summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-17 22:42:29 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-17 22:42:29 +0000
commit073f05064e806d0a0a2d75fb2a259e1962526db5 (patch)
tree6a3e524d9bc7fc257441273b2bec8fdfb6e0e757
parenta7af297702a4a8fe26af3a079ac4c2f619d2e0c0 (diff)
[package] pptp: properly support symbolic VPN host names, tear down created host routes (#4876)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27669 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/pptp/Makefile6
-rw-r--r--package/pptp/files/pptp.sh12
2 files changed, 13 insertions, 5 deletions
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 184f72698c..08f6b40aa3 100644
--- 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 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