[adm5120] fix support for 2.6.38 kernel

[openwrt.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
old mode 100644 (file)
new mode 100755 (executable)
index 42daef9..5f549bf
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,149 +1,183 @@
-stop_interface_ppp() {
-       local cfg="$1"
-
-       local proto
-       config_get proto "$cfg" proto
-
-       local ifname
-       config_get ifname "$cfg" ifname
-
-       local link="$proto-${ifname#$proto-}"
-       [ -f "/var/run/ppp-${link}.pid" ] && {
-               local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
-               local try=0
-               grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \
-                       while grep -qs pppd "/proc/$pid/cmdline" && [ $((try++)) -lt 5 ]; do sleep 1; done
-               grep -qs pppd "/proc/$pid/cmdline" && kill -KILL $pid && \
-                       while grep -qs pppd "/proc/$pid/cmdline"; do sleep 1; done
-               rm -f "/var/run/ppp-${link}.pid"
-       }
-
-       local lock="/var/lock/ppp-$link"
-       [ -f "$lock" ] && lock -u "$lock"
+#!/bin/sh
+
+[ -x /usr/sbin/pppd ] || exit 0
+
+[ -n "$INCLUDE_ONLY" ] || {
+       . /etc/functions.sh
+       . ../netifd-proto.sh
+       init_proto "$@"

 }
 
 }
 

-start_pppd() {
-       local cfg="$1"; shift
+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"
+}

 
 

-       local proto
-       config_get proto "$cfg" proto
+ppp_generic_setup() {
+       local config="$1"; shift

 
 

-       # unique link identifier
-       local link="${proto:-ppp}-$cfg"
+       json_get_var ipv6 ipv6
+       [ "$ipv6" = 1 ] || ipv6=""

 
 

-       # make sure only one pppd process is started
-       lock "/var/lock/ppp-${link}"
-       local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
-       [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
-               lock -u "/var/lock/ppp-${link}"
-               return 0
-       }
+       json_get_var peerdns peerdns
+       [ "$peerdns" = 0 ] && peerdns="" || peerdns="1"

 
 

-       # Workaround: sometimes hotplug2 doesn't deliver the hotplug event for creating
-       # /dev/ppp fast enough to be used here
-       [ -e /dev/ppp ] || mknod /dev/ppp c 108 0
+       json_get_var defaultroute defaultroute
+       if [ "$defaultroute" = 1 ]; then
+               defaultroute="defaultroute replacedefaultroute";
+       else
+               defaultroute="nodefaultroute"
+       fi

 
 

-       local device
-       config_get device "$cfg" device
+       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

 
 

-       local username
-       config_get username "$cfg" username
+       [ -n "$mtu" ] || json_get_var mtu mtu

 
 

-       local password
-       config_get password "$cfg" password
+       json_get_var keepalive keepalive
+       local interval="${keepalive##*[, ]}"
+       [ "$interval" != "$keepalive" ] || interval=5

 
 

-       local keepalive
-       config_get keepalive "$cfg" keepalive
+       json_get_var username username
+       json_get_var password password

 
 

-       local connect
-       config_get connect "$cfg" connect
+       [ -n "$connect" ] || json_get_var connect connect
+       [ -n "$disconnect" ] || json_get_var disconnect disconnect
+       json_get_var pppd_options pppd_options

 
 

-       local disconnect
-       config_get disconnect "$cfg" disconnect
+       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 "$@"
+}

 
 

-       local pppd_options
-       config_get pppd_options "$cfg" pppd_options
+ppp_generic_teardown() {
+       local interface="$1"

 
 

-       local defaultroute
-       config_get_bool defaultroute "$cfg" defaultroute 1
-       [ "$defaultroute" -eq 1 ] && \
-               defaultroute="defaultroute replacedefaultroute" || defaultroute="nodefaultroute"
+       case "$ERROR" in
+               11|19)
+                       proto_notify_error "$interface" AUTH_FAILED
+                       proto_block_restart "$interface"
+               ;;
+       esac
+       proto_kill_command "$interface"
+}

 
 

-       local interval="${keepalive##*[, ]}"
-       [ "$interval" != "$keepalive" ] || interval=5
+# PPP on serial device

 
 

-       local dns
-       config_get dns "$config" dns
+proto_ppp_init_config() {
+       proto_config_add_string "device"
+       ppp_generic_init_config
+       no_device=1
+       available=1
+}

 
 

-       local has_dns=0
-       local peer_default=1
-       [ -n "$dns" ] && {
-               has_dns=1
-               peer_default=0
-       }
+proto_ppp_setup() {
+       local config="$1"

 
 

-       local peerdns
-       config_get_bool peerdns "$cfg" peerdns $peer_default
+       json_get_var device device
+       ppp_generic_setup "$config" "$device"
+}

 
 

-       if [ "$peerdns" -eq 1 ] || [ ! -e /tmp/resolv.conf.auto ]; then
-               echo -n "" > /tmp/resolv.conf.auto
-       fi
+proto_ppp_teardown() {
+       ppp_generic_teardown "$@"
+}

 
 

-       [ "$peerdns" -eq 1 ] && {
-               peerdns="usepeerdns"
-       } || {
-               peerdns=""
-               for dns in $dns; do
-                       echo "nameserver $dns" >> /tmp/resolv.conf.auto
-               done
-       }
-
-       local demand
-       config_get_bool demand "$cfg" demand 0
-
-       local demandargs
-       [ "$demand" -eq 1 ] && {
-               demandargs="precompiled-active-filter /etc/ppp/filter demand idle"
-               [ "$has_dns" -eq 0 ] && \
-                       echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
-       } || {
-               demandargs="persist"
-       }
-
-       local ipv6
-       config_get_bool ipv6 "$cfg" ipv6 0
-       [ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
-
-       start-stop-daemon -S -b -x /usr/sbin/pppd -m -p /var/run/ppp-$link.pid -- "$@" \
-               ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
-               $demandargs \
-               $peerdns \
-               $defaultroute \
-               ${username:+user "$username" password "$password"} \
-               ipparam "$cfg" \
-               ifname "$link" \
-               ${connect:+connect "$connect"} \
-               ${disconnect:+disconnect "$disconnect"} \
-               ${ipv6} \
-               ${pppd_options} \
-               nodetach
+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

 
 

-       lock -u "/var/lock/ppp-${link}"
+       ppp_generic_setup "$config" \
+               plugin rp-pppoe.so \
+               ${ac:+rp_pppoe_ac "$ac"} \
+               ${service:+rp_pppoe_service "$service"} \
+               "nic-$iface"

 }
 
 }
 

-setup_interface_ppp() {
-       local iface="$1"
-       local config="$2"
+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

 
 

-       local device
-       config_get device "$config" device
+       json_get_var atmdev atmdev
+       json_get_var vci vci
+       json_get_var vpi vpi

 
 

-       local mtu
-       config_get mtu "$config" mtu
+       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 "$@"
+}

 
 

-       mtu=${mtu:-1492}
-       start_pppd "$config" \
-               mtu $mtu mru $mtu \
-               "$device"
+[ -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

 }
 
 }