[netfilter-cvslog] r6716 - in trunk/libnetfilter_conntrack: include/libnetfilter_conntrack src/conntrack utils

pablo at netfilter.org pablo at netfilter.org
Sat Dec 23 16:41:38 CET 2006


Author: pablo at netfilter.org
Date: 2006-12-23 16:41:38 +0100 (Sat, 23 Dec 2006)
New Revision: 6716

Modified:
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
   trunk/libnetfilter_conntrack/src/conntrack/api.c
   trunk/libnetfilter_conntrack/utils/new_api_test.c
Log:
- replace ntohs by htons in the example file (reported by Victor Stinner)
- introduce NFCT_O_PLAIN flag: NFCT_O_DEFAULT points to NFCT_O_PLAIN
- remove commented line in nfct_new()



Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2006-12-19 17:41:53 UTC (rev 6715)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2006-12-23 15:41:38 UTC (rev 6716)
@@ -494,7 +494,8 @@
 
 /* output type */
 enum {
-	NFCT_O_DEFAULT,
+	NFCT_O_PLAIN,
+	NFCT_O_DEFAULT = NFCT_O_PLAIN,
 	NFCT_O_XML,
 	NFCT_O_MAX
 };

Modified: trunk/libnetfilter_conntrack/src/conntrack/api.c
===================================================================
--- trunk/libnetfilter_conntrack/src/conntrack/api.c	2006-12-19 17:41:53 UTC (rev 6715)
+++ trunk/libnetfilter_conntrack/src/conntrack/api.c	2006-12-23 15:41:38 UTC (rev 6716)
@@ -28,9 +28,6 @@
 
 	memset(ct, 0, sizeof(struct nf_conntrack));
 
-	/* always work with confirmed conntracks */
-//	ct->status |= IPS_CONFIRMED;
-
 	return ct;
 }
 

Modified: trunk/libnetfilter_conntrack/utils/new_api_test.c
===================================================================
--- trunk/libnetfilter_conntrack/utils/new_api_test.c	2006-12-19 17:41:53 UTC (rev 6715)
+++ trunk/libnetfilter_conntrack/utils/new_api_test.c	2006-12-23 15:41:38 UTC (rev 6716)
@@ -54,16 +54,16 @@
 	nfct_set_attr_u32(ct, ATTR_ORIG_IPV4_DST, inet_addr("2.2.2.2"));
 	
 	nfct_set_attr_u8(ct, ATTR_ORIG_L4PROTO, IPPROTO_TCP);
-	nfct_set_attr_u16(ct, ATTR_ORIG_PORT_SRC, ntohs(20));
-	nfct_set_attr_u16(ct, ATTR_ORIG_PORT_DST, ntohs(10));
+	nfct_set_attr_u16(ct, ATTR_ORIG_PORT_SRC, htons(20));
+	nfct_set_attr_u16(ct, ATTR_ORIG_PORT_DST, htons(10));
 
 	nfct_set_attr_u8(ct, ATTR_REPL_L3PROTO, AF_INET);
 	nfct_set_attr_u32(ct, ATTR_REPL_IPV4_SRC, inet_addr("2.2.2.2"));
 	nfct_set_attr_u32(ct, ATTR_REPL_IPV4_DST, inet_addr("1.1.1.1"));
 	
 	nfct_set_attr_u8(ct, ATTR_REPL_L4PROTO, IPPROTO_TCP);
-	nfct_set_attr_u16(ct, ATTR_REPL_PORT_SRC, ntohs(10));
-	nfct_set_attr_u16(ct, ATTR_REPL_PORT_DST, ntohs(20));
+	nfct_set_attr_u16(ct, ATTR_REPL_PORT_SRC, htons(10));
+	nfct_set_attr_u16(ct, ATTR_REPL_PORT_DST, htons(20));
 
 	nfct_set_attr_u8(ct, ATTR_TCP_STATE, TCP_CONNTRACK_LISTEN);
 	nfct_set_attr_u32(ct, ATTR_TIMEOUT, 100);




More information about the netfilter-cvslog mailing list