This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 49c64a099303ef7e970366f9fcb359aeeeb4c301 (commit) via f6529a04a398643edeea679f79b15912f8a6fc94 (commit) from 257ce821ee076adf318a806eda40e1793da0215c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 49c64a099303ef7e970366f9fcb359aeeeb4c301 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 10 13:38:43 2015 +0100
Update translation
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f6529a04a398643edeea679f79b15912f8a6fc94 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 10 13:35:24 2015 +0100
IPsec: Add option to force using MOBIKE
Some peers that are behind a NAT router that fails to properly forward IKE packets on UDP port 500 cannot establish an IPsec connection. MOBIKE tries to solve that by sending these packets to UDP port 4500 instead.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/94/filelists/files | 1 + doc/language_issues.de | 6 +++ doc/language_issues.en | 5 ++ doc/language_issues.es | 18 +++++++ doc/language_issues.fr | 18 +++++++ doc/language_issues.it | 18 +++++++ doc/language_issues.nl | 18 +++++++ doc/language_issues.pl | 18 +++++++ doc/language_issues.ru | 18 +++++++ doc/language_issues.tr | 18 +++++++ doc/language_missings | 80 ++++++++++++++++++++++++++++++++ html/cgi-bin/vpnmain.cgi | 27 ++++++++++- langs/de/cgi-bin/de.pl | 24 +++++----- langs/en/cgi-bin/en.pl | 25 +++++----- 14 files changed, 269 insertions(+), 25 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index 625b017..9b08114 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -3,6 +3,7 @@ etc/issue etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/mail.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl diff --git a/doc/language_issues.de b/doc/language_issues.de index 0d86987..54d9de9 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -164,7 +164,11 @@ WARNING: translation string unused: edit network WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg +WARNING: translation string unused: email error WARNING: translation string unused: email server can not be empty +WARNING: translation string unused: email subject +WARNING: translation string unused: email success +WARNING: translation string unused: email text WARNING: translation string unused: enable javascript WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabled on @@ -643,6 +647,7 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: ike lifetime should be between 1 and 8 hours +WARNING: untranslated string: info messages WARNING: untranslated string: no data WARNING: untranslated string: none WARNING: untranslated string: qos add subclass @@ -651,4 +656,5 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: show tls-auth key +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.en b/doc/language_issues.en index 1f1c78d..95477de 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -187,7 +187,11 @@ WARNING: translation string unused: edit network WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg +WARNING: translation string unused: email error WARNING: translation string unused: email server can not be empty +WARNING: translation string unused: email subject +WARNING: translation string unused: email success +WARNING: translation string unused: email text WARNING: translation string unused: enable javascript WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabled on @@ -675,6 +679,7 @@ WARNING: untranslated string: bytes WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: ike lifetime should be between 1 and 8 hours +WARNING: untranslated string: info messages WARNING: untranslated string: no data WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --git a/doc/language_issues.es b/doc/language_issues.es index 2a50200..91945ff 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -690,6 +690,22 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: email config +WARNING: untranslated string: email empty field +WARNING: untranslated string: email invalid +WARNING: untranslated string: email invalid mailfqdn +WARNING: untranslated string: email invalid mailip +WARNING: untranslated string: email invalid mailport +WARNING: untranslated string: email mailaddr +WARNING: untranslated string: email mailpass +WARNING: untranslated string: email mailport +WARNING: untranslated string: email mailrcpt +WARNING: untranslated string: email mailsender +WARNING: untranslated string: email mailuser +WARNING: untranslated string: email settings +WARNING: untranslated string: email testmail +WARNING: untranslated string: email tls +WARNING: untranslated string: email usemail WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@ -879,6 +895,7 @@ WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -1047,6 +1064,7 @@ WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_issues.fr b/doc/language_issues.fr index aa4951d..344ef07 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -698,6 +698,22 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: email config +WARNING: untranslated string: email empty field +WARNING: untranslated string: email invalid +WARNING: untranslated string: email invalid mailfqdn +WARNING: untranslated string: email invalid mailip +WARNING: untranslated string: email invalid mailport +WARNING: untranslated string: email mailaddr +WARNING: untranslated string: email mailpass +WARNING: untranslated string: email mailport +WARNING: untranslated string: email mailrcpt +WARNING: untranslated string: email mailsender +WARNING: untranslated string: email mailuser +WARNING: untranslated string: email settings +WARNING: untranslated string: email testmail +WARNING: untranslated string: email tls +WARNING: untranslated string: email usemail WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@ -894,6 +910,7 @@ WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -1062,6 +1079,7 @@ WARNING: untranslated string: urlfilter mode block WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_issues.it b/doc/language_issues.it index 1669e79..38614d6 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -674,6 +674,22 @@ WARNING: untranslated string: advproxy group access control WARNING: untranslated string: advproxy group required WARNING: untranslated string: bytes WARNING: untranslated string: check all +WARNING: untranslated string: email config +WARNING: untranslated string: email empty field +WARNING: untranslated string: email invalid +WARNING: untranslated string: email invalid mailfqdn +WARNING: untranslated string: email invalid mailip +WARNING: untranslated string: email invalid mailport +WARNING: untranslated string: email mailaddr +WARNING: untranslated string: email mailpass +WARNING: untranslated string: email mailport +WARNING: untranslated string: email mailrcpt +WARNING: untranslated string: email mailsender +WARNING: untranslated string: email mailuser +WARNING: untranslated string: email settings +WARNING: untranslated string: email testmail +WARNING: untranslated string: email tls +WARNING: untranslated string: email usemail WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon WARNING: untranslated string: fwdfw limitconcon @@ -696,6 +712,7 @@ WARNING: untranslated string: geoipblock enable feature WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green @@ -720,6 +737,7 @@ WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain WARNING: untranslated string: search WARNING: untranslated string: uncheck all +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 11d7657..2d3c78b 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -686,6 +686,22 @@ WARNING: untranslated string: dnssec not supported WARNING: untranslated string: dnssec validating WARNING: untranslated string: download tls-auth key WARNING: untranslated string: drop outgoing +WARNING: untranslated string: email config +WARNING: untranslated string: email empty field +WARNING: untranslated string: email invalid +WARNING: untranslated string: email invalid mailfqdn +WARNING: untranslated string: email invalid mailip +WARNING: untranslated string: email invalid mailport +WARNING: untranslated string: email mailaddr +WARNING: untranslated string: email mailpass +WARNING: untranslated string: email mailport +WARNING: untranslated string: email mailrcpt +WARNING: untranslated string: email mailsender +WARNING: untranslated string: email mailuser +WARNING: untranslated string: email settings +WARNING: untranslated string: email testmail +WARNING: untranslated string: email tls +WARNING: untranslated string: email usemail WARNING: untranslated string: firewall logs country WARNING: untranslated string: fwdfw err concon WARNING: untranslated string: fwdfw err ratecon @@ -713,6 +729,7 @@ WARNING: untranslated string: imei WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: masquerade blue WARNING: untranslated string: masquerade green @@ -769,6 +786,7 @@ WARNING: untranslated string: ta key WARNING: untranslated string: uncheck all WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2a50200..91945ff 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -690,6 +690,22 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: email config +WARNING: untranslated string: email empty field +WARNING: untranslated string: email invalid +WARNING: untranslated string: email invalid mailfqdn +WARNING: untranslated string: email invalid mailip +WARNING: untranslated string: email invalid mailport +WARNING: untranslated string: email mailaddr +WARNING: untranslated string: email mailpass +WARNING: untranslated string: email mailport +WARNING: untranslated string: email mailrcpt +WARNING: untranslated string: email mailsender +WARNING: untranslated string: email mailuser +WARNING: untranslated string: email settings +WARNING: untranslated string: email testmail +WARNING: untranslated string: email tls +WARNING: untranslated string: email usemail WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@ -879,6 +895,7 @@ WARNING: untranslated string: imsi WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -1047,6 +1064,7 @@ WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d2215b6..4531670 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -692,6 +692,22 @@ WARNING: untranslated string: drop action1 WARNING: untranslated string: drop action2 WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing +WARNING: untranslated string: email config +WARNING: untranslated string: email empty field +WARNING: untranslated string: email invalid +WARNING: untranslated string: email invalid mailfqdn +WARNING: untranslated string: email invalid mailip +WARNING: untranslated string: email invalid mailport +WARNING: untranslated string: email mailaddr +WARNING: untranslated string: email mailpass +WARNING: untranslated string: email mailport +WARNING: untranslated string: email mailrcpt +WARNING: untranslated string: email mailsender +WARNING: untranslated string: email mailuser +WARNING: untranslated string: email settings +WARNING: untranslated string: email testmail +WARNING: untranslated string: email tls +WARNING: untranslated string: email usemail WARNING: untranslated string: emerging rules WARNING: untranslated string: encryption WARNING: untranslated string: entropy @@ -879,6 +895,7 @@ WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: incoming traffic in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -1040,6 +1057,7 @@ WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: vendor WARNING: untranslated string: visit us at +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a9d6332..672a49d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -666,6 +666,22 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: check all +WARNING: untranslated string: email config +WARNING: untranslated string: email empty field +WARNING: untranslated string: email invalid +WARNING: untranslated string: email invalid mailfqdn +WARNING: untranslated string: email invalid mailip +WARNING: untranslated string: email invalid mailport +WARNING: untranslated string: email mailaddr +WARNING: untranslated string: email mailpass +WARNING: untranslated string: email mailport +WARNING: untranslated string: email mailrcpt +WARNING: untranslated string: email mailsender +WARNING: untranslated string: email mailuser +WARNING: untranslated string: email settings +WARNING: untranslated string: email testmail +WARNING: untranslated string: email tls +WARNING: untranslated string: email usemail WARNING: untranslated string: fwhost addgeoipgrp WARNING: untranslated string: fwhost cust geoipgroup WARNING: untranslated string: fwhost cust geoipgrp @@ -682,6 +698,7 @@ WARNING: untranslated string: geoipblock enable feature WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: incoming compression in bytes per second WARNING: untranslated string: incoming overhead in bytes per second +WARNING: untranslated string: info messages WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: no data WARNING: untranslated string: none @@ -697,6 +714,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: search WARNING: untranslated string: uncheck all +WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index b88db57..97e2d18 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -113,6 +113,26 @@ < drop action2 < drop forward < drop outgoing +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs @@ -696,6 +716,26 @@ < drop action2 < drop forward < drop outgoing +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs @@ -1261,6 +1301,26 @@ < drop action2 < drop forward < drop outgoing +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs @@ -1816,6 +1876,26 @@ < drop forward < drop outgoing < Edit an existing route +< email config +< email empty field +< email error +< email invalid +< email invalid mailfqdn +< email invalid mailip +< email invalid mailport +< email mailaddr +< email mailpass +< email mailport +< email mailrcpt +< email mailsender +< email mailuser +< email settings +< email subject +< email success +< email testmail +< email text +< email tls +< email usemail < encryption < entropy < entropy graphs diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 8c44b7e..9f3c645 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -108,6 +108,7 @@ $cgiparams{'ROOTCERT_STATE'} = ''; $cgiparams{'RW_NET'} = ''; $cgiparams{'DPD_DELAY'} = '30'; $cgiparams{'DPD_TIMEOUT'} = '120'; +$cgiparams{'FORCE_MOBIKE'} = 'off'; &Header::getcgihash(%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
### @@ -360,6 +361,11 @@ sub writeipsecfiles { # Compression print CONF "\tcompress=yes\n" if ($lconfighash{$key}[13] eq 'on');
+ # Force MOBIKE? + if (($lconfighash{$key}[29] eq "ikev2") && ($lconfighash{$key}[32] eq 'on')) { + print CONF "\tmobike=yes\n"; + } + # Dead Peer Detection my $dpdaction = $lconfighash{$key}[27]; print CONF "\tdpdaction=$dpdaction\n"; @@ -1286,6 +1292,7 @@ END $cgiparams{'VHOST'} = $confighash{$cgiparams{'KEY'}}[14]; $cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30]; $cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31]; + $cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32];
if (!$cgiparams{'DPD_DELAY'}) { $cgiparams{'DPD_DELAY'} = 30; @@ -1768,7 +1775,7 @@ END my $key = $cgiparams{'KEY'}; if (! $key) { $key = &General::findhasharraykey (%confighash); - foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 32) { $confighash{$key}[$i] = "";} } $confighash{$key}[0] = $cgiparams{'ENABLED'}; $confighash{$key}[1] = $cgiparams{'NAME'}; @@ -1810,6 +1817,7 @@ END $confighash{$key}[14] = $cgiparams{'VHOST'}; $confighash{$key}[30] = $cgiparams{'DPD_TIMEOUT'}; $confighash{$key}[31] = $cgiparams{'DPD_DELAY'}; + $confighash{$key}[32] = $cgiparams{'FORCE_MOBIKE'};
#free unused fields! $confighash{$key}[6] = 'off'; @@ -1858,6 +1866,10 @@ END $cgiparams{'DPD_TIMEOUT'} = 120; }
+ if (!$cgiparams{'FORCE_MOBIKE'}) { + $cgiparams{'FORCE_MOBIKE'} = 'no'; + } + # Default IKE Version to v2 if (!$cgiparams{'IKE_VERSION'}) { $cgiparams{'IKE_VERSION'} = 'ikev2'; @@ -1935,6 +1947,7 @@ END <input type='hidden' name='DPD_ACTION' value='$cgiparams{'DPD_ACTION'}' /> <input type='hidden' name='DPD_DELAY' value='$cgiparams{'DPD_DELAY'}' /> <input type='hidden' name='DPD_TIMEOUT' value='$cgiparams{'DPD_TIMEOUT'}' /> + <input type='hidden' name='FORCE_MOBIKE' value='$cgiparams{'FORCE_MOBIKE'}' /> END ; if ($cgiparams{'KEY'}) { @@ -2206,6 +2219,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
if ( ($cgiparams{'COMPRESSION'} !~ /^(|on|off)$/) || + ($cgiparams{'FORCE_MOBIKE'} !~ /^(|on|off)$/) || ($cgiparams{'ONLY_PROPOSED'} !~ /^(|on|off)$/) || ($cgiparams{'PFS'} !~ /^(|on|off)$/) || ($cgiparams{'VHOST'} !~ /^(|on|off)$/) @@ -2241,6 +2255,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $confighash{$cgiparams{'KEY'}}[27] = $cgiparams{'DPD_ACTION'}; $confighash{$cgiparams{'KEY'}}[30] = $cgiparams{'DPD_TIMEOUT'}; $confighash{$cgiparams{'KEY'}}[31] = $cgiparams{'DPD_DELAY'}; + $confighash{$cgiparams{'KEY'}}[32] = $cgiparams{'FORCE_MOBIKE'}; &General::writehasharray("${General::swroot}/vpn/config", %confighash); &writeipsecfiles(); if (&vpnenabled) { @@ -2268,6 +2283,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $cgiparams{'DPD_ACTION'} = $confighash{$cgiparams{'KEY'}}[27]; $cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30]; $cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31]; + $cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32];
if (!$cgiparams{'DPD_DELAY'}) { $cgiparams{'DPD_DELAY'} = 30; @@ -2362,6 +2378,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || foreach my $key (@temp) {$checked{'ESP_GROUPTYPE'}{$key} = "selected='selected'"; }
$checked{'COMPRESSION'} = $cgiparams{'COMPRESSION'} eq 'on' ? "checked='checked'" : '' ; + $checked{'FORCE_MOBIKE'} = $cgiparams{'FORCE_MOBIKE'} eq 'on' ? "checked='checked'" : '' ; $checked{'ONLY_PROPOSED'} = $cgiparams{'ONLY_PROPOSED'} eq 'on' ? "checked='checked'" : '' ; $checked{'PFS'} = $cgiparams{'PFS'} eq 'on' ? "checked='checked'" : '' ; $checked{'VHOST'} = $cgiparams{'VHOST'} eq 'on' ? "checked='checked'" : '' ; @@ -2605,6 +2622,14 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || </label> </td> </tr> + <tr> + <td> + <label> + <input type='checkbox' name='FORCE_MOBIKE' $checked{'FORCE_MOBIKE'} /> + $Lang::tr{'vpn force mobike'} + </label> + </td> + </tr> EOF ; if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 36b54b8..c6d25fc 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -833,27 +833,27 @@ 'edit share' => 'Freigabe bearbeiten', 'editor' => 'Editor', 'eg' => 'z.B.:', -'email invalid mailip' => 'Ungültige IP-Adresse für Mailserver', +'email config' => 'Konfiguration', +'email empty field' => 'Leeres Feld', +'email error' => 'ERROR: Testmail konnte nicht versendet werden', +'email invalid' => 'Ungültiges Feld', 'email invalid mailfqdn' => 'Ungültiger FQDN für Mailserver', +'email invalid mailip' => 'Ungültige IP-Adresse für Mailserver', 'email invalid mailport' => 'Ungültiger Port für Mailserver', -'email empty field' => 'Leeres Feld', 'email mailaddr' => 'Mailserver-Adresse', -'email mailport' => 'Mailserver-Port', -'email mailuser' => 'Benutzername', 'email mailpass' => 'Passwort', -'email tls' => 'TLS aktivieren', +'email mailport' => 'Mailserver-Port', 'email mailrcpt' => 'E-Mail-Empfänger', 'email mailsender' => 'E-Mail Absender', -'email usemail' => 'Mailversand aktivieren', +'email mailuser' => 'Benutzername', +'email server can not be empty' => 'Email-Server darf nicht leer sein', 'email settings' => 'Mailversand', -'email config' => 'Konfiguration', 'email subject' => 'IPFire Testmail', -'email text' => 'Testnachricht vom IPFire Mailversand.', -'email testmail' => 'Testnachricht senden', 'email success' => 'Testmail erfolgreich versendet', -'email error' => 'ERROR: Testmail konnte nicht versendet werden', -'email invalid' => 'Ungültiges Feld', -'email server can not be empty' => 'Email-Server darf nicht leer sein', +'email testmail' => 'Testnachricht senden', +'email text' => 'Testnachricht vom IPFire Mailversand.', +'email tls' => 'TLS aktivieren', +'email usemail' => 'Mailversand aktivieren', 'emailreportlevel' => 'Email-Reportlevel', 'empty' => 'Dieses Feld kann leer bleiben', 'empty profile' => 'Unbenannt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ef5f50b..1e1b459 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -859,27 +859,27 @@ 'edit share' => 'Edit share', 'editor' => 'Editor', 'eg' => 'e.g.:', -'email invalid mailip' => 'Invalid mailserver IP address', +'email config' => 'Configuration', +'email empty field' => 'Empty field', +'email error' => 'ERROR: Testmail could not be sent', +'email invalid' => 'Invalid field', 'email invalid mailfqdn' => 'Invalid mailserver fqdn', +'email invalid mailip' => 'Invalid mailserver IP address', 'email invalid mailport' => 'Invalid mailserver port', -'email empty field' => 'Empty field', 'email mailaddr' => 'Mailserver address', -'email mailport' => 'Mailserver port', -'email mailuser' => 'Username', 'email mailpass' => 'Password', -'email tls' => 'Use TLS', +'email mailport' => 'Mailserver port', 'email mailrcpt' => 'Mail recipient', 'email mailsender' => 'Mail sender', -'email usemail' => 'Activate Mailservice', +'email mailuser' => 'Username', +'email server can not be empty' => 'E-mail server can not be empty', 'email settings' => 'Mailservice', -'email config' => 'Configuration', 'email subject' => 'IPFire Testmail', -'email text' => 'Testmail from IPFire Mailservice.', -'email testmail' => 'Send testmail', 'email success' => 'Testmail successfully sent', -'email error' => 'ERROR: Testmail could not be sent', -'email invalid' => 'Invalid field', -'email server can not be empty' => 'E-mail server can not be empty', +'email testmail' => 'Send testmail', +'email text' => 'Testmail from IPFire Mailservice.', +'email tls' => 'Use TLS', +'email usemail' => 'Activate Mailservice', 'emailreportlevel' => 'E-mailreportlevel', 'emerging rules' => 'Emergingthreats.net Community Rules', 'empty' => 'This field may be left blank', @@ -2648,6 +2648,7 @@ 'vpn configuration main' => 'VPN Configuration', 'vpn delayed start' => 'Delay before launching VPN (seconds)', 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.', +'vpn force mobike' => 'Force using MOBIKE (only IKEv2)', 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed', 'vpn keyexchange' => 'Keyexchange', 'vpn local id' => 'Local ID',
hooks/post-receive -- IPFire 2.x development tree