Changeset 29e7cc7 in mainline for uspace/lib/nic/src/nic_addr_db.c

Timestamp:

2025-04-18T15:14:10Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'upstream/master' into helenraid

File:

• uspace/lib/nic/src/nic_addr_db.c (modified) (8 diffs)

uspace/lib/nic/src/nic_addr_db.c

@@ -52 +52 @@
 typedef struct nic_addr_entry {
         ht_link_t link;
+        size_t hash;
         uint8_t len;
-        uint8_t addr[1];
+        uint8_t addr[];
 } nic_addr_entry_t;
 
@@ -60 +61 @@
  */
 typedef struct {
+        size_t hash;
         size_t len;
         const uint8_t *addr;
 } addr_key_t;
 
-static bool nic_addr_key_equal(const void *key_arg, const ht_link_t *item)
+static bool nic_addr_key_equal(const void *key_arg, size_t hash, const ht_link_t *item)
 {
         const addr_key_t *key = key_arg;
         nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
-
-        return memcmp(entry->addr, key->addr, entry->len) == 0;
+        return entry->hash == hash && memcmp(entry->addr, key->addr, entry->len) == 0;
 }
 
@@ -86 +87 @@
 {
         const addr_key_t *key = k;
-        return addr_hash(key->len, key->addr);
+        return key->hash ? key->hash : addr_hash(key->len, key->addr);
 }
 
@@ -92 +93 @@
 {
         nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
-        return addr_hash(entry->len, entry->addr);
+        return entry->hash;
 }
 
@@ -98 +99 @@
 {
         nic_addr_entry_t *entry = member_to_inst(item, nic_addr_entry_t, link);
-
         free(entry);
 }
@@ -173 +173 @@
         addr_key_t key = {
                 .len = db->addr_len,
-                .addr = addr
+                .addr = addr,
+                .hash = addr_hash(db->addr_len, addr),
         };
 
@@ -179 +180 @@
                 return EEXIST;
 
-        nic_addr_entry_t *entry = malloc(sizeof(nic_addr_entry_t) + db->addr_len - 1);
+        nic_addr_entry_t *entry = malloc(offsetof(nic_addr_entry_t, addr) + db->addr_len);
         if (entry == NULL)
                 return ENOMEM;
@@ -185 +186 @@
         entry->len = (uint8_t) db->addr_len;
         memcpy(entry->addr, addr, db->addr_len);
+        entry->hash = key.hash;
 
         hash_table_insert(&db->set, &entry->link);