mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-05 10:49:42 +02:00
b62840e4e7
- don't let pppd control resolv.conf.auto because it will wipe foreign dns entries - handle dns setup in ip-up handler - use add_dns() and remove_dns() to only add/remove dns entries related to the corresponding pppd instance - make pppd shutdown work for interfaces without ifname option, e.g. pptp git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21392 3c298f89-4303-0410-b956-a3cf2f4a3e73
142 lines
3.1 KiB
Bash
142 lines
3.1 KiB
Bash
stop_interface_ppp() {
|
|
local cfg="$1"
|
|
|
|
local proto
|
|
config_get proto "$cfg" proto
|
|
|
|
local link="$proto-$cfg"
|
|
[ -f "/var/run/ppp-${link}.pid" ] && {
|
|
local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
|
|
local try=0
|
|
grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \
|
|
while grep -qs pppd "/proc/$pid/cmdline" && [ $((try++)) -lt 5 ]; do sleep 1; done
|
|
grep -qs pppd "/proc/$pid/cmdline" && kill -KILL $pid && \
|
|
while grep -qs pppd "/proc/$pid/cmdline"; do sleep 1; done
|
|
rm -f "/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-${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-${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
|
|
|
|
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
|
|
|
|
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
|
|
|
|
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_bool demand "$cfg" demand 0
|
|
|
|
local demandargs
|
|
[ "$demand" -eq 1 ] && {
|
|
demandargs="precompiled-active-filter /etc/ppp/filter demand idle"
|
|
[ "$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%%[, ]*}} \
|
|
$demandargs \
|
|
$peerdns \
|
|
$defaultroute \
|
|
${username:+user "$username" password "$password"} \
|
|
ipparam "$cfg" \
|
|
ifname "$link" \
|
|
${connect:+connect "$connect"} \
|
|
${disconnect:+disconnect "$disconnect"} \
|
|
${ipv6} \
|
|
${pppd_options} \
|
|
nodetach
|
|
|
|
lock -u "/var/lock/ppp-${link}"
|
|
}
|
|
|
|
setup_interface_ppp() {
|
|
local iface="$1"
|
|
local config="$2"
|
|
|
|
local device
|
|
config_get device "$config" device
|
|
|
|
local mtu
|
|
config_get mtu "$config" mtu
|
|
|
|
mtu=${mtu:-1492}
|
|
start_pppd "$config" \
|
|
mtu $mtu mru $mtu \
|
|
"$device"
|
|
}
|
|
|