xl2tpd: tweak generating pppoptfile.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou
2015-08-11 11:54:12 +08:00
parent 23feea5814
commit 27aafeb96a
+22 -15
View File
@@ -67,22 +67,29 @@ proto_l2tp_setup() {
local interval="${keepalive##*[, ]}" local interval="${keepalive##*[, ]}"
[ "$interval" != "$keepalive" ] || interval=5 [ "$interval" != "$keepalive" ] || interval=5
mkdir -p /tmp/l2tp keepalive="${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}}"
username="${username:+user \"$username\" password \"$password\"}"
ipv6="${ipv6:++ipv6}"
mtu="${mtu:+mtu $mtu mru $mtu}"
echo "${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}}" > "${optfile}" mkdir -p /tmp/l2tp
echo "usepeerdns" >> "${optfile}" cat <<EOF >"$optfile"
echo "nodefaultroute" >> "${optfile}" usepeerdns
echo "${username:+user \"$username\" password \"$password\"}" >> "${optfile}" nodefaultroute
echo "ipparam \"$interface\"" >> "${optfile}" ipparam "$interface"
echo "ifname \"l2tp-$interface\"" >> "${optfile}" ifname "l2tp-$interface"
echo "ip-up-script /lib/netifd/ppp-up" >> "${optfile}" ip-up-script /lib/netifd/ppp-up
echo "ipv6-up-script /lib/netifd/ppp-up" >> "${optfile}" ipv6-up-script /lib/netifd/ppp-up
echo "ip-down-script /lib/netifd/ppp-down" >> "${optfile}" ip-down-script /lib/netifd/ppp-down
echo "ipv6-down-script /lib/netifd/ppp-down" >> "${optfile}" ipv6-down-script /lib/netifd/ppp-down
# Don't wait for LCP term responses; exit immediately when killed. # Don't wait for LCP term responses; exit immediately when killed.
echo "lcp-max-terminate 0" >> "${optfile}" lcp-max-terminate 0
echo "${ipv6:++ipv6} ${pppd_options}" >> "${optfile}" $keepalive
echo "${mtu:+mtu $mtu mru $mtu}" >> "${optfile}" $username
$ipv6
$mtu
$pppd_options
EOF
xl2tpd-control add l2tp-${interface} pppoptfile=${optfile} lns=${server} || { xl2tpd-control add l2tp-${interface} pppoptfile=${optfile} lns=${server} || {
echo "xl2tpd-control: Add l2tp-$interface failed" >&2 echo "xl2tpd-control: Add l2tp-$interface failed" >&2