ppp: Detailed last error support

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

diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index f07b11f..99fdc87 100755 (executable)
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -8,15 +8,48 @@
        init_proto "$@"
 }
 
+ppp_exitcode_tostring()
+{
+       local errorcode=$1
+       [ -n "$errorcode" ] || errorcode=5
+
+       case "$errorcode" in
+               0) echo "OK" ;;
+               1) echo "FATAL_ERROR" ;;
+               2) echo "OPTION_ERROR" ;;
+               3) echo "NOT_ROOT" ;;
+               4) echo "NO_KERNEL_SUPPORT" ;;
+               5) echo "USER_REQUEST" ;;
+               6) echo "LOCK_FAILED" ;;
+               7) echo "OPEN_FAILED" ;;
+               8) echo "CONNECT_FAILED" ;;
+               9) echo "PTYCMD_FAILED" ;;
+               10) echo "NEGOTIATION_FAILED" ;;
+               11) echo "PEER_AUTH_FAILED" ;;
+               12) echo "IDLE_TIMEOUT" ;;
+               13) echo "CONNECT_TIME" ;;
+               14) echo "CALLBACK" ;;
+               15) echo "PEER_DEAD" ;;
+               16) echo "HANGUP" ;;
+               17) echo "LOOPBACK" ;;
+               18) echo "INIT_FAILED" ;;
+               19) echo "AUTH_TOPEER_FAILED" ;;
+               20) echo "TRAFFIC_LIMIT" ;;
+               21) echo "CNID_AUTH_FAILED";;
+               *) echo "UNKNOWN_ERROR" ;;
+       esac
+}
+
 ppp_generic_init_config() {
        proto_config_add_string username
        proto_config_add_string password
        proto_config_add_string keepalive
+       proto_config_add_boolean keepalive_adaptive
        proto_config_add_int demand
        proto_config_add_string pppd_options
        proto_config_add_string 'connect:file'
        proto_config_add_string 'disconnect:file'
-       proto_config_add_boolean ipv6
+       proto_config_add_string ipv6
        proto_config_add_boolean authfail
        proto_config_add_int mtu
        proto_config_add_string pppname
@@ -25,30 +58,35 @@ ppp_generic_init_config() {
 ppp_generic_setup() {
        local config="$1"; shift
 
-       json_get_vars ipv6 demand keepalive username password pppd_options pppname
+       json_get_vars ipv6 demand keepalive keepalive_adaptive username password pppd_options pppname
        if [ "$ipv6" = 0 ]; then
                ipv6=""
-       else
+       elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
                ipv6=1
+               proto_export "AUTOIPV6=1"
        fi
+
        if [ "${demand:-0}" -gt 0 ]; then
                demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
        else
                demand="persist"
        fi
-       [ "${keepalive:-0}" -lt 1 ] && keepalive=""
        [ -n "$mtu" ] || json_get_var mtu mtu
        [ -n "$pppname" ] || pppname="${proto:-ppp}-$config"
 
-       local interval="${keepalive##*[, ]}"
-       [ "$interval" != "$keepalive" ] || interval=5
+       local lcp_failure="${keepalive%%[, ]*}"
+       local lcp_interval="${keepalive##*[, ]}"
+       local lcp_adaptive="lcp-echo-adaptive"
+       [ "${lcp_failure:-0}" -lt 1 ] && lcp_failure=""
+       [ "$lcp_interval" != "$keepalive" ] || lcp_interval=5
+       [ "${keepalive_adaptive:-1}" -lt 1 ] && lcp_adaptive=""
        [ -n "$connect" ] || json_get_var connect connect
        [ -n "$disconnect" ] || json_get_var disconnect disconnect
 
        proto_run_command "$config" /usr/sbin/pppd \
                nodetach ipparam "$config" \
                ifname "$pppname" \
-               ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
+               ${lcp_failure:+lcp-echo-interval $lcp_interval lcp-echo-failure $lcp_failure $lcp_adaptive} \
                ${ipv6:++ipv6} \
                nodefaultroute \
                usepeerdns \
@@ -66,20 +104,27 @@ ppp_generic_setup() {
 
 ppp_generic_teardown() {
        local interface="$1"
+       local errorstring=$(ppp_exitcode_tostring $ERROR)
 
        case "$ERROR" in
+               0)
+               ;;
+               2)
+                       proto_notify_error "$interface" "$errorstring"
+                       proto_block_restart "$interface"
+               ;;
                11|19)
-                       proto_notify_error "$interface" AUTH_FAILED
                        json_get_var authfail authfail
+                       proto_notify_error "$interface" "$errorstring"
                        if [ "${authfail:-0}" -gt 0 ]; then
                                proto_block_restart "$interface"
                        fi
                ;;
-               2)
-                       proto_notify_error "$interface" INVALID_OPTIONS
-                       proto_block_restart "$interface"
+               *)
+                       proto_notify_error "$interface" "$errorstring"
                ;;
        esac
+
        proto_kill_command "$interface"
 }
 
@@ -90,6 +135,7 @@ proto_ppp_init_config() {
        ppp_generic_init_config
        no_device=1
        available=1
+       lasterror=1
 }
 
 proto_ppp_setup() {
@@ -107,6 +153,8 @@ proto_pppoe_init_config() {
        ppp_generic_init_config
        proto_config_add_string "ac"
        proto_config_add_string "service"
+       proto_config_add_string "host_uniq"
+       lasterror=1
 }
 
 proto_pppoe_setup() {
@@ -122,11 +170,13 @@ proto_pppoe_setup() {
 
        json_get_var ac ac
        json_get_var service service
+       json_get_var host_uniq host_uniq
 
        ppp_generic_setup "$config" \
                plugin rp-pppoe.so \
                ${ac:+rp_pppoe_ac "$ac"} \
                ${service:+rp_pppoe_service "$service"} \
+               ${host_uniq:+host-uniq "$host_uniq"} \
                "nic-$iface"
 }
 
@@ -142,6 +192,7 @@ proto_pppoa_init_config() {
        proto_config_add_string "encaps"
        no_device=1
        available=1
+       lasterror=1
 }
 
 proto_pppoa_setup() {
@@ -172,18 +223,21 @@ proto_pppoa_teardown() {
 proto_pptp_init_config() {
        ppp_generic_init_config
        proto_config_add_string "server"
+       proto_config_add_string "interface"
        available=1
        no_device=1
+       lasterror=1
 }
 
 proto_pptp_setup() {
        local config="$1"
        local iface="$2"
 
-       local ip serv_addr server
-       json_get_var server server && {
+       local ip serv_addr server interface
+       json_get_vars interface server
+       [ -n "$server" ] && {
                for ip in $(resolveip -t 5 "$server"); do
-                       ( proto_add_host_dependency "$config" "$ip" )
+                       ( proto_add_host_dependency "$config" "$ip" $interface )
                        serv_addr=1
                done
        }