- some more work on libipulog compat API [almost finished]

- improt ulog_test.c from libipulog in order to test libipulog compat API

2 files changed, 90 insertions, 1 deletions

diff --git a/utils/Makefile.am b/utils/Makefile.am
index b0fe8a3..a62909f 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,8 +1,10 @@
-bin_PROGRAMS = nfulnl_test
+bin_PROGRAMS = nfulnl_test ulog_test
 nfulnl_test_SOURCES = nfulnl_test.c
+ulog_test_SOURCES = ulog_test.c
 
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
 
 nfulnl_test_LDFLAGS = $(all_libraries) -lnfnetlink_log
+ulog_test_LDFLAGS = $(all_libraries) -lnfnetlink_log_libipulog -lnfnetlink_log
 
diff --git a/utils/ulog_test.c b/utils/ulog_test.c
new file mode 100644
index 0000000..f8515d3
--- /dev/null
+++ b/utils/ulog_test.c
@@ -0,0 +1,87 @@
+/* ulog_test, $Revision: 1.4 $
+ *
+ * small testing program for libipulog, part of the netfilter ULOG target
+ * for the linux 2.4 netfilter subsystem.
+ *
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org>
+ *
+ * this code is released under the terms of GNU GPL
+ *
+ * $Id: ulog_test.c 286 2002-06-13 12:56:53Z laforge $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libnfnetlink_log/libipulog.h>
+
+#define MYBUFSIZ 2048
+
+/* prints some logging about a single packet */
+void handle_packet(ulog_packet_msg_t *pkt)
+{
+	unsigned char *p;
+	int i;
+	
+	printf("Hook=%u Mark=%lu len=%d ",
+	       pkt->hook, pkt->mark, pkt->data_len);
+	if (strlen(pkt->prefix))
+		printf("Prefix=%s ", pkt->prefix);
+	
+	if (pkt->mac_len)
+	{
+		printf("mac=");
+		p = pkt->mac;
+		for (i = 0; i < pkt->mac_len; i++, p++)
+			printf("%02x%c", *p, i==pkt->mac_len-1 ? ' ':':');
+	}
+	printf("\n");
+
+}
+
+int main(int argc, char *argv[])
+{
+	struct ipulog_handle *h;
+	unsigned char* buf;
+	int len;
+	ulog_packet_msg_t *upkt;
+	int i;
+
+	if (argc != 4) {
+		fprintf(stderr, "Usage: %s count group timeout\n", argv[0]);
+		exit(2);
+	}
+
+	/* allocate a receive buffer */
+	buf = (unsigned char *) malloc(MYBUFSIZ);
+	if (!buf)
+		exit(1);
+	
+	/* create ipulog handle */
+	h = ipulog_create_handle(ipulog_group2gmask(atoi(argv[2])), 65535);
+	if (!h)
+	{
+		/* if some error occurrs, print it to stderr */
+		ipulog_perror(NULL);
+		exit(1);
+	}
+
+	alarm(atoi(argv[3]));
+
+	/* loop receiving packets and handling them over to handle_packet */
+	for (i = 0; i < atoi(argv[1]); i++) {
+		len = ipulog_read(h, buf, MYBUFSIZ, 1);
+		if (len <= 0) {
+			ipulog_perror("ulog_test: short read");
+			exit(1);
+		}
+		printf("%d bytes received\n", len);
+		while (upkt = ipulog_get_packet(h, buf, len)) {
+			handle_packet(upkt);
+		}
+	}
+	
+	/* just to give it a cleaner look */
+	ipulog_destroy_handle(h);
+	return 0;
+}