diff options
| author | Aaron Goodman <aaronjg@stanford.edu> | 2020-07-31 21:37:06 -0400 |
|---|---|---|
| committer | Aaron Goodman <aaronjg@stanford.edu> | 2020-07-31 21:43:06 -0400 |
| commit | 176f363b5f25b361284714dc9df7af23f7d9d4fb (patch) | |
| tree | 8758beaea43b60f0986faded99400dab8d7c05ae /net/openfortivpn | |
| parent | 991147ff430f56f4018c1d62953fc8da56978672 (diff) | |
openfortivpn: remove explicit handling of peerdns and defaultroute
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>
Diffstat (limited to 'net/openfortivpn')
| -rwxr-xr-x | net/openfortivpn/files/openfortivpn.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/openfortivpn/files/openfortivpn.sh b/net/openfortivpn/files/openfortivpn.sh index fd1267a0b..30e7b7810 100755 --- a/net/openfortivpn/files/openfortivpn.sh +++ b/net/openfortivpn/files/openfortivpn.sh @@ -20,7 +20,6 @@ proto_openfortivpn_init_config() { proto_config_add_string "password" proto_config_add_string "trusted_cert" proto_config_add_string "remote_status_check" - proto_config_add_defaults no_device=1 available=1 } @@ -28,12 +27,12 @@ proto_openfortivpn_init_config() { proto_openfortivpn_setup() { 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 \ - remote_status_check defaultroute peerdns metric + remote_status_check 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" @@ -89,12 +88,10 @@ proto_openfortivpn_setup() { [ -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 "--set-dns=0" append_args "--no-routes" - append_args "--pppd-use-peerdns=$peerdns" + append_args "--pppd-use-peerdns=1" [ -n "$iface_name" ] && { append_args "--ifname=$iface_device_name" @@ -125,7 +122,6 @@ noauth default-asyncmap nopcomp receive-all -$defaultroute_arg nodetach ipparam $config lcp-max-configure 40 |