[conntrack-tools] config: move `Checksum' inside `Multicast' clause
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Sun Nov 30 11:41:39 CET 2008
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=1fadc34c80a17e291f5ae86ecb84efbdb2aab265
commit 1fadc34c80a17e291f5ae86ecb84efbdb2aab265
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Nov 30 11:40:36 2008 +0100
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Nov 30 11:40:36 2008 +0100
config: move `Checksum' inside `Multicast' clause
This patch moves `Checksum' into the `Multicast' clause. This
property is dependent of the multicast configuration. This patch
is required to introduce the redundant dedicated link support
that is on the way.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
via 1fadc34c80a17e291f5ae86ecb84efbdb2aab265 (commit)
from 1cd6dc33d533d05f5212f215521d5c3c9e362714 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1fadc34c80a17e291f5ae86ecb84efbdb2aab265
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sun Nov 30 11:40:36 2008 +0100
config: move `Checksum' inside `Multicast' clause
This patch moves `Checksum' into the `Multicast' clause. This
property is dependent of the multicast configuration. This patch
is required to introduce the redundant dedicated link support
that is on the way.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
-----------------------------------------------------------------------
doc/sync/alarm/conntrackd.conf | 13 +++++++------
doc/sync/ftfw/conntrackd.conf | 13 +++++++------
doc/sync/notrack/conntrackd.conf | 13 +++++++------
src/read_config_yy.y | 14 ++++++++++++++
4 files changed, 35 insertions(+), 18 deletions(-)
This patch moves `Checksum' into the `Multicast' clause. This
property is dependent of the multicast configuration. This patch
is required to introduce the redundant dedicated link support
that is on the way.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
diff --git a/doc/sync/alarm/conntrackd.conf b/doc/sync/alarm/conntrackd.conf
index 31a1a4d..dfdc91d 100644
--- a/doc/sync/alarm/conntrackd.conf
+++ b/doc/sync/alarm/conntrackd.conf
@@ -94,13 +94,14 @@ Sync {
# the receiver buffer.
#
# McastRcvSocketBuffer 1249280
- }
- #
- # Enable/Disable message checksumming. This is a good property to
- # achieve fault-tolerance. In case of doubt, do not modify this value.
- #
- Checksum on
+ #
+ # Enable/Disable message checksumming. This is a good
+ # property to achieve fault-tolerance. In case of doubt, do
+ # not modify this value.
+ #
+ Checksum on
+ }
}
#
diff --git a/doc/sync/ftfw/conntrackd.conf b/doc/sync/ftfw/conntrackd.conf
index ae2fe78..bf5711e 100644
--- a/doc/sync/ftfw/conntrackd.conf
+++ b/doc/sync/ftfw/conntrackd.conf
@@ -98,13 +98,14 @@ Sync {
# the receiver buffer.
#
# McastRcvSocketBuffer 1249280
- }
- #
- # Enable/Disable message checksumming. This is a good property to
- # achieve fault-tolerance. In case of doubt, do not modify this value.
- #
- Checksum on
+ #
+ # Enable/Disable message checksumming. This is a good
+ # property to achieve fault-tolerance. In case of doubt, do
+ # not modify this value.
+ #
+ Checksum on
+ }
}
#
diff --git a/doc/sync/notrack/conntrackd.conf b/doc/sync/notrack/conntrackd.conf
index d0e141c..90189cd 100644
--- a/doc/sync/notrack/conntrackd.conf
+++ b/doc/sync/notrack/conntrackd.conf
@@ -82,13 +82,14 @@ Sync {
# really recommended to increase the buffer size.
McastRcvSocketBuffer 1249280
- }
- #
- # Enable/Disable message checksumming. This is a good property to
- # achieve fault-tolerance. In case of doubt, do not modify this value.
- #
- Checksum on
+ #
+ # Enable/Disable message checksumming. This is a good
+ # property to achieve fault-tolerance. In case of doubt, do
+ # not modify this value.
+ #
+ Checksum on
+ }
}
#
diff --git a/src/read_config_yy.y b/src/read_config_yy.y
index 32ddeff..69a7eff 100644
--- a/src/read_config_yy.y
+++ b/src/read_config_yy.y
@@ -172,11 +172,15 @@ purge: T_PURGE T_NUMBER
checksum: T_CHECKSUM T_ON
{
+ fprintf(stderr, "WARNING: The use of `Checksum' outside the "
+ "`Multicast' clause is ambiguous.\n");
conf.mcast.checksum = 0;
};
checksum: T_CHECKSUM T_OFF
{
+ fprintf(stderr, "WARNING: The use of `Checksum' outside the "
+ "`Multicast' clause is ambiguous.\n");
conf.mcast.checksum = 1;
};
@@ -357,6 +361,16 @@ multicast_option: T_MCAST_RCVBUFF T_NUMBER
conf.mcast.rcvbuf = $2;
};
+multicast_option: T_CHECKSUM T_ON
+{
+ conf.mcast.checksum = 0;
+};
+
+multicast_option: T_CHECKSUM T_OFF
+{
+ conf.mcast.checksum = 1;
+};
+
hashsize : T_HASHSIZE T_NUMBER
{
conf.hashsize = $2;
More information about the netfilter-cvslog
mailing list