[netfilter-cvslog] r6415 - in trunk/libnetfilter_cthelper: . include include/libnetfilter_cthelper src

laforge at netfilter.org laforge at netfilter.org
Sat Jan 14 22:29:16 CET 2006


Author: laforge at netfilter.org
Date: 2006-01-14 22:29:14 +0100 (Sat, 14 Jan 2006)
New Revision: 6415

Added:
   trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/linux_nfnetlink_cthelper.h
   trunk/libnetfilter_cthelper/include/linux_list.h
Modified:
   trunk/libnetfilter_cthelper/autogen.sh
   trunk/libnetfilter_cthelper/include/Makefile.am
   trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/libnetfilter_cthelper.h
   trunk/libnetfilter_cthelper/src/helper.c
Log:
some further work, still not compiling


Modified: trunk/libnetfilter_cthelper/autogen.sh
===================================================================
--- trunk/libnetfilter_cthelper/autogen.sh	2006-01-14 19:49:16 UTC (rev 6414)
+++ trunk/libnetfilter_cthelper/autogen.sh	2006-01-14 21:29:14 UTC (rev 6415)
@@ -8,16 +8,16 @@
     # stage.
 
     INCLUDEDIR=${KERNEL_DIR:-/lib/modules/`uname -r`/build}/include/linux
-    if [ -f $INCLUDEDIR/netfilter/nfnetlink_conntrack.h ]
+    if [ -f $INCLUDEDIR/netfilter/nfnetlink_cthelper.h ]
     then
-    	TARGET=include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
-    	echo "Copying nfnetlink_conntrack.h to linux_nfnetlink_conntrack.h"
-    	cp $INCLUDEDIR/netfilter/nfnetlink_conntrack.h $TARGET
+    	TARGET=include/libnetfilter_cthelper/linux_nfnetlink_cthelper.h
+    	echo "Copying nfnetlink_cthelper.h to linux_nfnetlink_cthelper.h"
+    	cp $INCLUDEDIR/netfilter/nfnetlink_cthelper.h $TARGET
 	TEMP=`tempfile`
 	sed 's/linux\/netfilter\/nfnetlink.h/libnfnetlink\/linux_nfnetlink.h/g' $TARGET > $TEMP
 	mv $TEMP $TARGET
     else
-    	echo "can't find nfnetlink_conntrack.h kernel file in $INCLUDEDIR"
+    	echo "can't find nfnetlink_cthelper.h kernel file in $INCLUDEDIR"
     	exit 1
     fi
 }

Modified: trunk/libnetfilter_cthelper/include/Makefile.am
===================================================================
--- trunk/libnetfilter_cthelper/include/Makefile.am	2006-01-14 19:49:16 UTC (rev 6414)
+++ trunk/libnetfilter_cthelper/include/Makefile.am	2006-01-14 21:29:14 UTC (rev 6415)
@@ -1,2 +1,4 @@
 
 SUBDIRS = libnetfilter_cthelper
+
+nodist_HEADERS = linux_list.h

Modified: trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/libnetfilter_cthelper.h
===================================================================
--- trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/libnetfilter_cthelper.h	2006-01-14 19:49:16 UTC (rev 6414)
+++ trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/libnetfilter_cthelper.h	2006-01-14 21:29:14 UTC (rev 6415)
@@ -0,0 +1,48 @@
+#ifndef _NETFILTER_CTHELPER_H
+#define _NETFILTER_CTHELPER_H
+
+#include <libnetfilter_cthelper/linux_nfnetlink_cthelper.h>
+
+struct nfcth_handle;
+struct nfcth_expect;
+
+struct nfcth_helper {
+	/* library internal data, not to be touched by user */
+	struct list_head list;
+	struct nfcth_handle *h;
+	struct nfq_q_handle *qh;
+	u_int16_t queue_id;
+	/* end of library internal data */
+
+	/* public data */
+	const char *name;		/* name of the helper */
+	unsigned int max_expected;	/* max num of expected conns */
+	unsigned int timeout;		/* timeout for expecteds */
+
+	/* Mask things which we will help (compared against server response) */
+	struct nfct_tuple tuple;
+	struct nfct_tuple mask;
+
+	/* Function to call when data passes; return verdict, or -1
+	 * to invalidate. */
+	int (*help)(struct nfq_data *nfad);
+};
+
+extern struct nfcth_handle *nfcth_open_nfnl(struct nfnl_handle *nfnlh);
+extern struct nfcth_handle *nfcth_open(void);
+extern void nfcth_close(struct nfcth_handle *hh);
+
+extern struct nfnl_handle *nfcth_nfnlh(struct nfcth_handle *h);
+extern int nfcth_fd(struct nfcth_handle *h);
+
+extern int nfcth_handle_packet(struct nfcth_handle *h, char *buf, int len);
+
+extern int nfcth_helper_register(struct nfcth_handle *h,
+				 struct nfcth_helper *helper);
+extern void nfcth_helper_unregister(struct nfcth_helper *helper);
+
+extern int nfcth_expect_related(struct nfcth_helper *helper,
+				struct nfcth_expect *exp);
+extern void nfcth_unexpect_related(struct nfcth_expect *exp);
+
+#endif /* _NETFILTER_CTHELPER_H */

Added: trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/linux_nfnetlink_cthelper.h
===================================================================
--- trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/linux_nfnetlink_cthelper.h	2006-01-14 19:49:16 UTC (rev 6414)
+++ trunk/libnetfilter_cthelper/include/libnetfilter_cthelper/linux_nfnetlink_cthelper.h	2006-01-14 21:29:14 UTC (rev 6415)
@@ -0,0 +1,23 @@
+#ifndef _NFNETLINK_HELPER_H
+#define _NFNETLINK_HELPER_H
+
+enum nfhnl_msg_types {
+	NFHNL_MSG_HELPER_NEW,
+	NFHNL_MSG_HELPER_DELETE,
+
+	NFHNL_MSG_MAX
+};
+
+enum nfhnl_helper {
+	NFHA_UNSPEC,
+	NFHA_TUPLE,
+	NFHA_MASK,
+	NFHA_MAX_EXPECTED,
+	NFHA_TIMEOUT,
+	NFHA_QUEUENUM,
+	NFHA_NAME,
+	__NFHA_MAX
+};
+#define NFHA_MAX (__NFHA_MAX - 1)
+
+#endif /* _NFNETLINK_HELPER_H */

Added: trunk/libnetfilter_cthelper/include/linux_list.h
===================================================================
--- trunk/libnetfilter_cthelper/include/linux_list.h	2006-01-14 19:49:16 UTC (rev 6414)
+++ trunk/libnetfilter_cthelper/include/linux_list.h	2006-01-14 21:29:14 UTC (rev 6415)
@@ -0,0 +1,725 @@
+#ifndef _LINUX_LIST_H
+#define _LINUX_LIST_H
+
+#undef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ *
+ * @ptr:	the pointer to the member.
+ * @type:	the type of the container struct this is embedded in.
+ * @member:	the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({			\
+        const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+        (type *)( (char *)__mptr - offsetof(type,member) );})
+
+/*
+ * Check at compile time that something is of a particular type.
+ * Always evaluates to 1 so you may use it easily in comparisons.
+ */
+#define typecheck(type,x) \
+({	type __dummy; \
+	typeof(x) __dummy2; \
+	(void)(&__dummy == &__dummy2); \
+	1; \
+})
+
+#define prefetch(x)		1
+
+/* empty define to make this work in userspace -HW */
+#ifndef smp_wmb
+#define smp_wmb()
+#endif
+
+/*
+ * These are non-NULL pointers that will result in page faults
+ * under normal circumstances, used to verify that nobody uses
+ * non-initialized list entries.
+ */
+#define LIST_POISON1  ((void *) 0x00100100)
+#define LIST_POISON2  ((void *) 0x00200200)
+
+/*
+ * Simple doubly linked list implementation.
+ *
+ * Some of the internal functions ("__xxx") are useful when
+ * manipulating whole lists rather than single entries, as
+ * sometimes we already know the next/prev entries and we can
+ * generate better code by using them directly rather than
+ * using the generic single-entry routines.
+ */
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+#define INIT_LIST_HEAD(ptr) do { \
+	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
+} while (0)
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
+}
+
+/**
+ * list_add - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+static inline void list_add(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head, head->next);
+}
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head->prev, head);
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add_rcu(struct list_head * new,
+		struct list_head * prev, struct list_head * next)
+{
+	new->next = next;
+	new->prev = prev;
+	smp_wmb();
+	next->prev = new;
+	prev->next = new;
+}
+
+/**
+ * list_add_rcu - add a new entry to rcu-protected list
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as list_add_rcu()
+ * or list_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * list_for_each_entry_rcu().
+ */
+static inline void list_add_rcu(struct list_head *new, struct list_head *head)
+{
+	__list_add_rcu(new, head, head->next);
+}
+
+/**
+ * list_add_tail_rcu - add a new entry to rcu-protected list
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as list_add_tail_rcu()
+ * or list_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * list_for_each_entry_rcu().
+ */
+static inline void list_add_tail_rcu(struct list_head *new,
+					struct list_head *head)
+{
+	__list_add_rcu(new, head->prev, head);
+}
+
+/*
+ * Delete a list entry by making the prev/next entries
+ * point to each other.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_del(struct list_head * prev, struct list_head * next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+/**
+ * list_del - deletes entry from list.
+ * @entry: the element to delete from the list.
+ * Note: list_empty on entry does not return true after this, the entry is
+ * in an undefined state.
+ */
+static inline void list_del(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	entry->next = LIST_POISON1;
+	entry->prev = LIST_POISON2;
+}
+
+/**
+ * list_del_rcu - deletes entry from list without re-initialization
+ * @entry: the element to delete from the list.
+ *
+ * Note: list_empty on entry does not return true after this,
+ * the entry is in an undefined state. It is useful for RCU based
+ * lockfree traversal.
+ *
+ * In particular, it means that we can not poison the forward
+ * pointers that may still be used for walking the list.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as list_del_rcu()
+ * or list_add_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * list_for_each_entry_rcu().
+ *
+ * Note that the caller is not permitted to immediately free
+ * the newly deleted entry.  Instead, either synchronize_kernel()
+ * or call_rcu() must be used to defer freeing until an RCU
+ * grace period has elapsed.
+ */
+static inline void list_del_rcu(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	entry->prev = LIST_POISON2;
+}
+
+/**
+ * list_del_init - deletes entry from list and reinitialize it.
+ * @entry: the element to delete from the list.
+ */
+static inline void list_del_init(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	INIT_LIST_HEAD(entry);
+}
+
+/**
+ * list_move - delete from one list and add as another's head
+ * @list: the entry to move
+ * @head: the head that will precede our entry
+ */
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+        __list_del(list->prev, list->next);
+        list_add(list, head);
+}
+
+/**
+ * list_move_tail - delete from one list and add as another's tail
+ * @list: the entry to move
+ * @head: the head that will follow our entry
+ */
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
+{
+        __list_del(list->prev, list->next);
+        list_add_tail(list, head);
+}
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+static inline int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+/**
+ * list_empty_careful - tests whether a list is
+ * empty _and_ checks that no other CPU might be
+ * in the process of still modifying either member
+ *
+ * NOTE: using list_empty_careful() without synchronization
+ * can only be safe if the only activity that can happen
+ * to the list entry is list_del_init(). Eg. it cannot be used
+ * if another CPU could re-list_add() it.
+ *
+ * @head: the list to test.
+ */
+static inline int list_empty_careful(const struct list_head *head)
+{
+	struct list_head *next = head->next;
+	return (next == head) && (next == head->prev);
+}
+
+static inline void __list_splice(struct list_head *list,
+				 struct list_head *head)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+	struct list_head *at = head->next;
+
+	first->prev = head;
+	head->next = first;
+
+	last->next = at;
+	at->prev = last;
+}
+
+/**
+ * list_splice - join two lists
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice(struct list_head *list, struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head);
+}
+
+/**
+ * list_splice_init - join two lists and reinitialise the emptied list.
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * The list at @list is reinitialised
+ */
+static inline void list_splice_init(struct list_head *list,
+				    struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+/**
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @head:	the head for your list.
+ */
+#define list_for_each(pos, head) \
+	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
+        	pos = pos->next, prefetch(pos->next))
+
+/**
+ * __list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @head:	the head for your list.
+ *
+ * This variant differs from list_for_each() in that it's the
+ * simplest possible list iteration code, no prefetching is done.
+ * Use this for code that knows the list to be very short (empty
+ * or 1 entry) most of the time.
+ */
+#define __list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev(pos, head) \
+	for (pos = (head)->prev, prefetch(pos->prev); pos != (head); \
+        	pos = pos->prev, prefetch(pos->prev))
+
+/**
+ * list_for_each_safe	-	iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_safe(pos, n, head) \
+	for (pos = (head)->next, n = pos->next; pos != (head); \
+		pos = n, n = pos->next)
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop counter.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		     prefetch(pos->member.next);			\
+	     &pos->member != (head); 					\
+	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
+		     prefetch(pos->member.next))
+
+/**
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
+ * @pos:	the type * to use as a loop counter.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
+		     prefetch(pos->member.prev);			\
+	     &pos->member != (head); 					\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member),	\
+		     prefetch(pos->member.prev))
+
+/**
+ * list_prepare_entry - prepare a pos entry for use as a start point in
+ *			list_for_each_entry_continue
+ * @pos:	the type * to use as a start point
+ * @head:	the head of the list
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_prepare_entry(pos, head, member) \
+	((pos) ? : list_entry(head, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue -	iterate over list of given type
+ *			continuing after existing point
+ * @pos:	the type * to use as a loop counter.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member),	\
+		     prefetch(pos->member.next);			\
+	     &pos->member != (head);					\
+	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
+		     prefetch(pos->member.next))
+
+/**
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:	the type * to use as a loop counter.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		n = list_entry(pos->member.next, typeof(*pos), member);	\
+	     &pos->member != (head); 					\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_rcu	-	iterate over an rcu-protected list
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @head:	the head for your list.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as list_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define list_for_each_rcu(pos, head) \
+	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
+        	pos = pos->next, ({ smp_read_barrier_depends(); 0;}), prefetch(pos->next))
+
+#define __list_for_each_rcu(pos, head) \
+	for (pos = (head)->next; pos != (head); \
+        	pos = pos->next, ({ smp_read_barrier_depends(); 0;}))
+
+/**
+ * list_for_each_safe_rcu	-	iterate over an rcu-protected list safe
+ *					against removal of list entry
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as list_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define list_for_each_safe_rcu(pos, n, head) \
+	for (pos = (head)->next, n = pos->next; pos != (head); \
+		pos = n, ({ smp_read_barrier_depends(); 0;}), n = pos->next)
+
+/**
+ * list_for_each_entry_rcu	-	iterate over rcu list of given type
+ * @pos:	the type * to use as a loop counter.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as list_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define list_for_each_entry_rcu(pos, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		     prefetch(pos->member.next);			\
+	     &pos->member != (head); 					\
+	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
+		     ({ smp_read_barrier_depends(); 0;}),		\
+		     prefetch(pos->member.next))
+
+
+/**
+ * list_for_each_continue_rcu	-	iterate over an rcu-protected list
+ *			continuing after existing point.
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @head:	the head for your list.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as list_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define list_for_each_continue_rcu(pos, head) \
+	for ((pos) = (pos)->next, prefetch((pos)->next); (pos) != (head); \
+        	(pos) = (pos)->next, ({ smp_read_barrier_depends(); 0;}), prefetch((pos)->next))
+
+/*
+ * Double linked lists with a single pointer list head.
+ * Mostly useful for hash tables where the two pointer list head is
+ * too wasteful.
+ * You lose the ability to access the tail in O(1).
+ */
+
+struct hlist_head {
+	struct hlist_node *first;
+};
+
+struct hlist_node {
+	struct hlist_node *next, **pprev;
+};
+
+#define HLIST_HEAD_INIT { .first = NULL }
+#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+#define INIT_HLIST_NODE(ptr) ((ptr)->next = NULL, (ptr)->pprev = NULL)
+
+static inline int hlist_unhashed(const struct hlist_node *h)
+{
+	return !h->pprev;
+}
+
+static inline int hlist_empty(const struct hlist_head *h)
+{
+	return !h->first;
+}
+
+static inline void __hlist_del(struct hlist_node *n)
+{
+	struct hlist_node *next = n->next;
+	struct hlist_node **pprev = n->pprev;
+	*pprev = next;
+	if (next)
+		next->pprev = pprev;
+}
+
+static inline void hlist_del(struct hlist_node *n)
+{
+	__hlist_del(n);
+	n->next = LIST_POISON1;
+	n->pprev = LIST_POISON2;
+}
+
+/**
+ * hlist_del_rcu - deletes entry from hash list without re-initialization
+ * @n: the element to delete from the hash list.
+ *
+ * Note: list_unhashed() on entry does not return true after this,
+ * the entry is in an undefined state. It is useful for RCU based
+ * lockfree traversal.
+ *
+ * In particular, it means that we can not poison the forward
+ * pointers that may still be used for walking the hash list.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_entry().
+ */
+static inline void hlist_del_rcu(struct hlist_node *n)
+{
+	__hlist_del(n);
+	n->pprev = LIST_POISON2;
+}
+
+static inline void hlist_del_init(struct hlist_node *n)
+{
+	if (n->pprev)  {
+		__hlist_del(n);
+		INIT_HLIST_NODE(n);
+	}
+}
+
+#define hlist_del_rcu_init hlist_del_init
+
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
+{
+	struct hlist_node *first = h->first;
+	n->next = first;
+	if (first)
+		first->pprev = &n->next;
+	h->first = n;
+	n->pprev = &h->first;
+}
+
+
+/**
+ * hlist_add_head_rcu - adds the specified element to the specified hlist,
+ * while permitting racing traversals.
+ * @n: the element to add to the hash list.
+ * @h: the list to add to.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_add_head_rcu()
+ * or hlist_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_for_each_entry(), but only if smp_read_barrier_depends()
+ * is used to prevent memory-consistency problems on Alpha CPUs.
+ * Regardless of the type of CPU, the list-traversal primitive
+ * must be guarded by rcu_read_lock().
+ *
+ * OK, so why don't we have an hlist_for_each_entry_rcu()???
+ */
+static inline void hlist_add_head_rcu(struct hlist_node *n,
+					struct hlist_head *h)
+{
+	struct hlist_node *first = h->first;
+	n->next = first;
+	n->pprev = &h->first;
+	smp_wmb();
+	if (first)
+		first->pprev = &n->next;
+	h->first = n;
+}
+
+/* next must be != NULL */
+static inline void hlist_add_before(struct hlist_node *n,
+					struct hlist_node *next)
+{
+	n->pprev = next->pprev;
+	n->next = next;
+	next->pprev = &n->next;
+	*(n->pprev) = n;
+}
+
+static inline void hlist_add_after(struct hlist_node *n,
+					struct hlist_node *next)
+{
+	next->next = n->next;
+	n->next = next;
+	next->pprev = &n->next;
+
+	if(next->next)
+		next->next->pprev  = &next->next;
+}
+
+#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
+
+#define hlist_for_each(pos, head) \
+	for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
+	     pos = pos->next)
+
+#define hlist_for_each_safe(pos, n, head) \
+	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
+	     pos = n)
+
+/**
+ * hlist_for_each_entry	- iterate over list of given type
+ * @tpos:	the type * to use as a loop counter.
+ * @pos:	the &struct hlist_node to use as a loop counter.
+ * @head:	the head for your list.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry(tpos, pos, head, member)			 \
+	for (pos = (head)->first;					 \
+	     pos && ({ prefetch(pos->next); 1;}) &&			 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = pos->next)
+
+/**
+ * hlist_for_each_entry_continue - iterate over a hlist continuing after existing point
+ * @tpos:	the type * to use as a loop counter.
+ * @pos:	the &struct hlist_node to use as a loop counter.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_continue(tpos, pos, member)		 \
+	for (pos = (pos)->next;						 \
+	     pos && ({ prefetch(pos->next); 1;}) &&			 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = pos->next)
+
+/**
+ * hlist_for_each_entry_from - iterate over a hlist continuing from existing point
+ * @tpos:	the type * to use as a loop counter.
+ * @pos:	the &struct hlist_node to use as a loop counter.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_from(tpos, pos, member)			 \
+	for (; pos && ({ prefetch(pos->next); 1;}) &&			 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = pos->next)
+
+/**
+ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @tpos:	the type * to use as a loop counter.
+ * @pos:	the &struct hlist_node to use as a loop counter.
+ * @n:		another &struct hlist_node to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the hlist_node within the struct.
+ */
+#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
+	for (pos = (head)->first;					 \
+	     pos && ({ n = pos->next; 1; }) && 				 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = n)
+
+/**
+ * hlist_for_each_entry_rcu - iterate over rcu list of given type
+ * @pos:	the type * to use as a loop counter.
+ * @pos:	the &struct hlist_node to use as a loop counter.
+ * @head:	the head for your list.
+ * @member:	the name of the hlist_node within the struct.
+ *
+ * This list-traversal primitive may safely run concurrently with
+ * the _rcu list-mutation primitives such as hlist_add_rcu()
+ * as long as the traversal is guarded by rcu_read_lock().
+ */
+#define hlist_for_each_entry_rcu(tpos, pos, head, member)		 \
+	for (pos = (head)->first;					 \
+	     pos && ({ prefetch(pos->next); 1;}) &&			 \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
+	     pos = pos->next, ({ smp_read_barrier_depends(); 0; }) )
+
+#endif

Modified: trunk/libnetfilter_cthelper/src/helper.c
===================================================================
--- trunk/libnetfilter_cthelper/src/helper.c	2006-01-14 19:49:16 UTC (rev 6414)
+++ trunk/libnetfilter_cthelper/src/helper.c	2006-01-14 21:29:14 UTC (rev 6415)
@@ -51,28 +51,6 @@
 	struct list_head expqueue_list;	/* list of expfn's */
 };
 
-struct nfcth_helper {
-	/* library internal data, not to be touched by user */
-	struct list_head list;
-	struct nfcth_handle *h;
-
-	struct nfq_q_handle *qh;
-	u_int16_t queue_id;
-
-	/* public data */
-	const char *name;		/* name of the helper */
-	unsigned int max_expected;	/* max num of expected conns */
-	unsigned int timeout;		/* timeout for expecteds */
-
-	/* Mask things which we will help (compared against server response) */
-	struct nfct_tuple tuple;
-	struct nfct_tuple mask;
-
-	/* Function to call when data passes; return verdict, or -1
-	 * to invalidate. */
-	int (*help)();
-};
-
 /* wrapper structure around nfct_expect */
 struct nfcth_expect {
 	struct list_head list;
@@ -85,18 +63,40 @@
 
 /* nfnetlink_helper lowlevel stuff */
 
+/* called when we get a packet for helpfn */
+static int helpfn_queue_cb(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg,
+			   struct nfq_data *nfad, void *data)
+{
+	struct nfcth_helper *helper = (struct nfcth_helper *) data;
+
+	/* FIXME: we want to know the master conntrack */
+	return helper->help(nfad);
+}
+
+/* called when we need to call an expfn */
+static int expfn_queue_cb(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg,
+			  struct nfq_data *nfad, void *data)
+{
+	struct expqueue_entry *ee = (struct expqueue_entry *) data;
+
+	/* FIXME: we want to know which expectation was confirmed */
+	ee->expfn(nfad);
+
+	return 0;
+}
+
 static int nfcth_helper_new(struct nfcth_handle *hh, 
 			    struct nfcth_helper *helper)
 {
-	int err;
-	struct nfnlhdr *req;
 	char buf[NFH_BUFSIZE];
-	req = (void *)buf;
+	struct nfnlhdr *req = (void *)buf;
 	u_int8_t l3num = helper->tuple.l3protonum;
+	u_int32_t max_expected, timeout;
+	u_int16_t queue_id;
 	
 	memset(&buf, 0, sizeof(buf));
 
-	nfnl_fill_hdr(&hh->nfnlh, &req->nlh, 0, l3num, 0, NFHNL_MSG_HELPER_NEW,
+	nfnl_fill_hdr(hh->nfnlssh, &req->nlh, 0, l3num, 0, NFHNL_MSG_HELPER_NEW,
 		      NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK);
 
 	nfct_build_tuple(req, sizeof(buf), &helper->tuple, NFHA_TUPLE);
@@ -106,22 +106,18 @@
 	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_MAX_EXPECTED,
 		       &max_expected, sizeof(u_int32_t));
 
-	timeout = hotnl(helper->timeout);
+	timeout = htonl(helper->timeout);
 	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_TIMEOUT, &timeout,
 		       sizeof(u_int32_t));
 
 	queue_id = htons(helper->queue_id);
-	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_QUEUENUM, &id,
+	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_QUEUENUM, &queue_id,
 		       sizeof(u_int16_t));
 
-	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_NAME, helper->name,
+	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_NAME, (char *)helper->name,
 		       strlen(helper->name));
 
-	err = nfnl_send(&hh->nfnlh, &req->nlh);
-	if (err < 0)
-		return err;
-
-	return nfnl_listen(&hh->nfnlh, &callback_handler, hh);
+	return nfnl_talk(hh->nfnlh, &req->nlh, 0, 0, NULL, NULL, NULL);
 }
 
 static int nfcth_helper_del(struct nfcth_helper *helper)
@@ -134,39 +130,39 @@
 	
 	memset(&buf, 0, sizeof(buf));
 
-	nfnl_fill_hdr(&helper->h->nfnlh, &req->nlh, 0, l3num, 0,
+	nfnl_fill_hdr(helper->h->nfnlssh, &req->nlh, 0, l3num, 0,
 		      NFHNL_MSG_HELPER_DELETE,
 		      NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK);
 
-	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_NAME, helper->name,
+	nfnl_addattr_l(&req->nlh, sizeof(buf), NFHA_NAME, (char *)helper->name,
 		       strlen(helper->name));
 
-	err = nfnl_send(&helper->h->nfnlh, &req->nlh);
+	err = nfnl_send(helper->h->nfnlh, &req->nlh);
 	if (err < 0)
 		return err;
 
-	return nfnl_listen(&helper->h->nfnlh, &callback_handler, hh);
+	return nfnl_talk(helper->h->nfnlh, &req->nlh, 0, 0, NULL, NULL, NULL);
 }
 
 
 /* library internal housekeeping functions */
 
-static struct expqueue_entry {
+struct expqueue_entry {
 	struct list_head list;
 	void *expectfn;
 	u_int16_t queue;
 
 	struct nfq_q_handle *qh;
-}
+};
 
-static LIST_HEAD(&expqueue_list);
+static LIST_HEAD(expqueue_list);
 
 static int expqueue_resolve(struct nfcth_handle *h, void *expectfn)
 {
 	struct expqueue_entry *ee;
 	int ret;
 
-	list_for_each_entry(&h->expqueue_list, ee, list) {
+	list_for_each_entry(ee, &h->expqueue_list, list) {
 		if (ee->expectfn == expectfn)
 			return ee->queue;
 	}
@@ -184,7 +180,7 @@
 		return ret;
 	}
 
-	list_add(&h->expqueue_list, &ee->list);
+	list_add(&ee->list, &h->expqueue_list);
 
 	return ee->queue;
 }
@@ -225,7 +221,7 @@
 	if (exp_queue_nr < 0)
 		return exp_queue_nr;
 
-	exp->expectfn_queue_id = exp_queue_nr;
+	exp->exp.expectfn_queue_id = exp_queue_nr;
 
 	ret = nfct_create_expectation(cth, exp->exp);
 }
@@ -238,26 +234,7 @@
 	ret = nfct_delete_expectation(cth, tuple, id);
 }
 
-/* called when we get a packet for helpfn */
-static int helpfn_queue_cb(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg,
-			   struct nfq_data *nfad, void *data)
-{
-	struct nfcth_helper *helper = (struct nfcth_helper *) data;
 
-	return helper->help(nfad, data);
-}
-
-/* called when we need to call an expfn */
-static int expfn_queue_cb(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg,
-			  struct nfq_data *nfad, void *data)
-{
-	struct expqueue_entry *ee = (struct expqueue_entry *) data;
-
-	ee->expfn(FIXME);
-
-	return NF_REPEAT;
-}
-
 int nfcth_helper_register(struct nfcth_handle *h, struct nfcth_helper *helper)
 {
 	int ret;
@@ -278,7 +255,7 @@
 		return ret;
 	}
 
-	list_add(&h->helpers, &helper->list);
+	list_add(&helper->list, &h->helpers);
 
 	return 0;
 }
@@ -315,11 +292,11 @@
 	if (!h->q_h)
 		goto out_nfnlss_close;
 
-	h->ct_h = nfct_open(pf, 0);
+	h->ct_h = nfct_open_nfnl(h->nfnlh, 0, 0);
 	if (!h->ct_h)
 		goto out_nfq;
 
-	INIT_LIST_HEAD(&h->expqeue_list);
+	INIT_LIST_HEAD(&h->expqueue_list);
 	INIT_LIST_HEAD(&h->helpers);
 
 	return h;
@@ -347,26 +324,41 @@
 
 	nfcth = nfcth_open_nfnl(nfnlh);
 	if (!nfcth)
-		nfnl_close();
+		nfnl_close(nfnlh);
 
 	return nfcth;
 }
 
-void nfcth_close(struct nfcth_handle *h)
+void nfcth_close(struct nfcth_handle *hh)
 {
 	struct expqueue_entry *ee, *ee2;
 	struct nfcth_helper *h, *h2;
 
-	nfct_close(h->ct_h);
-	nfq_close(h->q_h);
+	nfct_close(hh->ct_h);
+	nfq_close(hh->q_h);
 
-	list_for_each_entry_safe(&h->helpers, h, h2, list) {
+	list_for_each_entry_safe(h, h2, &hh->helpers, list) {
 		nfcth_helper_unregister(h);	
 		free(h); /* FIXME */
 	}
-	list_for_each_entry_safe(&h->expqueue_list, ee, ee2, list) {
+	list_for_each_entry_safe(ee, ee2, &hh->expqueue_list, list) {
 		list_del(&ee->list);
 		free(ee);
 	}
-	free(h);
+	free(hh);
 }
+
+struct nfnl_handle *nfcth_nfnlh(struct nfcth_handle *h)
+{
+	return h->nfnlh;
+}
+
+int nfcth_fd(struct nfcth_handle *h)
+{
+	return nfnl_fd(h->nfnlh);
+}
+
+int nfcth_handle_packet(struct nfcth_handle *h, char *buf, int len)
+{
+	return nfnl_handle_packet(h->nfnlh, buf, len);
+}




More information about the netfilter-cvslog mailing list