ppp: Don't require setting the MTU configuration.

This commit is contained in:
Michael Tremer
2013-07-09 12:15:07 +02:00
parent d43bb759b1
commit 89baf6d537
3 changed files with 14 additions and 5 deletions

View File

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

View File

@@ -818,11 +818,11 @@ print <<END
</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>
</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>
</tr>
END
@@ -943,8 +943,8 @@ sub initprofile
$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
$pppsettings{'PPTP_ROUTE'} = '';
$pppsettings{'PROTOCOL'} = 'RFC2364';
$pppsettings{'MTU'} = '1492';
$pppsettings{'MRU'} = '1492';
$pppsettings{'MTU'} = '';
$pppsettings{'MRU'} = '';
$pppsettings{'DIALMODE'} = 'T';
$pppsettings{'MAXRETRIES'} = 5;
$pppsettings{'HOLDOFF'} = 30;

View File

@@ -388,10 +388,18 @@ case "${1}" in
### Standard PPP options we always use
#
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+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
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
#