Changeset 7740

Timestamp:

Jan 17, 2009, 11:14:35 PM (13 years ago)

Author:

charles

Message:

(trunk libT) discard peers from the tracker or pex that have a port of 0 or a multicast address.

Location:

trunk/libtransmission

Files:

• net.c (modified) (3 diffs)
• net.h (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)

trunk/libtransmission/net.c

@@ -58 +58 @@
     { { { { INADDR_ANY, 0x00, 0x00, 0x00 } } } } }; 
 
-
 #ifdef WIN32
 static const char *
@@ -463 +462 @@
 }
 
+static tr_bool
+isMulticastAddress( const tr_address * addr )
+{
+    if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
+        return TRUE;
+
+    if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] == 0xff ) )
+        return TRUE;
+
+    return FALSE;
+}
+
+tr_bool
+tr_isValidPeerAddress( const tr_address * addr, tr_port port )
+{
+    if( isMulticastAddress( addr ) )
+        return FALSE;
+
+    if( port == 0 )
+        return FALSE;
+
+    return TRUE;
+}
+
 int
 tr_netOpenTCP( tr_session        * session,
@@ -475 +498 @@
     assert( tr_isAddress( addr ) );
 
-    /* don't try to connect to multicast addresses */
-    if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
-        return -EINVAL;
-    if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] == 0xff ) )
+    if( isMulticastAddress( addr ) )
         return -EINVAL;
 

trunk/libtransmission/net.h

@@ -89 +89 @@
 void tr_normalizeV4Mapped( tr_address * const addr );
 
+tr_bool tr_isValidPeerAddress( const tr_address * addr, tr_port port );
+
 void tr_suspectAddress( const tr_address * a, const char * source );
 

trunk/libtransmission/peer-mgr.c

@@ -1316 +1316 @@
 
         if( !tr_sessionIsAddressBlocked( t->manager->session, &pex->addr ) )
-            ensureAtomExists( t, &pex->addr, pex->port, pex->flags, from );
+            if( tr_isValidPeerAddress( &pex->addr, pex->port ) )
+                ensureAtomExists( t, &pex->addr, pex->port, pex->flags, from );
 
         managerUnlock( t->manager );