bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 17:35:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

log: optimize logs for redir and socks5

Browse Source
This commit is contained in:
nadoo 2017-10-18 21:47:32 +08:00
parent ade87c9588
commit 8ef2944f1a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
redir_linux.go
View File

@ -37,16 +37,16 @@ func NewRedirProxy(addr string, sDialer Dialer) (*RedirProxy, error) {
func (s *RedirProxy) ListenAndServe() { func (s *RedirProxy) ListenAndServe() {
l, err := net.Listen("tcp", s.addr) l, err := net.Listen("tcp", s.addr)
if err != nil { if err != nil {
logf("failed to listen on %s: %v", s.addr, err) logf("proxy-redir failed to listen on %s: %v", s.addr, err)
return return
} }
logf("listening TCP on %s", s.addr) logf("proxy-redir listening TCP on %s", s.addr)
for { for {
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
logf("failed to accept: %v", err) logf("proxy-redir failed to accept: %v", err)
continue continue
} }
@ -59,13 +59,13 @@ func (s *RedirProxy) ListenAndServe() {
tgt, err := getOrigDst(c, false) tgt, err := getOrigDst(c, false)
if err != nil { if err != nil {
logf("failed to get target address: %v", err) logf("proxy-redir failed to get target address: %v", err)
return return
} }
rc, err := s.sDialer.Dial("tcp", tgt.String()) rc, err := s.sDialer.Dial("tcp", tgt.String())
if err != nil { if err != nil {
logf("failed to connect to target: %v", err) logf("proxy-redir failed to connect to target: %v", err)
return return
} }
defer rc.Close() defer rc.Close()
@ -77,7 +77,7 @@ func (s *RedirProxy) ListenAndServe() {
if err, ok := err.(net.Error); ok && err.Timeout() { if err, ok := err.(net.Error); ok && err.Timeout() {
return // ignore i/o timeout return // ignore i/o timeout
} }
logf("relay error: %v", err) logf("proxy-redir relay error: %v", err)
} }
}() }()

10
socks5.go
View File

@ -81,16 +81,16 @@ func NewSOCKS5(addr, user, pass string, cDialer Dialer, sDialer Dialer) (*SOCKS5
func (s *SOCKS5) ListenAndServe() { func (s *SOCKS5) ListenAndServe() {
l, err := net.Listen("tcp", s.addr) l, err := net.Listen("tcp", s.addr)
if err != nil { if err != nil {
logf("failed to listen on %s: %v", s.addr, err) logf("proxy-socks5 failed to listen on %s: %v", s.addr, err)
return return
} }
logf("listening TCP on %s", s.addr) logf("proxy-socks5 listening TCP on %s", s.addr)
for { for {
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
logf("failed to accept: %v", err) logf("proxy-socks5 failed to accept: %v", err)
continue continue
} }
@ -108,13 +108,13 @@ func (s *SOCKS5) Serve(c net.Conn) {
tgt, err := s.handshake(c) tgt, err := s.handshake(c)
if err != nil { if err != nil {
logf("failed to get target address: %v", err) logf("proxy-socks5 failed to get target address: %v", err)
return return
} }
rc, err := s.sDialer.Dial("tcp", tgt.String()) rc, err := s.sDialer.Dial("tcp", tgt.String())
if err != nil { if err != nil {
logf("failed to connect to target: %v", err) logf("proxy-socks5 failed to connect to target: %v", err)
return return
} }
defer rc.Close() defer rc.Close()