ipcpd: Rename hashtable to pft

This makes the hashtable more tailored to a packet forwarding table
(PFT). In the end not much of a change was needed, but now it's clear
the pft maps a destination address to a list of (outgoing) fds.

Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>

2 files changed, 34 insertions, 37 deletions

diff --git a/src/ipcpd/unicast/pol/tests/CMakeLists.txt b/src/ipcpd/unicast/pol/tests/CMakeLists.txt
index 86c2d948..34d80e8d 100644
--- a/src/ipcpd/unicast/pol/tests/CMakeLists.txt
+++ b/src/ipcpd/unicast/pol/tests/CMakeLists.txt
@@ -18,7 +18,7 @@ get_filename_component(PARENT_DIR ${PARENT_PATH} NAME)
 create_test_sourcelist(${PARENT_DIR}_tests test_suite.c
   # Add new tests here
   graph_test.c
-  hashtable_test.c
+  pft_test.c
   )
 
 add_executable(${PARENT_DIR}_test EXCLUDE_FROM_ALL ${${PARENT_DIR}_tests})
diff --git a/src/ipcpd/unicast/pol/tests/hashtable_test.c b/src/ipcpd/unicast/pol/tests/pft_test.c
index f84fee63..4e23898b 100644
--- a/src/ipcpd/unicast/pol/tests/hashtable_test.c
+++ b/src/ipcpd/unicast/pol/tests/pft_test.c
@@ -20,110 +20,107 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
-#include "hashtable.c"
+#include "pft.c"
 
 #include <stdio.h>
 
-#define HASHTABLE_SIZE 256
+#define TBL_SIZE 256
 #define INT_TEST 4
 
-int hashtable_test(int argc, char ** argv)
+int pft_test(int     argc,
+             char ** argv)
 {
-        struct htable * table;
-        int             i;
-        int *           j;
-        void *          el;
-        size_t          len;
+        struct pft * pft;
+        int          i;
+        int *        j;
+        size_t       len;
 
         (void) argc;
         (void) argv;
 
-        table = htable_create(HASHTABLE_SIZE, true);
-        if (table == NULL) {
+        pft = pft_create(TBL_SIZE, true);
+        if (pft == NULL) {
                 printf("Failed to create.\n");
                 return -1;
         }
 
-        htable_destroy(table);
+        pft_destroy(pft);
 
-        table = htable_create(HASHTABLE_SIZE, false);
-        if (table == NULL) {
+        pft = pft_create(TBL_SIZE, false);
+        if (pft == NULL) {
                 printf("Failed to create.\n");
                 return -1;
         }
 
-        for (i = 0; i < HASHTABLE_SIZE + INT_TEST + 2; i++) {
+        for (i = 0; i < TBL_SIZE + INT_TEST + 2; i++) {
                 j = malloc(sizeof(*j));
                 if (j == NULL) {
                         printf("Failed to malloc.\n");
-                        htable_destroy(table);
+                        pft_destroy(pft);
                         return -1;
                 }
                 *j = i;
 
-                if (htable_insert(table, i, (void *) j, 1)) {
+                if (pft_insert(pft, i, j, 1)) {
                         printf("Failed to insert.\n");
-                        htable_destroy(table);
+                        pft_destroy(pft);
                         free(j);
                         return -1;
                 }
         }
 
-        if (htable_lookup(table, INT_TEST, &el, &len)) {
+        if (pft_lookup(pft, INT_TEST, &j, &len)) {
                 printf("Failed to lookup.\n");
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        j = (int *) el;
         if (*j != INT_TEST) {
                 printf("Lookup returned wrong value (%d != %d).\n",
                        INT_TEST, *j);
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        if (htable_lookup(table, HASHTABLE_SIZE + INT_TEST, &el, &len)) {
+        if (pft_lookup(pft, TBL_SIZE + INT_TEST, &j, &len)) {
                 printf("Failed to lookup.\n");
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        j = (int *) el;
-        if (*j != HASHTABLE_SIZE + INT_TEST) {
+        if (*j != TBL_SIZE + INT_TEST) {
                 printf("Lookup returned wrong value (%d != %d).\n",
                        INT_TEST, *j);
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        if (htable_delete(table, INT_TEST)) {
+        if (pft_delete(pft, INT_TEST)) {
                 printf("Failed to delete.\n");
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        if (htable_lookup(table, INT_TEST, &el, &len) == 0) {
+        if (pft_lookup(pft, INT_TEST, &j, &len) == 0) {
                 printf("Failed to delete properly.\n");
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        if (htable_lookup(table, HASHTABLE_SIZE + INT_TEST, &el, &len)) {
+        if (pft_lookup(pft, TBL_SIZE + INT_TEST, &j, &len)) {
                 printf("Failed to lookup after deletion.\n");
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        j = (int *) el;
-        if (*j != HASHTABLE_SIZE + INT_TEST) {
+        if (*j != TBL_SIZE + INT_TEST) {
                 printf("Lookup returned wrong value (%d != %d).\n",
                        INT_TEST, *j);
-                htable_destroy(table);
+                pft_destroy(pft);
                 return -1;
         }
 
-        htable_destroy(table);
+        pft_destroy(pft);
 
         return 0;
 }