From cc501a5e0a0a0b769726b48a2184fb4e3077dc2a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 22 Oct 2020 14:33:02 +0200 Subject: [PATCH 1/4] Display label in MPTCP bandwidth graph --- luci-app-mptcp/luasrc/controller/mptcp.lua | 13 ++++++++-- .../luasrc/view/mptcp/multipath.htm | 26 +++++++++++-------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/luci-app-mptcp/luasrc/controller/mptcp.lua b/luci-app-mptcp/luasrc/controller/mptcp.lua index 1a593b844..383498a75 100644 --- a/luci-app-mptcp/luasrc/controller/mptcp.lua +++ b/luci-app-mptcp/luasrc/controller/mptcp.lua @@ -58,6 +58,7 @@ function multipath_bandwidth() uci:foreach("network", "interface", function(s) local intname = s[".name"] + local label = s["label"] local dev = get_device(intname) if dev == "" then dev = get_device(s["ifname"]) @@ -75,9 +76,17 @@ function multipath_bandwidth() local bwc = luci.sys.exec("luci-bwc -i %q 2>/dev/null" % dev) or "" if bwc ~= nil then --result[dev] = "[" .. string.gsub(bwc, '[\r\n]', '') .. "]" - result[intname] = "[" .. string.gsub(bwc, '[\r\n]', '') .. "]" + if label ~= nil then + result[intname .. " (" .. label .. ")" ] = "[" .. string.gsub(bwc, '[\r\n]', '') .. "]" + else + result[intname] = "[" .. string.gsub(bwc, '[\r\n]', '') .. "]" + end else - result[intname] = "[]" + if label ~= nil then + result[intname .. " (" .. label .. ")" ] = "[]" + else + result[intname] = "[]" + end end end end diff --git a/luci-app-mptcp/luasrc/view/mptcp/multipath.htm b/luci-app-mptcp/luasrc/view/mptcp/multipath.htm index 827412292..3e72fa34b 100644 --- a/luci-app-mptcp/luasrc/view/mptcp/multipath.htm +++ b/luci-app-mptcp/luasrc/view/mptcp/multipath.htm @@ -59,21 +59,21 @@ function stringToColour(str) { if(str == "total") return "OrangeRed"; - if(str == "wan") + if(str.substring(0, 4) == "wan") return "FireBrick"; - if(str == "wan1") + if(str.substring(0, 4) == "wan1") return "DeepSkyBlue"; - if(str == "wan2") + if(str.substring(0, 4) == "wan2") return "SeaGreen"; - if(str == "wan3") + if(str.substring(0, 4) == "wan3") return "PaleGreen"; - if(str == "wan4") + if(str.substring(0, 4) == "wan4") return "PowderBlue"; - if(str == "wan5") + if(str.substring(0, 4) == "wan5") return "Salmon"; - if(str == "wan6") + if(str.substring(0, 4) == "wan6") return "LightGreen"; - if(str == "wan7") + if(str.substring(0, 4) == "wan7") return "PaleTurquoise"; // Generate a color folowing the name Math.seedrandom(str); @@ -893,9 +893,13 @@ window.setTimeout(function() From 080449d0a753f1c32eb88d0f1392c219728218d7 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 22 Oct 2020 14:33:25 +0200 Subject: [PATCH 2/4] Increase timeout to detect Huawei devices --- mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index 10fd6ba29..4faac7ac0 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -707,7 +707,7 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($( # uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state=$(echo $intfdata | awk -F";" '{print $4}') #else if [ "$proto" != "qmi" ] && [ "$proto" != "modemmanager" ]; then - if [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ] && [ -n "$(curl -s -m 1 -X GET http://$OMR_TRACKER_DEVICE_GATEWAY/api/webserver/SesTokInfo)" ]; then + if [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ] && [ -n "$(curl -s -m 2 -X GET http://$OMR_TRACKER_DEVICE_GATEWAY/api/webserver/SesTokInfo)" ]; then uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.manufacturer='huawei' else uci -q delete openmptcprouter.$OMR_TRACKER_INTERFACE.manufacturer From 4a4c3d671b74c8885cf80d65ab96a6c3ecd581e2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 23 Oct 2020 09:56:02 +0200 Subject: [PATCH 3/4] Fix default IPv6 config --- openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp b/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp index 06c7b4883..82d955677 100755 --- a/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp +++ b/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp @@ -2,8 +2,8 @@ if [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "0" ]; then uci -q batch <<-EOF >/dev/null - set dhcp.lan.ra_default=0 - set dhcp.lan.dhcpv6=disabled + set dhcp.lan.ra_default=1 + set dhcp.lan.dhcpv6=server set dhcp.lan.force=1 commit dhcp EOF From e0c1f49584bdab5ce0d4b5cc28e3fe01645884f8 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 23 Oct 2020 09:56:19 +0200 Subject: [PATCH 4/4] Fix v2ray rules_up --- v2ray-core/files/etc/init.d/v2ray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2ray-core/files/etc/init.d/v2ray b/v2ray-core/files/etc/init.d/v2ray index 877297b88..aa7e56304 100755 --- a/v2ray-core/files/etc/init.d/v2ray +++ b/v2ray-core/files/etc/init.d/v2ray @@ -2088,7 +2088,7 @@ rules_up() { config_get enabled main enabled "0" [ "$enabled" = "0" ] && return OUTBOUND_SERVERS_V4="$(uci -q get v2ray.omrout.s_vless_address)" - TRANSPARENT_PROXY_PORT="$(uci -q get v2ray.omrout.s_vless_port)" + TRANSPARENT_PROXY_PORT="$(uci -q get v2ray.omr.port)" logger -t "V2Ray" "Rules UP" add_v2ray_redirect_rules }