Browse Source

openconnect: corrected call to proto_add_host_dependency

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Nikos Mavrogiannopoulos 9 years ago
parent
commit
2765d7b779
2 changed files with 4 additions and 3 deletions
  1. 1
    1
      net/openconnect/Makefile
  2. 3
    2
      net/openconnect/files/openconnect.sh

+ 1
- 1
net/openconnect/Makefile View File

9
 
9
 
10
 PKG_NAME:=openconnect
10
 PKG_NAME:=openconnect
11
 PKG_VERSION:=7.06
11
 PKG_VERSION:=7.06
12
-PKG_RELEASE:=1
12
+PKG_RELEASE:=2
13
 PKG_USE_MIPS16:=0
13
 PKG_USE_MIPS16:=0
14
 
14
 
15
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

+ 3
- 2
net/openconnect/files/openconnect.sh View File

26
 	json_get_vars server port username serverhash authgroup password password2 interface token_mode token_secret os csd_wrapper
26
 	json_get_vars server port username serverhash authgroup password password2 interface token_mode token_secret os csd_wrapper
27
 
27
 
28
 	grep -q tun /proc/modules || insmod tun
28
 	grep -q tun /proc/modules || insmod tun
29
+	ifname="vpn-$config"
29
 
30
 
30
 	logger -t openconnect "initializing..."
31
 	logger -t openconnect "initializing..."
31
 	serv_addr=
32
 	serv_addr=
32
 	for ip in $(resolveip -t 10 "$server"); do
33
 	for ip in $(resolveip -t 10 "$server"); do
33
-		( proto_add_host_dependency "$config" "$ip" $interface )
34
+		( proto_add_host_dependency "$interface" "$ip" "$ifname" )
34
 		serv_addr=1
35
 		serv_addr=1
35
 	done
36
 	done
36
 	[ -n "$serv_addr" ] || {
37
 	[ -n "$serv_addr" ] || {
42
 
43
 
43
 	[ -n "$port" ] && port=":$port"
44
 	[ -n "$port" ] && port=":$port"
44
 
45
 
45
-	cmdline="$server$port -i vpn-$config --non-inter --syslog --script /lib/netifd/vpnc-script"
46
+	cmdline="$server$port -i "$ifname" --non-inter --syslog --script /lib/netifd/vpnc-script"
46
 
47
 
47
 	# migrate to standard config files
48
 	# migrate to standard config files
48
 	[ -f "/etc/config/openconnect-user-cert-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-cert-vpn-$config.pem" "/etc/openconnect/user-cert-vpn-$config.pem"
49
 	[ -f "/etc/config/openconnect-user-cert-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-cert-vpn-$config.pem" "/etc/openconnect/user-cert-vpn-$config.pem"