From 61bb05b36615b1d81f234868b36478939e1a057b Mon Sep 17 00:00:00 2001 From: Ycarus Date: Mon, 22 Apr 2019 21:49:26 +0200 Subject: [PATCH] Add BLEST and Netlink in interface --- luci-app-mptcp/luasrc/model/cbi/mptcp.lua | 8 ++++++++ .../luasrc/model/cbi/admin_network/network.lua | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/luci-app-mptcp/luasrc/model/cbi/mptcp.lua b/luci-app-mptcp/luasrc/model/cbi/mptcp.lua index 7b41db1c4..27891aa0b 100644 --- a/luci-app-mptcp/luasrc/model/cbi/mptcp.lua +++ b/luci-app-mptcp/luasrc/model/cbi/mptcp.lua @@ -5,6 +5,8 @@ local m, s, o m = Map("network", translate("MPTCP"), translate("Networks MPTCP settings. Visit http://multipath-tcp.org/pmwiki.php/Users/ConfigureMPTCP for help.")) +local unameinfo = nixio.uname() or { } + s = m:section(TypedSection, "globals") local mtcpg = s:option(ListValue, "multipath", translate("Multipath TCP")) mtcpg:value("enable", translate("enable")) @@ -20,10 +22,16 @@ mtcppm:value("default", translate("default")) mtcppm:value("fullmesh", translate("fullmesh")) mtcppm:value("ndiffports", translate("ndiffports")) mtcppm:value("binder", translate("binder")) +if uname.release:sub(1,4) == "4.19" then + mtcppm:value("netlink", translate("Netlink")) +end local mtcpsch = s:option(ListValue, "mptcp_scheduler", translate("Multipath TCP scheduler")) mtcpsch:value("default", translate("default")) mtcpsch:value("roundrobin", translate("round-robin")) mtcpsch:value("redundant", translate("redundant")) +if uname.release:sub(1,4) == "4.19" then + mtcpsch:value("blest", translate("BLEST")) +end local mtcpsyn = s:option(Value, "mptcp_syn_retries", translate("Multipath TCP SYN retries")) mtcpsyn.datatype = "uinteger" mtcpsyn.rmempty = false diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua index 96cde2513..4fa5ba7b7 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua @@ -261,6 +261,7 @@ if network:has_ipv6() then o.rmempty = true end if fs.access("/proc/sys/net/mptcp") then + local uname = nixio.uname() local mtcp = s:option(ListValue, "multipath", translate("Multipath TCP")) mtcp:value("enable", translate("enable")) mtcp:value("disable", translate("disable")) @@ -272,10 +273,16 @@ if fs.access("/proc/sys/net/mptcp") then mtcppm:value("fullmesh", translate("fullmesh")) mtcppm:value("ndiffports", translate("ndiffports")) mtcppm:value("blinder", translate("blinder")) + if uname.release:sub(1,4) == "4.19" then + mtcppm:value("netlink", translate("Netlink")) + end local mtcpsch = s:option(ListValue, "mptcp_scheduler", translate("Multipath TCP scheduler")) mtcpsch:value("default", translate("default")) mtcpsch:value("roundrobin", translate("round-robin")) mtcpsch:value("redundant", translate("redundant")) + if uname.release:sub(1,4) == "4.19" then + mtcpsch:value("blest", translate("BLEST")) + end local mtcpsyn = s:option(Value, "mptcp_syn_retries", translate("Multipath TCP SYN retries")) mtcpsyn.datatype = "uinteger" mtcpsyn.rmempty = false