X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b1c117aeeb8be3f6642ebf53b6649b9a1890ecbe..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/ppp/files/ppp.sh diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 0d0941fda..996d54228 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -1,57 +1,130 @@ -scan_ppp() { - config_get ifname "$1" ifname - pppdev="${pppdev:-0}" - config_set "$1" ifname "ppp$pppdev" - config_set "$1" unit "$pppdev" +stop_interface_ppp() { + local cfg="$1" + + local proto + config_get proto "$cfg" proto + + local link="$proto-$cfg" + service_kill pppd "/var/run/ppp-${link}.pid" + + remove_dns "$cfg" + + local lock="/var/lock/ppp-$link" + [ -f "$lock" ] && lock -u "$lock" } start_pppd() { local cfg="$1"; shift + local proto + config_get proto "$cfg" proto + + # unique link identifier + local link="${proto:-ppp}-$cfg" + # 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)" + 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-${cfg}" + lock -u "/var/lock/ppp-${link}" return 0 } + # 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 + + local device config_get device "$cfg" device - config_get unit "$cfg" unit + + local username config_get username "$cfg" username + + local password config_get password "$cfg" password + + local keepalive config_get keepalive "$cfg" keepalive + local connect config_get connect "$cfg" connect + + local disconnect config_get disconnect "$cfg" disconnect - interval="${keepalive##*[, ]}" + local pppd_options + config_get pppd_options "$cfg" pppd_options + + local defaultroute + config_get_bool defaultroute "$cfg" defaultroute 1 + [ "$defaultroute" -eq 1 ] && \ + defaultroute="defaultroute replacedefaultroute" || defaultroute="nodefaultroute" + + local interval="${keepalive##*[, ]}" [ "$interval" != "$keepalive" ] || interval=5 - - config_get demand "$cfg" demand - [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto - /usr/sbin/pppd "$@" \ + + local dns + config_get dns "$config" dns + + local has_dns=0 + local peer_default=1 + [ -n "$dns" ] && { + has_dns=1 + peer_default=0 + } + + local peerdns + config_get_bool peerdns "$cfg" peerdns $peer_default + + [ "$peerdns" -eq 1 ] && { + peerdns="usepeerdns" + } || { + peerdns="" + add_dns "$cfg" $dns + } + + local demand + config_get demand "$cfg" demand 0 + + local demandargs + [ "$demand" -gt 0 ] && { + demandargs="precompiled-active-filter /etc/ppp/filter demand idle $demand" + [ "$has_dns" -eq 0 ] && add_dns "$cfg" 1.1.1.1 + } || { + 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%%[, ]*}} \ - ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \ - usepeerdns \ - defaultroute \ - replacedefaultroute \ + $demandargs \ + $peerdns \ + $defaultroute \ ${username:+user "$username" password "$password"} \ - linkname "$cfg" \ ipparam "$cfg" \ + ifname "$link" \ ${connect:+connect "$connect"} \ - ${disconnect:+disconnect "$disconnect"} + ${disconnect:+disconnect "$disconnect"} \ + ${ipv6} \ + ${pppd_options} \ + nodetach - lock -u "/var/lock/ppp-${cfg}" + lock -u "/var/lock/ppp-${link}" } setup_interface_ppp() { local iface="$1" local config="$2" + local device config_get device "$config" device - config_get mtu "$cfg" mtu + local mtu + config_get mtu "$config" mtu + mtu=${mtu:-1492} start_pppd "$config" \ mtu $mtu mru $mtu \