dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use half open limit directly from Config

This commit is contained in:
Matt Joiner 2018-07-10 12:23:00 +10:00
parent 1f6ba94882
commit 2685ef6aa9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.go
View File

@ -48,7 +48,6 @@ type Client struct {
config *ClientConfig
logger *log.Logger
halfOpenLimit int
peerID PeerID
defaultStorage *storage.Client
onClose []func()
@ -180,7 +179,6 @@ func NewClient(cfg *ClientConfig) (cl *Client, err error) {
}
}()
cl = &Client{
halfOpenLimit: cfg.HalfOpenConnsPerTorrent,
config: cfg,
dopplegangerAddrs: make(map[string]struct{}),
torrents: make(map[metainfo.Hash]*Torrent),

4
torrent.go
View File

@ -1059,7 +1059,7 @@ func (t *Torrent) maxHalfOpen() int {
extraIncoming := int64(t.numReceivedConns() - t.maxEstablishedConns/2)
// We want to allow some experimentation with new peers, and to try to
// upset an oversupply of received connections.
return int(min(max(5, extraIncoming)+establishedHeadroom, int64(t.cl.halfOpenLimit)))
return int(min(max(5, extraIncoming)+establishedHeadroom, int64(t.cl.config.HalfOpenConnsPerTorrent)))
}
func (t *Torrent) openNewConns() {
@ -1792,5 +1792,5 @@ func (t *Torrent) pieceQueuedForHash(i pieceIndex) bool {
}
func (t *Torrent) dialTimeout() time.Duration {
return reducedDialTimeout(t.cl.config.MinDialTimeout, t.cl.config.NominalDialTimeout, t.cl.halfOpenLimit, t.peers.Len())
return reducedDialTimeout(t.cl.config.MinDialTimeout, t.cl.config.NominalDialTimeout, t.cl.config.HalfOpenConnsPerTorrent, t.peers.Len())
}