openwrt: honour gcc extra configuration flags

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 0bd75fc..5ca1cf9 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,8 +1,12 @@
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
-       config_set "$1" ifname "ppp$pppdev"
-       config_set "$1" unit "$pppdev"
+       config_get unit "$1" unit
+       [ -z "$unit" ] && {
+               config_set "$1" ifname "ppp$pppdev"
+               config_set "$1" unit "$pppdev"
+               pppdev="$(($pppdev + 1))"
+       }
 }
 
 start_pppd() {
@@ -21,6 +25,13 @@ start_pppd() {
        config_get username "$cfg" username
        config_get password "$cfg" password
        config_get keepalive "$cfg" keepalive
+
+       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=""
+
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
        
@@ -30,11 +41,28 @@ start_pppd() {
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
                usepeerdns \
-               defaultroute \
-               replacedefaultroute \
+               $defaultroute \
                ${username:+user "$username" password "$password"} \
+               unit "$unit" \
                linkname "$cfg" \
-               ipparam "$cfg"
+               ipparam "$cfg" \
+               ${connect:+connect "$connect"} \
+               ${disconnect:+disconnect "$disconnect"} \
+               ${pppd_options}
 
        lock -u "/var/lock/ppp-${cfg}"
 }
+
+setup_interface_ppp() {
+       local iface="$1"
+       local config="$2"
+
+       config_get device "$config" device
+
+       config_get mtu "$cfg" mtu
+       mtu=${mtu:-1492}
+       start_pppd "$config" \
+               mtu $mtu mru $mtu \
+               "$device"
+}
+