Attachment #18009 for bug #53480

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




		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

		write_string_param type "$type"
		write_string_param port '1194'
		write_bool_param lzo false
		write_bool_param ncp_disable false
		write_bool_param use_tcp false
		if [ "$type" = 'routed' ];then
			write_string_param server_netmask '255.255.255.0'

	[ -n "$in_digests" ] && echo "auth $in_digests" >> $CACHEDIR/$dev/$OVPNCONFIG

	test_bool "$in_lzo" && echo 'comp-lzo' >>"$CACHEDIR/$dev/$OVPNCONFIG"
	test_bool "$in_ncp_disable" && echo 'ncp-disable' >>"$CACHEDIR/$dev/$OVPNCONFIG"

    if is_gost x509 "$CERTSDIR/$servername.cert"; then
		local engine=gost

Lines 39-45 Link Here

(-)a/ui/openvpn-server/ajax.scm (-2 / +2 lines)
39	(form-update-enum "bridge" (woo-list "/openvpn-server/avail_bridges"))	39	(form-update-enum "bridge" (woo-list "/openvpn-server/avail_bridges"))
40	(form-update-value-list	40	(form-update-value-list
41	'("enabled" "type" "bridge" "port" "server_net" "server_netmask" "vpnnet" "vpnnetmask"	41	'("enabled" "type" "bridge" "port" "server_net" "server_netmask" "vpnnet" "vpnnetmask"
42	"gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "ncp_disable" "dhparams")	42	"gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "ciphers" "tls_ciphers" "digests" "dhparams")
43	cmd)	43	cmd)
44	(update-type-interface)))	44	(update-type-interface)))
45		45
Lines 65-71 Link Here
65	'operation reason	65	'operation reason
66	(form-value-list	66	(form-value-list
67	'("enabled" "type" "bridge" "port" "server_net" "server_netmask" "vpnnet" "vpnnetmask"	67	'("enabled" "type" "bridge" "port" "server_net" "server_netmask" "vpnnet" "vpnnetmask"
68	"gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "language" "ciphers" "tls_ciphers" "digests" "ncp_disable" "dhparams"))))))	68	"gateway_vpnaddr" "vpnpool_start" "vpnpool_end" "lzo" "use_tcp" "language" "ciphers" "tls_ciphers" "digests" "dhparams"))))))
69		69
70	(define (add-network)	70	(define (add-network)
71	(write-config "add-server-network")	71	(write-config "add-server-network")




								<td><span translate="_" name="digests">Digest:</span></td>
								<td><select name="digests"></select></td>
							</tr>
							<tr>
								<td></td>
								<td>
									<input type="checkbox" name="ncp_disable" value="#t"/>
									<span translate="_" name="ncp_disable">Disable NCP</span>
								</td>
							</tr>
                            <tr>
                                <td><span translate="_" name="dhparams">DH Parameter:</span></td>
                                <td><select name="dhparams"></select></td>

Return to bug 53480

Lines 432-442 read_server_config() Link Here

(-)a/backend3/openvpn-server (-7 lines)
432	else	432	else
433	write_bool_param lzo false	433	write_bool_param lzo false
434	fi	434	fi
435	if grep -qs '^ncp-disable' "$IFACESDIR/$dev/$OVPNCONFIG";then
436	write_bool_param ncp_disable true
437	else
438	write_bool_param ncp_disable false
439	fi
440	if get_config_val "$dev" proto \| grep -qs '^tcp';then	435	if get_config_val "$dev" proto \| grep -qs '^tcp';then
441	write_bool_param use_tcp true	436	write_bool_param use_tcp true
442	else	437	else
Lines 465-471 read_server_config() Link Here
465	write_string_param type "$type"	460	write_string_param type "$type"
466	write_string_param port '1194'	461	write_string_param port '1194'
467	write_bool_param lzo false	462	write_bool_param lzo false
468	write_bool_param ncp_disable false
469	write_bool_param use_tcp false	463	write_bool_param use_tcp false
470	if [ "$type" = 'routed' ];then	464	if [ "$type" = 'routed' ];then
471	write_string_param server_netmask '255.255.255.0'	465	write_string_param server_netmask '255.255.255.0'
Lines 793-799 SERVER_CONF_TEMPLATE Link Here
793	[ -n "$in_digests" ] && echo "auth $in_digests" >> $CACHEDIR/$dev/$OVPNCONFIG	787	[ -n "$in_digests" ] && echo "auth $in_digests" >> $CACHEDIR/$dev/$OVPNCONFIG
794		788
795	test_bool "$in_lzo" && echo 'comp-lzo' >>"$CACHEDIR/$dev/$OVPNCONFIG"	789	test_bool "$in_lzo" && echo 'comp-lzo' >>"$CACHEDIR/$dev/$OVPNCONFIG"
796	test_bool "$in_ncp_disable" && echo 'ncp-disable' >>"$CACHEDIR/$dev/$OVPNCONFIG"
797		790
798	if is_gost x509 "$CERTSDIR/$servername.cert"; then	791	if is_gost x509 "$CERTSDIR/$servername.cert"; then
799	local engine=gost	792	local engine=gost

Lines 77-89 Link Here

(-)a/ui/openvpn-server/index.html (-7 lines)
77	<td><span translate="_" name="digests">Digest:</span></td>	77	<td><span translate="_" name="digests">Digest:</span></td>
78	<td><select name="digests"></select></td>	78	<td><select name="digests"></select></td>
79	</tr>	79	</tr>
80	<tr>
81	<td></td>
82	<td>
83	<input type="checkbox" name="ncp_disable" value="#t"/>
84	<span translate="_" name="ncp_disable">Disable NCP</span>
85	</td>
86	</tr>
87	<tr>	80	<tr>
88	<td><span translate="_" name="dhparams">DH Parameter:</span></td>	81	<td><span translate="_" name="dhparams">DH Parameter:</span></td>
89	<td><select name="dhparams"></select></td>	82	<td><select name="dhparams"></select></td>