[package] ppp: introduce "authfail" option which specifies whether pppd should attemp...
[openwrt.git] / package / ppp / files / ppp.sh
old mode 100644 (file)
new mode 100755 (executable)
index 339b4e7..7e9b8dd
-scan_ppp() {
-       config_get ifname "$1" ifname
-       pppdev="${pppdev:-0}"
-       config_get unit "$1" unit
-       [ -z "$unit" ] && {
-               config_set "$1" ifname "ppp$pppdev"
-               config_set "$1" unit "$pppdev"
-               pppdev="$(($pppdev + 1))"
-       }
+#!/bin/sh
+
+[ -x /usr/sbin/pppd ] || exit 0
+
+[ -n "$INCLUDE_ONLY" ] || {
+       . /lib/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_boolean "authfail"
+       proto_config_add_int "mtu"
+}
 
-       # make sure only one pppd process is started
-       lock "/var/lock/ppp-${cfg}"
-       local pid="$(head -n1 /var/run/ppp-${cfg}.pid 2>/dev/null)"
-       [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
-               lock -u "/var/lock/ppp-${cfg}"
-               return 0
-       }
+ppp_generic_setup() {
+       local config="$1"; shift
 
-       config_get device "$cfg" device
-       config_get unit "$cfg" unit
-       config_get username "$cfg" username
-       config_get password "$cfg" password
-       config_get keepalive "$cfg" keepalive
+       json_get_vars ipv6 peerdns defaultroute demand keepalive username password pppd_options
+       [ "$ipv6" = 1 ] || ipv6=""
+       [ "$peerdns" = 0 ] && peerdns="" || peerdns="1"
+       if [ "$defaultroute" = 1 ]; then
+               defaultroute="defaultroute replacedefaultroute";
+       else
+               defaultroute="nodefaultroute"
+       fi
+       if [ "${demand:-0}" -gt 0 ]; then
+               demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
+       else
+               demand="persist"
+       fi
 
-       config_get connect "$cfg" connect
-       config_get disconnect "$cfg" disconnect
-       config_get pppd_options "$cfg" pppd_options
-       config_get_bool defaultroute "$cfg" defaultroute 1
-       [ "$defaultroute" -eq 1 ] && defaultroute="defaultroute replacedefaultroute" || defaultroute=""
+       [ -n "$mtu" ] || json_get_var mtu mtu
 
-       interval="${keepalive##*[, ]}"
+       local interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
-       
-       config_get demand "$cfg" demand
-       [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
-
-       config_get_bool ipv6 "$cfg" ipv6 0
-       [ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
+       [ -n "$connect" ] || json_get_var connect connect
+       [ -n "$disconnect" ] || json_get_var disconnect disconnect
 
-       /usr/sbin/pppd "$@" \
+       proto_run_command "$config" /usr/sbin/pppd \
+               nodetach ipparam "$config" \
+               ifname "${proto:-ppp}-$config" \
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
-               ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
-               usepeerdns \
-               $defaultroute \
+               ${ipv6:++ipv6} $defaultroute \
+               ${peerdns:+usepeerdns} \
+               $demand maxfail 1 \
                ${username:+user "$username" password "$password"} \
-               unit "$unit" \
-               linkname "$cfg" \
-               ipparam "$cfg" \
                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \
-               ${ipv6} \
-               ${pppd_options}
+               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
+                       json_get_var authfail authfail
+                       if [ "${authfail:-0}" -gt 0 ]; then
+                               proto_block_restart "$interface"
+                       fi
+               ;;
+               2)
+                       proto_notify_error "$interface" INVALID_OPTIONS
+                       proto_block_restart "$interface"
+               ;;
+       esac
+       proto_kill_command "$interface"
+}
+
+# PPP on serial device
 
-       lock -u "/var/lock/ppp-${cfg}"
+proto_ppp_init_config() {
+       proto_config_add_string "device"
+       ppp_generic_init_config
+       no_device=1
+       available=1
 }
 
-setup_interface_ppp() {
-       local iface="$1"
-       local config="$2"
+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"
+}
 
-       config_get device "$config" device
+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"
+       no_device=1
+       available=1
+}
+
+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_vars atmdev vci vpi 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 "$@"
+}
+
+proto_pptp_init_config() {
+       ppp_generic_init_config
+       proto_config_add_string "server"
+       available=1
+       no_device=1
+}
+
+proto_pptp_setup() {
+       local config="$1"
+       local iface="$2"
+
+       local ip serv_addr server
+       json_get_var server server && {
+               for ip in $(resolveip -t 5 "$server"); do
+                       ( proto_add_host_dependency "$config" "$ip" )
+                       serv_addr=1
+               done
+       }
+       [ -n "$serv_addr" ] || {
+               echo "Could not resolve server address"
+               sleep 5
+               proto_setup_failed "$config"
+               exit 1
+       }
+
+       local load
+       for module in slhc ppp_generic ppp_async ppp_mppe ip_gre gre pptp; do
+               grep -q "$module" /proc/modules && continue
+               /sbin/insmod $module 2>&- >&-
+               load=1
+       done
+       [ "$load" = "1" ] && sleep 1
+
+       ppp_generic_setup "$config" \
+               plugin pptp.so \
+               pptp_server $server \
+               file /etc/ppp/options.pptp
+}
+
+proto_pptp_teardown() {
+       ppp_generic_teardown "$@"
+}
 
-       config_get mtu "$cfg" mtu
-       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
+       [ -f /usr/lib/pppd/*/pptp.so ] && add_protocol pptp
 }