From e2d4ab737616016a124309968de859e2e2a344d6 Mon Sep 17 00:00:00 2001 From: Andy Wang Date: Mon, 2 Sep 2019 14:04:52 +0100 Subject: [PATCH] Use non-pointer receiver instead --- internal/server/auth.go | 6 +++--- internal/server/transport.go | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/internal/server/auth.go b/internal/server/auth.go index 578fe4c..1cb7dbb 100644 --- a/internal/server/auth.go +++ b/internal/server/auth.go @@ -80,7 +80,7 @@ func PrepareConnection(firstPacket []byte, sta *State, conn net.Conn) (info Clie var ai authenticationInfo switch firstPacket[0] { case 0x47: - transport = &WebSocket{} + transport = WebSocket{} var req *http.Request req, err = http.ReadRequest(bufio.NewReader(bytes.NewBuffer(firstPacket))) if err != nil { @@ -122,7 +122,7 @@ func PrepareConnection(firstPacket []byte, sta *State, conn net.Conn) (info Clie return } case 0x16: - transport = &TLS{} + transport = TLS{} var ch *ClientHello ch, err = parseClientHello(firstPacket) if err != nil { @@ -165,7 +165,7 @@ func PrepareConnection(firstPacket []byte, sta *State, conn net.Conn) (info Clie info, err = touchStone(ai, sta.Now) if err != nil { log.Debug(err) - err = fmt.Errorf("transport %v in correct format but not Cloak: %v", err) + err = fmt.Errorf("transport %v in correct format but not Cloak: %v", transport, err) return } info.Transport = transport diff --git a/internal/server/transport.go b/internal/server/transport.go index b956f05..8b0f46f 100644 --- a/internal/server/transport.go +++ b/internal/server/transport.go @@ -12,10 +12,12 @@ type Transport interface { type TLS struct{} -func (*TLS) HasRecordLayer() bool { return true } -func (*TLS) UnitReadFunc() func(net.Conn, []byte) (int, error) { return util.ReadTLS } +func (TLS) String() string { return "TLS" } +func (TLS) HasRecordLayer() bool { return true } +func (TLS) UnitReadFunc() func(net.Conn, []byte) (int, error) { return util.ReadTLS } type WebSocket struct{} -func (*WebSocket) HasRecordLayer() bool { return false } -func (*WebSocket) UnitReadFunc() func(net.Conn, []byte) (int, error) { return util.ReadWebSocket } +func (WebSocket) String() string { return "WebSocket" } +func (WebSocket) HasRecordLayer() bool { return false } +func (WebSocket) UnitReadFunc() func(net.Conn, []byte) (int, error) { return util.ReadWebSocket }