Changeset 7669

Timestamp:

Jan 11, 2009, 6:10:13 PM (12 years ago)

Author:

jhujhiti

Message:

(1.5x) remove tr_suspectAddress() debugging stuff from 1.5

Location:

branches/1.5x/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) (3 diffs)

branches/1.5x/libtransmission/net.c

@@ -129 +129 @@
 }
 
-void
-tr_suspectAddress( const tr_address * a, const char * source )
-{
-    /* be really aggressive in what we report */
-    if( a->type == TR_AF_INET && !( ntohl( a->addr.addr4.s_addr ) & 0xff000000 ) )
-        tr_err(  "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 && !IN6_IS_ADDR_V4MAPPED( &a->addr.addr6 ) )
-            tr_err(  "Funny looking address %s from %s", tr_ntop_non_ts( a ), source );
-    }
-}
-
 const char * 
 tr_ntop( const tr_address * src, char * dst, int size ) 

branches/1.5x/libtransmission/net.h

@@ -89 +89 @@
 void tr_normalizeV4Mapped( tr_address * const addr );
 
-void tr_suspectAddress( const tr_address * a, const char * source );
-
 static TR_INLINE tr_bool tr_isAddress( const tr_address * a ) { return ( a != NULL ) && ( a->type==TR_AF_INET || a->type==TR_AF_INET6 ); }
 

branches/1.5x/libtransmission/peer-mgr.c

@@ -1397 +1397 @@
     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;

branches/1.5x/libtransmission/peer-msgs.c

@@ -1981 +1981 @@
             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;
@@ -2012 +2011 @@
             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;

branches/1.5x/libtransmission/tracker.c

@@ -260 +260 @@
         memcpy( &addr.addr.addr4, compactWalk, 4 );
         memcpy( &port, compactWalk + 4, 2 );
-        tr_suspectAddress( &addr, "compact" );
         
         memcpy( walk, &addr, sizeof( addr ) );
@@ -292 +291 @@
         memcpy( &addr.addr.addr6, compactWalk, 16 );
         memcpy( &port, compactWalk + 16, 2 );
-        tr_suspectAddress( &addr, "compact6" );
         
         memcpy( walk, &addr, sizeof( addr ) );
@@ -370 +368 @@
 
         memcpy( walk, &addr, sizeof( tr_address ) );
-        tr_suspectAddress( &addr, "old tracker" );
         port = htons( itmp );
         memcpy( walk + sizeof( tr_address ), &port, 2 );