Ability to override fifos/

[btrtrc.git] / pexconn.go

diff --git a/pexconn.go b/pexconn.go
index e70ed105de502f3aec81a4dd8776dec280d3e588..d0308f756db44ddc9d134842f7f85ed5521fa529 100644 (file)
--- a/pexconn.go
+++ b/pexconn.go
@@ -18,7 +18,7 @@ const (
 type pexConnState struct {
        enabled bool
        xid     pp.ExtensionNumber
-       seq     int
+       last    *pexEvent
        timer   *time.Timer
        gate    chan struct{}
        readyfn func()
@@ -39,10 +39,10 @@ func (s *pexConnState) Init(c *PeerConn) {
                return
        }
        s.xid = xid
-       s.seq = 0
+       s.last = nil
        s.torrent = c.t
-       s.info = c.t.cl.logger
-       s.dbg = c.logger
+       s.info = c.t.cl.logger.WithDefaultLevel(log.Info)
+       s.dbg = c.logger.WithDefaultLevel(log.Debug)
        s.readyfn = c.tickleWriter
        s.gate = make(chan struct{}, 1)
        s.timer = time.AfterFunc(0, func() {
@@ -59,12 +59,12 @@ func (s *pexConnState) sched(delay time.Duration) {
 
 // generate next PEX message for the peer; returns nil if nothing yet to send
 func (s *pexConnState) genmsg() *pp.PexMsg {
-       tx, seq := s.torrent.pex.Genmsg(s.seq)
+       tx, last := s.torrent.pex.Genmsg(s.last)
        if tx.Len() == 0 {
                return nil
        }
-       s.seq = seq
-       return tx
+       s.last = last
+       return &tx
 }
 
 // Share is called from the writer goroutine if when it is woken up with the write buffers empty
@@ -88,6 +88,15 @@ func (s *pexConnState) Share(postfn messageWriter) bool {
 
 // Recv is called from the reader goroutine
 func (s *pexConnState) Recv(payload []byte) error {
+       if !s.torrent.wantPeers() {
+               s.dbg.Printf("peer reserve ok, incoming PEX discarded")
+               return nil
+       }
+       if time.Now().Before(s.torrent.pex.rest) {
+               s.dbg.Printf("in cooldown period, incoming PEX discarded")
+               return nil
+       }
+
        rx, err := pp.LoadPexMsg(payload)
        if err != nil {
                return fmt.Errorf("error unmarshalling PEX message: %s", err)
@@ -96,12 +105,14 @@ func (s *pexConnState) Recv(payload []byte) error {
        torrent.Add("pex added peers received", int64(len(rx.Added)))
        torrent.Add("pex added6 peers received", int64(len(rx.Added6)))
 
-       var peers Peers
+       var peers peerInfos
        peers.AppendFromPex(rx.Added6, rx.Added6Flags)
        peers.AppendFromPex(rx.Added, rx.AddedFlags)
        s.dbg.Printf("adding %d peers from PEX", len(peers))
-       s.torrent.addPeers(peers)
-       // s.dbg.Print("known swarm now:", s.torrent.KnownSwarm())
+       if len(peers) > 0 {
+               s.torrent.pex.rest = time.Now().Add(pexInterval)
+               s.torrent.addPeers(peers)
+       }
 
        // one day we may also want to:
        // - check if the peer is not flooding us with PEX updates