Attachment 18010 Details for Bug 53480 – Патч, убирающий опцию ncp_disable

[patch] Патч, убирающий опцию ncp_disable

alterator-net-openvpn-0.8.15-alt-remove-ncp_disable.patch (text/plain), 4.25 KB, created by Alexey Volkov on 2025-03-18 15:24:10 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Volkov

Created: 2025-03-18 15:24:10 MSK

Size: 4.25 KB

patch

obsolete

>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 @@
> 								<td><span translate="_">Digest:</span></td>
> 								<td><select name="digests"></select></td>
> 							</tr>
>+							<tr>
>+								<td>&nbsp;</td>
>+								<td>
>+									<input type="checkbox" name="ncp_disable" value="#f"/>
>+									<span translate="_">Disable NCP</span>
>+								</td>
>+							</tr>
> 							<tr>
> 								<td colspan="2">&nbsp;</td>
> 							</tr>
>diff --git a/ui/net-openvpn/index.scm b/ui/net-openvpn/index.scm
>index 328dbd0..1ed298c 100644
>--- a/ui/net-openvpn/index.scm
>+++ b/ui/net-openvpn/index.scm
>@@ -16,7 +16,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")))
>@@ -34,7 +35,7 @@
>                              'dev (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)
>@@ -55,7 +56,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)
>@@ -185,6 +186,10 @@
> 	(combobox name "digests")
> 	(spacer)
>     ;;
>+	(spacer)
>+	(checkbox text (_ "Disable NCP") name "ncp_disable")
>+	(spacer)
>+	;;
>   (spacer)
>   (hbox align "left"
>         colspan 2

Actions: View | Diff

Attachments on bug 53480: 17992 | 18008 | 18009 | 18010