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 %><% end %> <% elseif proxy == "xray-shadowsocks" then %> <% if nixio.fs.access("/etc/init.d/xray") then %><% 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 %><% end %> <% end end %> diff --git a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter index b265e06d4..c0ab3480c 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" 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;