diff --git a/internal/client/client.go b/internal/client/client.go index 373af2b..6189281 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -253,7 +253,7 @@ func (c *Client) sendResetSignal() { func (c *Client) onData(data []byte) { plaintext, err := c.cipher.Decrypt(data) if err != nil { - logger.Debug("Decrypt error: %v", err) + logger.Debugf("Decrypt error: %v", err) return } @@ -288,7 +288,7 @@ func (c *Client) runSOCKS5( <-ctx.Done() log.Println("Closing SOCKS5 listener...") if err := listener.Close(); err != nil { - logger.Debug("SOCKS5 listener close error: %v", err) + logger.Debugf("SOCKS5 listener close error: %v", err) } }() @@ -313,7 +313,7 @@ func (c *Client) runSOCKS5( func (c *Client) closePeers() { for _, peer := range c.peers { if err := peer.Close(); err != nil { - logger.Debug("Peer close error: %v", err) + logger.Debugf("Peer close error: %v", err) } } } @@ -322,7 +322,7 @@ func (c *Client) closePeers() { func (c *Client) handleSOCKS5(conn net.Conn, username, password string) { defer func() { if err := conn.Close(); err != nil { - logger.Debug("SOCKS5 connection close error: %v", err) + logger.Debugf("SOCKS5 connection close error: %v", err) } }() @@ -358,7 +358,7 @@ func (c *Client) handleSOCKS5(conn net.Conn, username, password string) { } sid := c.mux.OpenStream() - logger.Verbose("SOCKS5 opened stream sid=%d for %s:%d", sid, addr, port) + logger.Verbosef("SOCKS5 opened stream sid=%d for %s:%d", sid, addr, port) log.Printf("[CLIENT] sid=%d SOCKS5_START %s:%d", sid, addr, port) if !c.sendConnectRequest(sid, addr, port) { @@ -477,12 +477,12 @@ func (c *Client) sendConnectRequest(sid uint16, addr string, port uint16) bool { Port: port, }) if err != nil { - logger.Debug("Connect request marshal error: %v", err) + logger.Debugf("Connect request marshal error: %v", err) return false } if err := c.mux.SendData(sid, reqData); err != nil { - logger.Debug("Connect request send error: %v", err) + logger.Debugf("Connect request send error: %v", err) return false } @@ -521,7 +521,7 @@ func (c *Client) proxyStream(conn net.Conn, sid uint16) { n, err := conn.Read(buf) if err != nil { if err := c.mux.CloseStream(sid); err != nil { - logger.Debug("Close stream error: %v", err) + logger.Debugf("Close stream error: %v", err) } return } @@ -575,7 +575,7 @@ func writeStreamData(conn net.Conn, data []byte) bool { func writeResponse(conn net.Conn, response []byte) { if _, err := conn.Write(response); err != nil { - logger.Debug("SOCKS5 response write error: %v", err) + logger.Debugf("SOCKS5 response write error: %v", err) } } diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 67e23b5..fbaa63f 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -15,13 +15,13 @@ func IsVerbose() bool { //nolint:revive return verboseEnabled.Load() } -func Verbose(format string, v ...interface{}) { //nolint:revive +func Verbosef(format string, v ...interface{}) { //nolint:revive if verboseEnabled.Load() { log.Printf("[VERBOSE] "+format, v...) } } -func Debug(format string, v ...interface{}) { //nolint:revive +func Debugf(format string, v ...interface{}) { //nolint:revive if verboseEnabled.Load() { log.Printf("[DEBUG] "+format, v...) } diff --git a/internal/mux/mux.go b/internal/mux/mux.go index 1054e10..f360421 100644 --- a/internal/mux/mux.go +++ b/internal/mux/mux.go @@ -108,7 +108,7 @@ func (m *Multiplexer) SendData(sid uint16, data []byte) error { //nolint:revive totalChunks := (len(data) + chunkSize - 1) / chunkSize if totalChunks > 10 { - logger.Debug("SendData: sid=%d, size=%d bytes, chunks=%d", sid, len(data), totalChunks) + logger.Debugf("SendData: sid=%d, size=%d bytes, chunks=%d", sid, len(data), totalChunks) } for i := 0; i < len(data); i += chunkSize { @@ -297,7 +297,7 @@ func (m *Multiplexer) applyOutOfOrder(stream *Stream, sid uint16, clientID uint3 stream.recvBuf = append(stream.recvBuf, nextData...) delete(stream.outOfOrder, stream.nextSeq) stream.nextSeq++ - logger.Verbose("Applied out-of-order packet sid=%d seq=%d", sid, stream.nextSeq-1) + logger.Verbosef("Applied out-of-order packet sid=%d seq=%d", sid, stream.nextSeq-1) } } @@ -317,7 +317,7 @@ func (m *Multiplexer) handleControlFrame(control ControlFrame) { case ControlResetClient: m.ResetClient(control.ClientID) default: - logger.Debug("Unknown mux control frame type=%d clientID=%d", control.Type, control.ClientID) + logger.Debugf("Unknown mux control frame type=%d clientID=%d", control.Type, control.ClientID) } } diff --git a/internal/server/server.go b/internal/server/server.go index 423370b..597f6d2 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -273,7 +273,7 @@ func (s *Server) socks5Connect(conn net.Conn, targetAddr string, targetPort int) func (s *Server) onData(data []byte) { plaintext, err := s.cipher.Decrypt(data) if err != nil { - logger.Debug("Decrypt error: %v", err) + logger.Debugf("Decrypt error: %v", err) return } diff --git a/internal/telemost/peer.go b/internal/telemost/peer.go index 917ba65..2e3f4a9 100644 --- a/internal/telemost/peer.go +++ b/internal/telemost/peer.go @@ -635,7 +635,7 @@ func (p *Peer) startTelemetry(serverHello map[string]interface{}) { endpoint, _ = cfg["url"].(string) } if endpoint == "" { - logger.Verbose("Telemetry configuration has no endpoint; skipping XHR simulation") + logger.Verbosef("Telemetry configuration has no endpoint; skipping XHR simulation") return } @@ -700,7 +700,7 @@ func (p *Peer) sendTelemetry(endpoint, event string) { req, err := http.NewRequestWithContext(context.Background(), http.MethodPost, endpoint, bytes.NewReader(body)) if err != nil { - logger.Verbose("Telemetry request skipped: %v", err) + logger.Verbosef("Telemetry request skipped: %v", err) return } req.Header.Set("Content-Type", "application/json") @@ -715,12 +715,12 @@ func (p *Peer) sendTelemetry(endpoint, event string) { client := protect.NewHTTPClient() resp, err := client.Do(req) if err != nil { - logger.Verbose("Telemetry send failed: %v", err) + logger.Verbosef("Telemetry send failed: %v", err) return } defer func() { _ = resp.Body.Close() }() if resp.StatusCode >= 400 { - logger.Verbose("Telemetry endpoint returned %s", resp.Status) + logger.Verbosef("Telemetry endpoint returned %s", resp.Status) } } @@ -1085,7 +1085,7 @@ func (p *Peer) processSendQueue(workerID int, sessionCloseCh <-chan struct{}) { time.Sleep(10 * time.Millisecond) } if waited := time.Since(waitStart); waited > 500*time.Millisecond { - logger.Verbose("[WORKER-%d] Buffer drained after %v", workerID, waited) + logger.Verbosef("[WORKER-%d] Buffer drained after %v", workerID, waited) } if p.dc == nil || p.dc.ReadyState() != webrtc.DataChannelStateOpen { @@ -1101,7 +1101,7 @@ func (p *Peer) processSendQueue(workerID int, sessionCloseCh <-chan struct{}) { log.Printf("[WORKER-%d] Sent %d bytes in %v (buffered: %d)", workerID, len(data), elapsed, p.dc.BufferedAmount()) } else { - logger.Verbose("[WORKER-%d] Sent %d bytes (buffered: %d)", + logger.Verbosef("[WORKER-%d] Sent %d bytes (buffered: %d)", workerID, len(data), p.dc.BufferedAmount()) } }