aboutsummaryrefslogtreecommitdiffstats
path: root/package/pptp/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-07-17 22:42:29 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-07-17 22:42:29 +0000
commit60fe01e698eb6f3c4b8af0c9b6b5a59f1bcb5ab3 (patch)
tree3945c27d420becbc7633959636747c6e155adc1b /package/pptp/files
parent28505cad0dd7be04aa706eda0a4bdae20d286788 (diff)
downloadupstream-60fe01e698eb6f3c4b8af0c9b6b5a59f1bcb5ab3.tar.gz
upstream-60fe01e698eb6f3c4b8af0c9b6b5a59f1bcb5ab3.tar.bz2
upstream-60fe01e698eb6f3c4b8af0c9b6b5a59f1bcb5ab3.zip
pptp: properly support symbolic VPN host names, tear down created host routes (#4876)
SVN-Revision: 27669
Diffstat (limited to 'package/pptp/files')
-rw-r--r--package/pptp/files/pptp.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 436bee3c87..7efbb02fb8 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -8,6 +8,9 @@ scan_pptp() {
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() {
@@ -39,8 +42,13 @@ setup_interface_pptp() {
setup_interface "$device" "$config" "${ipproto:-dhcp}"
local gw="$(find_gw)"
[ -n "$gw" ] && {
- [ "$gw" != 0.0.0.0 ] && 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