Attachment #18010 for bug #53480

View | Details | Raw Unified | Return to bug 53480
Collapse All | Expand All

Lines 149-154 read_client_config() Link Here

(-)a/backend3/net-openvpn (+8 lines)
149	else	149	else
150	write_bool_param lzo false	150	write_bool_param lzo false
151	fi	151	fi
		152	if grep -qs '^ncp-disable' "$IFACESDIR/$dev/$OVPNCONFIG";then
		153	write_bool_param ncp_disable true
		154	else
		155	write_bool_param ncp_disable false
		156	fi
152	if get_config_val "$dev" proto \| grep -qs '^tcp';then	157	if get_config_val "$dev" proto \| grep -qs '^tcp';then
153	write_bool_param use_tcp true	158	write_bool_param use_tcp true
154	else	159	else
Lines 268-273 CLIENT_CONF_TEMPLATE Link Here
268	if test_bool "$in_lzo";then	273	if test_bool "$in_lzo";then
269	echo 'comp-lzo' >>"$IFACESDIR/$dev/$OVPNCONFIG"	274	echo 'comp-lzo' >>"$IFACESDIR/$dev/$OVPNCONFIG"
270	fi	275	fi
		276	if test_bool "$in_ncp_disable";then
		277	echo 'ncp-disable' >>"$IFACESDIR/$dev/$OVPNCONFIG"
		278	fi
271		279
272	if is_gost x509 "$cert"; then	280	if is_gost x509 "$cert"; then
273	local engine=gost	281	local engine=gost




  (form-update-activity "delete" active)
  (form-update-activity "ciphers" active)
  (form-update-activity "tls_ciphers" active)
  (form-update-activity "digests" active)
  (form-update-activity "ncp_disable" active))

(define (read-connections)
  (let ((connections (woo-list "/net-openvpn/avail_connections")))

                             '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" "ncp_disable")
           cmd))))

(define (init-interface)

				 'commit #t
				 'dev dev
				 (form-value-list
				   '("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable")))))
	  (read-config))))

(define (new-connection)

Lines 111-116 Link Here

(-)a/ui/net-openvpn/index.html (+7 lines)
111	<td><span translate="_">Digest:</span></td>	111	<td><span translate="_">Digest:</span></td>
112	<td><select name="digests"></select></td>	112	<td><select name="digests"></select></td>
113	</tr>	113	</tr>
		114	<tr>
		115	<td> </td>
		116	<td>
		117	<input type="checkbox" name="ncp_disable" value="#f"/>
		118	<span translate="_">Disable NCP</span>
		119	</td>
		120	</tr>
114	<tr>	121	<tr>
115	<td colspan="2"> </td>	122	<td colspan="2"> </td>
116	</tr>	123	</tr>




  (form-update-activity "delete" active)
  (form-update-activity "ciphers" active)
  (form-update-activity "tls_ciphers" active)
  (form-update-activity "digests" active)
  (form-update-activity "ncp_disable" active))

(define (read-connections)
  (let ((connections (woo-list "/net-openvpn/avail_connections")))

                             '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" "ncp_disable")
           cmd))))

(define (init-interface)

				 'commit #t
				 'dev dev
				 (form-value-list
				   '("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable")))))
	  (read-config))))

(define (new-connection)

	(combobox name "digests")
	(spacer)
    ;;
	(spacer)
	(checkbox text (_ "Disable NCP") name "ncp_disable")
	(spacer)
	;;
  (spacer)
  (hbox align "left"
        colspan 2

Return to bug 53480

Lines 18-24 Link Here

(-)a/ui/net-openvpn/ajax.scm (-3 / +4 lines)
18	(form-update-activity "delete" active)	18	(form-update-activity "delete" active)
19	(form-update-activity "ciphers" active)	19	(form-update-activity "ciphers" active)
20	(form-update-activity "tls_ciphers" active)	20	(form-update-activity "tls_ciphers" active)
21	(form-update-activity "digests" active))	21	(form-update-activity "digests" active)
		22	(form-update-activity "ncp_disable" active))
22		23
23	(define (read-connections)	24	(define (read-connections)
24	(let ((connections (woo-list "/net-openvpn/avail_connections")))	25	(let ((connections (woo-list "/net-openvpn/avail_connections")))
Lines 36-42 Link Here
36	'dev (or (form-value "connections") "") 'language (form-value "language"))))	37	'dev (or (form-value "connections") "") 'language (form-value "language"))))
37	(and cmd	38	(and cmd
38	(form-update-value-list	39	(form-update-value-list
39	'("connections" "info" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests")	40	'("connections" "info" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable")
40	cmd))))	41	cmd))))
41		42
42	(define (init-interface)	43	(define (init-interface)
Lines 58-64 Link Here
58	'commit #t	59	'commit #t
59	'dev dev	60	'dev dev
60	(form-value-list	61	(form-value-list
61	'("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests")))))	62	'("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable")))))
62	(read-config))))	63	(read-config))))
63		64
64	(define (new-connection)	65	(define (new-connection)

Lines 16-22 Link Here

(-)a/ui/net-openvpn/index.scm (-3 / +8 lines)
16	(form-update-activity "delete" active)	16	(form-update-activity "delete" active)
17	(form-update-activity "ciphers" active)	17	(form-update-activity "ciphers" active)
18	(form-update-activity "tls_ciphers" active)	18	(form-update-activity "tls_ciphers" active)
19	(form-update-activity "digests" active))	19	(form-update-activity "digests" active)
		20	(form-update-activity "ncp_disable" active))
20		21
21	(define (read-connections)	22	(define (read-connections)
22	(let ((connections (woo-list "/net-openvpn/avail_connections")))	23	(let ((connections (woo-list "/net-openvpn/avail_connections")))
Lines 34-40 Link Here
34	'dev (form-value "connections") 'language (form-value "language"))))	35	'dev (form-value "connections") 'language (form-value "language"))))
35	(and cmd	36	(and cmd
36	(form-update-value-list	37	(form-update-value-list
37	'("connections" "info" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests")	38	'("connections" "info" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable")
38	cmd))))	39	cmd))))
39		40
40	(define (init-interface)	41	(define (init-interface)
Lines 55-61 Link Here
55	'commit #t	56	'commit #t
56	'dev dev	57	'dev dev
57	(form-value-list	58	(form-value-list
58	'("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests")))))	59	'("status" "server" "port" "keys" "onboot" "def_via_vpn" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable")))))
59	(read-config))))	60	(read-config))))
60		61
61	(define (new-connection)	62	(define (new-connection)
Lines 185-190 Link Here
185	(combobox name "digests")	186	(combobox name "digests")
186	(spacer)	187	(spacer)
187	;;	188	;;
		189	(spacer)
		190	(checkbox text (_ "Disable NCP") name "ncp_disable")
		191	(spacer)
		192	;;
188	(spacer)	193	(spacer)
189	(hbox align "left"	194	(hbox align "left"
190	colspan 2	195	colspan 2