IPsec: Add dropdown to select tunnel interface mode

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 6d793fd1a14584294d4d59120e933aac5f1a3921..42a913d0624b96fc1c3e08b8b3aca7b970d05278 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -775,7 +775,12 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string
 WARNING: untranslated string: info messages = unknown string

+WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for mode = Invalid input for mode

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: no data = unknown string
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: no data = unknown string

diff --git a/doc/language_issues.en b/doc/language_issues.en
index eead5113d1c2ae40929f48100c6a592d06dd08eb..362a33cc01a25f628d0af3fd13d88a44f17a2db8 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1052,6 +1052,7 @@ WARNING: untranslated string: install = Install
 WARNING: untranslated string: instant update = Instant Update
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: interface = Interface
 WARNING: untranslated string: instant update = Instant Update
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: interface = Interface

+WARNING: untranslated string: interface mode = Interface

 WARNING: untranslated string: interfaces = Interfaces
 WARNING: untranslated string: internet = INTERNET
 WARNING: untranslated string: intrusion detection = Intrusion Detection
 WARNING: untranslated string: interfaces = Interfaces
 WARNING: untranslated string: internet = INTERNET
 WARNING: untranslated string: intrusion detection = Intrusion Detection


@@ -1080,6 +1081,7 @@ WARNING: untranslated string: invalid input for esp keylife = Invalid input for
 WARNING: untranslated string: invalid input for hostname = Invalid input for hostname.
 WARNING: untranslated string: invalid input for ike lifetime = Invalid input for IKE lifetime
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for hostname = Invalid input for hostname.
 WARNING: untranslated string: invalid input for ike lifetime = Invalid input for IKE lifetime
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout

+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for keepalive 1 = Invalid input for Keepalive ping
 WARNING: untranslated string: invalid input for keepalive 1:2 = Invalid input for Keepalive use at least a ratio of 1:2
 WARNING: untranslated string: invalid input for keepalive 2 = Invalid input for Keepalive ping-restart
 WARNING: untranslated string: invalid input for keepalive 1 = Invalid input for Keepalive ping
 WARNING: untranslated string: invalid input for keepalive 1:2 = Invalid input for Keepalive use at least a ratio of 1:2
 WARNING: untranslated string: invalid input for keepalive 2 = Invalid input for Keepalive ping-restart


@@ -1128,6 +1130,9 @@ WARNING: untranslated string: ipfire side is invalid = IPFire side is invalid.
 WARNING: untranslated string: ipfires hostname = IPFire's Hostname
 WARNING: untranslated string: ipinfo = IP info
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipfires hostname = IPFire's Hostname
 WARNING: untranslated string: ipinfo = IP info
 WARNING: untranslated string: ipsec = IPsec

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 1545fa5308bd1dba03dc66aba69bda5005e6abb1..d1bcd4bfd56f09e7fbfd7d7cb0de905fbca1bca4 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1050,14 +1050,19 @@ WARNING: untranslated string: incoming firewall access = Incoming Firewall Acces
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: integrity = Integrity:

+WARNING: untranslated string: interface mode = Interface

 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout

+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ipsec = IPsec

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 45bb87da79a4328bb41ea4a0f978e08c11767b9c..bac356f4c5fb44b821f4fde36078e574ef4fc630 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -810,8 +810,13 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string
 WARNING: untranslated string: info messages = unknown string

+WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: no data = unknown string
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: no data = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index ed32fdb04060db52f2afe7ef46b612b63361822b..5e15535951f816738bb29f988d04651457719382 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -884,11 +884,16 @@ WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unk
 WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string

+WARNING: untranslated string: interface mode = Interface

 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout

+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: log server protocol = protocol:
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: log server protocol = protocol:

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 13bd9408d0909624dea3266f86bffa596fc9000a..6837903b9674cd4d4f4529ce92784cf2f308e132 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -898,11 +898,16 @@ WARNING: untranslated string: imsi = IMSI
 WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string

+WARNING: untranslated string: interface mode = Interface

 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout

+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: log server protocol = protocol:
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: log server protocol = protocol:

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 1545fa5308bd1dba03dc66aba69bda5005e6abb1..d1bcd4bfd56f09e7fbfd7d7cb0de905fbca1bca4 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1050,14 +1050,19 @@ WARNING: untranslated string: incoming firewall access = Incoming Firewall Acces
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: integrity = Integrity:

+WARNING: untranslated string: interface mode = Interface

 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout

+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ipsec = IPsec

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 526c1375485b85a117af8e85c5097733bf8ccaa7..2e641cce254b69c2684742e9f281a5eaab7f7f39 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1052,14 +1052,19 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O
 WARNING: untranslated string: incoming traffic in bytes per second = Incoming Traffic
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: incoming traffic in bytes per second = Incoming Traffic
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: integrity = Integrity:

+WARNING: untranslated string: interface mode = Interface

 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout

+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ipsec = IPsec

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: ipsec network = IPsec network

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 41546bb3223bd1799baeca4b89d8166ca85c29c5..57e582d4e6bb76993c1088049665cc9d3981bc45 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -813,8 +813,13 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string
 WARNING: untranslated string: info messages = unknown string

+WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode

 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: invalid input for mode = Invalid input for mode
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname

+WARNING: untranslated string: ipsec interface mode gre = GRE
+WARNING: untranslated string: ipsec interface mode none = - None (Default) -
+WARNING: untranslated string: ipsec interface mode vti = VTI

 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: no data = unknown string
 WARNING: untranslated string: ipsec mode transport = Transport
 WARNING: untranslated string: ipsec mode tunnel = Tunnel
 WARNING: untranslated string: no data = unknown string

diff --git a/doc/language_missings b/doc/language_missings
index 8c9c68e977c8c667a606f467db5728f6b93bbc13..edb0b3fd4245949ceb83458862dc855cb5e89855 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -39,7 +39,12 @@
 < g.lite
 < guardian
 < insert removable device
 < g.lite
 < guardian
 < insert removable device

+< interface mode
+< invalid input for interface mode

 < invalid input for mode
 < invalid input for mode

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 < none
 < ipsec mode transport
 < ipsec mode tunnel
 < none


@@ -495,14 +500,19 @@
 < incoming firewall access
 < incoming overhead in bytes per second
 < integrity
 < incoming firewall access
 < incoming overhead in bytes per second
 < integrity

+< interface mode

 < invalid input for dpd delay
 < invalid input for dpd timeout
 < invalid input for inactivity timeout
 < invalid input for dpd delay
 < invalid input for dpd timeout
 < invalid input for inactivity timeout

+< invalid input for interface mode

 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < ipsec
 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < ipsec

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 < ipsec network
 < ipsec mode transport
 < ipsec mode tunnel
 < ipsec network


@@ -792,8 +802,13 @@
 ############################################################################
 < cryptographic settings
 < dnsforward forward_servers
 ############################################################################
 < cryptographic settings
 < dnsforward forward_servers

+< interface mode
+< invalid input for interface mode

 < invalid input for mode
 < invalid ip or hostname
 < invalid input for mode
 < invalid ip or hostname

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 ############################################################################
 < ipsec mode transport
 < ipsec mode tunnel
 ############################################################################


@@ -931,11 +946,16 @@
 < guardian
 < incoming compression in bytes per second
 < incoming overhead in bytes per second
 < guardian
 < incoming compression in bytes per second
 < incoming overhead in bytes per second

+< interface mode

 < invalid input for inactivity timeout
 < invalid input for inactivity timeout

+< invalid input for interface mode

 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 < log server protocol
 < ipsec mode transport
 < ipsec mode tunnel
 < log server protocol


@@ -1171,11 +1191,16 @@
 < imsi
 < incoming compression in bytes per second
 < incoming overhead in bytes per second
 < imsi
 < incoming compression in bytes per second
 < incoming overhead in bytes per second

+< interface mode

 < invalid input for inactivity timeout
 < invalid input for inactivity timeout

+< invalid input for interface mode

 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 < log server protocol
 < ipsec mode transport
 < ipsec mode tunnel
 < log server protocol


@@ -1730,14 +1755,19 @@
 < incoming firewall access
 < incoming overhead in bytes per second
 < integrity
 < incoming firewall access
 < incoming overhead in bytes per second
 < integrity

+< interface mode

 < invalid input for dpd delay
 < invalid input for dpd timeout
 < invalid input for inactivity timeout
 < invalid input for dpd delay
 < invalid input for dpd timeout
 < invalid input for inactivity timeout

+< invalid input for interface mode

 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < ipsec
 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < ipsec

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 < ipsec network
 < ipsec mode transport
 < ipsec mode tunnel
 < ipsec network


@@ -2453,14 +2483,19 @@
 < incoming overhead in bytes per second
 < incoming traffic in bytes per second
 < integrity
 < incoming overhead in bytes per second
 < incoming traffic in bytes per second
 < integrity

+< interface mode

 < invalid input for dpd delay
 < invalid input for dpd timeout
 < invalid input for inactivity timeout
 < invalid input for dpd delay
 < invalid input for dpd timeout
 < invalid input for inactivity timeout

+< invalid input for interface mode

 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < ipsec
 < invalid input for mode
 < invalid input for valid till days
 < invalid ip or hostname
 < invalid logserver protocol
 < ipsec

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 < ipsec network
 < ipsec mode transport
 < ipsec mode tunnel
 < ipsec network


@@ -2737,8 +2772,13 @@
 < crypto warning
 < dnsforward forward_servers
 < fwdfw all subnets
 < crypto warning
 < dnsforward forward_servers
 < fwdfw all subnets

+< interface mode
+< invalid input for interface mode

 < invalid input for mode
 < invalid ip or hostname
 < invalid input for mode
 < invalid ip or hostname

+< ipsec interface mode gre
+< ipsec interface mode none
+< ipsec interface mode vti

 < ipsec mode transport
 < ipsec mode tunnel
 < ovpn error dh
 < ipsec mode transport
 < ipsec mode tunnel
 < ovpn error dh

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 27729d3f5567d5f775e3d89dfa889ad34b5dc695..a1f095bdcbf6588863919257fa89438be72cc8eb 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -112,6 +112,7 @@ $cgiparams{'FORCE_MOBIKE'} = 'off';
 $cgiparams{'START_ACTION'} = 'start';
 $cgiparams{'INACTIVITY_TIMEOUT'} = 900;
 $cgiparams{'MODE'} = "tunnel";
 $cgiparams{'START_ACTION'} = 'start';
 $cgiparams{'INACTIVITY_TIMEOUT'} = 900;
 $cgiparams{'MODE'} = "tunnel";

+$cgiparams{'INTERFACE_MODE'} = "";

 &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
 
 ###
 &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
 
 ###


@@ -1325,6 +1326,7 @@ END
                $cgiparams{'FORCE_MOBIKE'}              = $confighash{$cgiparams{'KEY'}}[32];
                $cgiparams{'INACTIVITY_TIMEOUT'}        = $confighash{$cgiparams{'KEY'}}[34];
                $cgiparams{'MODE'}                      = $confighash{$cgiparams{'KEY'}}[35];
                $cgiparams{'FORCE_MOBIKE'}              = $confighash{$cgiparams{'KEY'}}[32];
                $cgiparams{'INACTIVITY_TIMEOUT'}        = $confighash{$cgiparams{'KEY'}}[34];
                $cgiparams{'MODE'}                      = $confighash{$cgiparams{'KEY'}}[35];

+               $cgiparams{'INTERFACE_MODE'}            = $confighash{$cgiparams{'KEY'}}[36];

 
                if (!$cgiparams{'DPD_DELAY'}) {
                        $cgiparams{'DPD_DELAY'} = 30;
 
                if (!$cgiparams{'DPD_DELAY'}) {
                        $cgiparams{'DPD_DELAY'} = 30;


@@ -1824,7 +1826,7 @@ END
        my $key = $cgiparams{'KEY'};
        if (! $key) {
                $key = &General::findhasharraykey (\%confighash);
        my $key = $cgiparams{'KEY'};
        if (! $key) {
                $key = &General::findhasharraykey (\%confighash);

-               foreach my $i (0 .. 35) { $confighash{$key}[$i] = "";}
+               foreach my $i (0 .. 36) { $confighash{$key}[$i] = "";}

        }
        $confighash{$key}[0] = $cgiparams{'ENABLED'};
        $confighash{$key}[1] = $cgiparams{'NAME'};
        }
        $confighash{$key}[0] = $cgiparams{'ENABLED'};
        $confighash{$key}[1] = $cgiparams{'NAME'};


@@ -1870,6 +1872,7 @@ END
        $confighash{$key}[32] = $cgiparams{'FORCE_MOBIKE'};
        $confighash{$key}[34] = $cgiparams{'INACTIVITY_TIMEOUT'};
        $confighash{$key}[35] = $cgiparams{'MODE'};
        $confighash{$key}[32] = $cgiparams{'FORCE_MOBIKE'};
        $confighash{$key}[34] = $cgiparams{'INACTIVITY_TIMEOUT'};
        $confighash{$key}[35] = $cgiparams{'MODE'};

+       $confighash{$key}[36] = $cgiparams{'INTERFACE_MODE'};

 
        # free unused fields!
        $confighash{$key}[6] = 'off';
 
        # free unused fields!
        $confighash{$key}[6] = 'off';


@@ -1945,6 +1948,7 @@ END
        $cgiparams{'PFS'}                               = 'on'; #[28];
        $cgiparams{'INACTIVITY_TIMEOUT'}        = 900;
        $cgiparams{'MODE'}                      = "tunnel";
        $cgiparams{'PFS'}                               = 'on'; #[28];
        $cgiparams{'INACTIVITY_TIMEOUT'}        = 900;
        $cgiparams{'MODE'}                      = "tunnel";

+       $cgiparams{'INTERFACE_MODE'}            = "";

 }
 
 VPNCONF_ERROR:
 }
 
 VPNCONF_ERROR:


@@ -2002,6 +2006,7 @@ VPNCONF_ERROR:
        <input type='hidden' name='FORCE_MOBIKE' value='$cgiparams{'FORCE_MOBIKE'}' />
        <input type='hidden' name='INACTIVITY_TIMEOUT' value='$cgiparams{'INACTIVITY_TIMEOUT'}' />
        <input type='hidden' name='MODE' value='$cgiparams{'MODE'}' />
        <input type='hidden' name='FORCE_MOBIKE' value='$cgiparams{'FORCE_MOBIKE'}' />
        <input type='hidden' name='INACTIVITY_TIMEOUT' value='$cgiparams{'INACTIVITY_TIMEOUT'}' />
        <input type='hidden' name='MODE' value='$cgiparams{'MODE'}' />

+       <input type='hidden' name='INTERFACE_MODE' value='$cgiparams{'INTERFACE_MODE'}' />

 END
 ;
        if ($cgiparams{'KEY'}) {
 END
 ;
        if ($cgiparams{'KEY'}) {


@@ -2301,6 +2306,11 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
                        goto ADVANCED_ERROR;
                }
 
                        goto ADVANCED_ERROR;
                }
 

+               if ($cgiparams{'INTERFACE_MODE'} !~ /^(|gre|vti)$/) {
+                       $errormessage = $Lang::tr{'invalid input for interface mode'};
+                       goto ADVANCED_ERROR;
+               }
+

                $confighash{$cgiparams{'KEY'}}[29] = $cgiparams{'IKE_VERSION'};
                $confighash{$cgiparams{'KEY'}}[18] = $cgiparams{'IKE_ENCRYPTION'};
                $confighash{$cgiparams{'KEY'}}[19] = $cgiparams{'IKE_INTEGRITY'};
                $confighash{$cgiparams{'KEY'}}[29] = $cgiparams{'IKE_VERSION'};
                $confighash{$cgiparams{'KEY'}}[18] = $cgiparams{'IKE_ENCRYPTION'};
                $confighash{$cgiparams{'KEY'}}[19] = $cgiparams{'IKE_INTEGRITY'};


@@ -2321,6 +2331,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
                $confighash{$cgiparams{'KEY'}}[33] = $cgiparams{'START_ACTION'};
                $confighash{$cgiparams{'KEY'}}[34] = $cgiparams{'INACTIVITY_TIMEOUT'};
                $confighash{$cgiparams{'KEY'}}[35] = $cgiparams{'MODE'};
                $confighash{$cgiparams{'KEY'}}[33] = $cgiparams{'START_ACTION'};
                $confighash{$cgiparams{'KEY'}}[34] = $cgiparams{'INACTIVITY_TIMEOUT'};
                $confighash{$cgiparams{'KEY'}}[35] = $cgiparams{'MODE'};

+               $confighash{$cgiparams{'KEY'}}[36] = $cgiparams{'INTERFACE_MODE'};

                &General::writehasharray("${General::swroot}/vpn/config", \%confighash);
                &writeipsecfiles();
                if (&vpnenabled) {
                &General::writehasharray("${General::swroot}/vpn/config", \%confighash);
                &writeipsecfiles();
                if (&vpnenabled) {


@@ -2351,6 +2362,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
                $cgiparams{'START_ACTION'}              = $confighash{$cgiparams{'KEY'}}[33];
                $cgiparams{'INACTIVITY_TIMEOUT'}        = $confighash{$cgiparams{'KEY'}}[34];
                $cgiparams{'MODE'}                      = $confighash{$cgiparams{'KEY'}}[35];
                $cgiparams{'START_ACTION'}              = $confighash{$cgiparams{'KEY'}}[33];
                $cgiparams{'INACTIVITY_TIMEOUT'}        = $confighash{$cgiparams{'KEY'}}[34];
                $cgiparams{'MODE'}                      = $confighash{$cgiparams{'KEY'}}[35];

+               $cgiparams{'INTERFACE_MODE'}            = $confighash{$cgiparams{'KEY'}}[36];

 
                if (!$cgiparams{'DPD_DELAY'}) {
                        $cgiparams{'DPD_DELAY'} = 30;
 
                if (!$cgiparams{'DPD_DELAY'}) {
                        $cgiparams{'DPD_DELAY'} = 30;


@@ -2483,6 +2495,11 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
        $selected{'MODE'}{'transport'} = '';
        $selected{'MODE'}{$cgiparams{'MODE'}} = "selected='selected'";
 
        $selected{'MODE'}{'transport'} = '';
        $selected{'MODE'}{$cgiparams{'MODE'}} = "selected='selected'";
 

+       $selected{'INTERFACE_MODE'}{''} = '';
+       $selected{'INTERFACE_MODE'}{'gre'} = '';
+       $selected{'INTERFACE_MODE'}{'vti'} = '';
+       $selected{'INTERFACE_MODE'}{$cgiparams{'INTERFACE_MODE'}} = "selected='selected'";
+

        &Header::showhttpheaders();
        &Header::openpage($Lang::tr{'ipsec'}, 1, '');
        &Header::openbigbox('100%', 'left', '', $errormessage);
        &Header::showhttpheaders();
        &Header::openpage($Lang::tr{'ipsec'}, 1, '');
        &Header::openbigbox('100%', 'left', '', $errormessage);


@@ -2518,6 +2535,17 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
                                        </select>
                                </td>
                        </tr>
                                        </select>
                                </td>
                        </tr>

+
+                       <tr>
+                               <td width="15%">$Lang::tr{'interface mode'}:</td>
+                               <td>
+                                       <select name='INTERFACE_MODE'>
+                                               <option value='' $selected{'INTERFACE_MODE'}{''}>$Lang::tr{'ipsec interface mode none'}</option>
+                                               <option value='gre' $selected{'INTERFACE_MODE'}{'gre'}>$Lang::tr{'ipsec interface mode gre'}</option>
+                                               <option value='vti' $selected{'INTERFACE_MODE'}{'vti'}>$Lang::tr{'ipsec interface mode vti'}</option>
+                                       </select>
+                               </td>
+                       </tr>

                </tbody>
        </table>
 
                </tbody>
        </table>
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 93b857808e1236784da3b77a2ca8541b1d01e426..1211625c908cd7f1f2313dc0425267c790905ba8 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1393,6 +1393,7 @@
 'instant update' => 'Instant Update',
 'integrity' => 'Integrity:',
 'interface' => 'Interface',
 'instant update' => 'Instant Update',
 'integrity' => 'Integrity:',
 'interface' => 'Interface',

+'interface mode' => 'Interface',

 'interfaces' => 'Interfaces',
 'internet' => 'INTERNET',
 'intrusion detection' => 'Intrusion Detection',
 'interfaces' => 'Interfaces',
 'internet' => 'INTERNET',
 'intrusion detection' => 'Intrusion Detection',


@@ -1426,6 +1427,7 @@
 'invalid input for hostname' => 'Invalid input for hostname.',
 'invalid input for ike lifetime' => 'Invalid input for IKE lifetime',
 'invalid input for inactivity timeout' => 'Invalid input for Inactivity Timeout',
 'invalid input for hostname' => 'Invalid input for hostname.',
 'invalid input for ike lifetime' => 'Invalid input for IKE lifetime',
 'invalid input for inactivity timeout' => 'Invalid input for Inactivity Timeout',

+'invalid input for interface mode' => 'Invalid input for interface mode',

 'invalid input for keepalive 1' => 'Invalid input for Keepalive ping',
 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2',
 'invalid input for keepalive 2' => 'Invalid input for Keepalive ping-restart',
 'invalid input for keepalive 1' => 'Invalid input for Keepalive ping',
 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2',
 'invalid input for keepalive 2' => 'Invalid input for Keepalive ping-restart',


@@ -1483,6 +1485,9 @@
 'ipfires hostname' => 'IPFire\'s Hostname',
 'ipinfo' => 'IP info',
 'ipsec' => 'IPsec',
 'ipfires hostname' => 'IPFire\'s Hostname',
 'ipinfo' => 'IP info',
 'ipsec' => 'IPsec',

+'ipsec interface mode gre' => 'GRE',
+'ipsec interface mode none' => '- None (Default) -',
+'ipsec interface mode vti' => 'VTI',

 'ipsec mode transport' => 'Transport',
 'ipsec mode tunnel' => 'Tunnel',
 'ipsec network' => 'IPsec network',
 'ipsec mode transport' => 'Transport',
 'ipsec mode tunnel' => 'Tunnel',
 'ipsec network' => 'IPsec network',