Merge from remote branch

listener/tun/dev/dev_darwin.go

@@ -14,10 +14,10 @@ import (
 	"syscall"
 	"unsafe"
 
+	"github.com/Dreamacro/clash/common/pool"
+
 	"golang.org/x/net/ipv6"
 	"golang.org/x/sys/unix"
-
-	"github.com/Dreamacro/clash/common/pool"
 )
 
 const (

listener/tun/ipstack/commons/dns.go

@@ -2,6 +2,7 @@ package commons
 
 import (
 	"github.com/Dreamacro/clash/component/resolver"
+
 	D "github.com/miekg/dns"
 )
 

listener/tun/ipstack/gvisor/tun.go

@@ -17,6 +17,7 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/ipstack"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/transport/socks5"
+
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
 	"gvisor.dev/gvisor/pkg/tcpip/buffer"

listener/tun/ipstack/gvisor/tundns.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/Dreamacro/clash/dns"
 	"github.com/Dreamacro/clash/log"
+
 	D "github.com/miekg/dns"
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"

listener/tun/ipstack/gvisor/utils.go

@@ -5,6 +5,7 @@ import (
 	"net"
 
 	"github.com/Dreamacro/clash/component/resolver"
+
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/buffer"
 	"gvisor.dev/gvisor/pkg/tcpip/header"

listener/tun/ipstack/system/dns.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	D "github.com/Dreamacro/clash/listener/tun/ipstack/commons"
+
 	"github.com/kr328/tun2socket/binding"
 	"github.com/kr328/tun2socket/redirect"
 )

listener/tun/ipstack/system/tcp.go

@@ -4,10 +4,10 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/kr328/tun2socket/binding"
-
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/context"
+
+	"github.com/kr328/tun2socket/binding"
 )
 
 func handleTCP(conn net.Conn, endpoint *binding.Endpoint, tcpIn chan<- C.ConnContext) {

listener/tun/ipstack/system/tun.go

@@ -11,6 +11,7 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/dev"
 	"github.com/Dreamacro/clash/listener/tun/ipstack"
 	"github.com/Dreamacro/clash/log"
+
 	"github.com/kr328/tun2socket"
 	"github.com/kr328/tun2socket/binding"
 	"github.com/kr328/tun2socket/redirect"

listener/tun/ipstack/system/udp.go

@@ -8,6 +8,7 @@ import (
 	"github.com/Dreamacro/clash/common/pool"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/socks5"
+
 	"github.com/kr328/tun2socket/binding"
 	"github.com/kr328/tun2socket/redirect"
 )