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

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-07-09 20:08:40 +02:00
parent 02d67e7545 89baf6d537
commit 65b1608fd2
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/71/filelists/files
View File

@@ -12,6 +12,7 @@ etc/rc.d/rc0.d/K82wlanclient
etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc6.d/K82wlanclient etc/rc.d/rc6.d/K82wlanclient
usr/local/bin/wirelessclient usr/local/bin/wirelessclient
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi
var/ipfire/langs var/ipfire/langs
var/ipfire/backup/include var/ipfire/backup/include

8
html/cgi-bin/pppsetup.cgi
View File

@@ -818,11 +818,11 @@ print <<END
</tr> </tr>
<tr> <tr>
<tr> <tr>
<td width='25%'>MTU</td> <td width='25%'>MTU&nbsp;<img src='/blob.gif' alt='*' /></td>
<td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td> <td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td>
</tr> </tr>
<tr> <tr>
<td width='25%'>MRU</td> <td width='25%'>MRU&nbsp;<img src='/blob.gif' alt='*' /></td>
<td width='25%'><input type='text' name='MRU' value='$pppsettings{'MRU'}' /></td> <td width='25%'><input type='text' name='MRU' value='$pppsettings{'MRU'}' /></td>
</tr> </tr>
END END
@@ -943,8 +943,8 @@ sub initprofile
$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255'; $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
$pppsettings{'PPTP_ROUTE'} = ''; $pppsettings{'PPTP_ROUTE'} = '';
$pppsettings{'PROTOCOL'} = 'RFC2364'; $pppsettings{'PROTOCOL'} = 'RFC2364';
$pppsettings{'MTU'} = '1492'; $pppsettings{'MTU'} = '';
$pppsettings{'MRU'} = '1492'; $pppsettings{'MRU'} = '';
$pppsettings{'DIALMODE'} = 'T'; $pppsettings{'DIALMODE'} = 'T';
$pppsettings{'MAXRETRIES'} = 5; $pppsettings{'MAXRETRIES'} = 5;
$pppsettings{'HOLDOFF'} = 30; $pppsettings{'HOLDOFF'} = 30;

10
src/initscripts/init.d/networking/red
View File

@@ -388,10 +388,18 @@ case "${1}" in
### Standard PPP options we always use ### Standard PPP options we always use
# #
PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth" PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth"
PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach mtu ${MTU}" PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
PPP_STD_OPTIONS+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp" PPP_STD_OPTIONS+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp"
PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20" PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}" PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}"
if [ -n "${MTU}" ]; then
PPP_STD_OPTIONS="${PPP_STD_OPTIONS} mtu ${MTU}"
fi
if [ -n "${MRU}" ]; then
PPP_STD_OPTIONS="${PPP_STD_OPTIONS} mru ${MRU}"
fi
### Debugging ### Debugging
# #