[netfilter-cvslog] r6902 - in trunk/libnetfilter_conntrack: . include/libnetfilter_conntrack src src/conntrack

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-07-09 18:02:28 +0200 (Mon, 09 Jul 2007)
New Revision: 6902

Modified:
   trunk/libnetfilter_conntrack/configure.in
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
   trunk/libnetfilter_conntrack/src/conntrack/build.c
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
- introduce nfct_nfnlh() to use functions like nfnl_rcvbufsiz(): return read-only nfnl_handle
- remove unused build_id() from build.c
- bump version to 0.0.81


Modified: trunk/libnetfilter_conntrack/configure.in
===================================================================
--- trunk/libnetfilter_conntrack/configure.in	2007-07-04 11:44:01 UTC (rev 6901)
+++ trunk/libnetfilter_conntrack/configure.in	2007-07-09 16:02:28 UTC (rev 6902)
@@ -4,7 +4,7 @@
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.80)
+AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.81)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL

Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2007-07-04 11:44:01 UTC (rev 6901)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2007-07-09 16:02:28 UTC (rev 6902)
@@ -42,6 +42,7 @@
 extern int nfct_close(struct nfct_handle *cth);
 
 extern int nfct_fd(struct nfct_handle *cth);
+extern const struct nfnl_handle *nfct_nfnlh(struct nfct_handle *cth);
 
 /* 
  * NEW libnetfilter_conntrack API 

Modified: trunk/libnetfilter_conntrack/src/conntrack/build.c
===================================================================
--- trunk/libnetfilter_conntrack/src/conntrack/build.c	2007-07-04 11:44:01 UTC (rev 6901)
+++ trunk/libnetfilter_conntrack/src/conntrack/build.c	2007-07-09 16:02:28 UTC (rev 6902)
@@ -1,5 +1,5 @@
 /*
- * (C) 2006 by Pablo Neira Ayuso <pablo at netfilter.org>
+ * (C) 2006-2007 by Pablo Neira Ayuso <pablo at netfilter.org>
  *
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.
@@ -224,13 +224,6 @@
 	nfnl_addattr32(&req->nlh, size, CTA_MARK, htonl(ct->mark));
 }
 
-void __build_id(struct nfnlhdr *req,
-		size_t size,
-		const const struct nf_conntrack *ct)
-{
-	nfnl_addattr32(&req->nlh, size, CTA_ID, htonl(ct->id));
-}
-
 int __build_conntrack(struct nfnl_subsys_handle *ssh,
 		      struct nfnlhdr *req,
 		      size_t size,

Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2007-07-04 11:44:01 UTC (rev 6901)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2007-07-09 16:02:28 UTC (rev 6902)
@@ -159,6 +159,11 @@
 	return nfnl_fd(cth->nfnlh);
 }
 
+const struct nfnl_handle *nfct_nfnlh(struct nfct_handle *cth)
+{
+	return cth->nfnlh;
+}
+
 void nfct_register_callback(struct nfct_handle *cth, nfct_callback callback,
 			    void *data)
 {