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

Merge pull request #12799 from aaronjg/openfortivpn/netifd

Browse source 
openfortivpn: use standard 'peerdns' config option on netifd script
This commit is contained in:
Rosen Penev 2020-07-21 18:59:00 -07:00 committed by GitHub
commit 75efd85bf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/openfortivpn/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openfortivpn PKG_NAME:=openfortivpn
PKG_VERSION:=1.14.1 PKG_VERSION:=1.14.1
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/adrienverge/openfortivpn/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/adrienverge/openfortivpn/tar.gz/v$(PKG_VERSION)?

9
net/openfortivpn/files/openfortivpn.sh
View file

@ -19,8 +19,6 @@ proto_openfortivpn_init_config() {
proto_config_add_string "password" proto_config_add_string "password"
proto_config_add_string "trusted_cert" proto_config_add_string "trusted_cert"
proto_config_add_string "remote_status_check" proto_config_add_string "remote_status_check"
proto_config_add_int "set_dns"
proto_config_add_int "pppd_use_peerdns"
proto_config_add_int "peerdns" proto_config_add_int "peerdns"
proto_config_add_int "metric" proto_config_add_int "metric"
no_device=1 no_device=1
@ -32,7 +30,7 @@ proto_openfortivpn_setup() {
local msg local msg
json_get_vars host server port iface_name local_ip username password trusted_cert \ json_get_vars host server port iface_name local_ip username password trusted_cert \
remote_status_check set_dns pppd_use_peerdns metric remote_status_check peerdns metric
ifname="vpn-$config" ifname="vpn-$config"
@ -91,11 +89,12 @@ proto_openfortivpn_setup() {
[ -n "$port" ] && port=":$port" [ -n "$port" ] && port=":$port"
[ -z "$peerdns" ] && peerdns=1
append_args "$server$port" --pppd-ifname="$ifname" --use-syslog -c /dev/null append_args "$server$port" --pppd-ifname="$ifname" --use-syslog -c /dev/null
append_args "--set-dns=$set_dns" append_args "--set-dns=0"
append_args "--no-routes" append_args "--no-routes"
append_args "--pppd-use-peerdns=$pppd_use_peerdns" append_args "--pppd-use-peerdns=$peerdns"
[ -n "$iface_name" ] && { [ -n "$iface_name" ] && {
append_args "--ifname=$iface_device_name" append_args "--ifname=$iface_device_name"