Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pptp: properly support symbolic VPN host names, tear down created host routes (#4876)

Browse source 
SVN-Revision: 27669
This commit is contained in:
Jo-Philipp Wich 2011-07-17 22:42:29 +00:00
parent 28505cad0d
commit 60fe01e698
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/pptp/Makefile
View file

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pptp PKG_NAME:=pptp
PKG_VERSION:=1.7.1 PKG_VERSION:=1.7.1
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE_URL:=@SF/pptpclient
@ -23,7 +23,7 @@ define Package/pptp
TITLE:=PPTP client TITLE:=PPTP client
MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org> MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
URL:=http://pptpclient.sourceforge.net/ URL:=http://pptpclient.sourceforge.net/
DEPENDS:=+ppp +kmod-gre DEPENDS:=+ppp +kmod-gre +resolveip
endef endef
define Package/pptp/description define Package/pptp/description

12
package/pptp/files/pptp.sh
View file

@ -8,6 +8,9 @@ scan_pptp() {
stop_interface_pptp() { stop_interface_pptp() {
stop_interface_ppp "$1" 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() { coldplug_interface_pptp() {
@ -39,8 +42,13 @@ setup_interface_pptp() {
setup_interface "$device" "$config" "${ipproto:-dhcp}" setup_interface "$device" "$config" "${ipproto:-dhcp}"
local gw="$(find_gw)" local gw="$(find_gw)"
[ -n "$gw" ] && { [ -n "$gw" ] && {
[ "$gw" != 0.0.0.0 ] && route delete "$server" 2>/dev/null >/dev/null local serv_addrs=""
route add "$server" gw "$gw" 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 # fix up the netmask