Add configuration option for the log target
parent
e586115c2d
commit
1b0ce4078f
|
@ -155,8 +155,8 @@ func (s *Server) handleConnect(conn conn, bufConn io.Reader, dest, realDest *Add
|
||||||
|
|
||||||
// Start proxying
|
// Start proxying
|
||||||
errCh := make(chan error, 2)
|
errCh := make(chan error, 2)
|
||||||
go proxy("target", target, bufConn, errCh)
|
go proxy("target", target, bufConn, errCh, s.config.Logger)
|
||||||
go proxy("client", conn, target, errCh)
|
go proxy("client", conn, target, errCh, s.config.Logger)
|
||||||
|
|
||||||
// Wait
|
// Wait
|
||||||
select {
|
select {
|
||||||
|
@ -301,13 +301,13 @@ func sendReply(w io.Writer, resp uint8, addr *AddrSpec) error {
|
||||||
|
|
||||||
// proxy is used to suffle data from src to destination, and sends errors
|
// proxy is used to suffle data from src to destination, and sends errors
|
||||||
// down a dedicated channel
|
// down a dedicated channel
|
||||||
func proxy(name string, dst io.Writer, src io.Reader, errCh chan error) {
|
func proxy(name string, dst io.Writer, src io.Reader, errCh chan error, logger *log.Logger) {
|
||||||
// Copy
|
// Copy
|
||||||
n, err := io.Copy(dst, src)
|
n, err := io.Copy(dst, src)
|
||||||
|
|
||||||
// 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] socks: Copied %d bytes to %s", n, name)
|
logger.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
|
||||||
|
|
18
socks5.go
18
socks5.go
|
@ -5,6 +5,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -38,6 +39,10 @@ type Config struct {
|
||||||
|
|
||||||
// BindIP is used for bind or udp associate
|
// BindIP is used for bind or udp associate
|
||||||
BindIP net.IP
|
BindIP net.IP
|
||||||
|
|
||||||
|
// Logger can be used to provide a custom log target.
|
||||||
|
// Defaults to stdout.
|
||||||
|
Logger *log.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
// Server is reponsible for accepting connections and handling
|
// Server is reponsible for accepting connections and handling
|
||||||
|
@ -68,6 +73,11 @@ func New(conf *Config) (*Server, error) {
|
||||||
conf.Rules = PermitAll()
|
conf.Rules = PermitAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ensure we have a log target
|
||||||
|
if conf.Logger == nil {
|
||||||
|
conf.Logger = log.New(os.Stdout, "", log.LstdFlags)
|
||||||
|
}
|
||||||
|
|
||||||
server := &Server{
|
server := &Server{
|
||||||
config: conf,
|
config: conf,
|
||||||
}
|
}
|
||||||
|
@ -110,28 +120,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] socks: Failed to get version byte: %v", err)
|
s.config.Logger.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] socks: %v", err)
|
s.config.Logger.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] socks: %v", err)
|
s.config.Logger.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] socks: %v", err)
|
s.config.Logger.Printf("[ERR] socks: %v", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue