X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f66ab6474e8ec7ef0b0db8485b9675ee0bccce5b..e9c2d71d9206568fa901119d1ed697915aa539f3:/package/pptp/files/pptp.sh?ds=sidebyside diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh index ba0e37669..7efbb02fb 100644 --- a/package/pptp/files/pptp.sh +++ b/package/pptp/files/pptp.sh @@ -1,19 +1,38 @@ +find_gw() { + route -n | awk '$1 == "0.0.0.0" { print $2; exit }' +} + 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" + for ip in $(uci_get_state network "$1" serv_addrs); do + route del -host "$ip" 2>/dev/null + done } +coldplug_interface_pptp() { + setup_interface_pptp "pptp-$1" "$1" +} setup_interface_pptp() { local config="$2" local ifname - + + local device config_get device "$config" device + + local ipproto config_get ipproto "$config" ipproto - config_get server "$cfg" server + + local 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>&- >&- @@ -23,23 +42,23 @@ setup_interface_pptp() { setup_interface "$device" "$config" "${ipproto:-dhcp}" local gw="$(find_gw)" [ -n "$gw" ] && { - route delete "$server" 2>/dev/null >/dev/null - route add "$server" gw "$gw" + local serv_addrs="" + for ip in $(resolveip -4 -t 3 "$server"); do + append serv_addrs "$ip" + route delete -host "$ip" 2>/dev/null + route add -host "$ip" gw "$gw" + done + uci_toggle_state network "$config" serv_addrs "$serv_addrs" } # 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_state network "$config" ifname "$ifname" - - config_get mtu "$cfg" mtu + config_get mtu "$config" mtu 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 }