Make opentracker HUGE-accesslist-ready. Parse, then sort.

ot_accesslist.c

@@ -23,37 +23,25 @@
 
 /* GLOBAL VARIABLES */
 #ifdef WANT_ACCESSLIST
-char *g_accesslist_filename;
+       char    *g_accesslist_filename;
-static ot_vector accesslist;
+static ot_hash *g_accesslist;
+static size_t   g_accesslist_size;
 
-static void accesslist_reset( void ) {
+static int vector_compare_hash(const void *hash1, const void *hash2 ) {
-  free( accesslist.data );
+  return memcmp( hash1, hash2, OT_HASH_COMPARE_SIZE );
-  byte_zero( &accesslist, sizeof( accesslist ) );
 }
 
 void accesslist_deinit( void ) {
-  accesslist_reset( );
+  free( g_accesslist );
-}
+  g_accesslist = 0;
-
+  g_accesslist_size = 0;
-static int accesslist_addentry( ot_vector *al, ot_hash infohash ) {
-  int eger;
-  void *insert = vector_find_or_insert( al, infohash, OT_HASH_COMPARE_SIZE, OT_HASH_COMPARE_SIZE, &eger );
-
-  if( !insert )
-    return -1;
-
-  memcpy( insert, infohash, OT_HASH_COMPARE_SIZE );
-
-  return 0;
 }
 
 /* Read initial access list */
 static void accesslist_readfile( int sig ) {
-  ot_hash   infohash;
+  ot_hash *info_hash, *accesslist_new = NULL, *accesslist_old;
-  ot_vector accesslist_tmp;
+  char    *map, *map_end, *read_offs;
-  void     *olddata;
+  size_t   maplen;
-  char     *map, *map_end, *read_offs;
-  size_t    maplen;
 
   if( sig != SIGHUP ) return;
 
@@ -64,10 +52,15 @@ static void accesslist_readfile( int sig ) {
     return;
   }
 
-  /* Initialise an empty accesslist vector */
+  /* You need at least 41 bytes to pass an info_hash, make enough room
-  memset( &accesslist_tmp, 0, sizeof(accesslist_tmp));
+     for the maximum amount of them */
+  info_hash = accesslist_new = malloc( ( maplen / 41 ) * 20 );
+  if( !accesslist_new ) {
+    fprintf( stderr, "Warning: Not enough memory to allocate %zd bytes for accesslist buffer. May succeed later.\n", ( maplen / 41 ) * 20 );
+    return;
+  }
   
-  /* No use */
+  /* No use to scan if there's not enough room for another full info_hash */
   map_end = map + maplen - 40;
   read_offs = map;
 
@@ -78,45 +71,45 @@ static void accesslist_readfile( int sig ) {
       int eger = 16 * scan_fromhex( read_offs[ 2*i ] ) + scan_fromhex( read_offs[ 1 + 2*i ] );
       if( eger < 0 )
         continue;
-      infohash[i] = eger;
+      (*info_hash)[i] = eger;
     }
 
     read_offs += 40;
 
     /* Append accesslist to accesslist vector */
     if( scan_fromhex( *read_offs ) < 0 )
-      accesslist_addentry( &accesslist_tmp, infohash );
+      ++info_hash;
 
     /* Find start of next line */
     while( read_offs < map_end && *(read_offs++) != '\n' );
   }
-#ifdef _DEBUG
+//#ifdef _DEBUG
-  fprintf( stderr, "Added %zd info_hashes to accesslist\n", accesslist_tmp.size );
+  fprintf( stderr, "Added %d info_hashes to accesslist\n", info_hash - accesslist_new );
-#endif
+//#endif
 
   mmap_unmap( map, maplen);
 
+  qsort( accesslist_new, info_hash - accesslist_new, sizeof( *info_hash ), vector_compare_hash );
+
   /* Now exchange the accesslist vector in the least race condition prone way */
-  accesslist.size = 0;
+  g_accesslist_size = 0;
-  olddata = accesslist.data;
+  accesslist_old    = g_accesslist;
-  memcpy( &accesslist, &accesslist_tmp, sizeof( &accesslist_tmp ));
+  g_accesslist      = accesslist_new;
-  free( olddata );  
+  g_accesslist_size = info_hash - accesslist_new;
+  free( accesslist_old );  
 }
 
 int accesslist_hashisvalid( ot_hash hash ) {
-  int exactmatch;
+  void *exactmatch = bsearch( hash, g_accesslist, g_accesslist_size, OT_HASH_COMPARE_SIZE, vector_compare_hash );
-  binary_search( hash, accesslist.data, accesslist.size, OT_HASH_COMPARE_SIZE, OT_HASH_COMPARE_SIZE, &exactmatch );
 
 #ifdef WANT_ACCESSLIST_BLACK
-  exactmatch = !exactmatch;
+  return exactmatch == NULL;
+#else
+  return exactmatch != NULL;
 #endif
-
-  return exactmatch;
 }
 
 void accesslist_init( ) {
-  byte_zero( &accesslist, sizeof( accesslist ) );
-
   /* Passing "0" since read_blacklist_file also is SIGHUP handler */
   if( g_accesslist_filename ) {
     accesslist_readfile( SIGHUP );