purgatory/pingtunnel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
esrrhs 2019-10-25 21:57:38 +08:00
parent b0c7bc5949
commit 111b7397d8
2 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
client.go
View File

@ -93,11 +93,12 @@ type Client struct {
} }
type ClientConn struct { type ClientConn struct {
ipaddr *net.UDPAddr ipaddr *net.UDPAddr
tcpaddr *net.TCPAddr tcpaddr *net.TCPAddr
id string id string
activeTime time.Time activeRecvTime time.Time
close bool activeSendTime time.Time
close bool
fm *FrameMgr fm *FrameMgr
} }
@ -208,7 +209,7 @@ func (p *Client) AcceptTcpConn(conn *net.TCPConn) {
fm := NewFrameMgr(p.tcpmode_buffersize, p.tcpmode_maxwin, p.tcpmode_resend_timems) fm := NewFrameMgr(p.tcpmode_buffersize, p.tcpmode_maxwin, p.tcpmode_resend_timems)
now := time.Now() now := time.Now()
clientConn := &ClientConn{tcpaddr: tcpsrcaddr, id: uuid, activeTime: now, close: false, clientConn := &ClientConn{tcpaddr: tcpsrcaddr, id: uuid, activeRecvTime: now, activeSendTime: now, close: false,
fm: fm} fm: fm}
p.localAddrToConnMap[tcpsrcaddr.String()] = clientConn p.localAddrToConnMap[tcpsrcaddr.String()] = clientConn
p.localIdToConnMap[uuid] = clientConn p.localIdToConnMap[uuid] = clientConn
@ -238,7 +239,7 @@ func (p *Client) AcceptTcpConn(conn *net.TCPConn) {
sendlist := clientConn.fm.getSendList() sendlist := clientConn.fm.getSendList()
now := time.Now() now := time.Now()
clientConn.activeTime = now clientConn.activeSendTime = now
for e := sendlist.Front(); e != nil; e = e.Next() { for e := sendlist.Front(); e != nil; e = e.Next() {
@ -275,9 +276,16 @@ func (p *Client) AcceptTcpConn(conn *net.TCPConn) {
clientConn.fm.SkipRecvBuffer(n) clientConn.fm.SkipRecvBuffer(n)
} }
} }
diffrecv := now.Sub(clientConn.activeRecvTime)
diffsend := now.Sub(clientConn.activeSendTime)
if diffrecv > time.Second*(time.Duration(p.timeout)) || diffsend > time.Second*(time.Duration(p.timeout)) {
loggo.Info("close inactive conn %s %s", clientConn.id, clientConn.tcpaddr.String())
break
}
} }
loggo.Info("close inactive conn %s %s", clientConn.id, clientConn.tcpaddr.String()) loggo.Info("close tcp conn %s %s", clientConn.id, clientConn.tcpaddr.String())
conn.Close() conn.Close()
p.Close(clientConn) p.Close(clientConn)
} }
@ -306,13 +314,13 @@ func (p *Client) Accept() error {
clientConn := p.localAddrToConnMap[srcaddr.String()] clientConn := p.localAddrToConnMap[srcaddr.String()]
if clientConn == nil { if clientConn == nil {
uuid := UniqueId() uuid := UniqueId()
clientConn = &ClientConn{ipaddr: srcaddr, id: uuid, activeTime: now, close: false} clientConn = &ClientConn{ipaddr: srcaddr, id: uuid, activeRecvTime: now, activeSendTime: now, close: false}
p.localAddrToConnMap[srcaddr.String()] = clientConn p.localAddrToConnMap[srcaddr.String()] = clientConn
p.localIdToConnMap[uuid] = clientConn p.localIdToConnMap[uuid] = clientConn
loggo.Info("client accept new local udp %s %s", uuid, srcaddr.String()) loggo.Info("client accept new local udp %s %s", uuid, srcaddr.String())
} }
clientConn.activeTime = now clientConn.activeSendTime = now
sendICMP(p.id, p.sequence, *p.conn, p.ipaddrServer, p.targetAddr, clientConn.id, (uint32)(MyMsg_DATA), bytes[:n], sendICMP(p.id, p.sequence, *p.conn, p.ipaddrServer, p.targetAddr, clientConn.id, (uint32)(MyMsg_DATA), bytes[:n],
SEND_PROTO, RECV_PROTO, p.key, SEND_PROTO, RECV_PROTO, p.key,
p.tcpmode, p.tcpmode_buffersize, p.tcpmode_maxwin, p.tcpmode_resend_timems) p.tcpmode, p.tcpmode_buffersize, p.tcpmode_maxwin, p.tcpmode_resend_timems)
@ -357,7 +365,7 @@ func (p *Client) processPacket(packet *Packet) {
addr := clientConn.ipaddr addr := clientConn.ipaddr
now := time.Now() now := time.Now()
clientConn.activeTime = now clientConn.activeRecvTime = now
if p.tcpmode > 0 { if p.tcpmode > 0 {
f := &Frame{} f := &Frame{}
@ -396,8 +404,9 @@ func (p *Client) checkTimeoutConn() {
now := time.Now() now := time.Now()
for _, conn := range p.localIdToConnMap { for _, conn := range p.localIdToConnMap {
diff := now.Sub(conn.activeTime) diffrecv := now.Sub(conn.activeRecvTime)
if diff > time.Second*(time.Duration(p.timeout)) { diffsend := now.Sub(conn.activeSendTime)
if diffrecv > time.Second*(time.Duration(p.timeout)) || diffsend > time.Second*(time.Duration(p.timeout)) {
conn.close = true conn.close = true
} }
} }

43
server.go
View File

@ -33,16 +33,17 @@ type Server struct {
} }
type ServerConn struct { type ServerConn struct {
ipaddrTarget *net.UDPAddr ipaddrTarget *net.UDPAddr
conn *net.UDPConn conn *net.UDPConn
tcpaddrTarget *net.TCPAddr tcpaddrTarget *net.TCPAddr
tcpconn *net.TCPConn tcpconn *net.TCPConn
id string id string
activeTime time.Time activeRecvTime time.Time
close bool activeSendTime time.Time
rproto int close bool
fm *FrameMgr rproto int
tcpmode int fm *FrameMgr
tcpmode int
} }
func (p *Server) Run() { func (p *Server) Run() {
@ -117,7 +118,7 @@ func (p *Server) processPacket(packet *Packet) {
fm := NewFrameMgr((int)(packet.my.TcpmodeBuffersize), (int)(packet.my.TcpmodeMaxwin), (int)(packet.my.TcpmodeResendTimems)) fm := NewFrameMgr((int)(packet.my.TcpmodeBuffersize), (int)(packet.my.TcpmodeMaxwin), (int)(packet.my.TcpmodeResendTimems))
localConn = &ServerConn{tcpconn: targetConn, tcpaddrTarget: ipaddrTarget, id: id, activeTime: now, close: false, localConn = &ServerConn{tcpconn: targetConn, tcpaddrTarget: ipaddrTarget, id: id, activeRecvTime: now, activeSendTime: now, close: false,
rproto: (int)(packet.my.Rproto), fm: fm, tcpmode: (int)(packet.my.Tcpmode)} rproto: (int)(packet.my.Rproto), fm: fm, tcpmode: (int)(packet.my.Tcpmode)}
p.localConnMap[id] = localConn p.localConnMap[id] = localConn
@ -139,7 +140,7 @@ func (p *Server) processPacket(packet *Packet) {
return return
} }
localConn = &ServerConn{conn: targetConn, ipaddrTarget: ipaddrTarget, id: id, activeTime: now, close: false, localConn = &ServerConn{conn: targetConn, ipaddrTarget: ipaddrTarget, id: id, activeRecvTime: now, activeSendTime: now, close: false,
rproto: (int)(packet.my.Rproto), tcpmode: (int)(packet.my.Tcpmode)} rproto: (int)(packet.my.Rproto), tcpmode: (int)(packet.my.Tcpmode)}
p.localConnMap[id] = localConn p.localConnMap[id] = localConn
@ -148,7 +149,7 @@ func (p *Server) processPacket(packet *Packet) {
} }
} }
localConn.activeTime = now localConn.activeRecvTime = now
if packet.my.Type == (int32)(MyMsg_DATA) { if packet.my.Type == (int32)(MyMsg_DATA) {
@ -204,7 +205,7 @@ func (p *Server) RecvTCP(conn *ServerConn, id string, src *net.IPAddr) {
sendlist := conn.fm.getSendList() sendlist := conn.fm.getSendList()
now := time.Now() now := time.Now()
conn.activeTime = now conn.activeSendTime = now
for e := sendlist.Front(); e != nil; e = e.Next() { for e := sendlist.Front(); e != nil; e = e.Next() {
@ -239,6 +240,13 @@ func (p *Server) RecvTCP(conn *ServerConn, id string, src *net.IPAddr) {
conn.fm.SkipRecvBuffer(n) conn.fm.SkipRecvBuffer(n)
} }
} }
diffrecv := now.Sub(conn.activeRecvTime)
diffsend := now.Sub(conn.activeSendTime)
if diffrecv > time.Second*(time.Duration(p.timeout)) || diffsend > time.Second*(time.Duration(p.timeout)) {
loggo.Info("close inactive conn %s %s", conn.id, conn.tcpaddrTarget.String())
break
}
} }
loggo.Info("close tcp conn %s %s", conn.id, conn.tcpaddrTarget.String()) loggo.Info("close tcp conn %s %s", conn.id, conn.tcpaddrTarget.String())
@ -264,7 +272,7 @@ func (p *Server) Recv(conn *ServerConn, id string, src *net.IPAddr) {
} }
now := time.Now() now := time.Now()
conn.activeTime = now conn.activeSendTime = now
sendICMP(p.echoId, p.echoSeq, *p.conn, src, "", id, (uint32)(MyMsg_DATA), bytes[:n], sendICMP(p.echoId, p.echoSeq, *p.conn, src, "", id, (uint32)(MyMsg_DATA), bytes[:n],
conn.rproto, -1, p.key, conn.rproto, -1, p.key,
@ -289,8 +297,9 @@ func (p *Server) checkTimeoutConn() {
if conn.tcpmode > 0 { if conn.tcpmode > 0 {
continue continue
} }
diff := now.Sub(conn.activeTime) diffrecv := now.Sub(conn.activeRecvTime)
if diff > time.Second*(time.Duration(p.timeout)) { diffsend := now.Sub(conn.activeSendTime)
if diffrecv > time.Second*(time.Duration(p.timeout)) || diffsend > time.Second*(time.Duration(p.timeout)) {
conn.close = true conn.close = true
} }
} }