From c428d8a9ba4f2d7ef45944e4d630974db6ff7aae Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 11 Dec 2019 18:15:47 +0100
Subject: [PATCH] Use interface defined name instead of real name in MPTCP
 graph

---
 luci-app-mptcp/luasrc/controller/mptcp.lua | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/luci-app-mptcp/luasrc/controller/mptcp.lua b/luci-app-mptcp/luasrc/controller/mptcp.lua
index 869745bc9..df33186e4 100644
--- a/luci-app-mptcp/luasrc/controller/mptcp.lua
+++ b/luci-app-mptcp/luasrc/controller/mptcp.lua
@@ -39,13 +39,24 @@ function multipath_bandwidth()
 	local uci = luci.model.uci.cursor()
 
 	uci:foreach("network", "interface", function(s)
-		local dev = get_device(s["ifname"])
+		local intname = s[".name"]
+		local dev = get_device(intname)
+		if dev == "" then
+			dev = get_device(s["ifname"])
+		end
+		local multipath = s["multipath"] or ""
 		if dev ~= "lo" and dev ~= "" then
-			local multipath = s["multipath"] or "off"
+			if multipath == "" then
+				multipath = uci:get("openmptcprouter", intname, "multipath") or ""
+			end
+			if multipath == "" then
+				multipath = "off"
+			end
 			if multipath == "on" or multipath == "master" or multipath == "backup" or multipath == "handover" then
 				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[dev] = "[" .. string.gsub(bwc, '[\r\n]', '') .. "]"
+					result[intname] = "[" .. string.gsub(bwc, '[\r\n]', '') .. "]"
 				else
 					result[dev] = "[]"
 				end