[netfilter-cvslog] r7494 - in trunk/libnfnetlink: . src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-04-15 17:54:15 +0200 (Tue, 15 Apr 2008)
New Revision: 7494

Modified:
   trunk/libnfnetlink/configure.in
   trunk/libnfnetlink/src/libnfnetlink.c
Log:
fix nfnl_nfa_addattr_l (reported by Rick Xu)


Modified: trunk/libnfnetlink/configure.in
===================================================================
--- trunk/libnfnetlink/configure.in	2008-04-15 13:51:19 UTC (rev 7493)
+++ trunk/libnfnetlink/configure.in	2008-04-15 15:54:15 UTC (rev 7494)
@@ -4,7 +4,7 @@
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(libnfnetlink, 0.0.33)
+AM_INIT_AUTOMAKE(libnfnetlink, 0.0.34)
 
 AC_PROG_CC
 AC_EXEEXT

Modified: trunk/libnfnetlink/src/libnfnetlink.c
===================================================================
--- trunk/libnfnetlink/src/libnfnetlink.c	2008-04-15 13:51:19 UTC (rev 7493)
+++ trunk/libnfnetlink/src/libnfnetlink.c	2008-04-15 15:54:15 UTC (rev 7494)
@@ -799,16 +799,16 @@
 	assert(maxlen > 0);
 	assert(type >= 0);
 
-	if ((NFA_OK(nfa, nfa->nfa_len) + len) > maxlen) {
+	if (NFA_ALIGN(nfa->nfa_len) + len > maxlen) {
 		errno = ENOSPC;
 		return -1;
 	}
 
-	subnfa = (struct nfattr *)(((char *)nfa) + NFA_OK(nfa, nfa->nfa_len));
+	subnfa = (struct nfattr *)(((char *)nfa) + NFA_ALIGN(nfa->nfa_len));
 	subnfa->nfa_type = type;
 	subnfa->nfa_len = len;
 	memcpy(NFA_DATA(subnfa), data, alen);
-	nfa->nfa_len = (NLMSG_ALIGN(nfa->nfa_len) + len);
+	nfa->nfa_len = NFA_ALIGN(nfa->nfa_len) + len;
 
 	return 0;
 }