Merge from remote branch

2021-09-01 00:38:43 +08:00
parent 4cc16e0136 7d20097465
commit 48aef1829f
38 changed files with 583 additions and 272 deletions
--- a/listener/tproxy/setsockopt_linux.go
+++ b/listener/tproxy/setsockopt_linux.go
@ -1,3 +1,4 @@
+//go:build linux
 // +build linux

 package tproxy
--- a/listener/tproxy/setsockopt_other.go
+++ b/listener/tproxy/setsockopt_other.go
@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux

 package tproxy
--- a/listener/tproxy/udp_linux.go
+++ b/listener/tproxy/udp_linux.go
@ -1,3 +1,4 @@
+//go:build linux
 // +build linux

 package tproxy
--- a/listener/tproxy/udp_other.go
+++ b/listener/tproxy/udp_other.go
@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux

 package tproxy