From 08b93ecec364fc88769dd5fe5c27c0e64ca725f4 Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Thu, 23 Jan 2014 15:55:54 -0800 Subject: [PATCH] Prefix logs with 'socks' --- request.go | 2 +- socks5.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/request.go b/request.go index 70eec1e..14b715c 100644 --- a/request.go +++ b/request.go @@ -289,7 +289,7 @@ func proxy(name string, dst io.Writer, src io.Reader, errCh chan error) { // Log, and sleep. This is jank but allows the otherside // to finish a pending copy - log.Printf("[DEBUG] Copied %d bytes to %s", n, name) + log.Printf("[DEBUG] socks: Copied %d bytes to %s", n, name) time.Sleep(10 * time.Millisecond) // Send any errors diff --git a/socks5.go b/socks5.go index cb679ad..9b30fc6 100644 --- a/socks5.go +++ b/socks5.go @@ -82,28 +82,28 @@ func (s *Server) ServeConn(conn net.Conn) error { // Read the version byte version := []byte{0} if _, err := bufConn.Read(version); err != nil { - log.Printf("[ERR] Failed to get version byte: %v", err) + log.Printf("[ERR] socks: Failed to get version byte: %v", err) return err } // Ensure we are compatible if version[0] != socks5Version { err := fmt.Errorf("Unsupported SOCKS version: %v", version) - log.Printf("[ERR] %v", err) + log.Printf("[ERR] socks: %v", err) return err } // Authenticate the connection if err := s.authenticate(conn, bufConn); err != nil { err = fmt.Errorf("Failed to authenticate: %v", err) - log.Printf("[ERR] %v", err) + log.Printf("[ERR] socks: %v", err) return err } // Process the client request if err := s.handleRequest(conn, bufConn); err != nil { err = fmt.Errorf("Failed to handle request: %v", err) - log.Printf("[ERR] %v", err) + log.Printf("[ERR] socks: %v", err) return err }