diff options
| author | Shulhan <ms@kilabit.info> | 2023-05-20 13:42:39 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2023-05-20 13:44:07 +0700 |
| commit | 3eae1d3df5eeef14f9e8389895bb6b835ac2cf78 (patch) | |
| tree | f35ca6c111bed2ecf85ada965accf22ce83d3e8c /lib/websocket | |
| parent | f43b8ead50575c6a279bef403af0204df98323c9 (diff) | |
| download | pakakeh.go-3eae1d3df5eeef14f9e8389895bb6b835ac2cf78.tar.xz | |
all: remove any usage of debug.Value in all packages
Using global debug value for all packages turns out is not a good
idea.
Diffstat (limited to 'lib/websocket')
| -rw-r--r-- | lib/websocket/client.go | 46 | ||||
| -rw-r--r-- | lib/websocket/server.go | 30 |
2 files changed, 0 insertions, 76 deletions
diff --git a/lib/websocket/client.go b/lib/websocket/client.go index 1e7256c9..58b262b6 100644 --- a/lib/websocket/client.go +++ b/lib/websocket/client.go @@ -17,7 +17,6 @@ import ( "time" "unicode/utf8" - "github.com/shuLhan/share/lib/debug" libhttp "github.com/shuLhan/share/lib/http" ) @@ -354,11 +353,6 @@ func (cl *Client) open() (err error) { } ) - if debug.Value >= 3 { - fmt.Printf("websocket: Client.open: remoteAddr: %s\n", - cl.remoteAddr) - } - if cl.TLSConfig != nil { cl.conn, err = tls.DialWithDialer(dialer, "tcp", cl.remoteAddr, cl.TLSConfig) } else { @@ -404,10 +398,6 @@ func (cl *Client) handshake() (rest []byte, err error) { bb.WriteString("\r\n") req = bb.Bytes() - if debug.Value >= 3 { - fmt.Printf("websocket: Client.handshake:\n%s\n--\n", req) - } - rest, err = cl.doHandshake(keyAccept, req) if err != nil { return nil, err @@ -482,10 +472,6 @@ func clientOnClose(cl *Client, frame *Frame) (err error) { var packet []byte = NewFrameClose(true, frame.closeCode, frame.payload) - if debug.Value >= 3 { - fmt.Printf("websocket: clientOnClose: payload: %s\n", frame.payload) - } - cl.Lock() err = cl.send(packet) cl.Unlock() @@ -500,12 +486,6 @@ func clientOnClose(cl *Client, frame *Frame) (err error) { // handleFragment will handle continuation frame (fragmentation). func (cl *Client) handleFragment(frame *Frame) (isInvalid bool) { - if debug.Value >= 3 { - fmt.Printf("websocket: Client.handleFragment: frame:{fin:%d opcode:%d masked:%d len:%d, payload.len:%d}\n", - frame.fin, frame.opcode, frame.masked, frame.len, - len(frame.payload)) - } - if cl.frames == nil { if frame.opcode == OpcodeCont { // If a connection does not have continuous frame, @@ -610,15 +590,6 @@ func (cl *Client) handleFrame(frame *Frame) (isClosing bool) { } func (cl *Client) handleHandshake(keyAccept string, resp []byte) (rest []byte, err error) { - if debug.Value >= 3 { - var max int = 512 - if len(resp) < 512 { - max = len(resp) - } - fmt.Printf("websocket: Client.handleHandshake:\n%s\n--\n", - resp[:max]) - } - var httpRes *http.Response httpRes, rest, err = libhttp.ParseResponseHeader(resp) @@ -799,7 +770,6 @@ func (cl *Client) recv() (packet []byte, err error) { var ( buf []byte = make([]byte, 512) neterr net.Error - max int n int ok bool ) @@ -828,14 +798,6 @@ func (cl *Client) recv() (packet []byte, err error) { } } - if debug.Value >= 3 { - max = len(packet) - if max > 16 { - max = 16 - } - fmt.Printf("websocket: Client.recv: packet: len:%d % x\n", len(packet), packet[:max]) - } - return packet, err } @@ -849,14 +811,6 @@ func (cl *Client) send(packet []byte) (err error) { return err } - if debug.Value >= 3 { - var max int = len(packet) - if max > 16 { - max = 16 - } - fmt.Printf("websocket: Client.send: % x\n", packet[:max]) - } - _, err = cl.conn.Write(packet) if err != nil { return err diff --git a/lib/websocket/server.go b/lib/websocket/server.go index 074f5364..42d8faec 100644 --- a/lib/websocket/server.go +++ b/lib/websocket/server.go @@ -19,7 +19,6 @@ import ( "golang.org/x/sys/unix" libbytes "github.com/shuLhan/share/lib/bytes" - "github.com/shuLhan/share/lib/debug" libnet "github.com/shuLhan/share/lib/net" ) @@ -353,12 +352,6 @@ func (serv *Server) handleFragment(conn int, req *Frame) (isInvalid bool) { frames, ok = serv.Clients.getFrames(conn) - if debug.Value >= 3 { - fmt.Printf("websocket: Server.handleFragment: frame: {fin:%d opcode:%d masked:%d len:%d, payload.len:%d}\n", - req.fin, req.opcode, req.masked, req.len, - len(req.payload)) - } - if frames == nil { if req.opcode == OpcodeCont { // If a connection does not have continuous frame, @@ -590,10 +583,6 @@ func (serv *Server) handleClose(conn int, req *Frame) { err error ) - if debug.Value >= 3 { - fmt.Printf("websocket: Server.handleClose: req: %+v\n", req) - } - err = Send(conn, packet) if err != nil { log.Println("websocket: server.handleClose: Send: " + err.Error()) @@ -651,11 +640,6 @@ func (serv *Server) handleInvalidData(conn int) { // being replied to. // “` func (serv *Server) handlePing(conn int, req *Frame) { - if debug.Value >= 3 { - fmt.Printf("websocket: Server.handlePing: conn:%d frame:%+v\n", - conn, req) - } - req.opcode = OpcodePong req.masked = 0 @@ -690,7 +674,6 @@ func (serv *Server) reader() { packet []byte fds []int conn int - max int x int isClosing bool ) @@ -711,15 +694,6 @@ func (serv *Server) reader() { continue } - if debug.Value >= 3 { - max = len(packet) - if max > 16 { - max = 16 - } - fmt.Printf("websocket: Server.reader: packet {len:%d value:% x ...}\n", - len(packet), packet[:max]) - } - // Handle chopped, unfinished packet or payload. frame, _ = serv.Clients.getFrame(conn) if frame != nil { @@ -743,10 +717,6 @@ func (serv *Server) reader() { continue } - if debug.Value >= 3 { - fmt.Printf("websocket: Server.reader: frames: len:%d\n", len(frames.v)) - } - var isClosing bool for _, frame = range frames.v { if !frame.isComplete { |
