diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 0ec2671de66..1f4a58b4237 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 ead04f94167..2195bf2584f 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 59101afffaa..47aa25e3e74 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 4110c9b978a..1e00c4a4a46 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 e8ace303b96..92653a9651a 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 1a3c8ded572..75d60bf54b2 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 b2f8c594871..3783dc2911c 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 b89ae6312da..866d2eac818 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 4c0604324f0..0cb0a68b5d8 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 466a00183fb..81ab4cc325f 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 f61dad717d5..5ea8d5bdba2 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 b24b2422d32..4151a017a33 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 be3ddda19e3..d6f765d2cc8 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 a0d35015ecb..ead159b9d23 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 1bc5a8f0463..0a33feba6f2 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 7c3fda4ddd6..4d9c68f76f7 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 8569fa167fe..fb0d285b9bb 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 5429a1e1792..38f08d3d70e 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 07907b1ba53..0624a4db0e6 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 2d5dbc6cc0d..21d6ad060a7 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 5aa4c248218..2822e52c2e2 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 03703e7288a..ee4ce59e0bb 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 a2d33303a26..564152d8c32 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 fab215d36c0..0dfc87700c4 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 ed9dd2b1161..b2adea09150 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 3faec7e2cd5..88350f2ee11 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 eafcc3d2860..92ab1e5a8fd 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 6d1e33fd363..49afcce312a 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 1394dc151a6..ee4ef8f3bbc 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 daee2d28a20..be51ffb57c8 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 c53609d3693..5d88da148e3 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 47547e0ba26..0e7f1b42db7 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 cc7eb59cfd9..c7988a3c694 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 1cff09f3657..48d18d4d76d 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 e492ffa0ce8..f472a01b43d 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 dd8f8adcad0..3fbc5cd466c 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 bf774ad4c33..1c324534334 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 fea5754d1b2..f7277b3dd99 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 9fd96bde35c..79ade2ad0f1 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 571c16eba9b..9b75b88b07a 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 a06a747b503..df7b696c3b2 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 c60c431d0c0..cc6d4402844 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 a7b74f13290..1a16f35958b 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 1629bd4c265..6e9e6efcef9 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 8dde5b1dd28..ba3d06e58d8 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 623db4af178..28ab2568ad3 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 303354d06a5..dd317457161 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 7830576dad0..a32d550cf65 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 9609a79c9d3..5dd3e557afb 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 86b11bca087..80f84df2b85 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 52a541ed0dd..ef007bd1de2 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 0f5746903ba..5f15a88c73c 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 d9aedd83dd0..62199807c8e 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 5915f5cb83c..3392c6cedfd 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 e6974538085..b083e2fbf91 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 0b4d19500ff..928f4b7a524 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 6e51d19457a..2ae3b09f14d 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 85c2d19e198..d9ba6b4535d 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 265a33bc09b..d12cbcad480 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 49c9bb43cce..d1e94729a4d 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 97e31bf4e76..b5484028420 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 07294dc4320..5f6d6daac5b 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 c4e12013395..a6606a9eb5e 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 10ece3a7d3c..26eb6ef68ff 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 9fbee794544..eb63e3cc213 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 22c1f385105..a1f75a48948 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 a4d9fa67712..30b52e74c4b 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 d5dbc4ad04c..2e8a7457c79 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 8c8bb970002..f5ac6ad1e34 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 a26d36828ff..5a285172dc1 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 f015795589d..7a178f8f1f4 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 7d5a05d1a4e..427ac1d7646 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 6bade6af9da..67eaf486ba9 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 c8c61ed26c5..328680c7a9f 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 f1494b29d7c..d241d1d5919 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 834b68796d4..ff2ac104828 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 8dfe963dcb7..3e1bc265d57 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 b4c1c5f8b62..ab8ac064bde 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 a2f92c7149a..106e66b6692 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 454a24063f8..9533758afc8 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 380b9a80ca5..5fecb2bfd36 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 9e5b9b591a8..92743bd6df2 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 752816c3b02..2703a76e7e1 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 d51be28632d..3f045ce3f2a 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 50e27e94643..2d4db715bd3 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 1e4e8eaa174..02d0c52f91e 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 89516d1f7dc..95c6831a7fb 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 f5f750366e8..f47aa3edd2e 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 c728edb4668..03a016cca73 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 f91e351b448..e846453f229 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 63c18234e4e..e873c7b34ef 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 732c46deeff..2186ac850ec 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 ac9fc09dbad..84d3b9d68e5 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 342788b4ef8..3f84c1ec282 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 41594768683..a323dca9c1a 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 20cea64f281..a0878e26461 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 40766c145b5..bd61af4bddb 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 f866a7b5e1f..0d07a08916b 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 89217992b01..7232ce2ff75 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 30df032c6c6..09180addf42 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 d5583f1f7fc..1753c8503fe 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 99b138d5416..34e69deabc4 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 fd07c3a205b..b8a2602c6d8 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 5691f5607f3..24a644880e5 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 1b3be6062a0..69f8f8bd437 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 252523f0690..1f586bff66e 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 a0f3f1b5171..0a3aad40784 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 e12c0387f8a..080e00cc3b9 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 927f293d04f..68301ebb724 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 983c91b88e3..49132ef958d 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 ae2915cf5c5..00308d48173 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 6eadbc176d6..c723f9aebcc 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 0544ed9b501..4237a70ec12 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 66d10d16bd2..a0e942a7f30 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 ec6d25ccb65..ab9dc62357e 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 5805310ba5c..bf23c5cec23 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 2ea69a2db3d..89a5666dd2b 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 88ca9c913b4..9c25beb0a3a 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 668d2d7af16..7eefeec0d35 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 a593fdcaa57..607e373fcec 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 0347eab0879..32efa271fc8 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 59bbd36ab66..fdf4951136f 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 02e57921b12..6fb493c8542 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 492eb82358e..7ec515bbb68 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 039be43378b..56e21fd1745 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 443d9c8499b..9608787ef1e 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 e89453671fb..a1cd081f7c4 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 35bf561b663..0e6dbf53d77 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 9b9117c0282..831c1340a59 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 7531a558ea2..7f8bc06d2e9 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 3fcf6df96e2..3ea1383e10c 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 5023684dcb6..8d7a3804676 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 7c0d6a39d07..e12361f19ff 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 25badc45615..62153ed18fd 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 ca85bd3dd9e..6b2bffc11d0 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 f9f14e9aa99..70eaa257528 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 638321f83a0..dfff8a0c9b4 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 e696fb53284..c20af446207 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 b1d41483275..e3b9daf9644 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 a46ecc7552b..2b91f9e6ff0 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 d95c54e38b1..58c162907c2 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 fd60db6c253..5c61769f586 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 fc3d29970d4..548cb6acd13 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 c17f9ab688c..3cf759460ae 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 2a2b2118058..c64f2d6455a 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 8e77f2b4557..f9555e0c4bc 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 d9f21b87f00..b2420165576 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 e0d6a596aa8..3de6244835a 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 cc3cf85dafe..d4988f49ae2 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 fc926ac1767..8c68f853edc 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 347cd66cd74..28fc0f58da2 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 08c3ed5e5aa..a45174d41fc 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 a86247cf373..b67b6b23e4a 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 9e84e815e59..bbe7540b8cf 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 0a17dc2ac8b..4310b0fb96d 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 daf0287878b..aeac4ec6a45 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 264849a9a92..a302d9ea963 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 3bf8316a4a6..ee8db11d0a5 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 2a496e74b20..ab1ad0ac954 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 15d09e4d342..f24de2e5da9 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 cd0e4bc5efe..48dd344fd95 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 a04a3d7c493..17a7155676b 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 b624f86b2d5..3e30b1dfde6 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 efe8b7d3fa4..8ea9e80c37c 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 e2426d9b64a..d6f31683e0a 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 30d1c54539b..7dc261350ca 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 2150cf10ade..5bae193b6ca 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 1f67c75e7f5..faf811b29ec 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 d573b565535..16a40a98c01 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 1988e4447c4..9e4c3768c3e 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 6638f41d6db..b634e98f0c7 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 d60232f0882..27dcd555d53 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 d6e2550fa2b..5379c1884eb 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 b843b5664b1..df42b6904f0 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 12f03cbb668..25d6f135994 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 670865ccfd9..7ce942fedc9 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 59151612908..4a8d36c842c 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 9607ecf151d..ee3edae83bb 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 c16635c4e06..edf33e8f3e8 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 157062d3198..47f359f5685 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 6de9d295343..233a2729ab2 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 3ff111a299e..7578284cda8 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 79faae209bf..cd412dc31ad 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 59f35f119c9..b6b5bfacf47 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 224f5de7b0f..fd901f31911 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 567f68231af..08816699162 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 9e79e972029..5af56b8b14c 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 fcb7bae4e2a..4898ce0cd68 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 ac61296bf0c..ebcf4e266cd 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 5806cdbe043..a53e0e5bd3f 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 d019c03917d..af018f9e5c0 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 9139b0ee230..64b8b4c6d73 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 79341024249..ec14e3d1a10 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 bb79b0a79d8..60a3bb2d2e0 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 f06bc7a039d..d01356d806d 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 2d30e8f9b15..6e46e1bb8e8 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 54906f67399..663b638ca48 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 1af96960a9c..b7be95dc700 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 6340a7eaf57..a1706c269eb 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 beb199032ec..52418c953b0 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 b8ae1f86cd4..cbdd6a08c51 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 01d87bc7eee..82565fa08b7 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 abc32ed474b..1cd8541cbff 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 f02f6d26dba..1d6bf04ec56 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 14c5c616df4..35aed72ecfa 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 57b96220c24..297db2ed888 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 df0d5dbf70f..83f0d2a9163 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 39145315084..b4de0f917a6 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 4106139a002..67ddeba0a29 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 acd2266333d..558d9200fee 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 95720d28619..3491057875d 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 1ed28292eb7..470a5b9ca17 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 724e139dc85..76f1cffa56b 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 a2822144c3d..5a3ccd7d05f 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 51ba874f5ed..1ab60e849f8 100644 --- a/v2ray.go +++ b/v2ray.go @@ -1,3 +1,4 @@ +//go:build !confonly // +build !confonly package core