pppd: split files into netifd and non-netifd files, move the netifd ppp.sh file to the pppd package

SVN-Revision: 31041

1 files changed, 0 insertions, 183 deletions

diff --git a/package/netifd/files/lib/netifd/proto/ppp.sh b/package/netifd/files/lib/netifd/proto/ppp.sh
deleted file mode 100755
index 5f549bf..0000000
--- a/package/netifd/files/lib/netifd/proto/ppp.sh
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/bin/sh
-
-[ -x /usr/sbin/pppd ] || exit 0
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /etc/functions.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-ppp_generic_init_config() {
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_string "keepalive"
-	proto_config_add_int "demand"
-	proto_config_add_string "pppd_options"
-	proto_config_add_string "connect"
-	proto_config_add_string "disconnect"
-	proto_config_add_boolean "defaultroute"
-	proto_config_add_boolean "peerdns"
-	proto_config_add_boolean "ipv6"
-	proto_config_add_int "mtu"
-}
-
-ppp_generic_setup() {
-	local config="$1"; shift
-
-	json_get_var ipv6 ipv6
-	[ "$ipv6" = 1 ] || ipv6=""
-
-	json_get_var peerdns peerdns
-	[ "$peerdns" = 0 ] && peerdns="" || peerdns="1"
-
-	json_get_var defaultroute defaultroute
-	if [ "$defaultroute" = 1 ]; then
-		defaultroute="defaultroute replacedefaultroute";
-	else
-		defaultroute="nodefaultroute"
-	fi
-
-	json_get_var demand demand
-	if [ "${demand:-0}" -gt 0 ]; then
-		demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
-	else
-		demand="persist"
-	fi
-
-	[ -n "$mtu" ] || json_get_var mtu mtu
-
-	json_get_var keepalive keepalive
-	local interval="${keepalive##*[, ]}"
-	[ "$interval" != "$keepalive" ] || interval=5
-
-	json_get_var username username
-	json_get_var password password
-
-	[ -n "$connect" ] || json_get_var connect connect
-	[ -n "$disconnect" ] || json_get_var disconnect disconnect
-	json_get_var pppd_options pppd_options
-
-	proto_run_command "$config" /usr/sbin/pppd \
-		nodetach ipparam "$config" \
-		ifname "${proto:-ppp}-$config" \
-		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
-		${ipv6:++ipv6} $defaultroute \
-		${peerdns:+usepeerdns} \
-		$demand maxfail 1 \
-		${username:+user "$username" password "$password"} \
-		${connect:+connect "$connect"} \
-		${disconnect:+disconnect "$disconnect"} \
-		ip-up-script /lib/netifd/ppp-up \
-		ipv6-up-script /lib/netifd/ppp-up \
-		ip-down-script /lib/netifd/ppp-down \
-		ipv6-down-script /lib/netifd/ppp-down \
-		${mtu:+mtu $mtu mru $mtu} \
-		$pppd_options "$@"
-}
-
-ppp_generic_teardown() {
-	local interface="$1"
-
-	case "$ERROR" in
-		11|19)
-			proto_notify_error "$interface" AUTH_FAILED
-			proto_block_restart "$interface"
-		;;
-	esac
-	proto_kill_command "$interface"
-}
-
-# PPP on serial device
-
-proto_ppp_init_config() {
-	proto_config_add_string "device"
-	ppp_generic_init_config
-	no_device=1
-	available=1
-}
-
-proto_ppp_setup() {
-	local config="$1"
-
-	json_get_var device device
-	ppp_generic_setup "$config" "$device"
-}
-
-proto_ppp_teardown() {
-	ppp_generic_teardown "$@"
-}
-
-proto_pppoe_init_config() {
-	ppp_generic_init_config
-	proto_config_add_string "ac"
-	proto_config_add_string "service"
-}
-
-proto_pppoe_setup() {
-	local config="$1"
-	local iface="$2"
-
-	for module in slhc ppp_generic pppox pppoe; do
-		/sbin/insmod $module 2>&- >&-
-	done
-
-	json_get_var mtu mtu
-	mtu="${mtu:-1492}"
-
-	json_get_var ac ac
-	json_get_var service service
-
-	ppp_generic_setup "$config" \
-		plugin rp-pppoe.so \
-		${ac:+rp_pppoe_ac "$ac"} \
-		${service:+rp_pppoe_service "$service"} \
-		"nic-$iface"
-}
-
-proto_pppoe_teardown() {
-	ppp_generic_teardown "$@"
-}
-
-proto_pppoa_init_config() {
-	ppp_generic_init_config
-	proto_config_add_int "atmdev"
-	proto_config_add_int "vci"
-	proto_config_add_int "vpi"
-	proto_config_add_string "encaps"
-}
-
-proto_pppoa_setup() {
-	local config="$1"
-	local iface="$2"
-
-	for module in slhc ppp_generic pppox pppoatm; do
-		/sbin/insmod $module 2>&- >&-
-	done
-
-	json_get_var atmdev atmdev
-	json_get_var vci vci
-	json_get_var vpi vpi
-
-	json_get_var encaps encaps
-	case "$encaps" in
-		1|vc) encaps="vc-encaps" ;;
-		*) encaps="llc-encaps" ;;
-	esac
-
-	ppp_generic_setup "$config" \
-		plugin pppoatm.so \
-		${atmdev:+$atmdev.}${vpi:-8}.${vci:-35} \
-		${encaps}
-}
-
-proto_pppoa_teardown() {
-	ppp_generic_teardown "$@"
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol ppp
-	[ -f /usr/lib/pppd/*/rp-pppoe.so ] && add_protocol pppoe
-	[ -f /usr/lib/pppd/*/pppoatm.so ] && add_protocol pppoa
-}
-