1 files changed, 20 insertions, 10 deletions

diff --git a/ot_accesslist.c b/ot_accesslist.c
index a199fa4..2465ada 100644
--- a/ot_accesslist.c
+++ b/ot_accesslist.c
@@ -22,11 +22,11 @@
 #endif
 
 /* Libowfat */
-#include "ip6.h"
 
 /* Opentracker */
 #include "ot_accesslist.h"
 #include "ot_hex.h"
+#include "ot_ip.h"
 #include "ot_vector.h"
 #include "trackerlogic.h"
 
@@ -81,7 +81,7 @@ static ot_accesslist *accesslist_make(ot_accesslist *next, size_t size) {
   if (accesslist_new) {
     accesslist_new->list = size ? malloc(sizeof(ot_hash) * size) : NULL;
     accesslist_new->size = size;
-    accesslist_new->base = g_now_minutes;
+    accesslist_new->base = 0;
     accesslist_new->next = next;
     if (size && !accesslist_new->list) {
       free(accesslist_new);
@@ -192,16 +192,24 @@ static void accesslist_readfile(void) {
 
   /* Now exchange the accesslist vector in the least race condition prone way */
   pthread_mutex_lock(&g_accesslist_mutex);
+
+  /* Mark old accesslist as "needs to live another five minutes" */
+  if (g_accesslist)
+    g_accesslist->base = g_now_minutes;
   accesslist_new->next = g_accesslist;
   g_accesslist         = accesslist_new; /* Only now set a new list */
 
 #ifdef WANT_DYNAMIC_ACCESSLIST
   /* If we have dynamic accesslists, reloading a new one will always void the add/delete lists.
      Insert empty ones at the list head */
-  if (g_accesslist_add && (accesslist_new = accesslist_make(g_accesslist_add, 0)) != NULL)
+  if (g_accesslist_add && (accesslist_new = accesslist_make(g_accesslist_add, 0)) != NULL) {
+    g_accesslist_add->base = g_now_minutes;
     g_accesslist_add = accesslist_new;
-  if (g_accesslist_delete && (accesslist_new = accesslist_make(g_accesslist_delete, 0)) != NULL)
+  }
+  if (g_accesslist_delete && (accesslist_new = accesslist_make(g_accesslist_delete, 0)) != NULL) {
+    g_accesslist_delete->base = g_now_minutes;
     g_accesslist_delete = accesslist_new;
+  }
 #endif
 
   accesslist_clean(g_accesslist);
@@ -209,7 +217,7 @@ static void accesslist_readfile(void) {
   pthread_mutex_unlock(&g_accesslist_mutex);
 }
 
-int accesslist_hashisvalid(ot_hash hash) {
+int accesslist_hashisvalid(const ot_hash hash) {
   /* Get working copy of current access list */
   ot_accesslist *accesslist = g_accesslist;
 #ifdef WANT_DYNAMIC_ACCESSLIST
@@ -315,7 +323,8 @@ static void     *accesslist_adddel_worker(char *fifoname, ot_accesslist *_Atomic
           ot_accesslist *accesslist_new = accesslist_make(*removing_from, (*removing_from)->size - 1);
           if (accesslist_new) {
             memcpy(accesslist_new->list, (*removing_from)->list, sizeof(ot_hash) * off);
-            memcpy(accesslist_new->list + off, (*removing_from)->list + off + 1, (*removing_from)->size - off - 1);
+            memcpy(accesslist_new->list + off, (*removing_from)->list + off + 1, sizeof(ot_hash) * ((*removing_from)->size - off - 1));
+            (*removing_from)->base = g_now_minutes;
             *removing_from = accesslist_new;
           }
         }
@@ -330,7 +339,7 @@ static void     *accesslist_adddel_worker(char *fifoname, ot_accesslist *_Atomic
         }
       } else {
         int exactmatch   = 0;
-        ot_hash *insert_point = binary_search(info_hash, (*adding_to)->list, (*adding_to)->size, OT_HASH_COMPARE_SIZE, sizeof(ot_hash), &exactmatch);
+        ot_hash *insert_point = binary_search(info_hash, (*adding_to)->list, (*adding_to)->size, sizeof(ot_hash), OT_HASH_COMPARE_SIZE, &exactmatch);
 
         /* Only if the info hash is not in the adding_to list, create a new head with that entry */
         if (!exactmatch) {
@@ -339,7 +348,8 @@ static void     *accesslist_adddel_worker(char *fifoname, ot_accesslist *_Atomic
           if (accesslist_new) {
             memcpy(accesslist_new->list, (*adding_to)->list, sizeof(ot_hash) * off);
             memcpy(accesslist_new->list + off, info_hash, sizeof(info_hash));
-            memcpy(accesslist_new->list + off + 1, (*adding_to)->list + off, (*adding_to)->size - off);
+            memcpy(accesslist_new->list + off + 1, (*adding_to)->list + off, sizeof(ot_hash) * ((*adding_to)->size - off));
+            (*adding_to)->base = g_now_minutes;
             *adding_to = accesslist_new;
           }
         }
@@ -546,10 +556,10 @@ int accesslist_bless_net(ot_net *net, ot_permissions permissions) {
   {
     char _debug[512];
     int  off  = snprintf(_debug, sizeof(_debug), "Blessing ip net ");
-    off      += fmt_ip6c(_debug + off, net->address);
+    off      += ip_format(_debug + off, net->address);
     if (net->bits < 128) {
       _debug[off++] = '/';
-      if (ip6_isv4mapped(net->address))
+      if (ip_is_v4mapped(net->address))
         off += snprintf(_debug + off, sizeof(_debug) - off, "%d", net->bits - 96);
       else
         off += snprintf(_debug + off, sizeof(_debug) - off, "%d", net->bits);