Changeset 5432

Timestamp:

Mar 29, 2008, 9:05:51 PM (14 years ago)

Author:

charles

Message:

get the blocklist code working & add a unit test for it.

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (2 diffs)
• blocklist-test.c (added)
• blocklist.c (modified) (8 diffs)
• blocklist.h (modified) (1 diff)
• peer-mgr.c (modified) (3 diffs)

trunk/libtransmission/Makefile.am

@@ -79 +79 @@
 
 TESTS = \
+    blocklist-test \
     bencode-test \
     test-fastset \
@@ -96 +97 @@
 bencode_test_SOURCES = bencode-test.c
 bencode_test_LDADD = $(APPS_LDADD)
+blocklist_test_SOURCES = blocklist-test.c
+blocklist_test_LDADD = $(APPS_LDADD)
 test_fastset_SOURCES = test-fastset.c
 test_fastset_LDADD = $(APPS_LDADD)

trunk/libtransmission/blocklist.c

@@ -25 +25 @@
 
 #include "transmission.h"
-#include "net.h" /* inet_aton() */
+#include "internal.h"
+#include "net.h" /* tr_netResolve */
 #include "platform.h" /* tr_getPrefsDirectory() */
 #include "utils.h" /* tr_buildPath() */
 
-static void * blocklist = NULL;
-static size_t blocklistSize = 0;
+struct tr_ip_range
+{
+  uint32_t begin;
+  uint32_t end;
+};
+
+static struct tr_ip_range * blocklist = NULL;
+static size_t blocklistItemCount = 0;
+static size_t blocklistByteCount = 0;
 static int blocklistFd = -1;
 
-static void
-getFilename( char * buf, size_t buflen )
+void
+tr_getBlocklistFilename( char * buf, size_t buflen )
 {
     tr_buildPath( buf, buflen, tr_getPrefsDirectory(), "blocklist", NULL ); 
@@ -44 +52 @@
     if( blocklist )
     {
-        munmap( blocklist, blocklistSize );
+        munmap( blocklist, blocklistByteCount );
         close( blocklistFd );
         blocklist = NULL;
-        blocklistSize = 0;
+        blocklistItemCount = 0;
+        blocklistByteCount = 0;
         blocklistFd  = -1;
     }
@@ -58 +67 @@
     struct stat st;
     char filename[MAX_PATH_LENGTH];
-    getFilename( filename, sizeof( filename ) );
+    tr_getBlocklistFilename( filename, sizeof( filename ) );
 
     closeBlocklist( );
@@ -79 +88 @@
     }
 
-    blocklistSize = st.st_size;
+    blocklistByteCount = st.st_size;
+    blocklistItemCount = blocklistByteCount / sizeof( struct tr_ip_range );
     blocklistFd = fd;
+    tr_inf( _( "Blocklist contains %'d IP ranges" ), blocklistItemCount );
+}
+
+static int
+compareAddressToRange( const void * va, const void * vb )
+{
+    const uint32_t * a = va;
+    const struct tr_ip_range * b = vb;
+    if( *a < b->begin ) return -1;
+    if( *a > b->end ) return 1;
+    return 0;
 }
 
 int
-tr_isInBlocklist( const struct in_addr * addr UNUSED )
-{
-    if( !blocklist )
+tr_peerIsBlocked( tr_handle * handle UNUSED, const struct in_addr * addr )
+{
+    uint32_t needle;
+    const struct tr_ip_range * range;
+
+    if( !blocklist ) {
         loadBlocklist( );
-
-    return FALSE; /* FIXME */
-}
-
+        if( !blocklist )
+            return FALSE;
+    }
+
+    needle = ntohl( addr->s_addr );
+
+    range = bsearch( &needle,
+                     blocklist,
+                     blocklistItemCount,
+                     sizeof( struct tr_ip_range ), 
+                     compareAddressToRange );
+
+    return range != NULL;
+}
 
 static void
@@ -97 +131 @@
 {
     char filename[MAX_PATH_LENGTH];
-    getFilename( filename, sizeof( filename ) );
+    tr_getBlocklistFilename( filename, sizeof( filename ) );
     closeBlocklist( );
     unlink( filename );
@@ -110 +144 @@
     char * line;
     char outfile[MAX_PATH_LENGTH];
+    int lineCount = 0;
 
     if( filename == NULL ) {
@@ -124 +159 @@
     closeBlocklist( );
   
-    getFilename( outfile, sizeof( outfile ) );
-fprintf( stderr, "outfile is [%s]\n", outfile );
+    tr_getBlocklistFilename( outfile, sizeof( outfile ) );
     out = fopen( outfile, "wb+" );
     if( !out ) {
@@ -138 +172 @@
         char * rangeEnd;
         struct in_addr in_addr;
-        uint32_t range[2];
-//fprintf( stderr, "got line [%s]\n", line );
+        struct tr_ip_range range;
 
         rangeBegin = strrchr( line, ':' );
-        if( !rangeBegin ) continue;
+        if( !rangeBegin ) { free(line); continue; }
         ++rangeBegin;
 
         rangeEnd = strchr( rangeBegin, '-' );
-        if( !rangeEnd ) continue;
+        if( !rangeEnd ) { free(line); continue; }
         *rangeEnd++ = '\0';
 
-        //fprintf( stderr, "rangeBegin [%s] rangeEnd [%s]\n", rangeBegin, rangeEnd );
-        if( !inet_aton( rangeBegin, &in_addr ) )
-            fprintf( stderr, "skipping invalid address [%s]\n", rangeBegin );
-        range[0] = ntohl( in_addr.s_addr );
-        if( !inet_aton( rangeEnd, &in_addr ) )
-            fprintf( stderr, "skipping invalid address [%s]\n", rangeEnd );
-        range[1] = ntohl( in_addr.s_addr );
+        if( tr_netResolve( rangeBegin, &in_addr ) )
+            tr_err( "blocklist skipped invalid address [%s]\n", rangeBegin );
+        range.begin = ntohl( in_addr.s_addr );
+
+        if( tr_netResolve( rangeEnd, &in_addr ) )
+            tr_err( "blocklist skipped invalid address [%s]\n", rangeEnd );
+        range.end = ntohl( in_addr.s_addr );
 
         free( line );
 
-        if( fwrite( range, sizeof(uint32_t), 2, out ) != 2 ) {
+        if( fwrite( &range, sizeof(struct tr_ip_range), 1, out ) != 1 ) {
           tr_err( _( "Couldn't save file \"%s\": %s" ), outfile, tr_strerror( errno ) );
           break;
         }
-    }
+
+        ++lineCount;
+    }
+
+    tr_inf( _( "Blocklist updated with %'d IP ranges" ), lineCount );
 
     fclose( out );
     fclose( in );
-}
+
+    loadBlocklist( );
+}

trunk/libtransmission/blocklist.h

@@ -14 +14 @@
 #define TR_BLOCKLIST_H
 
+struct tr_handle;
 struct in_addr;
 
-int tr_isInBlocklist( const struct in_addr * );
+int tr_peerIsBlocked( const struct tr_handle *,
+                      const struct in_addr   * );
 
 #endif

trunk/libtransmission/peer-mgr.c

@@ -22 +22 @@
 
 #include "transmission.h"
+#include "blocklist.h"
 #include "clients.h"
 #include "completion.h"
@@ -1081 +1082 @@
     managerLock( manager );
 
-    if( getExistingHandshake( manager->incomingHandshakes, addr ) )
+    if( tr_peerIsBlocked( manager->handle, addr )
+        || getExistingHandshake( manager->incomingHandshakes, addr ) )
     {
         tr_netClose( socket );
@@ -1865 +1867 @@
         }
 
+        /* Don't connect to peers in our blocklist */
+        if( tr_peerIsBlocked( t->manager->handle, &atom->addr ) )
+            continue;
+
         ret[retCount++] = atom;
     }