pptp: add netifd support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31605 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 101 insertions, 45 deletions

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 3772adb064..e44806bdd2 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -36,13 +36,24 @@ endef
 
 MAKE_FLAGS += OPTIMIZE="$(TARGET_CFLAGS)"
 
-define Package/pptp/install
+ifneq ($(CONFIG_PACKAGE_netifd),)
+  define Package/pptp/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/ppp
 	$(INSTALL_DATA) ./files/options.pptp $(1)/etc/ppp/
 	$(INSTALL_DIR) $(1)/lib/network
 	$(INSTALL_BIN) ./files/pptp.sh $(1)/lib/network/
-endef
+  endef
+else
+  define Package/pptp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_DATA) ./files/options.pptp $(1)/etc/ppp/
+	$(INSTALL_DIR) $(1)/lib/network
+	$(INSTALL_DATA) ./files.old/pptp.sh $(1)/lib/network/
+  endef
+endif
 
 $(eval $(call BuildPackage,pptp))
diff --git a/package/pptp/files.old/pptp.sh b/package/pptp/files.old/pptp.sh
new file mode 100644
index 0000000000..1fb13ea754
--- /dev/null
+++ b/package/pptp/files.old/pptp.sh
@@ -0,0 +1,57 @@
+find_route() {
+	ip route get $1 | sed -e 's/ /\n/g' | \
+            sed -ne '1p;/via/{N;p};/dev/{N;p};/src/{N;p};/mtu/{N;p}'
+}
+
+scan_pptp() {
+	config_set "$1" device "pptp-$1"
+}
+
+stop_interface_pptp() {
+	stop_interface_ppp "$1"
+	for ip in $(uci_get_state network "$1" serv_addrs); do
+		ip route del "$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 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>&- >&-
+	done
+	sleep 1
+
+	local serv_addrs=""
+	for ip in $(resolveip -t 3 "${server}"); do
+		append serv_addrs "$ip"
+		ip route replace $(find_route $ip)
+	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
+
+	config_get mtu "$config" mtu
+	mtu=${mtu:-1452}
+	start_pppd "$config" \
+		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd $buffering" \
+		file /etc/ppp/options.pptp \
+		mtu $mtu mru $mtu
+}
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 1fb13ea754..00239850cc 100644..100755
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,57 +1,45 @@
-find_route() {
-	ip route get $1 | sed -e 's/ /\n/g' | \
-            sed -ne '1p;/via/{N;p};/dev/{N;p};/src/{N;p};/mtu/{N;p}'
-}
+#!/bin/sh
 
-scan_pptp() {
-	config_set "$1" device "pptp-$1"
-}
+. /etc/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
 
-stop_interface_pptp() {
-	stop_interface_ppp "$1"
-	for ip in $(uci_get_state network "$1" serv_addrs); do
-		ip route del "$ip" 2>/dev/null
-	done
-}
+INCLUDE_ONLY=1
+. ./ppp.sh
 
-coldplug_interface_pptp() {
-	setup_interface_pptp "pptp-$1" "$1"
+proto_pptp_init_config() {
+	ppp_generic_init_config
+	proto_config_add_string "server"
+	proto_config_add_boolean "buffering"
+	available=1
+	no_device=1
 }
 
-setup_interface_pptp() {
-	local config="$2"
-	local ifname
-
-	local device
-	config_get device "$config" device
+proto_pptp_setup() {
+	local config="$1"
+	local iface="$2"
+	local load
 
-	local server
-	config_get server "$config" server
+	json_get_var server server
+	proto_add_host_dependency "$config" "$server"
 
-	local buffering
-	config_get_bool buffering "$config" buffering 1
-	[ "$buffering" == 0 ] && buffering="--nobuffer" || buffering=
+	json_get_var buffering buffering
+	[ "${buffering:-1}" == 0 ] && buffering="--nobuffer" || buffering=
 
 	for module in slhc ppp_generic ppp_async ip_gre; do
+		grep -q "$module" /proc/modules && continue
 		/sbin/insmod $module 2>&- >&-
+		load=1
 	done
-	sleep 1
+	[ "$load" = "1" ] && sleep 1
 
-	local serv_addrs=""
-	for ip in $(resolveip -t 3 "${server}"); do
-		append serv_addrs "$ip"
-		ip route replace $(find_route $ip)
-	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
-
-	config_get mtu "$config" mtu
-	mtu=${mtu:-1452}
-	start_pppd "$config" \
+	ppp_generic_setup "$config" \
 		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd $buffering" \
-		file /etc/ppp/options.pptp \
-		mtu $mtu mru $mtu
+		file /etc/ppp/options.pptp
 }
+
+proto_pptp_teardown() {
+	ppp_generic_teardown "$@"
+}
+
+add_protocol pptp