// Returns nil connection and nil error if no connection could be established for valid reasons.
func (cl *Client) dialAndCompleteHandshake(opts outgoingConnOpts) (c *PeerConn, err error) {
- err = cl.config.DialRateLimiter.Wait(context.Background())
- if err != nil {
- return
+ // It would be better if dial rate limiting could be tested when considering to open connections
+ // instead. Doing it here means if the limit is low, and the half-open limit is high, we could
+ // end up with lots of outgoing connection attempts pending that were initiated on stale data.
+ {
+ dialReservation := cl.config.DialRateLimiter.Reserve()
+ if !opts.receivedHolepunchConnect {
+ if !dialReservation.OK() {
+ err = errors.New("can't make dial limit reservation")
+ return
+ }
+ time.Sleep(dialReservation.Delay())
+ }
}
torrent.Add("establish outgoing connection", 1)
addr := opts.peerInfo.Addr
}
return nil
case utHolepunch.Connect:
+ t.logger.Printf("got holepunch connect request for %v from %p", msg.AddrPort, sender)
opts := outgoingConnOpts{
peerInfo: PeerInfo{
Addr: msg.AddrPort,
qt "github.com/frankban/quicktest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "golang.org/x/time/rate"
"github.com/anacrolix/torrent/internal/testutil"
)
cfg.DisablePEX = true
cfg.Debug = true
cfg.AcceptPeerConnections = false
- // Listening, even without accepting, still means the leecher-leecher completes the dial to the seeder, and so it
- // won't attempt to holepunch.
+ // Listening, even without accepting, still means the leecher-leecher completes the dial to the
+ // seeder, and so it won't attempt to holepunch.
cfg.DisableTCP = true
+ // Ensure that responding to holepunch connects don't wait around for the dial limit. We also
+ // have to allow the initial connection to the leecher though, so it can rendezvous for us.
+ cfg.DialRateLimiter = rate.NewLimiter(0, 1)
seeder, err := NewClient(cfg)
require.NoError(t, err)
defer seeder.Close()
cfg.Seed = false
cfg.DataDir = t.TempDir()
cfg.MaxAllocPeerRequestDataPerConn = 4
- cfg.Debug = true
+ //cfg.Debug = true
cfg.NominalDialTimeout = time.Second
//cfg.DisableUTP = true
leecherLeecher, _ := NewClient(cfg)