projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: move the madwifi segfault fix to the right place
[openwrt.git]
/
package
/
pptp
/
files
/
pptp.sh
diff --git
a/package/pptp/files/pptp.sh
b/package/pptp/files/pptp.sh
index 648e0326bc2d98c0fe7cd0e1b1b4d12753b86b92..436bee3c8763dd79c474cede47ef14181365feb8 100644
(file)
--- a/
package/pptp/files/pptp.sh
+++ b/
package/pptp/files/pptp.sh
@@
-1,20
+1,36
@@
+find_gw() {
+ route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
+}
+
scan_pptp() {
scan_pptp() {
-
scan_ppp "$@
"
+
config_set "$1" device "pptp-$1
"
}
}
-
find_gw
() {
- route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
+
stop_interface_pptp
() {
+ stop_interface_ppp "$1"
}
}
+coldplug_interface_pptp() {
+ setup_interface_pptp "pptp-$1" "$1"
+}
setup_interface_pptp() {
local config="$2"
local ifname
setup_interface_pptp() {
local config="$2"
local ifname
-
+
+ local device
config_get device "$config" device
config_get device "$config" device
+
+ local ipproto
config_get ipproto "$config" ipproto
config_get ipproto "$config" ipproto
+
+ local server
config_get server "$config" server
config_get server "$config" server
+ local buffering
+ config_get_bool buffering "$config" buffering 1
+ [ "$buffering" == 0 ] && buffering="--nobuffer" || buffering=
+
for module in slhc ppp_generic ppp_async ip_gre; do
/sbin/insmod $module 2>&- >&-
done
for module in slhc ppp_generic ppp_async ip_gre; do
/sbin/insmod $module 2>&- >&-
done
@@
-23,7
+39,7
@@
setup_interface_pptp() {
setup_interface "$device" "$config" "${ipproto:-dhcp}"
local gw="$(find_gw)"
[ -n "$gw" ] && {
setup_interface "$device" "$config" "${ipproto:-dhcp}"
local gw="$(find_gw)"
[ -n "$gw" ] && {
- route delete "$server" 2>/dev/null >/dev/null
+
[ "$gw" != 0.0.0.0 ] &&
route delete "$server" 2>/dev/null >/dev/null
route add "$server" gw "$gw"
}
route add "$server" gw "$gw"
}
@@
-31,15
+47,10
@@
setup_interface_pptp() {
config_get netmask "$config" netmask
[ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $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_state network "$config" ifname "$ifname"
-
- config_get mtu "$configg" mtu
+ config_get mtu "$config" mtu
mtu=${mtu:-1452}
start_pppd "$config" \
mtu=${mtu:-1452}
start_pppd "$config" \
- pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \
+ pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd
$buffering
" \
file /etc/ppp/options.pptp \
mtu $mtu mru $mtu
}
file /etc/ppp/options.pptp \
mtu $mtu mru $mtu
}