[netfilter-cvslog] r7418 - in trunk/conntrack-tools: . include

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-03-25 15:36:14 +0100 (Tue, 25 Mar 2008)
New Revision: 7418

Modified:
   trunk/conntrack-tools/ChangeLog
   trunk/conntrack-tools/configure.in
   trunk/conntrack-tools/include/network.h
   trunk/conntrack-tools/include/state_helper.h
Log:
Pablo Neira Ayuso <pablo at netfilter.org>:
o remove .svn directory from make distcheck tarballs (reported by B.Benjamini)
+
Krzysztof Oledzki <ole at ans.pl>:
o fix minor compilation warning


Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog	2008-03-25 14:34:24 UTC (rev 7417)
+++ trunk/conntrack-tools/ChangeLog	2008-03-25 14:36:14 UTC (rev 7418)
@@ -1,3 +1,12 @@
+version 0.9.7 (yet unreleased)
+------------------------------
+
+Pablo Neira Ayuso <pablo at netfilter.org>:
+o remove .svn directory from make distcheck tarballs (reported by B.Benjamini)
+
+Krzysztof Oledzki <ole at ans.pl>:
+o fix minor compilation warning
+
 version 0.9.6 (2008/03/08)
 ------------------------------
 

Modified: trunk/conntrack-tools/configure.in
===================================================================
--- trunk/conntrack-tools/configure.in	2008-03-25 14:34:24 UTC (rev 7417)
+++ trunk/conntrack-tools/configure.in	2008-03-25 14:36:14 UTC (rev 7418)
@@ -1,4 +1,4 @@
-AC_INIT(conntrack-tools, 0.9.6, pablo at netfilter.org)
+AC_INIT(conntrack-tools, 0.9.7, pablo at netfilter.org)
 
 AC_CANONICAL_SYSTEM
 

Modified: trunk/conntrack-tools/include/network.h
===================================================================
--- trunk/conntrack-tools/include/network.h	2008-03-25 14:34:24 UTC (rev 7417)
+++ trunk/conntrack-tools/include/network.h	2008-03-25 14:36:14 UTC (rev 7418)
@@ -61,7 +61,7 @@
 
 struct mcast_conf;
 
-int mcast_buffered_init(struct mcast_conf *conf);
+int mcast_buffered_init(struct mcast_conf *mconf);
 void mcast_buffered_destroy(void);
 int mcast_buffered_send_netmsg(struct mcast_sock *m, void *data, size_t len);
 ssize_t mcast_buffered_pending_netmsg(struct mcast_sock *m);

Modified: trunk/conntrack-tools/include/state_helper.h
===================================================================
--- trunk/conntrack-tools/include/state_helper.h	2008-03-25 14:34:24 UTC (rev 7417)
+++ trunk/conntrack-tools/include/state_helper.h	2008-03-25 14:36:14 UTC (rev 7418)
@@ -17,6 +17,6 @@
 };
 
 int state_helper_verdict(int type, struct nf_conntrack *ct);
-void state_helper_register(struct state_replication_helper *h, int state);
+void state_helper_register(struct state_replication_helper *h, int h_state);
 
 #endif