From b46ba7bb7405c3b5a85f4203f816e623a5edb2d7 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sat, 15 Feb 2020 21:39:24 +0100 Subject: 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 Signed-off-by: Sander Vrijders --- src/ipcpd/unicast/pol/tests/CMakeLists.txt | 2 +- src/ipcpd/unicast/pol/tests/hashtable_test.c | 129 --------------------------- src/ipcpd/unicast/pol/tests/pft_test.c | 126 ++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 130 deletions(-) delete mode 100644 src/ipcpd/unicast/pol/tests/hashtable_test.c create mode 100644 src/ipcpd/unicast/pol/tests/pft_test.c (limited to 'src/ipcpd/unicast/pol/tests') 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/hashtable_test.c deleted file mode 100644 index f84fee63..00000000 --- a/src/ipcpd/unicast/pol/tests/hashtable_test.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - 2020 - * - * Test of the hash table - * - * Dimitri Staessens - * Sander Vrijders - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., http://www.fsf.org/about/contact/. - */ - -#include "hashtable.c" - -#include - -#define HASHTABLE_SIZE 256 -#define INT_TEST 4 - -int hashtable_test(int argc, char ** argv) -{ - struct htable * table; - int i; - int * j; - void * el; - size_t len; - - (void) argc; - (void) argv; - - table = htable_create(HASHTABLE_SIZE, true); - if (table == NULL) { - printf("Failed to create.\n"); - return -1; - } - - htable_destroy(table); - - table = htable_create(HASHTABLE_SIZE, false); - if (table == NULL) { - printf("Failed to create.\n"); - return -1; - } - - for (i = 0; i < HASHTABLE_SIZE + INT_TEST + 2; i++) { - j = malloc(sizeof(*j)); - if (j == NULL) { - printf("Failed to malloc.\n"); - htable_destroy(table); - return -1; - } - *j = i; - - if (htable_insert(table, i, (void *) j, 1)) { - printf("Failed to insert.\n"); - htable_destroy(table); - free(j); - return -1; - } - } - - if (htable_lookup(table, INT_TEST, &el, &len)) { - printf("Failed to lookup.\n"); - htable_destroy(table); - return -1; - } - - j = (int *) el; - if (*j != INT_TEST) { - printf("Lookup returned wrong value (%d != %d).\n", - INT_TEST, *j); - htable_destroy(table); - return -1; - } - - if (htable_lookup(table, HASHTABLE_SIZE + INT_TEST, &el, &len)) { - printf("Failed to lookup.\n"); - htable_destroy(table); - return -1; - } - - j = (int *) el; - if (*j != HASHTABLE_SIZE + INT_TEST) { - printf("Lookup returned wrong value (%d != %d).\n", - INT_TEST, *j); - htable_destroy(table); - return -1; - } - - if (htable_delete(table, INT_TEST)) { - printf("Failed to delete.\n"); - htable_destroy(table); - return -1; - } - - if (htable_lookup(table, INT_TEST, &el, &len) == 0) { - printf("Failed to delete properly.\n"); - htable_destroy(table); - return -1; - } - - if (htable_lookup(table, HASHTABLE_SIZE + INT_TEST, &el, &len)) { - printf("Failed to lookup after deletion.\n"); - htable_destroy(table); - return -1; - } - - j = (int *) el; - if (*j != HASHTABLE_SIZE + INT_TEST) { - printf("Lookup returned wrong value (%d != %d).\n", - INT_TEST, *j); - htable_destroy(table); - return -1; - } - - htable_destroy(table); - - return 0; -} diff --git a/src/ipcpd/unicast/pol/tests/pft_test.c b/src/ipcpd/unicast/pol/tests/pft_test.c new file mode 100644 index 00000000..4e23898b --- /dev/null +++ b/src/ipcpd/unicast/pol/tests/pft_test.c @@ -0,0 +1,126 @@ +/* + * Ouroboros - Copyright (C) 2016 - 2020 + * + * Test of the hash table + * + * Dimitri Staessens + * Sander Vrijders + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., http://www.fsf.org/about/contact/. + */ + +#include "pft.c" + +#include + +#define TBL_SIZE 256 +#define INT_TEST 4 + +int pft_test(int argc, + char ** argv) +{ + struct pft * pft; + int i; + int * j; + size_t len; + + (void) argc; + (void) argv; + + pft = pft_create(TBL_SIZE, true); + if (pft == NULL) { + printf("Failed to create.\n"); + return -1; + } + + pft_destroy(pft); + + pft = pft_create(TBL_SIZE, false); + if (pft == NULL) { + printf("Failed to create.\n"); + return -1; + } + + for (i = 0; i < TBL_SIZE + INT_TEST + 2; i++) { + j = malloc(sizeof(*j)); + if (j == NULL) { + printf("Failed to malloc.\n"); + pft_destroy(pft); + return -1; + } + *j = i; + + if (pft_insert(pft, i, j, 1)) { + printf("Failed to insert.\n"); + pft_destroy(pft); + free(j); + return -1; + } + } + + if (pft_lookup(pft, INT_TEST, &j, &len)) { + printf("Failed to lookup.\n"); + pft_destroy(pft); + return -1; + } + + if (*j != INT_TEST) { + printf("Lookup returned wrong value (%d != %d).\n", + INT_TEST, *j); + pft_destroy(pft); + return -1; + } + + if (pft_lookup(pft, TBL_SIZE + INT_TEST, &j, &len)) { + printf("Failed to lookup.\n"); + pft_destroy(pft); + return -1; + } + + if (*j != TBL_SIZE + INT_TEST) { + printf("Lookup returned wrong value (%d != %d).\n", + INT_TEST, *j); + pft_destroy(pft); + return -1; + } + + if (pft_delete(pft, INT_TEST)) { + printf("Failed to delete.\n"); + pft_destroy(pft); + return -1; + } + + if (pft_lookup(pft, INT_TEST, &j, &len) == 0) { + printf("Failed to delete properly.\n"); + pft_destroy(pft); + return -1; + } + + if (pft_lookup(pft, TBL_SIZE + INT_TEST, &j, &len)) { + printf("Failed to lookup after deletion.\n"); + pft_destroy(pft); + return -1; + } + + if (*j != TBL_SIZE + INT_TEST) { + printf("Lookup returned wrong value (%d != %d).\n", + INT_TEST, *j); + pft_destroy(pft); + return -1; + } + + pft_destroy(pft); + + return 0; +} -- cgit v1.2.3