From a57a418be60a59232f730bddfbd6ab1ed04c3a55 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 7 Dec 2023 14:58:48 +0100
Subject: [PATCH 1/3] Remove r8168 not needed patch

---
 r8168/patches/030-6.1-support.patch | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 r8168/patches/030-6.1-support.patch

diff --git a/r8168/patches/030-6.1-support.patch b/r8168/patches/030-6.1-support.patch
deleted file mode 100644
index 44ab2be19..000000000
--- a/r8168/patches/030-6.1-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/r8168.h
---- b/src/r8168.h
-@@ -566,7 +566,11 @@
- typedef struct napi_struct *napi_ptr;
- typedef int napi_budget;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
-+#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add_weight(ndev, &priv->napi, function, weight)
-+#else
- #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
-+#endif
- #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)
- #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)
- #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;

From 007374410e4950b05fc2cf4f89ba66d8a4f8b8e8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 8 Dec 2023 11:01:25 +0100
Subject: [PATCH 2/3] Add back Shadowsocks-Rust in wizard

---
 luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index 128199904..24ead847c 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -261,7 +261,7 @@
 						<% if nixio.fs.access("/etc/init.d/xray") then %><option value="xray-socks" <% if uci:get("openmptcprouter","settings","proxy") == "xray-socks" then %>selected="selected"<% end %>>XRay Socks</option><% end %>
 					<% elseif proxy == "xray-shadowsocks" then %>
 						<% if nixio.fs.access("/etc/init.d/xray") then %><option value="xray-shadowsocks" <% if uci:get("openmptcprouter","settings","proxy") == "xray-shadowsocks" then %>selected="selected"<% end %>>XRay Shadowsocks 2022</option><% end %>
-					<% elseif proxy == "shadowsocks-rust" then %>
+					<% elseif proxy == "shadowsocks-rust" or proxy == "shadowsocks-go" then %>
 						<% if nixio.fs.access("/etc/init.d/shadowsocks-rust") then %><option value="shadowsocks-rust" <% if uci:get("openmptcprouter","settings","proxy") == "shadowsocks-rust" then %>selected="selected"<% end %>>Shadowsocks-Rust 2022</option><% end %>
 					<% end
 				end %>

From f1ea9f3db163a929a1e34f8a067ca090d5fb029f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 8 Dec 2023 11:02:12 +0100
Subject: [PATCH 3/3] Fix partially issue when LAN interfance doesn't exist

---
 openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
index a73a9c33d..340fbf77c 100755
--- a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
+++ b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
@@ -767,7 +767,10 @@ function interfaces_status()
 		end)
 	end
 	local net = ntm:get_network("lan")
-	local ipaddr = net:ipaddr() or ""
+	local ipaddr = ""
+	if net then
+		ipaddr = net:ipaddr()
+	end
 	mArray.openmptcprouter["local_addr"] = ipaddr
 	--mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr")
 	mArray.openmptcprouter["hostname"] = "OpenMPTCProuter"