[acl] move poc-code into libknet dir and rename to links_acl.*

code is not integrated yet and test suite can´t run standalone Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · May 9, 2019 · d7fb8af · d7fb8af
1 parent c8aceef
commit d7fb8af
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 30 deletions.
diff --git a/configure.ac b/configure.ac
@@ -463,7 +463,6 @@ AC_CONFIG_FILES([
 		man/Doxyfile-nozzle
 		poc-code/Makefile
 		poc-code/iov-hash/Makefile
-		poc-code/access-list/Makefile
 		])
 
 if test "x$VERSION" = "xUNKNOWN"; then

diff --git a/libknet/Makefile.am b/libknet/Makefile.am
@@ -31,6 +31,7 @@ sources			= \
 			  handle.c \
 			  host.c \
 			  links.c \
+			  links_acl.c \
 			  logging.c \
 			  netutils.c \
 			  threads_common.c \
@@ -61,6 +62,7 @@ noinst_HEADERS		= \
 			  host.h \
 			  internals.h \
 			  links.h \
+			  links_acl.h \
 			  logging.h \
 			  netutils.h \
 			  onwire.h \

diff --git a/poc-code/access-list/ipcheck.c → libknet/links_acl.c b/poc-code/access-list/ipcheck.c → libknet/links_acl.c
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <malloc.h>
-#include "ipcheck.h"
+#include "links_acl.h"
 
 struct ip_match_entry {
 	ipcheck_type_t type;

diff --git a/poc-code/access-list/ipcheck.h → libknet/links_acl.h b/poc-code/access-list/ipcheck.h → libknet/links_acl.h
diff --git a/libknet/tests/Makefile.am b/libknet/tests/Makefile.am
@@ -13,7 +13,8 @@ include $(top_srcdir)/libknet/tests/api-check.mk
 
 EXTRA_DIST		= \
 			  api-test-coverage \
-			  api-check.mk
+			  api-check.mk \
+			  int_links_acl.txt
 
 AM_CPPFLAGS		= -I$(top_srcdir)/libknet
 AM_CFLAGS		+= $(PTHREAD_CFLAGS)
@@ -40,9 +41,11 @@ fun_checks		=
 benchmarks		= \
 			  knet_bench_test
 
+# int_links_acl_test can´t run yet standalone
 noinst_PROGRAMS		= \
 			  api_knet_handle_new_limit_test \
 			  pckt_test \
+			  int_links_acl_test \
 			  $(benchmarks) \
 			  $(check_PROGRAMS)
 
@@ -64,6 +67,9 @@ check-api-test-coverage:
 
 pckt_test_SOURCES	= pckt_test.c
 
+int_links_acl_test_SOURCES = int_links_acl.c \
+			     ../links_acl.c
+
 int_timediff_test_SOURCES = int_timediff.c
 
 knet_bench_test_SOURCES	= knet_bench.c \

diff --git a/poc-code/access-list/test_ipcheck.c → libknet/tests/int_links_acl.c b/poc-code/access-list/test_ipcheck.c → libknet/tests/int_links_acl.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <netdb.h>
 #include <malloc.h>
-#include "ipcheck.h"
+#include "links_acl.h"
 
 /* This is a test program .. remember! */
 #define BUFLEN 1024
@@ -103,9 +103,9 @@ static int load_file(void)
 
 	ipcheck_clear();
 
-	filterfile = fopen("test_ipcheck.txt", "r");
+	filterfile = fopen("int_links_acl.txt", "r");
 	if (!filterfile) {
-		fprintf(stderr, "Cannot open test_ipcheck.txt\n");
+		fprintf(stderr, "Cannot open int_links_acl.txt\n");
 		return 1;
 	}
 

diff --git a/poc-code/access-list/test_ipcheck.txt → libknet/tests/int_links_acl.txt b/poc-code/access-list/test_ipcheck.txt → libknet/tests/int_links_acl.txt
diff --git a/poc-code/Makefile.am b/poc-code/Makefile.am
@@ -10,4 +10,4 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 include $(top_srcdir)/build-aux/check.mk
 
-SUBDIRS			= access-list iov-hash
+SUBDIRS			= iov-hash
diff --git a/poc-code/access-list/.gitignore b/poc-code/access-list/.gitignore
diff --git a/poc-code/access-list/Makefile.am b/poc-code/access-list/Makefile.am