From d2783b7b3a48c2f6308b8ff5ce0e8252e096524e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 17 Dec 2020 10:48:23 +0100 Subject: [PATCH 1/5] Fix glorytun-udp rate auto setting --- .../htdocs/luci-static/resources/view/services/glorytun-udp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js b/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js index 73ecb401e..762332468 100644 --- a/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js +++ b/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js @@ -96,7 +96,7 @@ return L.view.extend({ o.rmempty = false; o.modalonly = true; - o = s.taboption('advanced', form.Flag, 'auto', _('Dynamic rate detection')); + o = s.taboption('advanced', form.Flag, 'rateauto', _('Dynamic rate detection')); o.rmempty = false; o.modalonly = true; From 4449784731076384513d715eb797a409c6cbe835 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 17 Dec 2020 16:33:11 +0100 Subject: [PATCH 2/5] Fix openvpn bonding --- openmptcprouter/files/etc/init.d/openvpnbonding | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openmptcprouter/files/etc/init.d/openvpnbonding b/openmptcprouter/files/etc/init.d/openvpnbonding index f0ba915fa..864a67eeb 100755 --- a/openmptcprouter/files/etc/init.d/openvpnbonding +++ b/openmptcprouter/files/etc/init.d/openvpnbonding @@ -36,6 +36,7 @@ _openvpnbonding() { set openvpn.omr_bonding_${interface}.client='1' set openvpn.omr_bonding_${interface}.tls_client='1' set openvpn.omr_bonding_${interface}.enabled='1' + set openvpn.omr_bonding_${interface}.persist_tun='1' set openvpn.omr_bonding_${interface}.key='/etc/luci-uploads/client.key' set openvpn.omr_bonding_${interface}.cert='/etc/luci-uploads/client.crt' set openvpn.omr_bonding_${interface}.ca='/etc/luci-uploads/ca.crt' @@ -75,6 +76,7 @@ start_service() set network.omrvpn.downdelay='100' set network.omrvpn.updelay='20' set network.omrvpn.use_carrier='1' + set network.omrvpn.mtu='1440' commit network EOF config_load openmptcprouter From a486708f2b0b1cc9d8d121b9357b031e57e0e39d Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 18 Dec 2020 10:53:31 +0100 Subject: [PATCH 3/5] Add needed changes to have OpenVPN Bonding used as default gateway --- luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua | 3 +++ omr-tracker/files/bin/omr-tracker | 3 +++ openmptcprouter/files/etc/init.d/openvpnbonding | 1 + 3 files changed, 7 insertions(+) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index c9a264ed8..5de2cda24 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -396,6 +396,9 @@ function wizard_add() vpn_port = 65301 vpn_intf = "tun0" ucic:set("network","omrvpn","proto","dhcp") + elseif default_vpn == "openvpn_bonding" then + vpn_intf = "bonding-omrvpn" + ucic:set("network","omrvpn","proto","bonding") end if vpn_intf ~= "" then ucic:set("network","omrvpn","ifname",vpn_intf) diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index 8b64a3785..d2211fcb5 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -189,6 +189,9 @@ while true; do #if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then # OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n") #fi + if [ "$OMR_TRACKER_DEVICE" = "bonding-omrvpn" ]; then + OMR_TRACKER_DEVICE_GATEWAY="10.255.248.1" + fi if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then OMR_TRACKER_DEVICE_GATEWAY=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway") fi diff --git a/openmptcprouter/files/etc/init.d/openvpnbonding b/openmptcprouter/files/etc/init.d/openvpnbonding index 864a67eeb..3093b0f42 100755 --- a/openmptcprouter/files/etc/init.d/openvpnbonding +++ b/openmptcprouter/files/etc/init.d/openvpnbonding @@ -77,6 +77,7 @@ start_service() set network.omrvpn.updelay='20' set network.omrvpn.use_carrier='1' set network.omrvpn.mtu='1440' + set network.omrvpn.ifname= 'bonding-omrvpn' commit network EOF config_load openmptcprouter From 4eed3d2a2c4f52e912ada0c41ded21480392095b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 18 Dec 2020 15:48:03 +0100 Subject: [PATCH 4/5] Restart network after bonding-omrvpn creation --- openmptcprouter/files/etc/init.d/openvpnbonding | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openmptcprouter/files/etc/init.d/openvpnbonding b/openmptcprouter/files/etc/init.d/openvpnbonding index 3093b0f42..d36eeb584 100755 --- a/openmptcprouter/files/etc/init.d/openvpnbonding +++ b/openmptcprouter/files/etc/init.d/openvpnbonding @@ -78,8 +78,13 @@ start_service() set network.omrvpn.use_carrier='1' set network.omrvpn.mtu='1440' set network.omrvpn.ifname= 'bonding-omrvpn' + set network.omrvpn.force_link='1' commit network EOF + if [ "$(ip link show bonding-omrvpn)" = "" ]; then + /etc/init.d/network restart + sleep 10 + fi config_load openmptcprouter config_foreach _openvpnbonding interface ip link set bonding-omrvpn up From a8a3ba330a4fe6b6934c11407ab61b141b7b96db Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 18 Dec 2020 15:48:34 +0100 Subject: [PATCH 5/5] Add help for DHCP lease time --- .../htdocs/luci-static/resources/view/network/dhcp.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index d3f564d47..dafb89b26 100644 --- a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -491,7 +491,8 @@ return view.extend({ so.datatype = 'or(ip4addr,"ignore")'; so.rmempty = true; - so = ss.option(form.Value, 'leasetime', _('Lease time')); + so = ss.option(form.Value, 'leasetime', _('Lease time'), _('The lease time is in seconds, or minutes (eg 45m) or hours (eg 1h) or "infinite"')); + so.placeholder = '12h'; so.rmempty = true; so = ss.option(form.Value, 'duid', _('DUID'));