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

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2005-11-22 18:29:07 +0100 (Tue, 22 Nov 2005)
New Revision: 4548

Modified:
   trunk/conntrack/ChangeLog
   trunk/conntrack/include/conntrack.h
Log:
Fixed oversized number of options (Marcus Sundberg)



Modified: trunk/conntrack/ChangeLog
===================================================================
--- trunk/conntrack/ChangeLog	2005-11-22 08:54:28 UTC (rev 4547)
+++ trunk/conntrack/ChangeLog	2005-11-22 17:29:07 UTC (rev 4548)
@@ -1,3 +1,7 @@
+2005-11-22
+<marcus at ingate.com>
+	o Fix oversized number of options
+
 2005-11-11
 <laforge at netfilter.org>
 	o don't check for kernel header path in configure, since we don't use

Modified: trunk/conntrack/include/conntrack.h
===================================================================
--- trunk/conntrack/include/conntrack.h	2005-11-22 08:54:28 UTC (rev 4547)
+++ trunk/conntrack/include/conntrack.h	2005-11-22 17:29:07 UTC (rev 4548)
@@ -115,9 +115,9 @@
 	CT_OPT_ID_BIT		= 15,
 	CT_OPT_ID		= (1 << CT_OPT_ID_BIT),
 
-	CT_OPT_MAX		= CT_OPT_ID
+	CT_OPT_MAX_BIT		= CT_OPT_ID_BIT
 };
-#define NUMBER_OF_OPT   CT_OPT_MAX
+#define NUMBER_OF_OPT   CT_OPT_MAX_BIT+1
 
 struct ctproto_handler {
 	struct list_head 	head;