[netfilter-cvslog] r4409 - trunk/libnfnetlink/include/libnfnetlink

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-10-31 20:00:01 +0100 (Mon, 31 Oct 2005)
New Revision: 4409

Modified:
   trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h
Log:
fix NFNL_HEADSER_LEN calculation (Pablo Neira)


Modified: trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h
===================================================================
--- trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h	2005-10-31 07:57:09 UTC (rev 4408)
+++ trunk/libnfnetlink/include/libnfnetlink/libnfnetlink.h	2005-10-31 19:00:01 UTC (rev 4409)
@@ -1,6 +1,9 @@
 /* libnfnetlink.h: Header file for generic netfilter netlink interface
  *
  * (C) 2002 Harald Welte <laforge at gnumonks.org>
+ *
+ * 2005-10-29 Pablo Neira Ayuso <pablo at netfilter.org>:
+ * 	Fix NFNL_HEADER_LEN
  */
 
 #ifndef __LIBNFNETLINK_H
@@ -18,8 +21,8 @@
 #define NLMSG_TAIL(nlh) \
 	(((void *) (nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))
 
-#define NFNL_HEADER_LEN	(NLMSG_LENGTH(sizeof(struct nlmsghdr))	\
-			 +NLMSG_LENGTH(sizeof(struct nfgenmsg)))
+#define NFNL_HEADER_LEN	(NLMSG_ALIGN(sizeof(struct nlmsghdr))	\
+			 +NLMSG_ALIGN(sizeof(struct nfgenmsg)))
 
 #define NFNL_BUFFSIZE		8192