diff --git a/backend3/net-openvpn b/backend3/net-openvpn index a78d3cd..e78854e 100755 --- a/backend3/net-openvpn +++ b/backend3/net-openvpn @@ -149,6 +149,11 @@ read_client_config() else write_bool_param lzo false fi + if grep -qs '^ncp-disable' "$IFACESDIR/$dev/$OVPNCONFIG";then + write_bool_param ncp_disable true + else + write_bool_param ncp_disable false + fi if get_config_val "$dev" proto | grep -qs '^tcp';then write_bool_param use_tcp true else @@ -268,6 +273,9 @@ CLIENT_CONF_TEMPLATE if test_bool "$in_lzo";then echo 'comp-lzo' >>"$IFACESDIR/$dev/$OVPNCONFIG" fi + if test_bool "$in_ncp_disable";then + echo 'ncp-disable' >>"$IFACESDIR/$dev/$OVPNCONFIG" + fi if is_gost x509 "$cert"; then local engine=gost diff --git a/ui/net-openvpn/ajax.scm b/ui/net-openvpn/ajax.scm index 240d4a5..ae5f7e2 100644 --- a/ui/net-openvpn/ajax.scm +++ b/ui/net-openvpn/ajax.scm @@ -18,7 +18,8 @@ (form-update-activity "delete" active) (form-update-activity "ciphers" active) (form-update-activity "tls_ciphers" active) - (form-update-activity "digests" active)) + (form-update-activity "digests" active) + (form-update-activity "ncp_disable" active)) (define (read-connections) (let ((connections (woo-list "/net-openvpn/avail_connections"))) @@ -36,7 +37,7 @@ 'dev (or (form-value "connections") "") 'language (form-value "language")))) (and cmd (form-update-value-list - '("connections" "info" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests") + '("connections" "info" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable") cmd)))) (define (init-interface) @@ -58,7 +59,7 @@ 'commit #t 'dev dev (form-value-list - '("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests"))))) + '("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable"))))) (read-config)))) (define (new-connection) diff --git a/ui/net-openvpn/index.html b/ui/net-openvpn/index.html index d34b5c7..5033786 100644 --- a/ui/net-openvpn/index.html +++ b/ui/net-openvpn/index.html @@ -111,6 +111,13 @@