From bd284584b4bfb2ecbbadc36da4d61918fcfe85bc Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Sun, 29 Aug 2021 18:02:14 +0800 Subject: [PATCH] feat: try supporting all platforms --- gui/src/App.vue | 2 +- gui/src/components/modalSetting.vue | 42 +- service/common/netTools/interface.go | 1 + service/common/netTools/netstat/netstat.go | 407 +---------------- .../common/netTools/netstat/netstat_other.go | 28 ++ .../common/netTools/netstat/netstat_unix.go | 408 ++++++++++++++++++ .../{netstat_test.go => netstat_unix_test.go} | 0 service/common/resolv/resolv.go | 4 + service/conf/environmentConfig.go | 13 +- service/core/specialMode/infra/dialer.go | 52 +-- service/core/specialMode/specialMode.go | 4 + .../{supervisor.go => supervisor_linux.go} | 15 +- service/core/specialMode/supervisor_other.go | 27 ++ service/core/v2ray/api.go | 90 ++-- service/core/v2ray/status.go | 52 +-- service/core/v2ray/v2rayTmpl.go | 30 +- service/core/v2ray/where/where.go | 15 +- service/main.go | 5 +- service/pkg/plugin/infra/direct.go | 11 +- service/pkg/plugin/infra/setsockopt_linux.go | 69 +++ service/pkg/plugin/infra/setsockopt_other.go | 13 + service/pkg/plugin/pingtunnel/pingtunnel.go | 4 +- service/pkg/plugin/server.go | 4 +- service/pkg/util/gopeed/down_test.go | 2 +- service/pre.go | 22 +- service/server/controller/version.go | 11 +- service/server/service/latency.go | 33 +- 27 files changed, 753 insertions(+), 611 deletions(-) create mode 100644 service/common/netTools/netstat/netstat_other.go create mode 100644 service/common/netTools/netstat/netstat_unix.go rename service/common/netTools/netstat/{netstat_test.go => netstat_unix_test.go} (100%) rename service/core/specialMode/{supervisor.go => supervisor_linux.go} (91%) create mode 100644 service/core/specialMode/supervisor_other.go create mode 100644 service/pkg/plugin/infra/setsockopt_linux.go create mode 100644 service/pkg/plugin/infra/setsockopt_other.go diff --git a/gui/src/App.vue b/gui/src/App.vue index b1737bcd..47da89a4 100644 --- a/gui/src/App.vue +++ b/gui/src/App.vue @@ -243,7 +243,7 @@ export default { duration: 10000 }); } else { - localStorage["iptablesMode"] = res.data.data.iptablesMode; + localStorage["lite"] = res.data.data.lite; localStorage["dohValid"] = res.data.data.dohValid; localStorage["vlessValid"] = res.data.data.vlessValid; localStorage["observatorySidebarValid"] = isVersionGreaterEqual( diff --git a/gui/src/components/modalSetting.vue b/gui/src/components/modalSetting.vue index d844731b..4a776dae 100644 --- a/gui/src/components/modalSetting.vue +++ b/gui/src/components/modalSetting.vue @@ -57,21 +57,21 @@ - - + - - + @@ -85,10 +85,7 @@ - +