summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>2005-11-22 17:29:07 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>2005-11-22 17:29:07 +0000
commit2082ea8a70a1c3b7c8b47115f00fcbe70fac9ffa (patch)
tree2006a133599d00096facafbe80f3b42f196c4a0e
parent4385f3c343220fde2dfab637a75767be9e9f98d0 (diff)
downloadconntrack-tools-2082ea8a70a1c3b7c8b47115f00fcbe70fac9ffa.tar.gz
conntrack-tools-2082ea8a70a1c3b7c8b47115f00fcbe70fac9ffa.zip
Fixed oversized number of options (Marcus Sundberg)
-rw-r--r--ChangeLog4
-rw-r--r--include/conntrack.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6662998..7909f74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-22
+<marcus@ingate.com>
+ o Fix oversized number of options
+
2005-11-11
<laforge@netfilter.org>
o don't check for kernel header path in configure, since we don't use
diff --git a/include/conntrack.h b/include/conntrack.h
index 98f96f2..1de5b34 100644
--- a/include/conntrack.h
+++ b/include/conntrack.h
@@ -115,9 +115,9 @@ enum options {
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;