1 files changed, 45 insertions, 33 deletions

diff --git a/src/ipcpd/shim-data.c b/src/ipcpd/shim-data.c
index ade157ce..8801213a 100644
--- a/src/ipcpd/shim-data.c
+++ b/src/ipcpd/shim-data.c
@@ -1,5 +1,5 @@
 /*
- * Ouroboros - Copyright (C) 2016 - 2021
+ * Ouroboros - Copyright (C) 2016 - 2024
  *
  * IPC process utilities
  *
@@ -30,18 +30,18 @@
 
 #define OUROBOROS_PREFIX "shim-data"
 
-#include <ouroboros/endian.h>
-#include <ouroboros/logs.h>
-#include <ouroboros/list.h>
-#include <ouroboros/time_utils.h>
 #include <ouroboros/errno.h>
+#include <ouroboros/hash.h>
+#include <ouroboros/list.h>
+#include <ouroboros/logs.h>
+#include <ouroboros/time.h>
 
 #include "shim-data.h"
 #include "ipcp.h"
 
-#include <string.h>
-#include <stdlib.h>
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct reg_entry {
         struct list_head list;
@@ -51,7 +51,7 @@ struct reg_entry {
 struct dir_entry {
         struct list_head list;
         uint8_t *        hash;
-        uint64_t         addr;
+        struct addr      addr;
 };
 
 static void destroy_dir_query(struct dir_query * query)
@@ -108,14 +108,12 @@ static void reg_entry_destroy(struct reg_entry * entry)
 {
         assert(entry);
 
-        if (entry->hash != NULL)
-                free(entry->hash);
-
+        free(entry->hash);
         free(entry);
 }
 
-static struct dir_entry * dir_entry_create(uint8_t * hash,
-                                           uint64_t  addr)
+static struct dir_entry * dir_entry_create(uint8_t *   hash,
+                                           struct addr addr)
 {
         struct dir_entry * entry = malloc(sizeof(*entry));
         if (entry == NULL)
@@ -133,15 +131,15 @@ static void dir_entry_destroy(struct dir_entry * entry)
 {
         assert(entry);
 
-        if (entry->hash != NULL)
-                free(entry->hash);
-
+        free(entry->hash);
         free(entry);
 }
 
-struct shim_data * shim_data_create()
+struct shim_data * shim_data_create(void)
 {
-        struct shim_data * sd = malloc(sizeof(*sd));
+        struct shim_data * sd;
+
+        sd = malloc(sizeof(*sd));
         if (sd == NULL)
                 return NULL;
 
@@ -151,11 +149,23 @@ struct shim_data * shim_data_create()
         list_head_init(&sd->dir_queries);
 
         /* init the locks */
-        pthread_rwlock_init(&sd->reg_lock, NULL);
-        pthread_rwlock_init(&sd->dir_lock, NULL);
-        pthread_mutex_init(&sd->dir_queries_lock, NULL);
+        if (pthread_rwlock_init(&sd->reg_lock, NULL) < 0)
+                goto fail_reg_lock_init;
+
+        if (pthread_rwlock_init(&sd->dir_lock, NULL) < 0)
+                goto fail_dir_lock_init;
+
+        if (pthread_mutex_init(&sd->dir_queries_lock, NULL) < 0)
+                goto fail_mutex_init;
 
         return sd;
+
+ fail_mutex_init:
+        pthread_rwlock_destroy(&sd->dir_lock);
+ fail_dir_lock_init:
+        pthread_rwlock_destroy(&sd->reg_lock);
+ fail_reg_lock_init:
+        return NULL;
 }
 
 static void clear_registry(struct shim_data * data)
@@ -244,13 +254,15 @@ static struct reg_entry * find_reg_entry_by_hash(struct shim_data * data,
 
 static struct dir_entry * find_dir_entry(struct shim_data * data,
                                          const uint8_t *    hash,
-                                         uint64_t           addr)
+                                         struct addr        addr)
 {
         struct list_head * h;
         list_for_each(h, &data->directory) {
                 struct dir_entry * e = list_entry(h, struct dir_entry, list);
-                if (e->addr == addr &&
-                    !memcmp(e->hash, hash, ipcp_dir_hash_len()))
+                if (memcmp(&e->addr, &addr, sizeof(addr)) != 0)
+                        continue;
+
+                if (memcmp(e->hash, hash, ipcp_dir_hash_len()) == 0)
                         return e;
         }
 
@@ -283,8 +295,8 @@ int shim_data_reg_add_entry(struct shim_data * data,
 
         if (find_reg_entry_by_hash(data, hash)) {
                 pthread_rwlock_unlock(&data->reg_lock);
-                log_dbg(HASH_FMT " was already in the directory.",
-                        HASH_VAL(hash));
+                log_dbg(HASH_FMT32 " was already in the directory.",
+                        HASH_VAL32(hash));
                 return 0;
         }
 
@@ -350,7 +362,7 @@ bool shim_data_reg_has(struct shim_data * data,
 
 int shim_data_dir_add_entry(struct shim_data * data,
                             const uint8_t *    hash,
-                            uint64_t           addr)
+                            struct addr        addr)
 {
         struct dir_entry * entry;
         uint8_t * entry_hash;
@@ -386,7 +398,7 @@ int shim_data_dir_add_entry(struct shim_data * data,
 
 int shim_data_dir_del_entry(struct shim_data * data,
                             const uint8_t *    hash,
-                            uint64_t           addr)
+                            struct addr        addr)
 {
         struct dir_entry * e;
         if (data == NULL)
@@ -423,19 +435,19 @@ bool shim_data_dir_has(struct shim_data * data,
         return ret;
 }
 
-uint64_t shim_data_dir_get_addr(struct shim_data * data,
-                                const uint8_t *    hash)
+struct addr shim_data_dir_get_addr(struct shim_data * data,
+                                   const uint8_t *    hash)
 {
         struct dir_entry * entry;
-        uint64_t           addr;
+        struct addr        addr = {0};
 
         pthread_rwlock_rdlock(&data->dir_lock);
 
         entry = find_dir_entry_any(data, hash);
-
         if (entry == NULL) {
                 pthread_rwlock_unlock(&data->dir_lock);
-                return 0; /* undefined behaviour, 0 may be a valid address */
+                log_warn("No address for " HASH_FMT32 ".", HASH_VAL32(hash));
+                return addr; /* undefined behaviour, 0 may be a valid address */
         }
 
         addr = entry->addr;