xl2tpd: bump to version devel-20151125

Main changes are as the following

 - Allow specifying port in server option, e.g. example.com:1702 (fixes
   github issue #1960 "xl2tpd port change bug").
 - Fixes NULL dereference on connection timeout
 - Update 100-makefile_opt_flags.patch

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou
2015-11-16 20:56:37 +08:00
parent a265450e65
commit c6e689d266
3 changed files with 11 additions and 11 deletions
+7 -7
View File
@@ -25,14 +25,14 @@ proto_l2tp_init_config() {
proto_l2tp_setup() {
local interface="$1"
local optfile="/tmp/l2tp/options.${interface}"
local ip serv_addr server host
local ip serv_addr server
json_get_var server server && {
for ip in $(resolveip -t 5 "$server"); do
( proto_add_host_dependency "$interface" "$ip" )
serv_addr=1
done
}
json_get_var server server
host="${server%:*}"
for ip in $(resolveip -t 5 "$host"); do
( proto_add_host_dependency "$interface" "$ip" )
serv_addr=1
done
[ -n "$serv_addr" ] || {
echo "Could not resolve server address" >&2
sleep 5