From e8f8d6c5b682ec4f1718492d955f9d8ae023f506 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 3 Aug 2023 19:15:41 +0200 Subject: [PATCH 1/2] Fix and add entry in json for status page --- luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter index cec97258f..8dade3146 100755 --- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter +++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter @@ -744,6 +744,7 @@ function interfaces_status() mArray.openmptcprouter["latest_version_omr"] = uci:get("openmptcprouter", "latest_versions", "omr") or "" mArray.openmptcprouter["latest_version_vps"] = uci:get("openmptcprouter", "latest_versions", "vps") or "" + mArray.openmptcprouter["proxy"] = uci:get("openmptcprouter", "settings", "proxy") or "" mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks-libev", "sss0", "server") or "" if mArray.openmptcprouter["service_addr"] == "" or mArray.openmptcprouter["service_addr"] == "192.168.1.3" then @@ -761,7 +762,7 @@ function interfaces_status() mArray.openmptcprouter["local_addr"] = ipaddr --mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr") mArray.openmptcprouter["hostname"] = "OpenMPTCProuter" - mArray.openmptcprouter["kernel"] = sys.exec("uname -r") + mArray.openmptcprouter["kernel"] = sys.exec("uname -r | tr -d '\n'") ucic:foreach("system", "system", function(s) mArray.openmptcprouter["hostname"] = uci:get("system",s[".name"],"hostname") or "OpenMPTCProuter" end) From 2883f879fddc84c46662741a23fea04dcbf7cdb0 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 3 Aug 2023 19:16:25 +0200 Subject: [PATCH 2/2] Fix issue when v2ray already set on router with fresh VPS install --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 8bb124ac0..2a953d748 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -1360,8 +1360,8 @@ _set_config_from_vps() { fi # Shadowsocks settings - shadowsocks_disabled="$(uci -q get openmptcprouter.settings.shadowsocks_disable)" - [ -z "$shadowsocks_disabled" ] && shadowsocks_disabled=0 + #shadowsocks_disabled="$(uci -q get openmptcprouter.settings.shadowsocks_disable)" + #[ -z "$shadowsocks_disabled" ] && shadowsocks_disabled=0 ss_key="$(echo "$vps_config" | jsonfilter -q -e '@.shadowsocks.key')" ss_key="$(echo $ss_key | sed 's/-/+/g; s/_/\//g;')" if [ -n "$ss_key" ] && [ "$ss_key" != "$(uci -q get shadowsocks-libev.sss0.key)" ]; then @@ -1397,7 +1397,6 @@ _set_config_from_vps() { set shadowsocks-libev.sss0.key=$ss_key set shadowsocks-libev.sss0.server_port=$ss_port set shadowsocks-libev.sss0.method=$ss_method - set shadowsocks-libev.sss0.disabled=$shadowsocks_disabled set shadowsocks-libev.sss0.obfs=$ss_obfs set shadowsocks-libev.sss0.obfs_plugin=$ss_obfs_plugin set shadowsocks-libev.sss0.obfs_type=$ss_obfs_type