1 files changed, 130 insertions, 112 deletions

diff --git a/ot_vector.c b/ot_vector.c
index 2a632b2..2bc07b5 100644
--- a/ot_vector.c
+++ b/ot_vector.c
@@ -4,39 +4,37 @@
    $id$ */
 
 /* System */
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <stdint.h>
 
 /* Opentracker */
 #include "trackerlogic.h"
-#include "ot_vector.h"
 
 /* Libowfat */
-#include "uint32.h"
 #include "uint16.h"
+#include "uint32.h"
 
-static int vector_compare_peer(const void *peer1, const void *peer2 ) {
-  return memcmp( peer1, peer2, OT_PEER_COMPARE_SIZE );
-}
+static int vector_compare_peer6(const void *peer1, const void *peer2) { return memcmp(peer1, peer2, OT_PEER_COMPARE_SIZE6); }
+static int vector_compare_peer4(const void *peer1, const void *peer2) { return memcmp(peer1, peer2, OT_PEER_COMPARE_SIZE4); }
 
 /* This function gives us a binary search that returns a pointer, even if
    no exact match is found. In that case it sets exactmatch 0 and gives
    calling functions the chance to insert data
 */
-void *binary_search( const void * const key, const void * base, const size_t member_count, const size_t member_size,
-                     size_t compare_size, int *exactmatch ) {
+void *binary_search(const void *const key, const void *base, const size_t member_count, const size_t member_size, size_t compare_size, int *exactmatch) {
   size_t interval = member_count;
 
-  while( interval ) {
-    uint8_t *lookat = ((uint8_t*)base) + member_size * ( interval / 2 );
-    int cmp = memcmp( lookat, key, compare_size );
-    if(cmp == 0 ) {
+  while (interval) {
+    uint8_t *lookat = ((uint8_t *)base) + member_size * (interval / 2);
+    int      cmp    = memcmp(lookat, key, compare_size);
+    if (cmp == 0) {
       base = lookat;
       break;
     }
-    if(cmp < 0) {
+    if (cmp < 0) {
       base = lookat + member_size;
       interval--;
     }
@@ -44,13 +42,14 @@ void *binary_search( const void * const key, const void * base, const size_t mem
   }
 
   *exactmatch = interval;
-  return (void*)base;
+  return (void *)base;
 }
 
-static uint8_t vector_hash_peer( ot_peer *peer, int bucket_count ) {
-  unsigned int hash = 5381, i = OT_PEER_COMPARE_SIZE;
-  uint8_t *p = (uint8_t*)peer;
-  while( i-- ) hash += (hash<<5) + *(p++);
+static uint8_t vector_hash_peer(ot_peer const *peer, size_t compare_size, int bucket_count) {
+  unsigned int hash = 5381;
+  uint8_t     *p    = (uint8_t *)peer;
+  while (compare_size--)
+    hash += (hash << 5) + *(p++);
   return hash % bucket_count;
 }
 
@@ -61,48 +60,62 @@ static uint8_t vector_hash_peer( ot_peer *peer, int bucket_count ) {
    if it wasn't found in vector. Caller needs to check the passed "exactmatch" variable to see, whether an insert
    took place. If resizing the vector failed, NULL is returned, else the pointer to the object in vector.
 */
-void *vector_find_or_insert( ot_vector *vector, void *key, size_t member_size, size_t compare_size, int *exactmatch ) {
-  uint8_t *match = binary_search( key, vector->data, vector->size, member_size, compare_size, exactmatch );
+void *vector_find_or_insert(ot_vector *vector, void *key, size_t member_size, size_t compare_size, int *exactmatch) {
+  uint8_t *match = binary_search(key, vector->data, vector->size, member_size, compare_size, exactmatch);
 
-  if( *exactmatch ) return match;
+  if (*exactmatch)
+    return match;
 
-  if( vector->size + 1 > vector->space ) {
+  if (vector->size + 1 > vector->space) {
     size_t   new_space = vector->space ? OT_VECTOR_GROW_RATIO * vector->space : OT_VECTOR_MIN_MEMBERS;
-    uint8_t *new_data = realloc( vector->data, new_space * member_size );
-    if( !new_data ) return NULL;
+    uint8_t *new_data  = realloc(vector->data, new_space * member_size);
+    if (!new_data)
+      return NULL;
     /* Adjust pointer if it moved by realloc */
-    match = new_data + (match - (uint8_t*)vector->data);
+    match         = new_data + (match - (uint8_t *)vector->data);
 
-    vector->data = new_data;
+    vector->data  = new_data;
     vector->space = new_space;
   }
-  memmove( match + member_size, match, ((uint8_t*)vector->data) + member_size * vector->size - match );
+  memmove(match + member_size, match, ((uint8_t *)vector->data) + member_size * vector->size - match);
 
   vector->size++;
   return match;
 }
 
-ot_peer *vector_find_or_insert_peer( ot_vector *vector, ot_peer *peer, int *exactmatch ) {
-  ot_peer *match;
+ot_peer *vector_find_or_insert_peer(ot_vector *vector, ot_peer const *peer, size_t peer_size, int *exactmatch) {
+  ot_peer     *match, *end;
+  const size_t compare_size = OT_PEER_COMPARE_SIZE_FROM_PEER_SIZE(peer_size);
+  size_t       match_to_end;
 
   /* If space is zero but size is set, we're dealing with a list of vector->size buckets */
-  if( vector->space < vector->size )
-    vector = ((ot_vector*)vector->data) + vector_hash_peer(peer, vector->size );
-  match = (ot_peer*)binary_search( peer, vector->data, vector->size, sizeof(ot_peer), OT_PEER_COMPARE_SIZE, exactmatch );
+  if (vector->space < vector->size)
+    vector = ((ot_vector *)vector->data) + vector_hash_peer(peer, compare_size, vector->size);
+  match = binary_search(peer, vector->data, vector->size, peer_size, compare_size, exactmatch);
 
-  if( *exactmatch ) return match;
+  if (*exactmatch)
+    return match;
 
-  if( vector->size + 1 > vector->space ) {
-    size_t   new_space = vector->space ? OT_VECTOR_GROW_RATIO * vector->space : OT_VECTOR_MIN_MEMBERS;
-    ot_peer *new_data = realloc( vector->data, new_space * sizeof(ot_peer) );
-    if( !new_data ) return NULL;
+  /* This is the amount of bytes that needs to be pushed backwards by peer_size bytes to make room for new peer */
+  end          = (ot_peer *)vector->data + vector->size * peer_size;
+  match_to_end = end - match;
+
+  if (vector->size + 1 > vector->space) {
+    ptrdiff_t offset    = match - (ot_peer *)vector->data;
+    size_t    new_space = vector->space ? OT_VECTOR_GROW_RATIO * vector->space : OT_VECTOR_MIN_MEMBERS;
+    ot_peer  *new_data  = realloc(vector->data, new_space * peer_size);
+
+    if (!new_data)
+      return NULL;
     /* Adjust pointer if it moved by realloc */
-    match = new_data + (match - (ot_peer*)vector->data);
+    match         = new_data + offset;
 
-    vector->data = new_data;
+    vector->data  = new_data;
     vector->space = new_space;
   }
-  memmove( match + 1, match, sizeof(ot_peer) * ( ((ot_peer*)vector->data) + vector->size - match ) );
+
+  /* Here we're guaranteed to have enough space in vector to move the block of peers after insertion point */
+  memmove(match + peer_size, match, match_to_end);
 
   vector->size++;
   return match;
@@ -113,126 +126,134 @@ ot_peer *vector_find_or_insert_peer( ot_vector *vector, ot_peer *peer, int *exac
               1 if a non-seeding peer was removed
               2 if a seeding peer was removed
 */
-int vector_remove_peer( ot_vector *vector, ot_peer *peer ) {
-  int      exactmatch;
+int vector_remove_peer(ot_vector *vector, ot_peer const *peer, size_t peer_size) {
+  int      exactmatch, was_seeder;
   ot_peer *match, *end;
+  size_t   compare_size = OT_PEER_COMPARE_SIZE_FROM_PEER_SIZE(peer_size);
 
-  if( !vector->size ) return 0;
+  if (!vector->size)
+    return 0;
 
   /* If space is zero but size is set, we're dealing with a list of vector->size buckets */
-  if( vector->space < vector->size )
-    vector = ((ot_vector*)vector->data) + vector_hash_peer(peer, vector->size );
+  if (vector->space < vector->size)
+    vector = ((ot_vector *)vector->data) + vector_hash_peer(peer, compare_size, vector->size);
 
-  end = ((ot_peer*)vector->data) + vector->size;
-  match = (ot_peer*)binary_search( peer, vector->data, vector->size, sizeof(ot_peer), OT_PEER_COMPARE_SIZE, &exactmatch );
-  if( !exactmatch ) return 0;
+  end   = ((ot_peer *)vector->data) + peer_size * vector->size;
+  match = (ot_peer *)binary_search(peer, vector->data, vector->size, peer_size, compare_size, &exactmatch);
+  if (!exactmatch)
+    return 0;
 
-  exactmatch = ( OT_PEERFLAG( match ) & PEER_FLAG_SEEDING ) ? 2 : 1;
-  memmove( match, match + 1, sizeof(ot_peer) * ( end - match - 1 ) );
+  was_seeder = (OT_PEERFLAG_D(match, peer_size) & PEER_FLAG_SEEDING) ? 2 : 1;
+  memmove(match, match + peer_size, end - match - peer_size);
 
   vector->size--;
-  vector_fixup_peers( vector );
-  return exactmatch;
+  vector_fixup_peers(vector, peer_size);
+  return was_seeder;
 }
 
-void vector_remove_torrent( ot_vector *vector, ot_torrent *match ) {
-  ot_torrent *end = ((ot_torrent*)vector->data) + vector->size;
+void vector_remove_torrent(ot_vector *vector, ot_torrent *match) {
+  ot_torrent *end = ((ot_torrent *)vector->data) + vector->size;
 
-  if( !vector->size ) return;
+  if (!vector->size)
+    return;
 
   /* If this is being called after a unsuccessful malloc() for peer_list
      in add_peer_to_torrent, match->peer_list actually might be NULL */
-  if( match->peer_list) free_peerlist( match->peer_list );
+  free_peerlist(match->peer_list6);
+  free_peerlist(match->peer_list4);
 
-  memmove( match, match + 1, sizeof(ot_torrent) * ( end - match - 1 ) );
-  if( ( --vector->size * OT_VECTOR_SHRINK_THRESH < vector->space ) && ( vector->space >= OT_VECTOR_SHRINK_RATIO * OT_VECTOR_MIN_MEMBERS ) ) {
+  memmove(match, match + 1, sizeof(ot_torrent) * (end - match - 1));
+  if ((--vector->size * OT_VECTOR_SHRINK_THRESH < vector->space) && (vector->space >= OT_VECTOR_SHRINK_RATIO * OT_VECTOR_MIN_MEMBERS)) {
     vector->space /= OT_VECTOR_SHRINK_RATIO;
-    vector->data = realloc( vector->data, vector->space * sizeof( ot_torrent ) );
+    vector->data   = realloc(vector->data, vector->space * sizeof(ot_torrent));
   }
 }
 
-void vector_clean_list( ot_vector * vector, int num_buckets ) {
-  while( num_buckets-- )
-    free( vector[num_buckets].data );
-  free( vector );
+void vector_clean_list(ot_vector *vector, int num_buckets) {
+  while (num_buckets--)
+    free(vector[num_buckets].data);
+  free(vector);
   return;
 }
 
-void vector_redistribute_buckets( ot_peerlist * peer_list ) {
-  int tmp, bucket, bucket_size_new, num_buckets_new, num_buckets_old = 1;
-  ot_vector * bucket_list_new, * bucket_list_old = &peer_list->peers;
+void vector_redistribute_buckets(ot_peerlist *peer_list, size_t peer_size) {
+  int        tmp, bucket, bucket_size_new, num_buckets_new, num_buckets_old = 1;
+  ot_vector *bucket_list_new, *bucket_list_old = &peer_list->peers;
+  int (*sort_func)(const void *, const void *) = peer_size == OT_PEER_SIZE6 ? &vector_compare_peer6 : &vector_compare_peer4;
 
-  if( OT_PEERLIST_HASBUCKETS( peer_list ) ) {
+  if (OT_PEERLIST_HASBUCKETS(peer_list)) {
     num_buckets_old = peer_list->peers.size;
     bucket_list_old = peer_list->peers.data;
   }
 
-  if( peer_list->peer_count < 255 )
+  if (peer_list->peer_count < 255)
     num_buckets_new = 1;
-  else if( peer_list->peer_count > 8192 )
+  else if (peer_list->peer_count > 8192)
     num_buckets_new = 64;
-  else if( peer_list->peer_count >= 512 && peer_list->peer_count < 4096 )
+  else if (peer_list->peer_count >= 512 && peer_list->peer_count < 4096)
     num_buckets_new = 16;
-  else if( peer_list->peer_count < 512 && num_buckets_old <= 16 )
+  else if (peer_list->peer_count < 512 && num_buckets_old <= 16)
     num_buckets_new = num_buckets_old;
-  else if( peer_list->peer_count < 512 )
+  else if (peer_list->peer_count < 512)
     num_buckets_new = 1;
-  else if( peer_list->peer_count < 8192 && num_buckets_old > 1 )
+  else if (peer_list->peer_count < 8192 && num_buckets_old > 1)
     num_buckets_new = num_buckets_old;
   else
     num_buckets_new = 16;
 
-  if( num_buckets_new == num_buckets_old )
+  if (num_buckets_new == num_buckets_old)
     return;
 
   /* Assume near perfect distribution */
-  bucket_list_new = malloc( num_buckets_new * sizeof( ot_vector ) );
-  if( !bucket_list_new) return;
-  bzero( bucket_list_new, num_buckets_new * sizeof( ot_vector ) );
+  bucket_list_new = malloc(num_buckets_new * sizeof(ot_vector));
+  if (!bucket_list_new)
+    return;
+  bzero(bucket_list_new, num_buckets_new * sizeof(ot_vector));
 
-  tmp = peer_list->peer_count / num_buckets_new;
+  tmp             = peer_list->peer_count / num_buckets_new;
   bucket_size_new = OT_VECTOR_MIN_MEMBERS;
-  while( bucket_size_new < tmp)
+  while (bucket_size_new < tmp)
     bucket_size_new *= OT_VECTOR_GROW_RATIO;
 
   /* preallocate vectors to hold all peers */
-  for( bucket=0; bucket<num_buckets_new; ++bucket ) {
+  for (bucket = 0; bucket < num_buckets_new; ++bucket) {
     bucket_list_new[bucket].space = bucket_size_new;
-    bucket_list_new[bucket].data  = malloc( bucket_size_new * sizeof(ot_peer) );
-    if( !bucket_list_new[bucket].data )
-      return vector_clean_list( bucket_list_new, num_buckets_new );
+    bucket_list_new[bucket].data  = malloc(bucket_size_new * peer_size);
+    if (!bucket_list_new[bucket].data)
+      return vector_clean_list(bucket_list_new, num_buckets_new);
   }
 
   /* Now sort them into the correct bucket */
-  for( bucket=0; bucket<num_buckets_old; ++bucket ) {
-    ot_peer * peers_old = bucket_list_old[bucket].data, * peers_new;
-    int peer_count_old = bucket_list_old[bucket].size;
-    while( peer_count_old-- ) {
-      ot_vector * bucket_dest = bucket_list_new;
-      if( num_buckets_new > 1 )
-        bucket_dest += vector_hash_peer(peers_old, num_buckets_new);
-      if( bucket_dest->size + 1 > bucket_dest->space ) {
-        void * tmp = realloc( bucket_dest->data, sizeof(ot_peer) * OT_VECTOR_GROW_RATIO * bucket_dest->space );
-        if( !tmp ) return vector_clean_list( bucket_list_new, num_buckets_new );
+  for (bucket = 0; bucket < num_buckets_old; ++bucket) {
+    ot_peer *peers_old      = bucket_list_old[bucket].data;
+    int      peer_count_old = bucket_list_old[bucket].size;
+    while (peer_count_old--) {
+      ot_vector *bucket_dest = bucket_list_new;
+      if (num_buckets_new > 1)
+        bucket_dest += vector_hash_peer(peers_old, OT_PEER_COMPARE_SIZE_FROM_PEER_SIZE(peer_size), num_buckets_new);
+      if (bucket_dest->size + 1 > bucket_dest->space) {
+        void *tmp = realloc(bucket_dest->data, peer_size * OT_VECTOR_GROW_RATIO * bucket_dest->space);
+        if (!tmp)
+          return vector_clean_list(bucket_list_new, num_buckets_new);
         bucket_dest->data   = tmp;
         bucket_dest->space *= OT_VECTOR_GROW_RATIO;
       }
-      peers_new = (ot_peer*)bucket_dest->data;
-      memcpy(peers_new + bucket_dest->size++, peers_old++, sizeof(ot_peer));
+      memcpy((ot_peer *)bucket_dest->data + peer_size * bucket_dest->size++, peers_old, peer_size);
+      peers_old += peer_size;
     }
   }
 
   /* Now sort each bucket to later allow bsearch */
-  for( bucket=0; bucket<num_buckets_new; ++bucket )
-    qsort( bucket_list_new[bucket].data, bucket_list_new[bucket].size, sizeof( ot_peer ), vector_compare_peer );
+  for (bucket = 0; bucket < num_buckets_new; ++bucket)
+    qsort(bucket_list_new[bucket].data, bucket_list_new[bucket].size, peer_size, sort_func);
 
   /* Everything worked fine. Now link new bucket_list to peer_list */
-  if( OT_PEERLIST_HASBUCKETS( peer_list) )
-    vector_clean_list( (ot_vector*)peer_list->peers.data, peer_list->peers.size );
+  if (OT_PEERLIST_HASBUCKETS(peer_list))
+    vector_clean_list((ot_vector *)peer_list->peers.data, peer_list->peers.size);
   else
-    free( peer_list->peers.data );
+    free(peer_list->peers.data);
 
-  if( num_buckets_new > 1 ) {
+  if (num_buckets_new > 1) {
     peer_list->peers.data  = bucket_list_new;
     peer_list->peers.size  = num_buckets_new;
     peer_list->peers.space = 0; /* Magic marker for "is list of buckets" */
@@ -240,27 +261,24 @@ void vector_redistribute_buckets( ot_peerlist * peer_list ) {
     peer_list->peers.data  = bucket_list_new->data;
     peer_list->peers.size  = bucket_list_new->size;
     peer_list->peers.space = bucket_list_new->space;
-    free( bucket_list_new );
+    free(bucket_list_new);
   }
 }
 
-void vector_fixup_peers( ot_vector * vector ) {
+void vector_fixup_peers(ot_vector *vector, size_t peer_size) {
   int need_fix = 0;
 
-  if( !vector->size ) {
-    free( vector->data );
-    vector->data = NULL;
+  if (!vector->size) {
+    free(vector->data);
+    vector->data  = NULL;
     vector->space = 0;
     return;
   }
 
-  while( ( vector->size * OT_VECTOR_SHRINK_THRESH < vector->space ) &&
-         ( vector->space >= OT_VECTOR_SHRINK_RATIO * OT_VECTOR_MIN_MEMBERS ) ) {
+  while ((vector->size * OT_VECTOR_SHRINK_THRESH < vector->space) && (vector->space >= OT_VECTOR_SHRINK_RATIO * OT_VECTOR_MIN_MEMBERS)) {
     vector->space /= OT_VECTOR_SHRINK_RATIO;
     need_fix++;
   }
-  if( need_fix )
-    vector->data = realloc( vector->data, vector->space * sizeof( ot_peer ) );
+  if (need_fix)
+    vector->data = realloc(vector->data, vector->space * peer_size);
 }
-
-const char *g_version_vector_c = "$Source$: $Revision$\n";