Skip to content

G
gost
Commit 768f97be authored by rui.zheng's avatar rui.zheng
Browse files
Options

fix log title

parent e12336fc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 80 deletions
conn.go
View file @ 768f97be
...@@ -87,16 +87,16 @@ func listenAndServe(arg Args) error { ...@@ -87,16 +87,16 @@ func listenAndServe(arg Args) error {
} }
func listenAndServeTcpForward(arg Args) error { func listenAndServeTcpForward(arg Args) error {
ln, err := net.Listen("tcp", arg.Addr) raddr, err := net.ResolveTCPAddr("tcp", arg.Remote)
if err != nil { if err != nil {
return err return err
} }
defer ln.Close()
raddr, err := net.ResolveTCPAddr("tcp", arg.Remote) ln, err := net.Listen("tcp", arg.Addr)
if err != nil { if err != nil {
return err return err
} }
defer ln.Close()
for { for {
conn, err := ln.Accept() conn, err := ln.Accept()
...@@ -121,7 +121,7 @@ func listenAndServeUdpForward(arg Args) error { ...@@ -121,7 +121,7 @@ func listenAndServeUdpForward(arg Args) error {
conn, err := net.ListenUDP("udp", laddr) conn, err := net.ListenUDP("udp", laddr)
if err != nil { if err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s -> %s : %s", laddr, raddr, err) glog.V(LWARNING).Infof("[udp] %s -> %s : %s", laddr, raddr, err)
return err return err
} }
defer conn.Close() defer conn.Close()
...@@ -132,7 +132,7 @@ func listenAndServeUdpForward(arg Args) error { ...@@ -132,7 +132,7 @@ func listenAndServeUdpForward(arg Args) error {
n, addr, err := conn.ReadFromUDP(b) n, addr, err := conn.ReadFromUDP(b)
if err != nil { if err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s -> %s : %s", laddr, raddr, err) glog.V(LWARNING).Infof("[udp] %s -> %s : %s", laddr, raddr, err)
continue continue
} }
go func() { go func() {
...@@ -149,7 +149,7 @@ func listenAndServeUdpForward(arg Args) error { ...@@ -149,7 +149,7 @@ func listenAndServeUdpForward(arg Args) error {
b := make([]byte, 32*1024) b := make([]byte, 32*1024)
n, addr, err := conn.ReadFromUDP(b) n, addr, err := conn.ReadFromUDP(b)
if err != nil { if err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s -> %s : %s", laddr, raddr, err) glog.V(LWARNING).Infof("[udp] %s -> %s : %s", laddr, raddr, err)
return return
} }
...@@ -166,11 +166,11 @@ func listenAndServeUdpForward(arg Args) error { ...@@ -166,11 +166,11 @@ func listenAndServeUdpForward(arg Args) error {
dgram := <-wChan dgram := <-wChan
addr, err := net.ResolveUDPAddr("udp", dgram.Header.Addr.String()) addr, err := net.ResolveUDPAddr("udp", dgram.Header.Addr.String())
if err != nil { if err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s <- %s : %s", laddr, raddr, err) glog.V(LWARNING).Infof("[udp] %s <- %s : %s", laddr, raddr, err)
continue // drop silently continue // drop silently
} }
if _, err = conn.WriteToUDP(dgram.Data, addr); err != nil { if _, err = conn.WriteToUDP(dgram.Data, addr); err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s <- %s : %s", laddr, raddr, err) glog.V(LWARNING).Infof("[udp] %s <- %s : %s", laddr, raddr, err)
return return
} }
} }
...@@ -186,6 +186,15 @@ func serveRTcpForward(arg Args) error { ...@@ -186,6 +186,15 @@ func serveRTcpForward(arg Args) error {
return errors.New("rtcp: at least one -F must be assigned") return errors.New("rtcp: at least one -F must be assigned")
} }
laddr, err := net.ResolveTCPAddr("tcp", arg.Addr)
if err != nil {
return err
}
raddr, err := net.ResolveTCPAddr("tcp", arg.Remote)
if err != nil {
return err
}
retry := 0 retry := 0
for { for {
conn, _, err := forwardChain(forwardArgs...) conn, _, err := forwardChain(forwardArgs...)
...@@ -199,9 +208,9 @@ func serveRTcpForward(arg Args) error { ...@@ -199,9 +208,9 @@ func serveRTcpForward(arg Args) error {
} }
retry = 0 retry = 0
if err := connectRTcpForward(conn, arg); err != nil { if err := connectRTcpForward(conn, laddr, raddr); err != nil {
conn.Close() conn.Close()
time.Sleep(10 * time.Second) time.Sleep(6 * time.Second)
} }
} }
} }
...@@ -211,6 +220,15 @@ func serveRUdpForward(arg Args) error { ...@@ -211,6 +220,15 @@ func serveRUdpForward(arg Args) error {
return errors.New("rudp: at least one -F must be assigned") return errors.New("rudp: at least one -F must be assigned")
} }
laddr, err := net.ResolveUDPAddr("udp", arg.Addr)
if err != nil {
return err
}
raddr, err := net.ResolveUDPAddr("udp", arg.Remote)
if err != nil {
return err
}
retry := 0 retry := 0
for { for {
conn, _, err := forwardChain(forwardArgs...) conn, _, err := forwardChain(forwardArgs...)
...@@ -224,9 +242,9 @@ func serveRUdpForward(arg Args) error { ...@@ -224,9 +242,9 @@ func serveRUdpForward(arg Args) error {
} }
retry = 0 retry = 0
if err := connectRUdpForward(conn, arg); err != nil { if err := connectRUdpForward(conn, laddr, raddr); err != nil {
conn.Close() conn.Close()
time.Sleep(10 * time.Second) time.Sleep(6 * time.Second)
} }
} }
} }
......
forward.go
View file @ 768f97be
This diff is collapsed.
socks.go
View file @ 768f97be
...@@ -220,7 +220,7 @@ func handleSocks5Request(req *gosocks5.Request, conn net.Conn) { ...@@ -220,7 +220,7 @@ func handleSocks5Request(req *gosocks5.Request, conn net.Conn) {
glog.V(LINFO).Infof("[socks5-bind] %s >-< %s", conn.RemoteAddr(), fconn.RemoteAddr()) glog.V(LINFO).Infof("[socks5-bind] %s >-< %s", conn.RemoteAddr(), fconn.RemoteAddr())
case CmdUdpConnect: case CmdUdpConnect:
glog.V(LINFO).Infof("[udp-connect] %s - %s", conn.RemoteAddr(), req.Addr) glog.V(LINFO).Infof("[udp] %s - %s", conn.RemoteAddr(), req.Addr)
udpConnect(req, conn) udpConnect(req, conn)
case gosocks5.CmdUdp: case gosocks5.CmdUdp:
...@@ -249,43 +249,43 @@ func udpConnect(req *gosocks5.Request, conn net.Conn) error { ...@@ -249,43 +249,43 @@ func udpConnect(req *gosocks5.Request, conn net.Conn) error {
if len(forwardArgs) > 0 { // direct forwarding if len(forwardArgs) > 0 { // direct forwarding
fconn, _, err := forwardChain(forwardArgs...) fconn, _, err := forwardChain(forwardArgs...)
if err != nil { if err != nil {
glog.V(LINFO).Infof("[udp-connect] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err) glog.V(LINFO).Infof("[udp] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err)
gosocks5.NewReply(gosocks5.Failure, nil).Write(conn) gosocks5.NewReply(gosocks5.Failure, nil).Write(conn)
return err return err
} }
defer fconn.Close() defer fconn.Close()
if err := req.Write(fconn); err != nil { if err := req.Write(fconn); err != nil {
glog.V(LINFO).Infof("[udp-connect] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err) glog.V(LINFO).Infof("[udp] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err)
gosocks5.NewReply(gosocks5.Failure, nil).Write(conn) gosocks5.NewReply(gosocks5.Failure, nil).Write(conn)
return err return err
} }
glog.V(LINFO).Infof("[udp-connect] %s <-> %s", conn.RemoteAddr(), req.Addr) glog.V(LINFO).Infof("[udp] %s <-> %s", conn.RemoteAddr(), req.Addr)
err = Transport(conn, fconn) err = Transport(conn, fconn)
glog.V(LINFO).Infof("[udp-connect] %s >-< %s", conn.RemoteAddr(), req.Addr) glog.V(LINFO).Infof("[udp] %s >-< %s", conn.RemoteAddr(), req.Addr)
return err return err
} }
raddr, err := net.ResolveUDPAddr("udp", req.Addr.String()) raddr, err := net.ResolveUDPAddr("udp", req.Addr.String())
if err != nil { if err != nil {
glog.V(LINFO).Infof("[udp-connect] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err) glog.V(LINFO).Infof("[udp] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err)
gosocks5.NewReply(gosocks5.Failure, nil).Write(conn) gosocks5.NewReply(gosocks5.Failure, nil).Write(conn)
return err return err
} }
if err := gosocks5.NewReply(gosocks5.Succeeded, nil).Write(conn); err != nil { if err := gosocks5.NewReply(gosocks5.Succeeded, nil).Write(conn); err != nil {
glog.V(LINFO).Infof("[udp-connect] %s <- %s : %s", conn.RemoteAddr(), req.Addr, err) glog.V(LINFO).Infof("[udp] %s <- %s : %s", conn.RemoteAddr(), req.Addr, err)
return err return err
} }
glog.V(LINFO).Infof("[udp-connect] %s <-> %s", conn.RemoteAddr(), raddr) glog.V(LINFO).Infof("[udp] %s <-> %s", conn.RemoteAddr(), raddr)
defer glog.V(LINFO).Infof("[udp-connect] %s >-< %s", conn.RemoteAddr(), raddr) defer glog.V(LINFO).Infof("[udp] %s >-< %s", conn.RemoteAddr(), raddr)
for { for {
dgram, err := gosocks5.ReadUDPDatagram(conn) dgram, err := gosocks5.ReadUDPDatagram(conn)
if err != nil { if err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err) glog.V(LWARNING).Infof("[udp] %s -> %s : %s", conn.RemoteAddr(), req.Addr, err)
return err return err
} }
...@@ -295,30 +295,30 @@ func udpConnect(req *gosocks5.Request, conn net.Conn) error { ...@@ -295,30 +295,30 @@ func udpConnect(req *gosocks5.Request, conn net.Conn) error {
relay, err := net.DialUDP("udp", nil, raddr) relay, err := net.DialUDP("udp", nil, raddr)
if err != nil { if err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s -> %s : %s", conn.RemoteAddr(), raddr, err) glog.V(LWARNING).Infof("[udp] %s -> %s : %s", conn.RemoteAddr(), raddr, err)
return return
} }
defer relay.Close() defer relay.Close()
if _, err := relay.Write(dgram.Data); err != nil { if _, err := relay.Write(dgram.Data); err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s -> %s : %s", conn.RemoteAddr(), raddr, err) glog.V(LWARNING).Infof("[udp] %s -> %s : %s", conn.RemoteAddr(), raddr, err)
return return
} }
glog.V(LDEBUG).Infof("[udp-connect] %s >>> %s length: %d", conn.RemoteAddr(), raddr, len(dgram.Data)) glog.V(LDEBUG).Infof("[udp-tun] %s >>> %s length: %d", conn.RemoteAddr(), raddr, len(dgram.Data))
relay.SetReadDeadline(time.Now().Add(time.Second * 60)) relay.SetReadDeadline(time.Now().Add(time.Second * 60))
n, err := relay.Read(b) n, err := relay.Read(b)
if err != nil { if err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s <- %s : %s", conn.RemoteAddr(), raddr, err) glog.V(LWARNING).Infof("[udp] %s <- %s : %s", conn.RemoteAddr(), raddr, err)
return return
} }
relay.SetReadDeadline(time.Time{}) relay.SetReadDeadline(time.Time{})
glog.V(LDEBUG).Infof("[udp-connect] %s <<< %s length: %d", conn.RemoteAddr(), raddr, n) glog.V(LDEBUG).Infof("[udp-tun] %s <<< %s length: %d", conn.RemoteAddr(), raddr, n)
conn.SetWriteDeadline(time.Now().Add(time.Second * 90)) conn.SetWriteDeadline(time.Now().Add(time.Second * 90))
if err := gosocks5.NewUDPDatagram(gosocks5.NewUDPHeader(uint16(n), 0, dgram.Header.Addr), b[:n]).Write(conn); err != nil { if err := gosocks5.NewUDPDatagram(gosocks5.NewUDPHeader(uint16(n), 0, dgram.Header.Addr), b[:n]).Write(conn); err != nil {
glog.V(LWARNING).Infof("[udp-connect] %s <- %s : %s", conn.RemoteAddr(), raddr, err) glog.V(LWARNING).Infof("[udp] %s <- %s : %s", conn.RemoteAddr(), raddr, err)
return return
} }
conn.SetWriteDeadline(time.Time{}) conn.SetWriteDeadline(time.Time{})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment