ambrose
/
bypass
mirror of https://github.com/serverwentdown/bypass.git
1
0
Fork 0
Code Releases Activity

Prefix logs with 'socks'

logger
Armon Dadgar 2014-01-23 15:55:54 -08:00
parent 633d3d7152
commit 08b93ecec3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
request.go
View File

@ -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 // Log, and sleep. This is jank but allows the otherside
// to finish a pending copy // 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) time.Sleep(10 * time.Millisecond)
// Send any errors // Send any errors

8
socks5.go
View File

@ -82,28 +82,28 @@ func (s *Server) ServeConn(conn net.Conn) error {
// Read the version byte // Read the version byte
version := []byte{0} version := []byte{0}
if _, err := bufConn.Read(version); err != nil { 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 return err
} }
// Ensure we are compatible // Ensure we are compatible
if version[0] != socks5Version { if version[0] != socks5Version {
err := fmt.Errorf("Unsupported SOCKS version: %v", version) err := fmt.Errorf("Unsupported SOCKS version: %v", version)
log.Printf("[ERR] %v", err) log.Printf("[ERR] socks: %v", err)
return err return err
} }
// Authenticate the connection // Authenticate the connection
if err := s.authenticate(conn, bufConn); err != nil { if err := s.authenticate(conn, bufConn); err != nil {
err = fmt.Errorf("Failed to authenticate: %v", err) err = fmt.Errorf("Failed to authenticate: %v", err)
log.Printf("[ERR] %v", err) log.Printf("[ERR] socks: %v", err)
return err return err
} }
// Process the client request // Process the client request
if err := s.handleRequest(conn, bufConn); err != nil { if err := s.handleRequest(conn, bufConn); err != nil {
err = fmt.Errorf("Failed to handle request: %v", err) err = fmt.Errorf("Failed to handle request: %v", err)
log.Printf("[ERR] %v", err) log.Printf("[ERR] socks: %v", err)
return err return err
} }