[netfilter-cvslog] r4280 - in trunk/libnfnetlink_log: include/libnfnetlink_log src

laforge at netfilter.org laforge at netfilter.org
Fri Sep 23 20:38:11 CEST 2005


Author: laforge at netfilter.org
Date: 2005-09-23 20:38:11 +0200 (Fri, 23 Sep 2005)
New Revision: 4280

Modified:
   trunk/libnfnetlink_log/include/libnfnetlink_log/libnfnetlink_log.h
   trunk/libnfnetlink_log/src/libnfnetlink_log.c
Log:
fix header dependencies


Modified: trunk/libnfnetlink_log/include/libnfnetlink_log/libnfnetlink_log.h
===================================================================
--- trunk/libnfnetlink_log/include/libnfnetlink_log/libnfnetlink_log.h	2005-09-23 16:00:32 UTC (rev 4279)
+++ trunk/libnfnetlink_log/include/libnfnetlink_log/libnfnetlink_log.h	2005-09-23 18:38:11 UTC (rev 4280)
@@ -9,9 +9,9 @@
 #ifndef __LIBNFNETLINK_LOG_H
 #define __LIBNFNETLINK_LOG_H
 
-#include <linux/netfilter/nfnetlink.h>
+#include <libnfnetlink/libnfnetlink.h>
+//#include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_log.h>
-#include <libnfnetlink/libnfnetlink.h>
 
 struct nfulnl_handle;
 struct nfulnl_g_handle;
@@ -21,8 +21,8 @@
 extern struct nfnl_handle *nfulnl_nfnlh(struct nfulnl_handle *h);
 extern int nfulnl_fd(struct nfulnl_handle *h);
 
-typedef nfulnl_callback(struct nfulnl_g_handle *gh, struct nfgenmsg *nfmsg,
-			struct nfattr *nfa[], void *data);
+typedef int nfulnl_callback(struct nfulnl_g_handle *gh, struct nfgenmsg *nfmsg,
+			    struct nfattr *nfa[], void *data);
 
 
 extern struct nfulnl_handle *nfulnl_open(void);

Modified: trunk/libnfnetlink_log/src/libnfnetlink_log.c
===================================================================
--- trunk/libnfnetlink_log/src/libnfnetlink_log.c	2005-09-23 16:00:32 UTC (rev 4279)
+++ trunk/libnfnetlink_log/src/libnfnetlink_log.c	2005-09-23 18:38:11 UTC (rev 4280)
@@ -25,9 +25,6 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <linux/netlink.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_log.h>
 #include <libnfnetlink/libnfnetlink.h>
 #include <libnfnetlink_log/libnfnetlink_log.h>
 




More information about the netfilter-cvslog mailing list