[package] pptp: properly support symbolic VPN host names, tear down created host...

SVN-Revision: 27669

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 184f72698c2731aa62421a8d21857c41a3fa89da..08f6b40aa3d02fc32d7c5cfaf1c936702b823eff 100644 (file)
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.7.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
@@ -23,7 +23,7 @@ define Package/pptp
   TITLE:=PPTP client
   MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   URL:=http://pptpclient.sourceforge.net/
-  DEPENDS:=+ppp +kmod-gre
+  DEPENDS:=+ppp +kmod-gre +resolveip
 endef
 
 define Package/pptp/description

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 436bee3c8763dd79c474cede47ef14181365feb8..7efbb02fb8e5357d068153deb5459cf33681c3f4 100644 (file)
--- 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