X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=client.go;h=6a82774e7a0d5cf8f0fa4b265161de1076a40609;hb=0b6209062d730cbbda0bb66391089f5c2b0e8084;hp=95c21aabb7576333b80cdbd9b4d3a2cef71b0460;hpb=a11739a667be8c5bfaad2cf73417eba0e9adab2c;p=btrtrc.git

diff --git a/client.go b/client.go
index 95c21aab..6a82774e 100644
--- a/client.go
+++ b/client.go
@@ -91,9 +91,7 @@ type Client struct {
 	activeAnnounceLimiter limiter.Instance
 	httpClient            *http.Client
 
-	undialableWithoutHolepunch                                   map[netip.AddrPort]struct{}
-	undialableWithoutHolepunchDialAttemptedAfterHolepunchConnect map[netip.AddrPort]struct{}
-	dialableOnlyAfterHolepunch                                   map[netip.AddrPort]struct{}
+	clientHolepunchAddrSets
 }
 
 type ipStr string
@@ -520,6 +518,20 @@ func (cl *Client) acceptConnections(l Listener) {
 			log.Fmsg("error accepting connection: %s", err).LogLevel(log.Debug, cl.logger)
 			continue
 		}
+		{
+			holepunchAddr, holepunchErr := addrPortFromPeerRemoteAddr(conn.RemoteAddr())
+			if holepunchErr == nil {
+				cl.lock()
+				if g.MapContains(
+					cl.undialableWithoutHolepunchDialedAfterHolepunchConnect,
+					holepunchAddr,
+				) {
+					g.MakeMapIfNil(&cl.probablyOnlyConnectedDueToHolepunch)
+					g.MapInsert(cl.probablyOnlyConnectedDueToHolepunch, holepunchAddr, struct{}{})
+				}
+				cl.unlock()
+			}
+		}
 		go func() {
 			if reject != nil {
 				torrent.Add("rejected accepted connections", 1)
@@ -738,12 +750,16 @@ func (cl *Client) dialAndCompleteHandshake(opts outgoingConnOpts) (c *PeerConn,
 		}
 	}
 	holepunchAddr, holepunchAddrErr := addrPortFromPeerRemoteAddr(addr)
-	if holepunchAddrErr == nil && g.MapContains(cl.undialableWithoutHolepunch, holepunchAddr) && opts.receivedHolepunchConnect {
-		g.MakeMapIfNilAndSet(
-			&cl.undialableWithoutHolepunchDialAttemptedAfterHolepunchConnect,
-			holepunchAddr,
-			struct{}{},
-		)
+	if holepunchAddrErr == nil && opts.receivedHolepunchConnect {
+		cl.lock()
+		if g.MapContains(cl.undialableWithoutHolepunch, holepunchAddr) {
+			g.MakeMapIfNilAndSet(
+				&cl.undialableWithoutHolepunchDialedAfterHolepunchConnect,
+				holepunchAddr,
+				struct{}{},
+			)
+		}
+		cl.unlock()
 	}
 	headerObfuscationPolicy := opts.HeaderObfuscationPolicy
 	obfuscatedHeaderFirst := headerObfuscationPolicy.Preferred
@@ -751,18 +767,24 @@ func (cl *Client) dialAndCompleteHandshake(opts outgoingConnOpts) (c *PeerConn,
 	if firstDialResult.Conn == nil {
 		// No dialers worked. Try to initiate a holepunching rendezvous.
 		if holepunchAddrErr == nil {
+			cl.lock()
 			if !opts.receivedHolepunchConnect {
-				cl.lock()
 				g.MakeMapIfNilAndSet(&cl.undialableWithoutHolepunch, holepunchAddr, struct{}{})
-				cl.unlock()
 			}
 			opts.t.startHolepunchRendezvous(holepunchAddr)
+			cl.unlock()
 		}
 		err = fmt.Errorf("all initial dials failed")
 		return
 	}
-	if opts.receivedHolepunchConnect && holepunchAddrErr == nil && g.MapContains(cl.undialableWithoutHolepunch, holepunchAddr) {
-		g.MakeMapIfNilAndSet(&cl.dialableOnlyAfterHolepunch, holepunchAddr, struct{}{})
+	if opts.receivedHolepunchConnect && holepunchAddrErr == nil {
+		cl.lock()
+		if g.MapContains(cl.undialableWithoutHolepunch, holepunchAddr) {
+			g.MakeMapIfNilAndSet(&cl.dialableOnlyAfterHolepunch, holepunchAddr, struct{}{})
+		}
+		g.MakeMapIfNil(&cl.dialedSuccessfullyAfterHolepunchConnect)
+		g.MapInsert(cl.dialedSuccessfullyAfterHolepunchConnect, holepunchAddr, struct{}{})
+		cl.unlock()
 	}
 	c, err = doProtocolHandshakeOnDialResult(
 		opts.t,
@@ -1746,13 +1768,3 @@ func (cl *Client) Stats() ClientStats {
 	defer cl.rUnlock()
 	return cl.statsLocked()
 }
-
-func (cl *Client) statsLocked() (stats ClientStats) {
-	stats.ConnStats = cl.connStats.Copy()
-	stats.ActiveHalfOpenAttempts = cl.numHalfOpen
-	stats.NumPeersUndialableWithoutHolepunchDialedAfterHolepunchConnect =
-		len(cl.undialableWithoutHolepunchDialAttemptedAfterHolepunchConnect)
-	stats.NumPeersDialableOnlyAfterHolepunch =
-		len(cl.dialableOnlyAfterHolepunch)
-	return
-}