diff options
author | Mengyang Li <mayli.he@gmail.com> | 2020-10-24 21:00:40 -0700 |
---|---|---|
committer | Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> | 2020-10-25 21:44:32 +0100 |
commit | b6119433a512aa35a740708c0aaa941e8bf07fea (patch) | |
tree | 77cdddf07e3188181d9f8a2d51f07cf8c5b61c70 /net/openconnect | |
parent | 80ac8dac11bb71c74a09535b3d43d04541449de3 (diff) |
openconnect: allow specify --protocol from config
openconnect v8.10 supports 4 VPN protocols
--protocol=anyconnect Compatible with Cisco AnyConnect SSL VPN, as well as ocserv (default)
--protocol=nc Compatible with Juniper Network Connect
--protocol=gp Compatible with Palo Alto Networks (PAN) GlobalProtect SSL VPN
--protocol=pulse Compatible with Pulse Connect Secure SSL VPN
This patch allows user to specify protocol use the new "vpn_protocol"
option and deprecate the old option "juniper" which seems to be missing in
the current openconnect client.
Signed-off-by: Mengyang Li <mayli.he@gmail.com>
Diffstat (limited to 'net/openconnect')
-rw-r--r-- | net/openconnect/Makefile | 2 | ||||
-rw-r--r-- | net/openconnect/README | 11 | ||||
-rwxr-xr-x | net/openconnect/files/openconnect.sh | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile index 277653a1b..59e81f77a 100644 --- a/net/openconnect/Makefile +++ b/net/openconnect/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openconnect PKG_VERSION:=8.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/ diff --git a/net/openconnect/README b/net/openconnect/README index 7ab2a69cd..e7c60d765 100644 --- a/net/openconnect/README +++ b/net/openconnect/README @@ -32,8 +32,15 @@ config interface 'MYVPN' #option token_mode 'script' #option token_script '/lib/custom/getocpass.sh' - # Juniper vpn support - #option juniper '1' + # For non-anyconnect vpn protocols + # Cisco AnyConnect (default) + #option vpn_protocol 'anyconnect' + # Juniper Network Connect + #option vpn_protocol 'nc' + # Palo Alto Networks GlobalProtect + #option vpn_protocol 'gp' + # Pulse Connect Secure + #option vpn_protocol 'pulse' # Authentication form responses #list form_entry FORM:OPT=VAL diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh index aef13a3c3..d310cf5c1 100755 --- a/net/openconnect/files/openconnect.sh +++ b/net/openconnect/files/openconnect.sh @@ -15,6 +15,7 @@ proto_openconnect_init_config() { proto_config_add_int "port" proto_config_add_int "mtu" proto_config_add_int "juniper" + proto_config_add_string "vpn_protocol" proto_config_add_boolean "no_dtls" proto_config_add_string "interface" proto_config_add_string "username" @@ -46,6 +47,7 @@ proto_openconnect_setup() { form_entry \ interface \ juniper \ + vpn_protocol \ mtu \ no_dtls \ os \ @@ -93,6 +95,10 @@ proto_openconnect_setup() { append_args --juniper fi + [ -n "$vpn_protocol" ] && { + append_args --protocol "$vpn_protocol" + } + [ -n "$serverhash" ] && { append_args "--servercert=$serverhash" append_args --no-system-trust |