webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into thirteen

Browse Source 
Conflicts:
	config/rootfiles/core/52/meta
	config/rootfiles/core/53/filelists/strongswan
	config/rootfiles/core/53/meta
	config/rootfiles/core/54/filelists/strongswan
	config/rootfiles/core/54/meta
	config/rootfiles/core/55/exclude
	config/rootfiles/core/55/meta
	config/rootfiles/core/56/exclude
	config/rootfiles/core/56/meta
	config/rootfiles/core/57/exclude
	config/rootfiles/core/57/filelists/strongswan
	config/rootfiles/core/57/meta
	config/rootfiles/core/58/exclude
	config/rootfiles/core/58/filelists/strongswan
	config/rootfiles/core/58/meta
	config/rootfiles/core/59/exclude
	config/rootfiles/core/59/filelists/strongswan
	config/rootfiles/core/59/meta
	config/rootfiles/core/strongswan/exclude
	config/rootfiles/core/strongswan/filelists/strongswan
	config/rootfiles/core/strongswan/meta
	config/rootfiles/oldcore/52/meta
	config/rootfiles/oldcore/53/filelists/strongswan
	config/rootfiles/oldcore/53/meta
	config/rootfiles/oldcore/54/filelists/strongswan
	config/rootfiles/oldcore/54/meta
	config/rootfiles/oldcore/55/exclude
	config/rootfiles/oldcore/55/meta
	config/rootfiles/oldcore/56/exclude
	config/rootfiles/oldcore/56/meta
	config/rootfiles/oldcore/57/exclude
	config/rootfiles/oldcore/57/filelists/strongswan
	config/rootfiles/oldcore/57/meta
	config/rootfiles/oldcore/58/exclude
	config/rootfiles/oldcore/58/filelists/strongswan
	config/rootfiles/oldcore/58/meta
	config/rootfiles/oldcore/59/exclude
	config/rootfiles/oldcore/59/filelists/strongswan
	config/rootfiles/oldcore/59/meta
	lfs/dhcp
This commit is contained in:
Arne Fitzenreiter
2012-09-20 07:45:00 +02:00
parent c7961db8ed 6de056b1de
commit e0027e6cdc
58 changed files with 7659 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
html/cgi-bin/ovpnmain.cgi
View File

@@ -356,14 +356,11 @@ sub writeserverconf {
if ($sovpnsettings{CLIENT2CLIENT} eq 'on') {
print CONF "client-to-client\n";
}
if ($sovpnsettings{'DPROTOCOL'} eq 'udp') {
if ($sovpnsettings{MSSFIX} eq 'on') {
print CONF "mssfix\n";
}
if ($sovpnsettings{'FRAGMENT'} eq '' || $sovpnsettings{'FRAGMENT'} eq 0) {
$sovpnsettings{'FRAGMENT'} = '1300';
}
print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
if ($sovpnsettings{MSSFIX} eq 'on') {
print CONF "mssfix\n";
}
if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
}
if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {
print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n";
@@ -532,7 +529,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
}
}
if ($cgiparams{'MSSFIX'} ne 'on') {
$vpnsettings{'MSSFIX'} = 'off';
delete $vpnsettings{'MSSFIX'};
} else {
$vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'};
}
@@ -1906,12 +1903,6 @@ ADV_ERROR:
if ($cgiparams{'LOG_VERB'} eq '') {
$cgiparams{'LOG_VERB'} = '3';
}
if ($cgiparams{'MSSFIX'} eq '') {
$cgiparams{'MSSFIX'} = 'on';
}
if ($cgiparams{'FRAGMENT'} eq '') {
$cgiparams{'FRAGMENT'} = '1300';
}
$checked{'CLIENT2CLIENT'}{'off'} = '';
$checked{'CLIENT2CLIENT'}{'on'} = '';
$checked{'CLIENT2CLIENT'}{$cgiparams{'CLIENT2CLIENT'}} = 'CHECKED';