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

openfortivpn: remove explicit handling of peerdns and defaultroute

Browse source 
netifd is clever enough to handle the peerdns and default route
arguments, so we can just let them get passed along, and when
ppp-up invokes proto_send_update, netifd will only apply what
is needed

Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
This commit is contained in:
Aaron Goodman 2020-07-31 21:37:06 -04:00
parent 991147ff43
commit 176f363b5f
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,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_defaults
no_device=1 no_device=1
available=1 available=1
} }
@ -28,12 +27,12 @@ proto_openfortivpn_init_config() {
proto_openfortivpn_setup() { proto_openfortivpn_setup() {
local config="$1" local config="$1"
local msg ifname ip server_ip pwfile callfile default_route_arg local msg ifname ip server_ip pwfile callfile
local host server port iface_name local_ip username password trusted_cert \ local host server port iface_name local_ip username password trusted_cert \
remote_status_check defaultroute peerdns metric remote_status_check
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 defaultroute peerdns metric remote_status_check
ifname="vpn-$config" ifname="vpn-$config"
@ -89,12 +88,10 @@ proto_openfortivpn_setup() {
[ -n "$port" ] && port=":$port" [ -n "$port" ] && port=":$port"
[ -z "$peerdns" ] && peerdns=1
[ "$defaultroute" = 1 ] && defaultroute_arg="defaultroute" || defaultroute_arg=nodefaultroute
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=0" append_args "--set-dns=0"
append_args "--no-routes" append_args "--no-routes"
append_args "--pppd-use-peerdns=$peerdns" append_args "--pppd-use-peerdns=1"
[ -n "$iface_name" ] && { [ -n "$iface_name" ] && {
append_args "--ifname=$iface_device_name" append_args "--ifname=$iface_device_name"
@ -125,7 +122,6 @@ noauth
default-asyncmap default-asyncmap
nopcomp nopcomp
receive-all receive-all
$defaultroute_arg
nodetach nodetach
ipparam $config ipparam $config
lcp-max-configure 40 lcp-max-configure 40