root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add retry support for TCP port forwarding

Browse Source
This commit is contained in:
ginuerzh 2018-07-08 14:51:37 +08:00
parent 93ac1dc342
commit 18f7ba2b7c
1 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
forward.go
View File

@ -79,25 +79,42 @@ func (h *tcpDirectForwardHandler) Init(options ...HandlerOption) {
func (h *tcpDirectForwardHandler) Handle(conn net.Conn) { func (h *tcpDirectForwardHandler) Handle(conn net.Conn) {
defer conn.Close() defer conn.Close()
node, err := h.group.Next() retries := 1
if err != nil { if h.options.Chain != nil && h.options.Chain.Retries > 0 {
log.Logf("[tcp] %s - %s : %s", conn.RemoteAddr(), h.raddr, err) retries = h.options.Chain.Retries
return }
if h.options.Retries > 0 {
retries = h.options.Retries
} }
log.Logf("[tcp] %s - %s", conn.RemoteAddr(), node.Addr) var cc net.Conn
cc, err := h.options.Chain.Dial(node.Addr, var node Node
RetryChainOption(h.options.Retries), var err error
TimeoutChainOption(h.options.Timeout), for i := 0; i < retries; i++ {
) node, err = h.group.Next()
if err != nil {
log.Logf("[tcp] %s - %s : %s", conn.RemoteAddr(), h.raddr, err)
return
}
log.Logf("[tcp] %s - %s", conn.RemoteAddr(), node.Addr)
cc, err = h.options.Chain.Dial(node.Addr,
RetryChainOption(h.options.Retries),
TimeoutChainOption(h.options.Timeout),
)
if err != nil {
log.Logf("[tcp] %s -> %s : %s", conn.RemoteAddr(), node.Addr, err)
node.MarkDead()
} else {
break
}
}
if err != nil { if err != nil {
log.Logf("[tcp] %s -> %s : %s", conn.RemoteAddr(), node.Addr, err)
node.MarkDead()
return return
} }
defer cc.Close()
node.ResetDead() node.ResetDead()
defer cc.Close()
log.Logf("[tcp] %s <-> %s", conn.RemoteAddr(), node.Addr) log.Logf("[tcp] %s <-> %s", conn.RemoteAddr(), node.Addr)
transport(conn, cc) transport(conn, cc)
@ -248,18 +265,35 @@ func (h *tcpRemoteForwardHandler) Init(options ...HandlerOption) {
func (h *tcpRemoteForwardHandler) Handle(conn net.Conn) { func (h *tcpRemoteForwardHandler) Handle(conn net.Conn) {
defer conn.Close() defer conn.Close()
node, err := h.group.Next() retries := 1
if h.options.Chain != nil && h.options.Chain.Retries > 0 {
retries = h.options.Chain.Retries
}
if h.options.Retries > 0 {
retries = h.options.Retries
}
var cc net.Conn
var node Node
var err error
for i := 0; i < retries; i++ {
node, err = h.group.Next()
if err != nil {
log.Logf("[rtcp] %s - %s : %s", conn.LocalAddr(), h.raddr, err)
return
}
cc, err = net.DialTimeout("tcp", node.Addr, h.options.Timeout)
if err != nil {
log.Logf("[rtcp] %s -> %s : %s", conn.LocalAddr(), node.Addr, err)
node.MarkDead()
} else {
break
}
}
if err != nil { if err != nil {
log.Logf("[rtcp] %s - %s : %s", conn.LocalAddr(), h.raddr, err)
return return
} }
cc, err := net.DialTimeout("tcp", node.Addr, DialTimeout)
if err != nil {
node.MarkDead()
log.Logf("[rtcp] %s -> %s : %s", conn.LocalAddr(), node.Addr, err)
return
}
defer cc.Close() defer cc.Close()
node.ResetDead() node.ResetDead()