webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

vpnmain.cgi: Reflect recent changes: vpn-watch removed.

Browse Source
This commit is contained in:
Michael Tremer
2012-07-19 16:54:05 +02:00
parent e6a97a0ca2
commit 7916a3bef8
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
html/cgi-bin/vpnmain.cgi
View File

@@ -246,7 +246,7 @@ sub writeipsecfiles {
flock SECRETS, 2; flock SECRETS, 2;
print CONF "version 2\n\n"; print CONF "version 2\n\n";
print CONF "conn %default\n"; print CONF "conn %default\n";
print CONF "\tkeyingtries=0\n"; print CONF "\tkeyingtries=%forever\n";
print CONF "\n"; print CONF "\n";
# Add user includes to config file # Add user includes to config file
@@ -335,14 +335,19 @@ sub writeipsecfiles {
foreach my $i (@encs) { foreach my $i (@encs) {
foreach my $j (@ints) { foreach my $j (@ints) {
my $modp = ""; my $modp = "";
foreach my $k (@groups) { if ($pfs eq "on") {
if ($comma != 0) { print CONF ","; } else { $comma = 1; } foreach my $k (@groups) {
if ($pfs eq "on") { if ($comma != 0) { print CONF ","; } else { $comma = 1; }
$modp = "-modp$k"; if ($pfs eq "on") {
} else { $modp = "-modp$k";
$modp = ""; } else {
} $modp = "";
print CONF "$i-$j$modp"; }
print CONF "$i-$j$modp";
}
} else {
if ($comma != 0) { print CONF ","; } else { $comma = 1; }
print CONF "$i-$j";
} }
} }
} }
@@ -426,11 +431,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
goto SAVE_ERROR; goto SAVE_ERROR;
} }
unless ($cgiparams{'VPN_WATCH'} =~ /^(|off|on)$/ ) {
$errormessage = $Lang::tr{'invalid input'};
goto SAVE_ERROR;
}
if ( $cgiparams{'RW_NET'} ne '' and !&General::validipandmask($cgiparams{'RW_NET'}) ) { if ( $cgiparams{'RW_NET'} ne '' and !&General::validipandmask($cgiparams{'RW_NET'}) ) {
$errormessage = $Lang::tr{'urlfilter invalid ip or mask error'}; $errormessage = $Lang::tr{'urlfilter invalid ip or mask error'};
goto SAVE_ERROR; goto SAVE_ERROR;
@@ -438,7 +438,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
$vpnsettings{'VPN_IP'} = $cgiparams{'VPN_IP'}; $vpnsettings{'VPN_IP'} = $cgiparams{'VPN_IP'};
$vpnsettings{'VPN_DELAYED_START'} = $cgiparams{'VPN_DELAYED_START'}; $vpnsettings{'VPN_DELAYED_START'} = $cgiparams{'VPN_DELAYED_START'};
$vpnsettings{'VPN_WATCH'} = $cgiparams{'VPN_WATCH'};
$vpnsettings{'RW_NET'} = $cgiparams{'RW_NET'}; $vpnsettings{'RW_NET'} = $cgiparams{'RW_NET'};
&General::writehash("${General::swroot}/vpn/settings", \%vpnsettings); &General::writehash("${General::swroot}/vpn/settings", \%vpnsettings);
&writeipsecfiles(); &writeipsecfiles();
@@ -2385,7 +2384,6 @@ EOF
$cgiparams{'VPN_IP'} ='%defaultroute' if ($cgiparams{'VPN_IP'} eq ''); $cgiparams{'VPN_IP'} ='%defaultroute' if ($cgiparams{'VPN_IP'} eq '');
$cgiparams{'VPN_DELAYED_START'} = 0 if (! defined ($cgiparams{'VPN_DELAYED_START'})); $cgiparams{'VPN_DELAYED_START'} = 0 if (! defined ($cgiparams{'VPN_DELAYED_START'}));
$checked{'VPN_WATCH'} = $cgiparams{'VPN_WATCH'} eq 'on' ? "checked='checked'" : '' ;
$checked{'ENABLED'} = $cgiparams{'ENABLED'} eq 'on' ? "checked='checked'" : ''; $checked{'ENABLED'} = $cgiparams{'ENABLED'} eq 'on' ? "checked='checked'" : '';
&Header::showhttpheaders(); &Header::showhttpheaders();
@@ -2420,7 +2418,6 @@ print <<END
<td ><input type='text' name='RW_NET' value='$cgiparams{'RW_NET'}' /></td> <td ><input type='text' name='RW_NET' value='$cgiparams{'RW_NET'}' /></td>
</tr> </tr>
</table> </table>
<p>$Lang::tr{'vpn watch'}:<input type='checkbox' name='VPN_WATCH' $checked{'VPN_WATCH'} /></p>
<hr /> <hr />
<table width='100%'> <table width='100%'>
<tr> <tr>