[netfilter-cvslog] r4342 - trunk/libnfnetlink/src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-10-09 18:37:12 +0200 (Sun, 09 Oct 2005)
New Revision: 4342

Modified:
   trunk/libnfnetlink/src/libnfnetlink.c
Log:
use NFA_TYPE() to use indication of nested/not-nested TLV


Modified: trunk/libnfnetlink/src/libnfnetlink.c
===================================================================
--- trunk/libnfnetlink/src/libnfnetlink.c	2005-10-09 15:46:20 UTC (rev 4341)
+++ trunk/libnfnetlink/src/libnfnetlink.c	2005-10-09 16:37:12 UTC (rev 4342)
@@ -50,7 +50,7 @@
 
 	while (NFA_OK(nfa, len)) {
 		printf("    nfa@%p: nfa_type=%u, nfa_len=%u\n",
-			nfa, nfa->nfa_type, nfa->nfa_len);
+			nfa, NFA_TYPE(nfa), nfa->nfa_len);
 		nfa = NFA_NEXT(nfa,len);
 	}
 }
@@ -584,8 +584,8 @@
 	memset(tb, 0, sizeof(struct nfattr *) * max);
 
 	while (NFA_OK(nfa, len)) {
-		if (nfa->nfa_type <= max)
-			tb[nfa->nfa_type-1] = nfa;
+		if (NFA_TYPE(nfa) <= max)
+			tb[NFA_TYPE(nfa)-1] = nfa;
                 nfa = NFA_NEXT(nfa,len);
 	}
 	if (len)
@@ -732,7 +732,7 @@
 		int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
 
 		while (NFA_OK(attr, attrlen)) {
-			unsigned int flavor = attr->nfa_type;
+			unsigned int flavor = NFA_TYPE(attr);
 			if (flavor) {
 				if (flavor > cb->attr_count)
 					return -EINVAL;