From 9d3249cfa6e6d7967609b16ca4618b7e963f51be Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 6 Nov 2019 18:10:30 +0100 Subject: [PATCH] Changes with OpenVPN TCP --- .../luasrc/controller/openmptcprouter.lua | 2 +- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 2 ++ openmptcprouter/files/etc/uci-defaults/2020-omr-vpn | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index c87a019ca..29d8c6c02 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -545,7 +545,7 @@ function wizard_add() if default_vpn == "openvpn" then ucic:set("openvpn","omr","enabled",1) - ucic:set("network","omrvpn","proto","dhcp") + ucic:set("network","omrvpn","proto","none") else ucic:set("openvpn","omr","enabled",0) end diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index fa55c3ef8..5feeb3e44 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -688,6 +688,8 @@ _set_config_from_vps() { set openvpn.omr.ca="/etc/luci-uploads/ca.crt" set openvpn.omr.enabled=$openvpn_state set openvpn.omr.tls_client=1 + set openvpn.omr.client=1 + set openvpn.omr.allow_recursive_routing=1 EOF if [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ]; then uci -q set openvpn.omr.remote="$vpsip" diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn index 4fbb4a7b4..a84f67394 100755 --- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn +++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn @@ -24,7 +24,7 @@ if [ "$(uci -q get glorytun.vpn.localip)" = "10.0.0.2" ]; then EOF fi -if [ "$(uci -q get openvpn.omr)" = "" ]; then +if [ "$(uci -q get openvpn.omr.proto)" != "tcp-client" ]; then uci -q batch <<-EOF >/dev/null set openvpn.omr=openvpn set openvpn.omr.dev=tun0 @@ -34,6 +34,9 @@ if [ "$(uci -q get openvpn.omr)" = "" ]; then set openvpn.omr.enabled=0 set openvpn.omr.ncp_disable=1 set openvpn.omr.auth_nocache=1 + set openvpn.omr.client=1 + set openvpn.omr.tls_client=1 + set openvpn.omr.allow_recursive_routing=1 commit openvpn EOF fi