fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-12 21:00:27 +08:00
Code Activity

feat(tcp): add config option dialtimeout

Browse Source
This commit is contained in:
源文雨
2024-07-16 22:16:01 +09:00
parent 739cf863f1
commit 5d04567ec9
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gold/p2p/tcp/init.go
View File

@@ -9,6 +9,7 @@ import (
)
type Config struct {
DialTimeout time.Duration
PeersTimeout time.Duration
ReceiveChannelSize int
}
@@ -28,6 +29,7 @@ func newEndpoint(endpoint string, configs ...any) *EndPoint {
addr: net.TCPAddrFromAddrPort(
netip.MustParseAddrPort(endpoint),
),
dialtimeout: cfg.DialTimeout,
peerstimeout: cfg.PeersTimeout,
recvchansize: cfg.ReceiveChannelSize,
}

24
gold/p2p/tcp/tcp.go
View File

@@ -5,6 +5,7 @@ import (
"io"
"math/rand"
"net"
"reflect"
"strconv"
"time"
@@ -16,6 +17,7 @@ import (
type EndPoint struct {
addr *net.TCPAddr
dialtimeout time.Duration
peerstimeout time.Duration
recvchansize int
}
@@ -45,9 +47,9 @@ func (ep *EndPoint) Listen() (p2p.Conn, error) {
return nil, err
}
ep.addr = lstn.Addr().(*net.TCPAddr)
timeout := ep.peerstimeout
if timeout < time.Second {
timeout = time.Second
peerstimeout := ep.peerstimeout
if peerstimeout < time.Second {
peerstimeout = time.Second
}
chansz := ep.recvchansize
if chansz < 32 {
@@ -56,7 +58,7 @@ func (ep *EndPoint) Listen() (p2p.Conn, error) {
conn := &Conn{
addr: ep,
lstn: lstn,
peers: ttl.NewCacheOn(timeout, [4]func(string, *net.TCPConn){
peers: ttl.NewCacheOn(peerstimeout, [4]func(string, *net.TCPConn){
nil,
nil,
func(s string, t *net.TCPConn) {
@@ -122,6 +124,7 @@ func (conn *Conn) accept() {
continue
}
ep := newEndpoint(tcpconn.RemoteAddr().String(), &Config{
DialTimeout: conn.addr.dialtimeout,
PeersTimeout: conn.addr.peerstimeout,
ReceiveChannelSize: conn.addr.recvchansize,
})
@@ -203,11 +206,22 @@ func (conn *Conn) WriteToPeer(b []byte, ep p2p.EndPoint) (n int, err error) {
}
tcpconn := conn.peers.Get(tcpep.String())
if tcpconn == nil {
dialtimeout := tcpep.dialtimeout
if dialtimeout < time.Second {
dialtimeout = time.Second
}
logrus.Infoln("[tcp] dial to", tcpep.addr, "timeout", dialtimeout)
var cn net.Conn
// must use another port to send because there's no exsiting conn
tcpconn, err = net.DialTCP(tcpep.Network(), nil, tcpep.addr)
cn, err = net.DialTimeout(tcpep.Network(), tcpep.addr.String(), dialtimeout)
if err != nil {
return
}
tcpconn, ok = cn.(*net.TCPConn)
if !ok {
return 0, errors.New("expect *net.TCPConn but got " + reflect.ValueOf(cn).Type().String())
}
logrus.Infoln("[tcp] dial to", tcpep.addr, "success, local:", tcpconn.LocalAddr())
conn.peers.Set(tcpep.String(), tcpconn)
}
cnt, err := io.Copy(tcpconn, &packet{