Changeset 7448

Timestamp:

Dec 21, 2008, 7:13:52 PM (12 years ago)

Author:

jhujhiti

Message:

add some debugging stuff to track down where some bogus addresses are coming from

Location:

trunk/libtransmission

Files:

• net.c (modified) (1 diff)
• net.h (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)
• peer-msgs.c (modified) (2 diffs)
• tracker.c (modified) (4 diffs)

trunk/libtransmission/net.c

@@ -69 +69 @@
 }
 
+void
+tr_suspectAddress( const tr_address * a, const char * source )
+{
+    /* be really aggressive in what we report */
+    if( a->type == TR_AF_INET && !( a->addr.addr4.s_addr & 0xff000000 ) )
+        tr_dbg(  "Funny looking address %s from %s", tr_ntop_non_ts( a ), source );
+    /* /16s taken from ipv6 rib on 21 dec, 2008 */
+    /* this is really, really ugly. expedience over quality */
+    if( a->type == TR_AF_INET6 )
+    {
+        uint16_t slash16;
+        uint16_t valid[] = { 0x339, 0x2002, 0x2003, 0x2400, 0x2401, 0x2402,
+            0x2403, 0x2404, 0x2405, 0x2406, 0x2407, 0x2600, 0x2607, 0x2610,
+            0x2620, 0x2800, 0x2801, 0x2a00, 0x2a01, 0x0a02, 0x2001, 0x0000 };
+        uint16_t *p;
+        tr_bool good = FALSE;
+        p = valid;
+        memcpy( &slash16, &a->addr, 2 );
+        slash16 = ntohs( slash16 );
+        while( *p )
+        {
+            if( slash16 == *p )
+                good = TRUE;
+            p++;
+        }
+        if( !good )
+            tr_dbg(  "Funny looking address %s from %s", tr_ntop_non_ts( a ), source );
+    }
+}
+
 tr_bool
 tr_isAddress( const tr_address * a )

trunk/libtransmission/net.h

@@ -86 +86 @@
 void tr_normalizeV4Mapped( tr_address * const addr );
 
+void tr_suspectAddress( const tr_address * a, const char * source );
 tr_bool tr_isAddress( const tr_address * a );
 

trunk/libtransmission/peer-mgr.c

@@ -1433 +1433 @@
     for( i = 0 ; i < n ; i++ ) {
         memcpy( &pex[i].addr, walk, sizeof( tr_address ) );
+        tr_suspectAddress( &pex[i].addr, "tracker"  );
         memcpy( &pex[i].port, walk + sizeof( tr_address ), 2 );
         pex[i].flags = 0x00;

trunk/libtransmission/peer-msgs.c

@@ -2103 +2103 @@
             for( i = 0; i < diffs.addedCount; ++i )
             {
+                tr_suspectAddress( &diffs.added[i].addr, "pex" );
                 memcpy( walk, &diffs.added[i].addr.addr, 4 ); walk += 4;
                 memcpy( walk, &diffs.added[i].port, 2 ); walk += 2;
@@ -2133 +2134 @@
             for( i = 0; i < diffs6.addedCount; ++i )
             {
+                tr_suspectAddress( &diffs6.added[i].addr, "pex6" );
                 memcpy( walk, &diffs6.added[i].addr.addr.addr6.s6_addr, 16 );
                 walk += 16;

trunk/libtransmission/tracker.c

@@ -261 +261 @@
         memcpy( &addr.addr.addr4, compactWalk, 4 );
         memcpy( &port, compactWalk + 4, 2 );
+        tr_suspectAddress( &addr, "compact" );
         
         memcpy( walk, &addr, sizeof( addr ) );
@@ -292 +293 @@
         memcpy( &addr.addr.addr6, compactWalk, 16 );
         memcpy( &port, compactWalk + 16, 2 );
+        tr_suspectAddress( &addr, "compact6" );
         
         memcpy( walk, &addr, sizeof( addr ) );
@@ -356 +358 @@
         int64_t      itmp;
         tr_address   addr;
-        tr_port    port;
-        tr_benc *    peer = &bePeers->val.l.vals[i];
+        tr_port      port;
+        tr_benc    * peer = &bePeers->val.l.vals[i];
 
         if( tr_bencDictFindStr( peer, "ip", &s ) )
@@ -369 +371 @@
 
         memcpy( walk, &addr, sizeof( tr_address ) );
+        tr_suspectAddress( &addr, "old tracker" );
         port = htons( itmp );
         memcpy( walk + sizeof( tr_address ), &port, 2 );