From 18468f06c1408f9f40a5c4a144bcbbd86b314ba3 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Sat, 18 Aug 2018 09:19:32 +0200
Subject: [PATCH] Only display interface with mptcp enabled in mptcp check

---
 .../luasrc/controller/openmptcprouter.lua                | 3 ++-
 .../luasrc/view/openmptcprouter/mptcp_check.htm          | 9 ++++++---
 .../luasrc/view/openmptcprouter/wanstatus.htm            | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index e8130906b..f72114612 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -812,10 +812,11 @@ function _ipv6_discover(interface)
 	return ra6_result
 end
 
-function mptcp_check_trace(interface)
+function mptcp_check_trace(iface)
 	luci.http.prepare_content("text/plain")
 	local tracebox
 	local uci    = require "luci.model.uci".cursor()
+	local interface = get_device(iface)
 	local server = uci:get("shadowsocks-libev", "sss0", "server") or ""
 	if server == "" then return end
 	if interface == "" then
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm
index d7849e6bc..97b560bbb 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/mptcp_check.htm
@@ -4,6 +4,7 @@
 	local uci = require("luci.model.uci").cursor()
 	local sys = require "luci.sys"
 	local ifaces = sys.net:devices()
+	local net = require "luci.model.network".init()
 %>
 
 <script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.193.28471-ee087a1"></script>
@@ -48,10 +49,12 @@
 		<div class="cbi-value-field">
 		    <select class="cbi-input-select" name="interface" size="1">
 			<%
-			    for _, iface in ipairs(ifaces) do
-				if not (iface == "lo" or iface:match("^ifb.*")) then
+			    for _, iface in ipairs(net:get_networks()) do
+				local ifname = iface:name()
+				local multipath = uci:get("network",ifname,"multipath")
+				if multipath ~= "off" then
 			%>
-			<option value="<%=iface%>"><%=iface%></option>
+			<option value="<%=ifname%>"><%=ifname%></option>
 			<%
 				end
 			    end
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 4890f2609..f7e847511 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -406,7 +406,7 @@
 		<h3>Settings</h3>
 		<fieldset class="cbi-section">
 			<div class="cbi-value">
-				<label class="cbi-value-title">Anonymize public IPs</label>
+				<label class="cbi-value-title">Anonymize public IPs (at next refresh)</label>
 				<div class="cbi-value-field">
 					<input type="checkbox" name="anon" class="cbi-input-checkbox" value="1" onclick="setAnonymize()" \>
 				</div>