mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-09-30 16:11:18 +02:00
Code Issues

fix ifname in network state for pppoe and pptp, add a workaround for isps sending wrong netmasks for pptp (thx, moonwatcher)

Browse Source 
SVN-Revision: 8552
This commit is contained in:
Felix Fietkau 2007-08-30 16:53:22 +00:00
parent 6550278912
commit 52a138a953
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/ppp/files/pppoe.sh
View File

@ -12,6 +12,11 @@ setup_interface_pppoe() {
/sbin/insmod $module 2>&- >&- /sbin/insmod $module 2>&- >&-
done 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 config_get mtu "$cfg" mtu
mtu=${mtu:-1492} mtu=${mtu:-1492}
start_pppd "$config" \ start_pppd "$config" \

15
package/pptp/files/pptp.sh
View File

@ -3,8 +3,8 @@ scan_pptp() {
} }
setup_interface_pptp() { setup_interface_pptp() {
local iface="$1"
local config="$2" local config="$2"
local ifname
config_get device "$config" device config_get device "$config" device
config_get ipproto "$config" ipproto config_get ipproto "$config" ipproto
@ -12,7 +12,18 @@ setup_interface_pptp() {
for module in slhc ppp_generic ppp_async ip_gre; do for module in slhc ppp_generic ppp_async ip_gre; do
/sbin/insmod $module 2>&- >&- /sbin/insmod $module 2>&- >&-
done 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 mtu "$cfg" mtu
config_get server "$cfg" server config_get server "$cfg" server