Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13221 from yousong/oc

Browse source 
openconnect: allow disable dtls with bool option no_dtls
This commit is contained in:
Nikos Mavrogiannopoulos 2020-08-30 13:29:29 +02:00 committed by GitHub
commit 25b4544297
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/openconnect/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openconnect PKG_NAME:=openconnect
PKG_VERSION:=8.10 PKG_VERSION:=8.10
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/ PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/

22
net/openconnect/files/openconnect.sh
View file

@ -15,6 +15,7 @@ proto_openconnect_init_config() {
proto_config_add_int "port" proto_config_add_int "port"
proto_config_add_int "mtu" proto_config_add_int "mtu"
proto_config_add_int "juniper" proto_config_add_int "juniper"
proto_config_add_boolean "no_dtls"
proto_config_add_string "interface" proto_config_add_string "interface"
proto_config_add_string "username" proto_config_add_string "username"
proto_config_add_string "serverhash" proto_config_add_string "serverhash"
@ -39,7 +40,25 @@ proto_openconnect_add_form_entry() {
proto_openconnect_setup() { proto_openconnect_setup() {
local config="$1" local config="$1"
json_get_vars server port interface username serverhash authgroup usergroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper form_entry json_get_vars \
authgroup \
csd_wrapper \
form_entry \
interface \
juniper \
mtu \
no_dtls \
os \
password \
password2 \
port \
server \
serverhash \
token_mode \
token_script \
token_secret \
usergroup \
username \
grep -q tun /proc/modules || insmod tun grep -q tun /proc/modules || insmod tun
ifname="vpn-$config" ifname="vpn-$config"
@ -55,6 +74,7 @@ proto_openconnect_setup() {
[ -n "$port" ] && port=":$port" [ -n "$port" ] && port=":$port"
append_args "$server$port" -i "$ifname" --non-inter --syslog --script /lib/netifd/vpnc-script append_args "$server$port" -i "$ifname" --non-inter --syslog --script /lib/netifd/vpnc-script
[ "$no_dtls" = 1 ] && append_args --no-dtls
[ -n "$mtu" ] && append_args --mtu "$mtu" [ -n "$mtu" ] && append_args --mtu "$mtu"
# migrate to standard config files # migrate to standard config files