1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:01:55 +02:00

pptp: add netifd support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31605 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-05-05 16:56:28 +00:00
parent 2945a6df4b
commit 66823c0d82
3 changed files with 104 additions and 48 deletions

View File

@ -36,6 +36,7 @@ endef
MAKE_FLAGS += OPTIMIZE="$(TARGET_CFLAGS)" MAKE_FLAGS += OPTIMIZE="$(TARGET_CFLAGS)"
ifneq ($(CONFIG_PACKAGE_netifd),)
define Package/pptp/install define Package/pptp/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
@ -44,5 +45,15 @@ define Package/pptp/install
$(INSTALL_DIR) $(1)/lib/network $(INSTALL_DIR) $(1)/lib/network
$(INSTALL_BIN) ./files/pptp.sh $(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)) $(eval $(call BuildPackage,pptp))

View File

@ -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
}

80
package/pptp/files/pptp.sh Normal file → Executable file
View File

@ -1,57 +1,45 @@
find_route() { #!/bin/sh
ip route get $1 | sed -e 's/ /\n/g' | \
sed -ne '1p;/via/{N;p};/dev/{N;p};/src/{N;p};/mtu/{N;p}' . /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() { proto_pptp_setup() {
config_set "$1" device "pptp-$1" local config="$1"
} local iface="$2"
local load
stop_interface_pptp() { json_get_var server server
stop_interface_ppp "$1" proto_add_host_dependency "$config" "$server"
for ip in $(uci_get_state network "$1" serv_addrs); do
ip route del "$ip" 2>/dev/null
done
}
coldplug_interface_pptp() { json_get_var buffering buffering
setup_interface_pptp "pptp-$1" "$1" [ "${buffering:-1}" == 0 ] && buffering="--nobuffer" || buffering=
}
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 for module in slhc ppp_generic ppp_async ip_gre; do
grep -q "$module" /proc/modules && continue
/sbin/insmod $module 2>&- >&- /sbin/insmod $module 2>&- >&-
load=1
done done
sleep 1 [ "$load" = "1" ] && sleep 1
local serv_addrs="" ppp_generic_setup "$config" \
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" \ pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd $buffering" \
file /etc/ppp/options.pptp \ file /etc/ppp/options.pptp
mtu $mtu mru $mtu
} }
proto_pptp_teardown() {
ppp_generic_teardown "$@"
}
add_protocol pptp