Changeset 31605

Timestamp:

2012-05-05T18:56:28+02:00 (6 years ago)

Author:

nbd

Message:

pptp: add netifd support

Location:

trunk/package/pptp

Files:

• Makefile (modified) (2 diffs)
• files.old (added)
• files.old/pptp.sh (copied) (copied from trunk/package/pptp/files/pptp.sh)
• files/pptp.sh (modified) (1 diff, 1 prop)

trunk/package/pptp/Makefile

@@ -37 +37 @@
 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/
@@ -44 +45 @@
         $(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))

trunk/package/pptp/files/pptp.sh

@@ -1 @@
-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
+
+. /etc/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
+
+INCLUDE_ONLY=1
+. ./ppp.sh
+
+proto_pptp_init_config() {
+        ppp_generic_init_config
+        proto_config_add_string "server"
+        proto_config_add_boolean "buffering"
+        available=1
+        no_device=1
 }
 
-scan_pptp() {
-        config_set "$1" device "pptp-$1"
+proto_pptp_setup() {
+        local config="$1"
+        local iface="$2"
+        local load
+
+        json_get_var server server
+        proto_add_host_dependency "$config" "$server"
+
+        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
+        [ "$load" = "1" ] && sleep 1
+
+        ppp_generic_setup "$config" \
+                pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd $buffering" \
+                file /etc/ppp/options.pptp
 }
 
-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
+proto_pptp_teardown() {
+        ppp_generic_teardown "$@"
 }
 
-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
-}
+add_protocol pptp