aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-08-30 16:53:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-08-30 16:53:22 +0000
commit52a138a9531aa82117216443ca1f346974e3a58e (patch)
tree8fbb48b1f4a80441d9eca6c4d17bf52bb63bc2cb /package
parent655027891294c054d43d554788f01c40f742ab11 (diff)
downloadupstream-52a138a9531aa82117216443ca1f346974e3a58e.tar.gz
upstream-52a138a9531aa82117216443ca1f346974e3a58e.tar.bz2
upstream-52a138a9531aa82117216443ca1f346974e3a58e.zip
fix ifname in network state for pppoe and pptp, add a workaround for isps sending wrong netmasks for pptp (thx, moonwatcher)
SVN-Revision: 8552
Diffstat (limited to 'package')
-rw-r--r--package/ppp/files/pppoe.sh5
-rw-r--r--package/pptp/files/pptp.sh15
2 files changed, 18 insertions, 2 deletions
diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index 86bddddf59..ba6a8768da 100644
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -12,6 +12,11 @@ setup_interface_pppoe() {
/sbin/insmod $module 2>&- >&-
done
+ # 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
mtu=${mtu:-1492}
start_pppd "$config" \
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