diff --git a/app/proxyman/outbound/handler.go b/app/proxyman/outbound/handler.go index 3ffe9ae2..f899e6b8 100644 --- a/app/proxyman/outbound/handler.go +++ b/app/proxyman/outbound/handler.go @@ -200,7 +200,7 @@ func (h *Handler) Dial(ctx context.Context, dest net.Destination) (internet.Conn return h.getStatCouterConnection(conn), err } -func (h *Handler) getStatCouterConnection(conn internet.Connection) (internet.Connection) { +func (h *Handler) getStatCouterConnection(conn internet.Connection) internet.Connection { if h.uplinkCounter != nil || h.downlinkCounter != nil { return &internet.StatCouterConnection{ Connection: conn, diff --git a/app/proxyman/outbound/handler_test.go b/app/proxyman/outbound/handler_test.go index c0518378..b3b6e054 100644 --- a/app/proxyman/outbound/handler_test.go +++ b/app/proxyman/outbound/handler_test.go @@ -57,7 +57,7 @@ func TestOutboundWithStatCounter(t *testing.T) { serial.ToTypedMessage(&policy.Config{ System: &policy.SystemPolicy{ Stats: &policy.SystemPolicy_Stats{ - OutboundUplink: true, + OutboundUplink: true, OutboundDownlink: true, }, }, diff --git a/external/github.com/cloudflare/sidh/sidh/api.go b/external/github.com/cloudflare/sidh/sidh/api.go index 50dd1371..500dc5bf 100644 --- a/external/github.com/cloudflare/sidh/sidh/api.go +++ b/external/github.com/cloudflare/sidh/sidh/api.go @@ -2,8 +2,8 @@ package sidh import ( "errors" - . "v2ray.com/core/external/github.com/cloudflare/sidh/internal/isogeny" "io" + . "v2ray.com/core/external/github.com/cloudflare/sidh/internal/isogeny" ) // I keep it bool in order to be able to apply logical NOT diff --git a/external/github.com/lucas-clemente/quic-go/buffer_pool.go b/external/github.com/lucas-clemente/quic-go/buffer_pool.go index 2966dbd7..e196fae0 100644 --- a/external/github.com/lucas-clemente/quic-go/buffer_pool.go +++ b/external/github.com/lucas-clemente/quic-go/buffer_pool.go @@ -3,8 +3,8 @@ package quic import ( "sync" - "v2ray.com/core/external/github.com/lucas-clemente/quic-go/internal/protocol" "v2ray.com/core/common/bytespool" + "v2ray.com/core/external/github.com/lucas-clemente/quic-go/internal/protocol" ) type packetBuffer struct { diff --git a/external/github.com/marten-seemann/qtls/13.go b/external/github.com/marten-seemann/qtls/13.go index 715dc615..8a98e2de 100644 --- a/external/github.com/marten-seemann/qtls/13.go +++ b/external/github.com/marten-seemann/qtls/13.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "time" - "v2ray.com/core/external/github.com/cloudflare/sidh/sidh" "golang.org/x/crypto/curve25519" + "v2ray.com/core/external/github.com/cloudflare/sidh/sidh" ) // numSessionTickets is the number of different session tickets the diff --git a/proxy/shadowsocks/protocol.go b/proxy/shadowsocks/protocol.go index 03dad5b3..babcefdf 100644 --- a/proxy/shadowsocks/protocol.go +++ b/proxy/shadowsocks/protocol.go @@ -38,7 +38,7 @@ var addrParser = protocol.NewAddressParser( func ReadTCPSession(user *protocol.MemoryUser, reader io.Reader) (*protocol.RequestHeader, buf.Reader, error) { account := user.Account.(*MemoryAccount) - hashkdf := hmac.New(func()hash.Hash{return sha256.New()}, []byte("SSBSKDF")) + hashkdf := hmac.New(func() hash.Hash { return sha256.New() }, []byte("SSBSKDF")) hashkdf.Write(account.Key) behaviorSeed := crc32.ChecksumIEEE(hashkdf.Sum(nil)) @@ -50,7 +50,6 @@ func ReadTCPSession(user *protocol.MemoryUser, reader io.Reader) (*protocol.Requ DrainSize := BaseDrainSize + 16 + 38 + RandDrainRolled readSizeRemain := DrainSize - buffer := buf.New() defer buffer.Release() @@ -59,7 +58,7 @@ func ReadTCPSession(user *protocol.MemoryUser, reader io.Reader) (*protocol.Requ if ivLen > 0 { if _, err := buffer.ReadFullFrom(reader, ivLen); err != nil { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("failed to read IV").Base(err) } @@ -69,7 +68,7 @@ func ReadTCPSession(user *protocol.MemoryUser, reader io.Reader) (*protocol.Requ r, err := account.Cipher.NewDecryptionReader(account.Key, iv, reader) if err != nil { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("failed to initialize decoding stream").Base(err).AtError() } br := &buf.BufferedReader{Reader: r} @@ -87,7 +86,7 @@ func ReadTCPSession(user *protocol.MemoryUser, reader io.Reader) (*protocol.Requ addr, port, err := addrParser.ReadAddressPort(buffer, br) if err != nil { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("failed to read address").Base(err) } @@ -101,13 +100,13 @@ func ReadTCPSession(user *protocol.MemoryUser, reader io.Reader) (*protocol.Requ if request.Option.Has(RequestOptionOneTimeAuth) && account.OneTimeAuth == Account_Disabled { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("rejecting connection with OTA enabled, while server disables OTA") } if !request.Option.Has(RequestOptionOneTimeAuth) && account.OneTimeAuth == Account_Enabled { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("rejecting connection with OTA disabled, while server enables OTA") } } @@ -119,20 +118,20 @@ func ReadTCPSession(user *protocol.MemoryUser, reader io.Reader) (*protocol.Requ _, err := buffer.ReadFullFrom(br, AuthSize) if err != nil { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("Failed to read OTA").Base(err) } if !bytes.Equal(actualAuth, buffer.BytesFrom(-AuthSize)) { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("invalid OTA") } } if request.Address == nil { readSizeRemain -= int(buffer.Len()) - DrainConnN(reader,readSizeRemain) + DrainConnN(reader, readSizeRemain) return nil, nil, newError("invalid remote address.") } diff --git a/proxy/vmess/validator.go b/proxy/vmess/validator.go index b63a7d7e..abcdc630 100644 --- a/proxy/vmess/validator.go +++ b/proxy/vmess/validator.go @@ -142,7 +142,7 @@ func (v *TimedUserValidator) Add(u *protocol.MemoryUser) error { account := uu.user.Account.(*MemoryAccount) if v.behaviorFused == false { - hashkdf := hmac.New(func()hash.Hash{return sha256.New()}, []byte("VMESSBSKDF")) + hashkdf := hmac.New(func() hash.Hash { return sha256.New() }, []byte("VMESSBSKDF")) hashkdf.Write(account.ID.Bytes()) v.behaviorSeed = crc64.Update(v.behaviorSeed, crc64.MakeTable(crc64.ECMA), hashkdf.Sum(nil)) } diff --git a/testing/scenarios/vmess_test.go b/testing/scenarios/vmess_test.go index 81312139..5f90cca7 100644 --- a/testing/scenarios/vmess_test.go +++ b/testing/scenarios/vmess_test.go @@ -928,8 +928,8 @@ func TestVMessKCPLarge(t *testing.T) { t.Error(err) } - defer func(){ - <-time.After(5*time.Second) + defer func() { + <-time.After(5 * time.Second) CloseAllServers(servers) }() } @@ -1178,8 +1178,8 @@ func TestVMessGCMMuxUDP(t *testing.T) { time.Sleep(time.Second) } - defer func(){ - <-time.After(5*time.Second) + defer func() { + <-time.After(5 * time.Second) CloseAllServers(servers) }() } diff --git a/transport/internet/domainsocket/listener.go b/transport/internet/domainsocket/listener.go index 587fecd9..aba951d0 100644 --- a/transport/internet/domainsocket/listener.go +++ b/transport/internet/domainsocket/listener.go @@ -11,7 +11,7 @@ import ( "strings" "golang.org/x/sys/unix" - + "v2ray.com/core/common" "v2ray.com/core/common/net" "v2ray.com/core/transport/internet"