fix issues with multiple ppp links (noticed by Stefano Rivera)

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 0bd75fc..84def12 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,6 +3,7 @@ scan_ppp() {
        pppdev="${pppdev:-0}"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"
+       pppdev="$(($pppdev + 1))"
 }
 
 start_pppd() {
@@ -21,6 +22,11 @@ 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
+
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
        
@@ -33,8 +39,26 @@ start_pppd() {
                defaultroute \
                replacedefaultroute \
                ${username:+user "$username" password "$password"} \
+               unit "$pppdev" \
                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"
+}
+