diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 0ec2671de..1f4a58b42 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: ^1.16.4 + go-version: ^1.17 - name: Checkout codebase uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ead04f941..2195bf258 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,6 +57,8 @@ jobs: goarch: arm64 - goos: linux goarch: riscv64 + - goos: windows + goarch: arm64 # BEGIN MIPS - goos: linux goarch: mips64 @@ -98,7 +100,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ^1.16.4 + go-version: ^1.17 - name: Get project dependencies run: go mod download @@ -169,7 +171,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ^1.16.4 + go-version: ^1.17 - uses: actions/download-artifact@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59101afff..47aa25e3e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: ^1.16.4 + go-version: ^1.17 - name: Checkout codebase uses: actions/checkout@v2 diff --git a/app/browserforwarder/config.pb.go b/app/browserforwarder/config.pb.go index 4110c9b97..1e00c4a4a 100644 --- a/app/browserforwarder/config.pb.go +++ b/app/browserforwarder/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/browserforwarder/config.proto package browserforwarder diff --git a/app/browserforwarder/forwarder.go b/app/browserforwarder/forwarder.go index e8ace303b..92653a965 100644 --- a/app/browserforwarder/forwarder.go +++ b/app/browserforwarder/forwarder.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package browserforwarder diff --git a/app/commander/commander.go b/app/commander/commander.go index 1a3c8ded5..75d60bf54 100644 --- a/app/commander/commander.go +++ b/app/commander/commander.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package commander diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go index b2f8c5948..3783dc291 100644 --- a/app/commander/config.pb.go +++ b/app/commander/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/commander/config.proto package commander diff --git a/app/commander/outbound.go b/app/commander/outbound.go index b89ae6312..866d2eac8 100644 --- a/app/commander/outbound.go +++ b/app/commander/outbound.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package commander diff --git a/app/commander/service.go b/app/commander/service.go index 4c0604324..0cb0a68b5 100644 --- a/app/commander/service.go +++ b/app/commander/service.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package commander diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go index 466a00183..81ab4cc32 100644 --- a/app/dispatcher/config.pb.go +++ b/app/dispatcher/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/dispatcher/config.proto package dispatcher diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go index f61dad717..5ea8d5bdb 100644 --- a/app/dispatcher/default.go +++ b/app/dispatcher/default.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dispatcher diff --git a/app/dispatcher/dispatcher.go b/app/dispatcher/dispatcher.go index b24b2422d..4151a017a 100644 --- a/app/dispatcher/dispatcher.go +++ b/app/dispatcher/dispatcher.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dispatcher diff --git a/app/dispatcher/fakednssniffer.go b/app/dispatcher/fakednssniffer.go index be3ddda19..d6f765d2c 100644 --- a/app/dispatcher/fakednssniffer.go +++ b/app/dispatcher/fakednssniffer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dispatcher diff --git a/app/dispatcher/sniffer.go b/app/dispatcher/sniffer.go index a0d35015e..ead159b9d 100644 --- a/app/dispatcher/sniffer.go +++ b/app/dispatcher/sniffer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dispatcher diff --git a/app/dispatcher/stats.go b/app/dispatcher/stats.go index 1bc5a8f04..0a33feba6 100644 --- a/app/dispatcher/stats.go +++ b/app/dispatcher/stats.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dispatcher diff --git a/app/dns/config.go b/app/dns/config.go index 7c3fda4dd..4d9c68f76 100644 --- a/app/dns/config.go +++ b/app/dns/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go index 8569fa167..fb0d285b9 100644 --- a/app/dns/config.pb.go +++ b/app/dns/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/dns/config.proto package dns diff --git a/app/dns/dns.go b/app/dns/dns.go index 5429a1e17..38f08d3d7 100644 --- a/app/dns/dns.go +++ b/app/dns/dns.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly // Package dns is an implementation of core.DNS feature. diff --git a/app/dns/dnscommon.go b/app/dns/dnscommon.go index 07907b1ba..0624a4db0 100644 --- a/app/dns/dnscommon.go +++ b/app/dns/dnscommon.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/dnscommon_test.go b/app/dns/dnscommon_test.go index 2d5dbc6cc..21d6ad060 100644 --- a/app/dns/dnscommon_test.go +++ b/app/dns/dnscommon_test.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/fakedns/fake.go b/app/dns/fakedns/fake.go index 5aa4c2482..2822e52c2 100644 --- a/app/dns/fakedns/fake.go +++ b/app/dns/fakedns/fake.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package fakedns diff --git a/app/dns/fakedns/fakedns.go b/app/dns/fakedns/fakedns.go index 03703e728..ee4ce59e0 100644 --- a/app/dns/fakedns/fakedns.go +++ b/app/dns/fakedns/fakedns.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package fakedns diff --git a/app/dns/fakedns/fakedns.pb.go b/app/dns/fakedns/fakedns.pb.go index a2d33303a..564152d8c 100644 --- a/app/dns/fakedns/fakedns.pb.go +++ b/app/dns/fakedns/fakedns.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/dns/fakedns/fakedns.proto package fakedns diff --git a/app/dns/hosts.go b/app/dns/hosts.go index fab215d36..0dfc87700 100644 --- a/app/dns/hosts.go +++ b/app/dns/hosts.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/nameserver.go b/app/dns/nameserver.go index ed9dd2b11..b2adea091 100644 --- a/app/dns/nameserver.go +++ b/app/dns/nameserver.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/nameserver_doh.go b/app/dns/nameserver_doh.go index 3faec7e2c..88350f2ee 100644 --- a/app/dns/nameserver_doh.go +++ b/app/dns/nameserver_doh.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/nameserver_fakedns.go b/app/dns/nameserver_fakedns.go index eafcc3d28..92ab1e5a8 100644 --- a/app/dns/nameserver_fakedns.go +++ b/app/dns/nameserver_fakedns.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/nameserver_local.go b/app/dns/nameserver_local.go index 6d1e33fd3..49afcce31 100644 --- a/app/dns/nameserver_local.go +++ b/app/dns/nameserver_local.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/nameserver_quic.go b/app/dns/nameserver_quic.go index 1394dc151..ee4ef8f3b 100644 --- a/app/dns/nameserver_quic.go +++ b/app/dns/nameserver_quic.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/nameserver_tcp.go b/app/dns/nameserver_tcp.go index daee2d28a..be51ffb57 100644 --- a/app/dns/nameserver_tcp.go +++ b/app/dns/nameserver_tcp.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/dns/nameserver_udp.go b/app/dns/nameserver_udp.go index c53609d36..5d88da148 100644 --- a/app/dns/nameserver_udp.go +++ b/app/dns/nameserver_udp.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/app/log/command/command.go b/app/log/command/command.go index 47547e0ba..0e7f1b42d 100644 --- a/app/log/command/command.go +++ b/app/log/command/command.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package command diff --git a/app/log/command/config.pb.go b/app/log/command/config.pb.go index cc7eb59cf..c7988a3c6 100644 --- a/app/log/command/config.pb.go +++ b/app/log/command/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/log/command/config.proto package command diff --git a/app/log/config.pb.go b/app/log/config.pb.go index 1cff09f36..48d18d4d7 100644 --- a/app/log/config.pb.go +++ b/app/log/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/log/config.proto package log diff --git a/app/log/log.go b/app/log/log.go index e492ffa0c..f472a01b4 100644 --- a/app/log/log.go +++ b/app/log/log.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package log diff --git a/app/log/log_creator.go b/app/log/log_creator.go index dd8f8adca..3fbc5cd46 100644 --- a/app/log/log_creator.go +++ b/app/log/log_creator.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package log diff --git a/app/observatory/command/command.go b/app/observatory/command/command.go index bf774ad4c..1c3245343 100644 --- a/app/observatory/command/command.go +++ b/app/observatory/command/command.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package command diff --git a/app/observatory/command/command.pb.go b/app/observatory/command/command.pb.go index fea5754d1..f7277b3dd 100644 --- a/app/observatory/command/command.pb.go +++ b/app/observatory/command/command.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/observatory/command/command.proto package command diff --git a/app/observatory/config.pb.go b/app/observatory/config.pb.go index 9fd96bde3..79ade2ad0 100644 --- a/app/observatory/config.pb.go +++ b/app/observatory/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/observatory/config.proto package observatory diff --git a/app/observatory/observer.go b/app/observatory/observer.go index 571c16eba..9b75b88b0 100644 --- a/app/observatory/observer.go +++ b/app/observatory/observer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package observatory diff --git a/app/policy/config.pb.go b/app/policy/config.pb.go index a06a747b5..df7b696c3 100644 --- a/app/policy/config.pb.go +++ b/app/policy/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/policy/config.proto package policy diff --git a/app/proxyman/command/command.go b/app/proxyman/command/command.go index c60c431d0..cc6d44028 100644 --- a/app/proxyman/command/command.go +++ b/app/proxyman/command/command.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package command diff --git a/app/proxyman/command/command.pb.go b/app/proxyman/command/command.pb.go index a7b74f132..1a16f3595 100644 --- a/app/proxyman/command/command.pb.go +++ b/app/proxyman/command/command.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/proxyman/command/command.proto package command diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go index 1629bd4c2..6e9e6efce 100644 --- a/app/proxyman/config.pb.go +++ b/app/proxyman/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/proxyman/config.proto package proxyman diff --git a/app/reverse/bridge.go b/app/reverse/bridge.go index 8dde5b1dd..ba3d06e58 100644 --- a/app/reverse/bridge.go +++ b/app/reverse/bridge.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package reverse diff --git a/app/reverse/config.go b/app/reverse/config.go index 623db4af1..28ab2568a 100644 --- a/app/reverse/config.go +++ b/app/reverse/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package reverse diff --git a/app/reverse/config.pb.go b/app/reverse/config.pb.go index 303354d06..dd3174571 100644 --- a/app/reverse/config.pb.go +++ b/app/reverse/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/reverse/config.proto package reverse diff --git a/app/reverse/portal.go b/app/reverse/portal.go index 7830576da..a32d550cf 100644 --- a/app/reverse/portal.go +++ b/app/reverse/portal.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package reverse diff --git a/app/reverse/reverse.go b/app/reverse/reverse.go index 9609a79c9..5dd3e557a 100644 --- a/app/reverse/reverse.go +++ b/app/reverse/reverse.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package reverse diff --git a/app/router/balancing.go b/app/router/balancing.go index 86b11bca0..80f84df2b 100644 --- a/app/router/balancing.go +++ b/app/router/balancing.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package router diff --git a/app/router/command/command.go b/app/router/command/command.go index 52a541ed0..ef007bd1d 100644 --- a/app/router/command/command.go +++ b/app/router/command/command.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package command diff --git a/app/router/command/command.pb.go b/app/router/command/command.pb.go index 0f5746903..5f15a88c7 100644 --- a/app/router/command/command.pb.go +++ b/app/router/command/command.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/router/command/command.proto package command diff --git a/app/router/condition.go b/app/router/condition.go index d9aedd83d..62199807c 100644 --- a/app/router/condition.go +++ b/app/router/condition.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package router diff --git a/app/router/condition_geoip.go b/app/router/condition_geoip.go index 5915f5cb8..3392c6ced 100644 --- a/app/router/condition_geoip.go +++ b/app/router/condition_geoip.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package router diff --git a/app/router/config.go b/app/router/config.go index e69745380..b083e2fbf 100644 --- a/app/router/config.go +++ b/app/router/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package router diff --git a/app/router/config.pb.go b/app/router/config.pb.go index 0b4d19500..928f4b7a5 100644 --- a/app/router/config.pb.go +++ b/app/router/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/router/config.proto package router diff --git a/app/router/router.go b/app/router/router.go index 6e51d1945..2ae3b09f1 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package router diff --git a/app/router/strategy_leastping.go b/app/router/strategy_leastping.go index 85c2d19e1..d9ba6b453 100644 --- a/app/router/strategy_leastping.go +++ b/app/router/strategy_leastping.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package router diff --git a/app/stats/channel.go b/app/stats/channel.go index 265a33bc0..d12cbcad4 100644 --- a/app/stats/channel.go +++ b/app/stats/channel.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package stats diff --git a/app/stats/command/command.go b/app/stats/command/command.go index 49c9bb43c..d1e94729a 100644 --- a/app/stats/command/command.go +++ b/app/stats/command/command.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package command diff --git a/app/stats/command/command.pb.go b/app/stats/command/command.pb.go index 97e31bf4e..b54840284 100644 --- a/app/stats/command/command.pb.go +++ b/app/stats/command/command.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/stats/command/command.proto package command diff --git a/app/stats/config.pb.go b/app/stats/config.pb.go index 07294dc43..5f6d6daac 100644 --- a/app/stats/config.pb.go +++ b/app/stats/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: app/stats/config.proto package stats diff --git a/app/stats/counter.go b/app/stats/counter.go index c4e120133..a6606a9eb 100644 --- a/app/stats/counter.go +++ b/app/stats/counter.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package stats diff --git a/app/stats/stats.go b/app/stats/stats.go index 10ece3a7d..26eb6ef68 100644 --- a/app/stats/stats.go +++ b/app/stats/stats.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package stats diff --git a/common/buf/readv_posix.go b/common/buf/readv_posix.go index 9fbee7945..eb63e3cc2 100644 --- a/common/buf/readv_posix.go +++ b/common/buf/readv_posix.go @@ -1,6 +1,5 @@ -// +build !windows -// +build !wasm -// +build !illumos +//go:build !windows && !wasm && !illumos +// +build !windows,!wasm,!illumos package buf diff --git a/common/buf/readv_reader.go b/common/buf/readv_reader.go index 22c1f3851..a1f75a489 100644 --- a/common/buf/readv_reader.go +++ b/common/buf/readv_reader.go @@ -1,3 +1,4 @@ +//go:build !wasm // +build !wasm package buf diff --git a/common/buf/readv_reader_wasm.go b/common/buf/readv_reader_wasm.go index a4d9fa677..30b52e74c 100644 --- a/common/buf/readv_reader_wasm.go +++ b/common/buf/readv_reader_wasm.go @@ -1,3 +1,4 @@ +//go:build wasm // +build wasm package buf diff --git a/common/buf/readv_test.go b/common/buf/readv_test.go index d5dbc4ad0..2e8a7457c 100644 --- a/common/buf/readv_test.go +++ b/common/buf/readv_test.go @@ -1,3 +1,4 @@ +//go:build !wasm // +build !wasm package buf_test diff --git a/common/buf/readv_unix.go b/common/buf/readv_unix.go index 8c8bb9700..f5ac6ad1e 100644 --- a/common/buf/readv_unix.go +++ b/common/buf/readv_unix.go @@ -1,3 +1,4 @@ +//go:build illumos // +build illumos package buf diff --git a/common/crypto/internal/chacha_core_gen.go b/common/crypto/internal/chacha_core_gen.go index a26d36828..5a285172d 100644 --- a/common/crypto/internal/chacha_core_gen.go +++ b/common/crypto/internal/chacha_core_gen.go @@ -1,3 +1,4 @@ +//go:build generate // +build generate package main diff --git a/common/log/log.pb.go b/common/log/log.pb.go index f01579558..7a178f8f1 100644 --- a/common/log/log.pb.go +++ b/common/log/log.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/log/log.proto package log diff --git a/common/net/address.pb.go b/common/net/address.pb.go index 7d5a05d1a..427ac1d76 100644 --- a/common/net/address.pb.go +++ b/common/net/address.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/net/address.proto package net diff --git a/common/net/connection.go b/common/net/connection.go index 6bade6af9..67eaf486b 100644 --- a/common/net/connection.go +++ b/common/net/connection.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package net diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go index c8c61ed26..328680c7a 100644 --- a/common/net/destination.pb.go +++ b/common/net/destination.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/net/destination.proto package net diff --git a/common/net/network.pb.go b/common/net/network.pb.go index f1494b29d..d241d1d59 100644 --- a/common/net/network.pb.go +++ b/common/net/network.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/net/network.proto package net diff --git a/common/net/port.pb.go b/common/net/port.pb.go index 834b68796..ff2ac1048 100644 --- a/common/net/port.pb.go +++ b/common/net/port.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/net/port.proto package net diff --git a/common/platform/ctlcmd/attr_other.go b/common/platform/ctlcmd/attr_other.go index 8dfe963dc..3e1bc265d 100644 --- a/common/platform/ctlcmd/attr_other.go +++ b/common/platform/ctlcmd/attr_other.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package ctlcmd diff --git a/common/platform/ctlcmd/attr_windows.go b/common/platform/ctlcmd/attr_windows.go index b4c1c5f8b..ab8ac064b 100644 --- a/common/platform/ctlcmd/attr_windows.go +++ b/common/platform/ctlcmd/attr_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package ctlcmd diff --git a/common/platform/others.go b/common/platform/others.go index a2f92c714..106e66b66 100644 --- a/common/platform/others.go +++ b/common/platform/others.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package platform diff --git a/common/platform/windows.go b/common/platform/windows.go index 454a24063..9533758af 100644 --- a/common/platform/windows.go +++ b/common/platform/windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package platform diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go index 380b9a80c..5fecb2bfd 100644 --- a/common/protocol/headers.pb.go +++ b/common/protocol/headers.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/protocol/headers.proto package protocol diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go index 9e5b9b591..92743bd6d 100644 --- a/common/protocol/server_spec.pb.go +++ b/common/protocol/server_spec.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/protocol/server_spec.proto package protocol diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go index 752816c3b..2703a76e7 100644 --- a/common/protocol/user.pb.go +++ b/common/protocol/user.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/protocol/user.proto package protocol diff --git a/common/serial/typed_message.pb.go b/common/serial/typed_message.pb.go index d51be2863..3f045ce3f 100644 --- a/common/serial/typed_message.pb.go +++ b/common/serial/typed_message.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: common/serial/typed_message.proto package serial diff --git a/config.go b/config.go index 50e27e946..2d4db715b 100644 --- a/config.go +++ b/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package core diff --git a/config.pb.go b/config.pb.go index 1e4e8eaa1..02d0c52f9 100644 --- a/config.pb.go +++ b/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: config.proto package core diff --git a/context.go b/context.go index 89516d1f7..95c6831a7 100644 --- a/context.go +++ b/context.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package core diff --git a/functions.go b/functions.go index f5f750366..f47aa3edd 100644 --- a/functions.go +++ b/functions.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package core diff --git a/go.mod b/go.mod index c728edb46..03a016cca 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/v2fly/v2ray-core/v4 -go 1.16 +go 1.17 require ( github.com/golang/mock v1.6.0 @@ -25,3 +25,27 @@ require ( google.golang.org/protobuf v1.27.1 h12.io/socks v1.0.3 ) + +require ( + github.com/cheekybits/genny v1.0.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165 // indirect + github.com/ebfe/bcrypt_pbkdf v0.0.0-20140212075826-3c8d2dcb253a // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect + github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect + github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect + github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/onsi/ginkgo v1.16.4 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect + github.com/xtaci/smux v1.5.15 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/tools v0.1.1 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c // indirect +) diff --git a/go.sum b/go.sum index f91e351b4..e846453f2 100644 --- a/go.sum +++ b/go.sum @@ -462,7 +462,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/main/main_test.go b/main/main_test.go index 63c18234e..e873c7b34 100644 --- a/main/main_test.go +++ b/main/main_test.go @@ -1,3 +1,4 @@ +//go:build coveragemain // +build coveragemain package main diff --git a/proxy/blackhole/blackhole.go b/proxy/blackhole/blackhole.go index 732c46dee..2186ac850 100644 --- a/proxy/blackhole/blackhole.go +++ b/proxy/blackhole/blackhole.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly // Package blackhole is an outbound handler that blocks all connections. diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go index ac9fc09db..84d3b9d68 100644 --- a/proxy/blackhole/config.pb.go +++ b/proxy/blackhole/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/blackhole/config.proto package blackhole diff --git a/proxy/dns/config.pb.go b/proxy/dns/config.pb.go index 342788b4e..3f84c1ec2 100644 --- a/proxy/dns/config.pb.go +++ b/proxy/dns/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/dns/config.proto package dns diff --git a/proxy/dns/dns.go b/proxy/dns/dns.go index 415947686..a323dca9c 100644 --- a/proxy/dns/dns.go +++ b/proxy/dns/dns.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dns diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go index 20cea64f2..a0878e264 100644 --- a/proxy/dokodemo/config.pb.go +++ b/proxy/dokodemo/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/dokodemo/config.proto package dokodemo diff --git a/proxy/dokodemo/dokodemo.go b/proxy/dokodemo/dokodemo.go index 40766c145..bd61af4bd 100644 --- a/proxy/dokodemo/dokodemo.go +++ b/proxy/dokodemo/dokodemo.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package dokodemo diff --git a/proxy/freedom/config.pb.go b/proxy/freedom/config.pb.go index f866a7b5e..0d07a0891 100644 --- a/proxy/freedom/config.pb.go +++ b/proxy/freedom/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/freedom/config.proto package freedom diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go index 89217992b..7232ce2ff 100644 --- a/proxy/freedom/freedom.go +++ b/proxy/freedom/freedom.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package freedom diff --git a/proxy/http/client.go b/proxy/http/client.go index 30df032c6..09180addf 100644 --- a/proxy/http/client.go +++ b/proxy/http/client.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package http diff --git a/proxy/http/config.pb.go b/proxy/http/config.pb.go index d5583f1f7..1753c8503 100644 --- a/proxy/http/config.pb.go +++ b/proxy/http/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/http/config.proto package http diff --git a/proxy/http/server.go b/proxy/http/server.go index 99b138d54..34e69deab 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package http diff --git a/proxy/loopback/config.pb.go b/proxy/loopback/config.pb.go index fd07c3a20..b8a2602c6 100644 --- a/proxy/loopback/config.pb.go +++ b/proxy/loopback/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/loopback/config.proto package loopback diff --git a/proxy/loopback/loopback.go b/proxy/loopback/loopback.go index 5691f5607..24a644880 100644 --- a/proxy/loopback/loopback.go +++ b/proxy/loopback/loopback.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package loopback diff --git a/proxy/mtproto/config.pb.go b/proxy/mtproto/config.pb.go index 1b3be6062..69f8f8bd4 100644 --- a/proxy/mtproto/config.pb.go +++ b/proxy/mtproto/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/mtproto/config.proto package mtproto diff --git a/proxy/mtproto/server.go b/proxy/mtproto/server.go index 252523f06..1f586bff6 100644 --- a/proxy/mtproto/server.go +++ b/proxy/mtproto/server.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package mtproto diff --git a/proxy/shadowsocks/client.go b/proxy/shadowsocks/client.go index a0f3f1b51..0a3aad407 100644 --- a/proxy/shadowsocks/client.go +++ b/proxy/shadowsocks/client.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package shadowsocks diff --git a/proxy/shadowsocks/config.pb.go b/proxy/shadowsocks/config.pb.go index e12c0387f..080e00cc3 100644 --- a/proxy/shadowsocks/config.pb.go +++ b/proxy/shadowsocks/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/shadowsocks/config.proto package shadowsocks diff --git a/proxy/shadowsocks/protocol.go b/proxy/shadowsocks/protocol.go index 927f293d0..68301ebb7 100644 --- a/proxy/shadowsocks/protocol.go +++ b/proxy/shadowsocks/protocol.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package shadowsocks diff --git a/proxy/shadowsocks/server.go b/proxy/shadowsocks/server.go index 983c91b88..49132ef95 100644 --- a/proxy/shadowsocks/server.go +++ b/proxy/shadowsocks/server.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package shadowsocks diff --git a/proxy/socks/client.go b/proxy/socks/client.go index ae2915cf5..00308d481 100644 --- a/proxy/socks/client.go +++ b/proxy/socks/client.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package socks diff --git a/proxy/socks/config.go b/proxy/socks/config.go index 6eadbc176..c723f9aeb 100644 --- a/proxy/socks/config.go +++ b/proxy/socks/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package socks diff --git a/proxy/socks/config.pb.go b/proxy/socks/config.pb.go index 0544ed9b5..4237a70ec 100644 --- a/proxy/socks/config.pb.go +++ b/proxy/socks/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/socks/config.proto package socks diff --git a/proxy/socks/protocol.go b/proxy/socks/protocol.go index 66d10d16b..a0e942a7f 100644 --- a/proxy/socks/protocol.go +++ b/proxy/socks/protocol.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package socks diff --git a/proxy/socks/server.go b/proxy/socks/server.go index ec6d25ccb..ab9dc6235 100644 --- a/proxy/socks/server.go +++ b/proxy/socks/server.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package socks diff --git a/proxy/trojan/client.go b/proxy/trojan/client.go index 5805310ba..bf23c5cec 100644 --- a/proxy/trojan/client.go +++ b/proxy/trojan/client.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package trojan diff --git a/proxy/trojan/config.pb.go b/proxy/trojan/config.pb.go index 2ea69a2db..89a5666dd 100644 --- a/proxy/trojan/config.pb.go +++ b/proxy/trojan/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/trojan/config.proto package trojan diff --git a/proxy/trojan/server.go b/proxy/trojan/server.go index 88ca9c913..9c25beb0a 100644 --- a/proxy/trojan/server.go +++ b/proxy/trojan/server.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package trojan diff --git a/proxy/trojan/validator.go b/proxy/trojan/validator.go index 668d2d7af..7eefeec0d 100644 --- a/proxy/trojan/validator.go +++ b/proxy/trojan/validator.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package trojan diff --git a/proxy/vless/account.go b/proxy/vless/account.go index a593fdcaa..607e373fc 100644 --- a/proxy/vless/account.go +++ b/proxy/vless/account.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package vless diff --git a/proxy/vless/account.pb.go b/proxy/vless/account.pb.go index 0347eab08..32efa271f 100644 --- a/proxy/vless/account.pb.go +++ b/proxy/vless/account.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/vless/account.proto package vless diff --git a/proxy/vless/encoding/addons.go b/proxy/vless/encoding/addons.go index 59bbd36ab..fdf495113 100644 --- a/proxy/vless/encoding/addons.go +++ b/proxy/vless/encoding/addons.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package encoding diff --git a/proxy/vless/encoding/addons.pb.go b/proxy/vless/encoding/addons.pb.go index 02e57921b..6fb493c85 100644 --- a/proxy/vless/encoding/addons.pb.go +++ b/proxy/vless/encoding/addons.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/vless/encoding/addons.proto package encoding diff --git a/proxy/vless/encoding/encoding.go b/proxy/vless/encoding/encoding.go index 492eb8235..7ec515bbb 100644 --- a/proxy/vless/encoding/encoding.go +++ b/proxy/vless/encoding/encoding.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package encoding diff --git a/proxy/vless/inbound/config.go b/proxy/vless/inbound/config.go index 039be4337..56e21fd17 100644 --- a/proxy/vless/inbound/config.go +++ b/proxy/vless/inbound/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package inbound diff --git a/proxy/vless/inbound/config.pb.go b/proxy/vless/inbound/config.pb.go index 443d9c849..9608787ef 100644 --- a/proxy/vless/inbound/config.pb.go +++ b/proxy/vless/inbound/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/vless/inbound/config.proto package inbound diff --git a/proxy/vless/inbound/inbound.go b/proxy/vless/inbound/inbound.go index e89453671..a1cd081f7 100644 --- a/proxy/vless/inbound/inbound.go +++ b/proxy/vless/inbound/inbound.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package inbound diff --git a/proxy/vless/outbound/config.go b/proxy/vless/outbound/config.go index 35bf561b6..0e6dbf53d 100644 --- a/proxy/vless/outbound/config.go +++ b/proxy/vless/outbound/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package outbound diff --git a/proxy/vless/outbound/config.pb.go b/proxy/vless/outbound/config.pb.go index 9b9117c02..831c1340a 100644 --- a/proxy/vless/outbound/config.pb.go +++ b/proxy/vless/outbound/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/vless/outbound/config.proto package outbound diff --git a/proxy/vless/outbound/outbound.go b/proxy/vless/outbound/outbound.go index 7531a558e..7f8bc06d2 100644 --- a/proxy/vless/outbound/outbound.go +++ b/proxy/vless/outbound/outbound.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package outbound diff --git a/proxy/vless/validator.go b/proxy/vless/validator.go index 3fcf6df96..3ea1383e1 100644 --- a/proxy/vless/validator.go +++ b/proxy/vless/validator.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package vless diff --git a/proxy/vmess/account.go b/proxy/vmess/account.go index 5023684dc..8d7a38046 100644 --- a/proxy/vmess/account.go +++ b/proxy/vmess/account.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package vmess diff --git a/proxy/vmess/account.pb.go b/proxy/vmess/account.pb.go index 7c0d6a39d..e12361f19 100644 --- a/proxy/vmess/account.pb.go +++ b/proxy/vmess/account.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/vmess/account.proto package vmess diff --git a/proxy/vmess/inbound/config.go b/proxy/vmess/inbound/config.go index 25badc456..62153ed18 100644 --- a/proxy/vmess/inbound/config.go +++ b/proxy/vmess/inbound/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package inbound diff --git a/proxy/vmess/inbound/config.pb.go b/proxy/vmess/inbound/config.pb.go index ca85bd3dd..6b2bffc11 100644 --- a/proxy/vmess/inbound/config.pb.go +++ b/proxy/vmess/inbound/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/vmess/inbound/config.proto package inbound diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go index f9f14e9aa..70eaa2575 100644 --- a/proxy/vmess/inbound/inbound.go +++ b/proxy/vmess/inbound/inbound.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package inbound diff --git a/proxy/vmess/outbound/command.go b/proxy/vmess/outbound/command.go index 638321f83..dfff8a0c9 100644 --- a/proxy/vmess/outbound/command.go +++ b/proxy/vmess/outbound/command.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package outbound diff --git a/proxy/vmess/outbound/config.pb.go b/proxy/vmess/outbound/config.pb.go index e696fb532..c20af4462 100644 --- a/proxy/vmess/outbound/config.pb.go +++ b/proxy/vmess/outbound/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: proxy/vmess/outbound/config.proto package outbound diff --git a/proxy/vmess/outbound/outbound.go b/proxy/vmess/outbound/outbound.go index b1d414832..e3b9daf96 100644 --- a/proxy/vmess/outbound/outbound.go +++ b/proxy/vmess/outbound/outbound.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package outbound diff --git a/proxy/vmess/validator.go b/proxy/vmess/validator.go index a46ecc755..2b91f9e6f 100644 --- a/proxy/vmess/validator.go +++ b/proxy/vmess/validator.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package vmess diff --git a/release/friendly-filenames.json b/release/friendly-filenames.json index d95c54e38..58c162907 100644 --- a/release/friendly-filenames.json +++ b/release/friendly-filenames.json @@ -19,6 +19,7 @@ "openbsd-amd64": { "friendlyName": "openbsd-64" }, "windows-amd64": { "friendlyName": "windows-64" }, "windows-386": { "friendlyName": "windows-32" }, + "windows-arm64": { "friendlyName": "windows-arm64-v8a" }, "windows-arm7": { "friendlyName": "windows-arm32-v7a" }, "android-arm64": { "friendlyName": "android-arm64-v8a" } } diff --git a/testing/scenarios/common_coverage.go b/testing/scenarios/common_coverage.go index fd60db6c2..5c61769f5 100644 --- a/testing/scenarios/common_coverage.go +++ b/testing/scenarios/common_coverage.go @@ -1,3 +1,4 @@ +//go:build coverage // +build coverage package scenarios diff --git a/testing/scenarios/common_regular.go b/testing/scenarios/common_regular.go index fc3d29970..548cb6acd 100644 --- a/testing/scenarios/common_regular.go +++ b/testing/scenarios/common_regular.go @@ -1,3 +1,4 @@ +//go:build !coverage // +build !coverage package scenarios diff --git a/transport/config.pb.go b/transport/config.pb.go index c17f9ab68..3cf759460 100644 --- a/transport/config.pb.go +++ b/transport/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/config.proto package transport diff --git a/transport/internet/config.pb.go b/transport/internet/config.pb.go index 2a2b21180..c64f2d645 100644 --- a/transport/internet/config.pb.go +++ b/transport/internet/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/config.proto package internet diff --git a/transport/internet/domainsocket/config.go b/transport/internet/domainsocket/config.go index 8e77f2b45..f9555e0c4 100644 --- a/transport/internet/domainsocket/config.go +++ b/transport/internet/domainsocket/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package domainsocket diff --git a/transport/internet/domainsocket/config.pb.go b/transport/internet/domainsocket/config.pb.go index d9f21b87f..b24201655 100644 --- a/transport/internet/domainsocket/config.pb.go +++ b/transport/internet/domainsocket/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/domainsocket/config.proto package domainsocket diff --git a/transport/internet/domainsocket/dial.go b/transport/internet/domainsocket/dial.go index e0d6a596a..3de624483 100644 --- a/transport/internet/domainsocket/dial.go +++ b/transport/internet/domainsocket/dial.go @@ -1,6 +1,5 @@ -// +build !windows -// +build !wasm -// +build !confonly +//go:build !windows && !wasm && !confonly +// +build !windows,!wasm,!confonly package domainsocket diff --git a/transport/internet/domainsocket/listener.go b/transport/internet/domainsocket/listener.go index cc3cf85da..d4988f49a 100644 --- a/transport/internet/domainsocket/listener.go +++ b/transport/internet/domainsocket/listener.go @@ -1,6 +1,5 @@ -// +build !windows -// +build !wasm -// +build !confonly +//go:build !windows && !wasm && !confonly +// +build !windows,!wasm,!confonly package domainsocket diff --git a/transport/internet/domainsocket/listener_test.go b/transport/internet/domainsocket/listener_test.go index fc926ac17..8c68f853e 100644 --- a/transport/internet/domainsocket/listener_test.go +++ b/transport/internet/domainsocket/listener_test.go @@ -1,5 +1,5 @@ -// +build !windows -// +build !android +//go:build !windows && !android +// +build !windows,!android package domainsocket_test diff --git a/transport/internet/filelocker_other.go b/transport/internet/filelocker_other.go index 347cd66cd..28fc0f58d 100644 --- a/transport/internet/filelocker_other.go +++ b/transport/internet/filelocker_other.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package internet diff --git a/transport/internet/grpc/config.pb.go b/transport/internet/grpc/config.pb.go index 08c3ed5e5..a45174d41 100644 --- a/transport/internet/grpc/config.pb.go +++ b/transport/internet/grpc/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/grpc/config.proto package grpc diff --git a/transport/internet/grpc/dial.go b/transport/internet/grpc/dial.go index a86247cf3..b67b6b23e 100644 --- a/transport/internet/grpc/dial.go +++ b/transport/internet/grpc/dial.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package grpc diff --git a/transport/internet/grpc/encoding/conn.go b/transport/internet/grpc/encoding/conn.go index 9e84e815e..bbe7540b8 100644 --- a/transport/internet/grpc/encoding/conn.go +++ b/transport/internet/grpc/encoding/conn.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package encoding diff --git a/transport/internet/grpc/encoding/customSeviceName.go b/transport/internet/grpc/encoding/customSeviceName.go index 0a17dc2ac..4310b0fb9 100644 --- a/transport/internet/grpc/encoding/customSeviceName.go +++ b/transport/internet/grpc/encoding/customSeviceName.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package encoding diff --git a/transport/internet/grpc/encoding/stream.pb.go b/transport/internet/grpc/encoding/stream.pb.go index daf028787..aeac4ec6a 100644 --- a/transport/internet/grpc/encoding/stream.pb.go +++ b/transport/internet/grpc/encoding/stream.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/grpc/encoding/stream.proto package encoding diff --git a/transport/internet/grpc/grpc.go b/transport/internet/grpc/grpc.go index 264849a9a..a302d9ea9 100644 --- a/transport/internet/grpc/grpc.go +++ b/transport/internet/grpc/grpc.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package grpc diff --git a/transport/internet/grpc/hub.go b/transport/internet/grpc/hub.go index 3bf8316a4..ee8db11d0 100644 --- a/transport/internet/grpc/hub.go +++ b/transport/internet/grpc/hub.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package grpc diff --git a/transport/internet/headers/http/config.pb.go b/transport/internet/headers/http/config.pb.go index 2a496e74b..ab1ad0ac9 100644 --- a/transport/internet/headers/http/config.pb.go +++ b/transport/internet/headers/http/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/headers/http/config.proto package http diff --git a/transport/internet/headers/noop/config.pb.go b/transport/internet/headers/noop/config.pb.go index 15d09e4d3..f24de2e5d 100644 --- a/transport/internet/headers/noop/config.pb.go +++ b/transport/internet/headers/noop/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/headers/noop/config.proto package noop diff --git a/transport/internet/headers/srtp/config.pb.go b/transport/internet/headers/srtp/config.pb.go index cd0e4bc5e..48dd344fd 100644 --- a/transport/internet/headers/srtp/config.pb.go +++ b/transport/internet/headers/srtp/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/headers/srtp/config.proto package srtp diff --git a/transport/internet/headers/tls/config.pb.go b/transport/internet/headers/tls/config.pb.go index a04a3d7c4..17a715567 100644 --- a/transport/internet/headers/tls/config.pb.go +++ b/transport/internet/headers/tls/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/headers/tls/config.proto package tls diff --git a/transport/internet/headers/utp/config.pb.go b/transport/internet/headers/utp/config.pb.go index b624f86b2..3e30b1dfd 100644 --- a/transport/internet/headers/utp/config.pb.go +++ b/transport/internet/headers/utp/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/headers/utp/config.proto package utp diff --git a/transport/internet/headers/wechat/config.pb.go b/transport/internet/headers/wechat/config.pb.go index efe8b7d3f..8ea9e80c3 100644 --- a/transport/internet/headers/wechat/config.pb.go +++ b/transport/internet/headers/wechat/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/headers/wechat/config.proto package wechat diff --git a/transport/internet/headers/wireguard/config.pb.go b/transport/internet/headers/wireguard/config.pb.go index e2426d9b6..d6f31683e 100644 --- a/transport/internet/headers/wireguard/config.pb.go +++ b/transport/internet/headers/wireguard/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/headers/wireguard/config.proto package wireguard diff --git a/transport/internet/http/config.go b/transport/internet/http/config.go index 30d1c5453..7dc261350 100644 --- a/transport/internet/http/config.go +++ b/transport/internet/http/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package http diff --git a/transport/internet/http/config.pb.go b/transport/internet/http/config.pb.go index 2150cf10a..5bae193b6 100644 --- a/transport/internet/http/config.pb.go +++ b/transport/internet/http/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/http/config.proto package http diff --git a/transport/internet/http/dialer.go b/transport/internet/http/dialer.go index 1f67c75e7..faf811b29 100644 --- a/transport/internet/http/dialer.go +++ b/transport/internet/http/dialer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package http diff --git a/transport/internet/http/hub.go b/transport/internet/http/hub.go index d573b5655..16a40a98c 100644 --- a/transport/internet/http/hub.go +++ b/transport/internet/http/hub.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package http diff --git a/transport/internet/kcp/config.go b/transport/internet/kcp/config.go index 1988e4447..9e4c3768c 100644 --- a/transport/internet/kcp/config.go +++ b/transport/internet/kcp/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/config.pb.go b/transport/internet/kcp/config.pb.go index 6638f41d6..b634e98f0 100644 --- a/transport/internet/kcp/config.pb.go +++ b/transport/internet/kcp/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/kcp/config.proto package kcp diff --git a/transport/internet/kcp/connection.go b/transport/internet/kcp/connection.go index d60232f08..27dcd555d 100644 --- a/transport/internet/kcp/connection.go +++ b/transport/internet/kcp/connection.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/crypt.go b/transport/internet/kcp/crypt.go index d6e2550fa..5379c1884 100644 --- a/transport/internet/kcp/crypt.go +++ b/transport/internet/kcp/crypt.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/dialer.go b/transport/internet/kcp/dialer.go index b843b5664..df42b6904 100644 --- a/transport/internet/kcp/dialer.go +++ b/transport/internet/kcp/dialer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/io.go b/transport/internet/kcp/io.go index 12f03cbb6..25d6f1359 100644 --- a/transport/internet/kcp/io.go +++ b/transport/internet/kcp/io.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/listener.go b/transport/internet/kcp/listener.go index 670865ccf..7ce942fed 100644 --- a/transport/internet/kcp/listener.go +++ b/transport/internet/kcp/listener.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/output.go b/transport/internet/kcp/output.go index 591516129..4a8d36c84 100644 --- a/transport/internet/kcp/output.go +++ b/transport/internet/kcp/output.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/receiving.go b/transport/internet/kcp/receiving.go index 9607ecf15..ee3edae83 100644 --- a/transport/internet/kcp/receiving.go +++ b/transport/internet/kcp/receiving.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/segment.go b/transport/internet/kcp/segment.go index c16635c4e..edf33e8f3 100644 --- a/transport/internet/kcp/segment.go +++ b/transport/internet/kcp/segment.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/sending.go b/transport/internet/kcp/sending.go index 157062d31..47f359f56 100644 --- a/transport/internet/kcp/sending.go +++ b/transport/internet/kcp/sending.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package kcp diff --git a/transport/internet/kcp/xor.go b/transport/internet/kcp/xor.go index 6de9d2953..233a2729a 100644 --- a/transport/internet/kcp/xor.go +++ b/transport/internet/kcp/xor.go @@ -1,3 +1,4 @@ +//go:build !amd64 // +build !amd64 package kcp diff --git a/transport/internet/quic/config.go b/transport/internet/quic/config.go index 3ff111a29..7578284cd 100644 --- a/transport/internet/quic/config.go +++ b/transport/internet/quic/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package quic diff --git a/transport/internet/quic/config.pb.go b/transport/internet/quic/config.pb.go index 79faae209..cd412dc31 100644 --- a/transport/internet/quic/config.pb.go +++ b/transport/internet/quic/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/quic/config.proto package quic diff --git a/transport/internet/quic/conn.go b/transport/internet/quic/conn.go index 59f35f119..b6b5bfacf 100644 --- a/transport/internet/quic/conn.go +++ b/transport/internet/quic/conn.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package quic diff --git a/transport/internet/quic/dialer.go b/transport/internet/quic/dialer.go index 224f5de7b..fd901f319 100644 --- a/transport/internet/quic/dialer.go +++ b/transport/internet/quic/dialer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package quic diff --git a/transport/internet/quic/hub.go b/transport/internet/quic/hub.go index 567f68231..088166991 100644 --- a/transport/internet/quic/hub.go +++ b/transport/internet/quic/hub.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package quic diff --git a/transport/internet/quic/pool.go b/transport/internet/quic/pool.go index 9e79e9720..5af56b8b1 100644 --- a/transport/internet/quic/pool.go +++ b/transport/internet/quic/pool.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package quic diff --git a/transport/internet/quic/quic.go b/transport/internet/quic/quic.go index fcb7bae4e..4898ce0cd 100644 --- a/transport/internet/quic/quic.go +++ b/transport/internet/quic/quic.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package quic diff --git a/transport/internet/sockopt_other.go b/transport/internet/sockopt_other.go index ac61296bf..ebcf4e266 100644 --- a/transport/internet/sockopt_other.go +++ b/transport/internet/sockopt_other.go @@ -1,3 +1,4 @@ +//go:build js || dragonfly || netbsd || openbsd || solaris // +build js dragonfly netbsd openbsd solaris package internet diff --git a/transport/internet/system_dns_android.go b/transport/internet/system_dns_android.go index 5806cdbe0..a53e0e5bd 100644 --- a/transport/internet/system_dns_android.go +++ b/transport/internet/system_dns_android.go @@ -1,3 +1,4 @@ +//go:build android // +build android package internet diff --git a/transport/internet/system_dns_android_test.go b/transport/internet/system_dns_android_test.go index d019c0391..af018f9e5 100644 --- a/transport/internet/system_dns_android_test.go +++ b/transport/internet/system_dns_android_test.go @@ -1,3 +1,4 @@ +//go:build android // +build android package internet diff --git a/transport/internet/tagged/taggedimpl/impl.go b/transport/internet/tagged/taggedimpl/impl.go index 9139b0ee2..64b8b4c6d 100644 --- a/transport/internet/tagged/taggedimpl/impl.go +++ b/transport/internet/tagged/taggedimpl/impl.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package taggedimpl diff --git a/transport/internet/tcp/config.go b/transport/internet/tcp/config.go index 793410242..ec14e3d1a 100644 --- a/transport/internet/tcp/config.go +++ b/transport/internet/tcp/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package tcp diff --git a/transport/internet/tcp/config.pb.go b/transport/internet/tcp/config.pb.go index bb79b0a79..60a3bb2d2 100644 --- a/transport/internet/tcp/config.pb.go +++ b/transport/internet/tcp/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/tcp/config.proto package tcp diff --git a/transport/internet/tcp/dialer.go b/transport/internet/tcp/dialer.go index f06bc7a03..d01356d80 100644 --- a/transport/internet/tcp/dialer.go +++ b/transport/internet/tcp/dialer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package tcp diff --git a/transport/internet/tcp/hub.go b/transport/internet/tcp/hub.go index 2d30e8f9b..6e46e1bb8 100644 --- a/transport/internet/tcp/hub.go +++ b/transport/internet/tcp/hub.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package tcp diff --git a/transport/internet/tcp/sockopt_freebsd.go b/transport/internet/tcp/sockopt_freebsd.go index 54906f673..663b638ca 100644 --- a/transport/internet/tcp/sockopt_freebsd.go +++ b/transport/internet/tcp/sockopt_freebsd.go @@ -1,5 +1,5 @@ -// +build freebsd -// +build !confonly +//go:build freebsd && !confonly +// +build freebsd,!confonly package tcp diff --git a/transport/internet/tcp/sockopt_linux.go b/transport/internet/tcp/sockopt_linux.go index 1af96960a..b7be95dc7 100644 --- a/transport/internet/tcp/sockopt_linux.go +++ b/transport/internet/tcp/sockopt_linux.go @@ -1,5 +1,5 @@ -// +build linux -// +build !confonly +//go:build linux && !confonly +// +build linux,!confonly package tcp diff --git a/transport/internet/tcp/sockopt_linux_test.go b/transport/internet/tcp/sockopt_linux_test.go index 6340a7eaf..a1706c269 100644 --- a/transport/internet/tcp/sockopt_linux_test.go +++ b/transport/internet/tcp/sockopt_linux_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package tcp_test diff --git a/transport/internet/tcp/sockopt_other.go b/transport/internet/tcp/sockopt_other.go index beb199032..52418c953 100644 --- a/transport/internet/tcp/sockopt_other.go +++ b/transport/internet/tcp/sockopt_other.go @@ -1,5 +1,5 @@ -// +build !linux,!freebsd -// +build !confonly +//go:build !linux && !freebsd && !confonly +// +build !linux,!freebsd,!confonly package tcp diff --git a/transport/internet/tls/config.go b/transport/internet/tls/config.go index b8ae1f86c..cbdd6a08c 100644 --- a/transport/internet/tls/config.go +++ b/transport/internet/tls/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package tls diff --git a/transport/internet/tls/config.pb.go b/transport/internet/tls/config.pb.go index 01d87bc7e..82565fa08 100644 --- a/transport/internet/tls/config.pb.go +++ b/transport/internet/tls/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/tls/config.proto package tls diff --git a/transport/internet/tls/config_other.go b/transport/internet/tls/config_other.go index abc32ed47..1cd8541cb 100644 --- a/transport/internet/tls/config_other.go +++ b/transport/internet/tls/config_other.go @@ -1,5 +1,5 @@ -// +build !windows -// +build !confonly +//go:build !windows && !confonly +// +build !windows,!confonly package tls diff --git a/transport/internet/tls/config_windows.go b/transport/internet/tls/config_windows.go index f02f6d26d..1d6bf04ec 100644 --- a/transport/internet/tls/config_windows.go +++ b/transport/internet/tls/config_windows.go @@ -1,5 +1,5 @@ -// +build windows -// +build !confonly +//go:build windows && !confonly +// +build windows,!confonly package tls diff --git a/transport/internet/tls/tls.go b/transport/internet/tls/tls.go index 14c5c616d..35aed72ec 100644 --- a/transport/internet/tls/tls.go +++ b/transport/internet/tls/tls.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package tls diff --git a/transport/internet/udp/config.pb.go b/transport/internet/udp/config.pb.go index 57b96220c..297db2ed8 100644 --- a/transport/internet/udp/config.pb.go +++ b/transport/internet/udp/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/udp/config.proto package udp diff --git a/transport/internet/udp/hub_freebsd.go b/transport/internet/udp/hub_freebsd.go index df0d5dbf7..83f0d2a91 100644 --- a/transport/internet/udp/hub_freebsd.go +++ b/transport/internet/udp/hub_freebsd.go @@ -1,3 +1,4 @@ +//go:build freebsd // +build freebsd package udp diff --git a/transport/internet/udp/hub_linux.go b/transport/internet/udp/hub_linux.go index 391453150..b4de0f917 100644 --- a/transport/internet/udp/hub_linux.go +++ b/transport/internet/udp/hub_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package udp diff --git a/transport/internet/udp/hub_other.go b/transport/internet/udp/hub_other.go index 4106139a0..67ddeba0a 100644 --- a/transport/internet/udp/hub_other.go +++ b/transport/internet/udp/hub_other.go @@ -1,3 +1,4 @@ +//go:build !linux && !freebsd // +build !linux,!freebsd package udp diff --git a/transport/internet/websocket/config.go b/transport/internet/websocket/config.go index acd226633..558d9200f 100644 --- a/transport/internet/websocket/config.go +++ b/transport/internet/websocket/config.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package websocket diff --git a/transport/internet/websocket/config.pb.go b/transport/internet/websocket/config.pb.go index 95720d286..349105787 100644 --- a/transport/internet/websocket/config.pb.go +++ b/transport/internet/websocket/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.27.1 -// protoc v3.15.6 +// protoc v3.17.3 // source: transport/internet/websocket/config.proto package websocket diff --git a/transport/internet/websocket/connection.go b/transport/internet/websocket/connection.go index 1ed28292e..470a5b9ca 100644 --- a/transport/internet/websocket/connection.go +++ b/transport/internet/websocket/connection.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package websocket diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go index 724e139dc..76f1cffa5 100644 --- a/transport/internet/websocket/dialer.go +++ b/transport/internet/websocket/dialer.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package websocket diff --git a/transport/internet/websocket/hub.go b/transport/internet/websocket/hub.go index a2822144c..5a3ccd7d0 100644 --- a/transport/internet/websocket/hub.go +++ b/transport/internet/websocket/hub.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package websocket diff --git a/v2ray.go b/v2ray.go index 51ba874f5..1ab60e849 100644 --- a/v2ray.go +++ b/v2ray.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package core