mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-10 02:55:55 +02:00
IPsec: Fix and enhance DPD configuration.
Also the action option has now moved to the advanced settings page and the design has been improved.
This commit is contained in:
@@ -198,7 +198,6 @@ WARNING: translation string unused: from warn email bad
|
||||
WARNING: translation string unused: fwdfw MODE1
|
||||
WARNING: translation string unused: fwdfw MODE2
|
||||
WARNING: translation string unused: fwdfw err prot_port1
|
||||
WARNING: translation string unused: fwdfw err tgt_port
|
||||
WARNING: translation string unused: fwdfw final_rule
|
||||
WARNING: translation string unused: fwdfw from
|
||||
WARNING: translation string unused: fwdfw ipsec network
|
||||
@@ -572,6 +571,7 @@ WARNING: untranslated string: Scan for Songs
|
||||
WARNING: untranslated string: advproxy cache-digest
|
||||
WARNING: untranslated string: bytes
|
||||
WARNING: untranslated string: community rules
|
||||
WARNING: untranslated string: dead peer detection
|
||||
WARNING: untranslated string: emerging rules
|
||||
WARNING: untranslated string: fwhost err hostip
|
||||
WARNING: untranslated string: new
|
||||
|
||||
@@ -221,7 +221,6 @@ WARNING: translation string unused: from warn email bad
|
||||
WARNING: translation string unused: fwdfw MODE1
|
||||
WARNING: translation string unused: fwdfw MODE2
|
||||
WARNING: translation string unused: fwdfw err prot_port1
|
||||
WARNING: translation string unused: fwdfw err tgt_port
|
||||
WARNING: translation string unused: fwdfw final_rule
|
||||
WARNING: translation string unused: fwdfw from
|
||||
WARNING: translation string unused: fwdfw ipsec network
|
||||
|
||||
@@ -595,6 +595,7 @@ WARNING: untranslated string: ccd none
|
||||
WARNING: untranslated string: ccd routes
|
||||
WARNING: untranslated string: ccd subnet
|
||||
WARNING: untranslated string: ccd used
|
||||
WARNING: untranslated string: dead peer detection
|
||||
WARNING: untranslated string: default ip
|
||||
WARNING: untranslated string: deprecated fs warn
|
||||
WARNING: untranslated string: dnat address
|
||||
@@ -605,6 +606,8 @@ WARNING: untranslated string: dnsforward edit an entry
|
||||
WARNING: untranslated string: dnsforward entries
|
||||
WARNING: untranslated string: dnsforward forward_server
|
||||
WARNING: untranslated string: dnsforward zone
|
||||
WARNING: untranslated string: dpd delay
|
||||
WARNING: untranslated string: dpd timeout
|
||||
WARNING: untranslated string: drop action
|
||||
WARNING: untranslated string: drop action1
|
||||
WARNING: untranslated string: drop action2
|
||||
@@ -664,6 +667,7 @@ WARNING: untranslated string: fwdfw err src_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_grp
|
||||
WARNING: untranslated string: fwdfw err tgt_mac
|
||||
WARNING: untranslated string: fwdfw err tgt_port
|
||||
WARNING: untranslated string: fwdfw err time
|
||||
WARNING: untranslated string: fwdfw external port nat
|
||||
WARNING: untranslated string: fwdfw hint ip1
|
||||
@@ -774,6 +778,8 @@ WARNING: untranslated string: fwhost used
|
||||
WARNING: untranslated string: fwhost welcome
|
||||
WARNING: untranslated string: grouptype
|
||||
WARNING: untranslated string: integrity
|
||||
WARNING: untranslated string: invalid input for dpd delay
|
||||
WARNING: untranslated string: invalid input for dpd timeout
|
||||
WARNING: untranslated string: least preferred
|
||||
WARNING: untranslated string: lifetime
|
||||
WARNING: untranslated string: minute
|
||||
|
||||
@@ -597,6 +597,7 @@ WARNING: untranslated string: ccd none
|
||||
WARNING: untranslated string: ccd routes
|
||||
WARNING: untranslated string: ccd subnet
|
||||
WARNING: untranslated string: ccd used
|
||||
WARNING: untranslated string: dead peer detection
|
||||
WARNING: untranslated string: default ip
|
||||
WARNING: untranslated string: deprecated fs warn
|
||||
WARNING: untranslated string: dnat address
|
||||
@@ -608,6 +609,8 @@ WARNING: untranslated string: dnsforward edit an entry
|
||||
WARNING: untranslated string: dnsforward entries
|
||||
WARNING: untranslated string: dnsforward forward_server
|
||||
WARNING: untranslated string: dnsforward zone
|
||||
WARNING: untranslated string: dpd delay
|
||||
WARNING: untranslated string: dpd timeout
|
||||
WARNING: untranslated string: drop action
|
||||
WARNING: untranslated string: drop action1
|
||||
WARNING: untranslated string: drop action2
|
||||
@@ -667,6 +670,7 @@ WARNING: untranslated string: fwdfw err src_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_grp
|
||||
WARNING: untranslated string: fwdfw err tgt_mac
|
||||
WARNING: untranslated string: fwdfw err tgt_port
|
||||
WARNING: untranslated string: fwdfw err time
|
||||
WARNING: untranslated string: fwdfw external port nat
|
||||
WARNING: untranslated string: fwdfw hint ip1
|
||||
@@ -777,6 +781,8 @@ WARNING: untranslated string: fwhost used
|
||||
WARNING: untranslated string: fwhost welcome
|
||||
WARNING: untranslated string: grouptype
|
||||
WARNING: untranslated string: integrity
|
||||
WARNING: untranslated string: invalid input for dpd delay
|
||||
WARNING: untranslated string: invalid input for dpd timeout
|
||||
WARNING: untranslated string: least preferred
|
||||
WARNING: untranslated string: lifetime
|
||||
WARNING: untranslated string: minute
|
||||
|
||||
@@ -563,6 +563,7 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
|
||||
WARNING: untranslated string: advproxy proxy port transparent
|
||||
WARNING: untranslated string: bytes
|
||||
WARNING: untranslated string: ccd iroute2
|
||||
WARNING: untranslated string: dead peer detection
|
||||
WARNING: untranslated string: default ip
|
||||
WARNING: untranslated string: dnat address
|
||||
WARNING: untranslated string: dnsforward
|
||||
@@ -572,6 +573,8 @@ WARNING: untranslated string: dnsforward edit an entry
|
||||
WARNING: untranslated string: dnsforward entries
|
||||
WARNING: untranslated string: dnsforward forward_server
|
||||
WARNING: untranslated string: dnsforward zone
|
||||
WARNING: untranslated string: dpd delay
|
||||
WARNING: untranslated string: dpd timeout
|
||||
WARNING: untranslated string: drop action
|
||||
WARNING: untranslated string: drop action1
|
||||
WARNING: untranslated string: drop action2
|
||||
@@ -613,6 +616,7 @@ WARNING: untranslated string: fwdfw err src_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_grp
|
||||
WARNING: untranslated string: fwdfw err tgt_mac
|
||||
WARNING: untranslated string: fwdfw err tgt_port
|
||||
WARNING: untranslated string: fwdfw err time
|
||||
WARNING: untranslated string: fwdfw external port nat
|
||||
WARNING: untranslated string: fwdfw hint ip1
|
||||
@@ -723,6 +727,8 @@ WARNING: untranslated string: fwhost used
|
||||
WARNING: untranslated string: fwhost welcome
|
||||
WARNING: untranslated string: grouptype
|
||||
WARNING: untranslated string: integrity
|
||||
WARNING: untranslated string: invalid input for dpd delay
|
||||
WARNING: untranslated string: invalid input for dpd timeout
|
||||
WARNING: untranslated string: least preferred
|
||||
WARNING: untranslated string: lifetime
|
||||
WARNING: untranslated string: most preferred
|
||||
|
||||
@@ -595,6 +595,7 @@ WARNING: untranslated string: ccd none
|
||||
WARNING: untranslated string: ccd routes
|
||||
WARNING: untranslated string: ccd subnet
|
||||
WARNING: untranslated string: ccd used
|
||||
WARNING: untranslated string: dead peer detection
|
||||
WARNING: untranslated string: default ip
|
||||
WARNING: untranslated string: deprecated fs warn
|
||||
WARNING: untranslated string: dnat address
|
||||
@@ -605,6 +606,8 @@ WARNING: untranslated string: dnsforward edit an entry
|
||||
WARNING: untranslated string: dnsforward entries
|
||||
WARNING: untranslated string: dnsforward forward_server
|
||||
WARNING: untranslated string: dnsforward zone
|
||||
WARNING: untranslated string: dpd delay
|
||||
WARNING: untranslated string: dpd timeout
|
||||
WARNING: untranslated string: drop action
|
||||
WARNING: untranslated string: drop action1
|
||||
WARNING: untranslated string: drop action2
|
||||
@@ -664,6 +667,7 @@ WARNING: untranslated string: fwdfw err src_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_grp
|
||||
WARNING: untranslated string: fwdfw err tgt_mac
|
||||
WARNING: untranslated string: fwdfw err tgt_port
|
||||
WARNING: untranslated string: fwdfw err time
|
||||
WARNING: untranslated string: fwdfw external port nat
|
||||
WARNING: untranslated string: fwdfw hint ip1
|
||||
@@ -774,6 +778,8 @@ WARNING: untranslated string: fwhost used
|
||||
WARNING: untranslated string: fwhost welcome
|
||||
WARNING: untranslated string: grouptype
|
||||
WARNING: untranslated string: integrity
|
||||
WARNING: untranslated string: invalid input for dpd delay
|
||||
WARNING: untranslated string: invalid input for dpd timeout
|
||||
WARNING: untranslated string: least preferred
|
||||
WARNING: untranslated string: lifetime
|
||||
WARNING: untranslated string: minute
|
||||
|
||||
@@ -590,6 +590,7 @@ WARNING: untranslated string: ccd routes
|
||||
WARNING: untranslated string: ccd subnet
|
||||
WARNING: untranslated string: ccd used
|
||||
WARNING: untranslated string: community rules
|
||||
WARNING: untranslated string: dead peer detection
|
||||
WARNING: untranslated string: default ip
|
||||
WARNING: untranslated string: deprecated fs warn
|
||||
WARNING: untranslated string: disk access per
|
||||
@@ -601,6 +602,8 @@ WARNING: untranslated string: dnsforward edit an entry
|
||||
WARNING: untranslated string: dnsforward entries
|
||||
WARNING: untranslated string: dnsforward forward_server
|
||||
WARNING: untranslated string: dnsforward zone
|
||||
WARNING: untranslated string: dpd delay
|
||||
WARNING: untranslated string: dpd timeout
|
||||
WARNING: untranslated string: drop action
|
||||
WARNING: untranslated string: drop action1
|
||||
WARNING: untranslated string: drop action2
|
||||
@@ -650,6 +653,7 @@ WARNING: untranslated string: fwdfw err src_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_grp
|
||||
WARNING: untranslated string: fwdfw err tgt_mac
|
||||
WARNING: untranslated string: fwdfw err tgt_port
|
||||
WARNING: untranslated string: fwdfw err time
|
||||
WARNING: untranslated string: fwdfw external port nat
|
||||
WARNING: untranslated string: fwdfw hint ip1
|
||||
@@ -761,6 +765,8 @@ WARNING: untranslated string: fwhost welcome
|
||||
WARNING: untranslated string: grouptype
|
||||
WARNING: untranslated string: incoming traffic in bytes per second
|
||||
WARNING: untranslated string: integrity
|
||||
WARNING: untranslated string: invalid input for dpd delay
|
||||
WARNING: untranslated string: invalid input for dpd timeout
|
||||
WARNING: untranslated string: least preferred
|
||||
WARNING: untranslated string: lifetime
|
||||
WARNING: untranslated string: minute
|
||||
|
||||
@@ -576,8 +576,11 @@ WARNING: untranslated string: Scan for Songs
|
||||
WARNING: untranslated string: advproxy errmsg proxy ports equal
|
||||
WARNING: untranslated string: advproxy proxy port transparent
|
||||
WARNING: untranslated string: bytes
|
||||
WARNING: untranslated string: dead peer detection
|
||||
WARNING: untranslated string: default ip
|
||||
WARNING: untranslated string: dnat address
|
||||
WARNING: untranslated string: dpd delay
|
||||
WARNING: untranslated string: dpd timeout
|
||||
WARNING: untranslated string: drop action
|
||||
WARNING: untranslated string: drop action1
|
||||
WARNING: untranslated string: drop action2
|
||||
@@ -619,6 +622,7 @@ WARNING: untranslated string: fwdfw err src_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_addr
|
||||
WARNING: untranslated string: fwdfw err tgt_grp
|
||||
WARNING: untranslated string: fwdfw err tgt_mac
|
||||
WARNING: untranslated string: fwdfw err tgt_port
|
||||
WARNING: untranslated string: fwdfw err time
|
||||
WARNING: untranslated string: fwdfw external port nat
|
||||
WARNING: untranslated string: fwdfw hint ip1
|
||||
@@ -729,6 +733,8 @@ WARNING: untranslated string: fwhost used
|
||||
WARNING: untranslated string: fwhost welcome
|
||||
WARNING: untranslated string: grouptype
|
||||
WARNING: untranslated string: integrity
|
||||
WARNING: untranslated string: invalid input for dpd delay
|
||||
WARNING: untranslated string: invalid input for dpd timeout
|
||||
WARNING: untranslated string: least preferred
|
||||
WARNING: untranslated string: lifetime
|
||||
WARNING: untranslated string: most preferred
|
||||
|
||||
@@ -70,6 +70,8 @@
|
||||
< dnsforward entries
|
||||
< dnsforward forward_server
|
||||
< dnsforward zone
|
||||
< dpd delay
|
||||
< dpd timeout
|
||||
< drop action
|
||||
< drop action1
|
||||
< drop action2
|
||||
@@ -268,6 +270,8 @@
|
||||
< fw settings ruletable
|
||||
< grouptype
|
||||
< integrity
|
||||
< invalid input for dpd delay
|
||||
< invalid input for dpd timeout
|
||||
< least preferred
|
||||
< lifetime
|
||||
< minute
|
||||
@@ -488,6 +492,8 @@
|
||||
< dnsforward entries
|
||||
< dnsforward forward_server
|
||||
< dnsforward zone
|
||||
< dpd delay
|
||||
< dpd timeout
|
||||
< drop action
|
||||
< drop action1
|
||||
< drop action2
|
||||
@@ -686,6 +692,8 @@
|
||||
< fw settings ruletable
|
||||
< grouptype
|
||||
< integrity
|
||||
< invalid input for dpd delay
|
||||
< invalid input for dpd timeout
|
||||
< least preferred
|
||||
< lifetime
|
||||
< minute
|
||||
@@ -898,6 +906,8 @@
|
||||
< dnsforward entries
|
||||
< dnsforward forward_server
|
||||
< dnsforward zone
|
||||
< dpd delay
|
||||
< dpd timeout
|
||||
< drop action
|
||||
< drop action1
|
||||
< drop action2
|
||||
@@ -1088,6 +1098,8 @@
|
||||
< fw settings ruletable
|
||||
< grouptype
|
||||
< integrity
|
||||
< invalid input for dpd delay
|
||||
< invalid input for dpd timeout
|
||||
< least preferred
|
||||
< lifetime
|
||||
< minute
|
||||
@@ -1287,6 +1299,8 @@
|
||||
< dnsforward entries
|
||||
< dnsforward forward_server
|
||||
< dnsforward zone
|
||||
< dpd delay
|
||||
< dpd timeout
|
||||
< drop action
|
||||
< drop action1
|
||||
< drop action2
|
||||
@@ -1481,6 +1495,8 @@
|
||||
< hour-graph
|
||||
< incoming traffic in bytes per second
|
||||
< integrity
|
||||
< invalid input for dpd delay
|
||||
< invalid input for dpd timeout
|
||||
< least preferred
|
||||
< lifetime
|
||||
< minute
|
||||
|
||||
@@ -385,10 +385,19 @@ sub writeipsecfiles {
|
||||
print CONF "\tcompress=yes\n" if ($lconfighash{$key}[13] eq 'on');
|
||||
|
||||
# Dead Peer Detection
|
||||
print CONF "\tdpddelay=$lconfighash{$key}[30]\n";
|
||||
print CONF "\tdpdtimeout=$lconfighash{$key}[31]\n";
|
||||
print CONF "\tdpdaction=$lconfighash{$key}[27]\n";
|
||||
|
||||
my $dpddelay = $lconfighash{$key}[30];
|
||||
if (!$dpddelay) {
|
||||
$dpddelay = 30;
|
||||
}
|
||||
print CONF "\tdpddelay=$dpddelay\n";
|
||||
my $dpdtimeout = $lconfighash{$key}[31];
|
||||
if (!$dpdtimeout) {
|
||||
$dpdtimeout = 120;
|
||||
}
|
||||
print CONF "\tdpdtimeout=$dpdtimeout\n";
|
||||
|
||||
# Build Authentication details: LEFTid RIGHTid : PSK psk
|
||||
my $psk_line;
|
||||
if ($lconfighash{$key}[4] eq 'psk') {
|
||||
@@ -1278,6 +1287,14 @@ END
|
||||
$cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30];
|
||||
$cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31];
|
||||
|
||||
if (!$cgiparams{'DPD_DELAY'}) {
|
||||
$cgiparams{'DPD_DELAY'} = 30;
|
||||
}
|
||||
|
||||
if (!$cgiparams{'DPD_TIMEOUT'}) {
|
||||
$cgiparams{'DPD_TIMEOUT'} = 120;
|
||||
}
|
||||
|
||||
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
|
||||
$cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
|
||||
if ($cgiparams{'TYPE'} !~ /^(host|net)$/) {
|
||||
@@ -1833,6 +1850,14 @@ END
|
||||
$cgiparams{'DPD_ACTION'} = 'restart';
|
||||
}
|
||||
|
||||
if (!$cgiparams{'DPD_DELAY'}) {
|
||||
$cgiparams{'DPD_DELAY'} = 30;
|
||||
}
|
||||
|
||||
if (!$cgiparams{'DPD_TIMEOUT'}) {
|
||||
$cgiparams{'DPD_TIMEOUT'} = 120;
|
||||
}
|
||||
|
||||
# Default IKE Version to v2
|
||||
if (!$cgiparams{'IKE_VERSION'}) {
|
||||
$cgiparams{'IKE_VERSION'} = 'ikev2';
|
||||
@@ -1874,11 +1899,6 @@ END
|
||||
$checked{'AUTH'}{'auth-dn'} = '';
|
||||
$checked{'AUTH'}{$cgiparams{'AUTH'}} = "checked='checked'";
|
||||
|
||||
$selected{'DPD_ACTION'}{'clear'} = '';
|
||||
$selected{'DPD_ACTION'}{'hold'} = '';
|
||||
$selected{'DPD_ACTION'}{'restart'} = '';
|
||||
$selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'";
|
||||
|
||||
$selected{'IKE_VERSION'}{'ikev1'} = '';
|
||||
$selected{'IKE_VERSION'}{'ikev2'} = '';
|
||||
$selected{'IKE_VERSION'}{$cgiparams{'IKE_VERSION'}} = "selected='selected'";
|
||||
@@ -1915,6 +1935,9 @@ END
|
||||
<input type='hidden' name='ONLY_PROPOSED' value='$cgiparams{'ONLY_PROPOSED'}' />
|
||||
<input type='hidden' name='PFS' value='$cgiparams{'PFS'}' />
|
||||
<input type='hidden' name='VHOST' value='$cgiparams{'VHOST'}' />
|
||||
<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'}' />
|
||||
END
|
||||
;
|
||||
if ($cgiparams{'KEY'}) {
|
||||
@@ -1970,13 +1993,7 @@ END
|
||||
<option value='ikev1' $selected{'IKE_VERSION'}{'ikev1'}>IKEv1</option>
|
||||
</select>
|
||||
</td>
|
||||
<td>$Lang::tr{'dpd action'}:</td>
|
||||
<td><select name='DPD_ACTION'>
|
||||
<option value='clear' $selected{'DPD_ACTION'}{'clear'}>clear</option>
|
||||
<option value='hold' $selected{'DPD_ACTION'}{'hold'}>hold</option>
|
||||
<option value='restart' $selected{'DPD_ACTION'}{'restart'}>restart</option>
|
||||
</select>
|
||||
</td>
|
||||
<td colspan="2"></td>
|
||||
</tr><tr>
|
||||
<td class='boldbase'>$Lang::tr{'remark title'} <img src='/blob.gif' alt='*' /></td>
|
||||
<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td>
|
||||
@@ -2189,6 +2206,16 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
goto ADVANCED_ERROR;
|
||||
}
|
||||
|
||||
if ($cgiparams{'DPD_DELAY'} !~ /^\d+$/) {
|
||||
$errormessage = $Lang::tr{'invalid input for dpd delay'};
|
||||
goto ADVANCED_ERROR;
|
||||
}
|
||||
|
||||
if ($cgiparams{'DPD_TIMEOUT'} !~ /^\d+$/) {
|
||||
$errormessage = $Lang::tr{'invalid input for dpd timeout'};
|
||||
goto ADVANCED_ERROR;
|
||||
}
|
||||
|
||||
$confighash{$cgiparams{'KEY'}}[18] = $cgiparams{'IKE_ENCRYPTION'};
|
||||
$confighash{$cgiparams{'KEY'}}[19] = $cgiparams{'IKE_INTEGRITY'};
|
||||
$confighash{$cgiparams{'KEY'}}[20] = $cgiparams{'IKE_GROUPTYPE'};
|
||||
@@ -2227,6 +2254,14 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
$cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30];
|
||||
$cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31];
|
||||
|
||||
if (!$cgiparams{'DPD_DELAY'}) {
|
||||
$cgiparams{'DPD_DELAY'} = 30;
|
||||
}
|
||||
|
||||
if (!$cgiparams{'DPD_TIMEOUT'}) {
|
||||
$cgiparams{'DPD_TIMEOUT'} = 120;
|
||||
}
|
||||
|
||||
if ($confighash{$cgiparams{'KEY'}}[3] eq 'net' || $confighash{$cgiparams{'KEY'}}[10]) {
|
||||
$cgiparams{'VHOST'} = 'off';
|
||||
}
|
||||
@@ -2288,6 +2323,11 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
$checked{'PFS'} = $cgiparams{'PFS'} eq 'on' ? "checked='checked'" : '' ;
|
||||
$checked{'VHOST'} = $cgiparams{'VHOST'} eq 'on' ? "checked='checked'" : '' ;
|
||||
|
||||
$selected{'DPD_ACTION'}{'clear'} = '';
|
||||
$selected{'DPD_ACTION'}{'hold'} = '';
|
||||
$selected{'DPD_ACTION'}{'restart'} = '';
|
||||
$selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'";
|
||||
|
||||
&Header::showhttpheaders();
|
||||
&Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
|
||||
&Header::openbigbox('100%', 'left', '', $errormessage);
|
||||
@@ -2315,14 +2355,14 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
<table width='100%'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th width="15%"></th>
|
||||
<th>IKE</th>
|
||||
<th>ESP</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class='boldbase'>$Lang::tr{'encryption'}</td>
|
||||
<td class='boldbase' width="15%">$Lang::tr{'encryption'}</td>
|
||||
<td class='boldbase'>
|
||||
<select name='IKE_ENCRYPTION' multiple='multiple' size='6' style='width: 100%'>
|
||||
<option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option>
|
||||
@@ -2348,7 +2388,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='boldbase'>$Lang::tr{'integrity'}</td>
|
||||
<td class='boldbase' width="15%">$Lang::tr{'integrity'}</td>
|
||||
<td class='boldbase'>
|
||||
<select name='IKE_INTEGRITY' multiple='multiple' size='6' style='width: 100%'>
|
||||
<option value='sha2_512' $checked{'IKE_INTEGRITY'}{'sha2_512'}>SHA2 512 bit</option>
|
||||
@@ -2371,7 +2411,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='boldbase'>$Lang::tr{'lifetime'}</td>
|
||||
<td class='boldbase' width="15%">$Lang::tr{'lifetime'}</td>
|
||||
<td class='boldbase'>
|
||||
<input type='text' name='IKE_LIFETIME' value='$cgiparams{'IKE_LIFETIME'}' size='5' /> $Lang::tr{'hours'}
|
||||
</td>
|
||||
@@ -2380,7 +2420,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='boldbase'>$Lang::tr{'grouptype'}</td>
|
||||
<td class='boldbase' width="15%">$Lang::tr{'grouptype'}</td>
|
||||
<td class='boldbase'>
|
||||
<select name='IKE_GROUPTYPE' multiple='multiple' size='6' style='width: 100%'>
|
||||
<option value='e521' $checked{'IKE_GROUPTYPE'}{'e521'}>ECP-521 (NIST)</option>
|
||||
@@ -2409,11 +2449,40 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<br><br>
|
||||
|
||||
<h2>$Lang::tr{'dead peer detection'}</h2>
|
||||
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td width="15%">$Lang::tr{'dpd action'}:</td>
|
||||
<td>
|
||||
<select name='DPD_ACTION'>
|
||||
<option value='clear' $selected{'DPD_ACTION'}{'clear'}>clear</option>
|
||||
<option value='hold' $selected{'DPD_ACTION'}{'hold'}>hold</option>
|
||||
<option value='restart' $selected{'DPD_ACTION'}{'restart'}>restart</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="15%">$Lang::tr{'dpd timeout'}:</td>
|
||||
<td>
|
||||
<input type='text' name='DPD_TIMEOUT' size='5' value='$cgiparams{'DPD_TIMEOUT'}' />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="15%">$Lang::tr{'dpd delay'}:</td>
|
||||
<td>
|
||||
<input type='text' name='DPD_DELAY' size='5' value='$cgiparams{'DPD_DELAY'}' />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<hr>
|
||||
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td colspan='2'>
|
||||
<td>
|
||||
<label>
|
||||
<input type='checkbox' name='ONLY_PROPOSED' $checked{'ONLY_PROPOSED'} />
|
||||
IKE+ESP: $Lang::tr{'use only proposed settings'}</td>
|
||||
@@ -2421,7 +2490,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan='2'>
|
||||
<td>
|
||||
<label>
|
||||
<input type='checkbox' name='PFS' $checked{'PFS'} />
|
||||
$Lang::tr{'pfs yes no'}
|
||||
@@ -2429,33 +2498,13 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan='2'>
|
||||
<td>
|
||||
<label>
|
||||
<input type='checkbox' name='COMPRESSION' $checked{'COMPRESSION'} />
|
||||
$Lang::tr{'vpn payload compression'}
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width='20%'>
|
||||
<label>
|
||||
$Lang::tr{'dpd timeout'}
|
||||
</label>
|
||||
</td>
|
||||
<td>
|
||||
<input type='text' name='DPD_TIMEOUT' size='5' value='$cgiparams{'DPD_TIMEOUT'}' />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width='20%'>
|
||||
<label>
|
||||
$Lang::tr{'dpd delay'}
|
||||
</label>
|
||||
</td>
|
||||
<td>
|
||||
<input type='text' name='DPD_DELAY' size='5' value='$cgiparams{'DPD_DELAY'}' />
|
||||
</td>
|
||||
</tr>
|
||||
EOF
|
||||
;
|
||||
if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
|
||||
|
||||
@@ -749,8 +749,8 @@
|
||||
'download pkcs12 file' => 'PKCS12-Datei herunterladen',
|
||||
'download root certificate' => 'Root-Zertifikat herunterladen',
|
||||
'dpd action' => 'Aktion für Dead Peer Detection',
|
||||
'dpd timeout' => 'DPD Zeitüberschreitung',
|
||||
'dpd delay' => 'DPD Verzögerung',
|
||||
'dpd delay' => 'Verzögerung',
|
||||
'dpd timeout' => 'Zeitüberschreitung',
|
||||
'driver' => 'Treiber',
|
||||
'drop action' => 'Standardverhalten der (Forward) Firewall in Modus "Blocked"',
|
||||
'drop action1' => 'Standardverhalten der (Outgoing) Firewall in Modus "Blocked"',
|
||||
@@ -1211,6 +1211,8 @@
|
||||
'invalid input for dhcp dns' => 'Ungültige Eingabe für DHCP DNS',
|
||||
'invalid input for dhcp domain' => 'Ungültige Eingabe für DHCP Domain',
|
||||
'invalid input for dhcp wins' => 'Ungültige Eingabe für DHCP WINS',
|
||||
'invalid input for dpd delay' => 'Ungültige Eingabe für DPD-Verzögerung',
|
||||
'invalid input for dpd timeout' => 'Ungültige Eingabe für DPD-Zeitüberschreitung',
|
||||
'invalid input for e-mail address' => 'Ungültige Eingabe für die E-mail Adresse',
|
||||
'invalid input for esp keylife' => 'Ungültige Eingabe für ESP Schlüssel-Lebensdauer',
|
||||
'invalid input for hostname' => 'Ungültige Eingabe für Hostname',
|
||||
|
||||
@@ -634,6 +634,7 @@
|
||||
'ddns noip prefix' => 'To use no-ip in group mode, prefix hostname with <b>%</b>',
|
||||
'deactivate' => 'deactivate',
|
||||
'deactivate user' => 'deactivate user',
|
||||
'dead peer detection' => 'Dead Peer Detection',
|
||||
'debugme' => 'Not yet implemented',
|
||||
'december' => 'December',
|
||||
'deep scan directories' => 'Scan recursive',
|
||||
@@ -772,9 +773,9 @@
|
||||
'download new ruleset' => 'Download new ruleset',
|
||||
'download pkcs12 file' => 'Download PKCS12 file',
|
||||
'download root certificate' => 'Download root certificate',
|
||||
'dpd action' => 'Dead Peer Detection action',
|
||||
'dpd timeout' => 'DPD timeout',
|
||||
'dpd delay' => 'DPD delay',
|
||||
'dpd action' => 'Action',
|
||||
'dpd delay' => 'Delay',
|
||||
'dpd timeout' => 'Timeout',
|
||||
'driver' => 'Driver',
|
||||
'drop action' => 'Default behaviour of (forward) firewall in mode "Blocked"',
|
||||
'drop action1' => 'Default behaviour of (outgoing) firewall in mode "Blocked"',
|
||||
@@ -1239,6 +1240,8 @@
|
||||
'invalid input for dhcp dns' => 'Invalid input for DHCP DNS',
|
||||
'invalid input for dhcp domain' => 'Invalid input for DHCP domain',
|
||||
'invalid input for dhcp wins' => 'Invalid input for DHCP WINS',
|
||||
'invalid input for dpd delay' => 'Invalid input for DPD delay',
|
||||
'invalid input for dpd timeout' => 'Invalid input for DPD timeout',
|
||||
'invalid input for e-mail address' => 'Invalid input for e-mail address.',
|
||||
'invalid input for esp keylife' => 'Invalid input for ESP Keylife',
|
||||
'invalid input for hostname' => 'Invalid input for hostname.',
|
||||
|
||||
Reference in New Issue
Block a user