From d0d987cc20ae74e1884817c8d30c3cadbfaa3a65 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 23 Jan 2024 20:06:11 +0100
Subject: [PATCH] Fix bug on IPv6 gateway display in status page and some
 commands in API

---
 .../files/usr/libexec/rpcd/openmptcprouter    | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
index ca526f957..e0798e6f5 100755
--- a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
+++ b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
@@ -328,6 +328,7 @@ function server_settings(server,server_ip,openmptcprouter_vps_key)
 	ucic:save("openmptcprouter")
 	if ucic:get("openmptcprouter",server,"master") == "1" then
 		ucic:set("shadowsocks-libev","sss0","server",server_ip)
+		ucic:set("shadowsocks-rust","sss0","server",server_ip)
 		ucic:set("glorytun","vpn","host",server_ip)
 		ucic:set("dsvpn","vpn","host",server_ip)
 		ucic:set("mlvpn","general","host",server_ip)
@@ -357,6 +358,8 @@ function server_settings(server,server_ip,openmptcprouter_vps_key)
 		ucic:commit("glorytun")
 		ucic:save("shadowsocks-libev")
 		ucic:commit("shadowsocks-libev")
+		ucic:save("shadowsocks-rust")
+		ucic:commit("shadowsocks-rust")
 	end
 end
 
@@ -560,6 +563,20 @@ function update_vps()
 	local vpsgettoken = sys.exec("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null")
 end
 
+function get_mptcp_config(interface)
+	return ucic:get("network",interface,"multipath")
+end
+
+function set_mptcp_config(interface,state)
+	ucic:set("network",interface,"multipath",state)
+	ucic:save("network")
+	ucic:commit("network")
+	ucic:set("openmptcprouter",interface,"multipath",state)
+	ucic:save("openmptcprouter")
+	ucic:commit("openmptcprouter")
+end
+
+
 function get_rootfs()
 	local rootfs = {}
 	rootfs['format'] = luci.util.trim(sys.exec("mount | awk 'NR==1{print $5}'"))
@@ -1364,7 +1381,7 @@ function interfaces_status()
 		    end
 	    end
 	    if ifname ~= nil and not (ifname:match("^tun.*") or interface:match("^ovpn.*") or interface:match("^wg.*")) then
-		if ipv6 == "1" or ipv6 == "auto" and gateway6 == ""then
+		if (ipv6 == "1" or ipv6 == "auto") and gateway6 == "" then
 			gateway6 = ut.trim(sys.exec("ip -6 r list dev " .. ifname .. " | grep via | grep -v default | grep -v metric | awk '{print $1}' | tr -d '\n'"))
 		end
 	    end
@@ -2326,6 +2343,18 @@ local methods = {
 			set_openvpn(args.key)
 		end
 	},
+	getmptcpconfig = {
+		args = { interface = "" },
+		call = function(args)
+			get_mptcp_config(args.interface)
+		end
+	},
+	setmptcpconfig = {
+		args = { interface = "", state = "" },
+		call = function(args)
+			set_mptcp_config(args.interface,args.state)
+		end
+	},
 	
 }