diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-08-30 16:53:22 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-08-30 16:53:22 +0000 |
| commit | 66c928d06372953c0d4edf3d5bdbb80c38efc15c (patch) | |
| tree | 00aee3dc6656d973cb9940215bde346f4c996185 /package/pptp | |
| parent | 39c62b54db169f4c2212dc0068198155dc10dcb8 (diff) | |
| download | master-187ad058-66c928d06372953c0d4edf3d5bdbb80c38efc15c.tar.gz master-187ad058-66c928d06372953c0d4edf3d5bdbb80c38efc15c.tar.bz2 master-187ad058-66c928d06372953c0d4edf3d5bdbb80c38efc15c.zip | |
fix ifname in network state for pppoe and pptp, add a workaround for isps sending wrong netmasks for pptp (thx, moonwatcher)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8552 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/pptp')
| -rw-r--r-- | package/pptp/files/pptp.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh index 4d03af0085..f1c46c9a39 100644 --- a/package/pptp/files/pptp.sh +++ b/package/pptp/files/pptp.sh @@ -3,8 +3,8 @@ scan_pptp() { } setup_interface_pptp() { - local iface="$1" local config="$2" + local ifname config_get device "$config" device config_get ipproto "$config" ipproto @@ -12,7 +12,18 @@ setup_interface_pptp() { for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- done - setup_interface "$iface" "$config" "${ipproto:-dhcp}" + sleep 1 + + setup_interface "$device" "$config" "${ipproto:-dhcp}" + + # fix up the netmask + config_get netmask "$config" netmask + [ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $netmask + + # make sure the network state references the correct ifname + scan_ppp "$config" + config_get ifname "$config" ifname + uci set "/var/state/network.$config.ifname=$ifname" config_get mtu "$cfg" mtu config_get server "$cfg" server |