[conntrack-tools] conntrack: fix English typo in output message
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Tue Apr 14 10:46:44 CEST 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=575fc906a302599cb9afeb136096dfd96bb57b17
commit 575fc906a302599cb9afeb136096dfd96bb57b17
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Apr 14 10:43:21 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Apr 14 10:43:21 2009 +0200
conntrack: fix English typo in output message
This patch fixes an English typo in an output message.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit dfb88dae65fbdc37d72483ddff23171ef4070dae
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Apr 14 10:43:16 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Apr 14 10:43:16 2009 +0200
conntrackd: change scheduler and priority via configuration file
With this patch, you can change the scheduler policy and priority
for conntrackd. Using a RT scheduler policy reduces the chances to
hit ENOBUFS in Netlink.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 549d78e74c1140b1a4dcd35e44e64d51a3c613e6
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Apr 11 16:42:20 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Apr 11 16:42:20 2009 +0200
conntrack: add DCCP support
This patch adds DCCP support for the command line tool conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 19f183958c1ce9d8faf312c7e4009dee5a10e1ac
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Apr 11 16:42:20 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Apr 11 16:42:20 2009 +0200
conntrack: add SCTP support
This patch adds SCTP support to the command line tool conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit ff8cf014f089f1dc36898188f962974091c71c7d
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Apr 11 16:42:20 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Apr 11 16:42:20 2009 +0200
conntrack: add UDPlite support
This patch adds UDPlite support for the command line tool conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit d406e609f664a8151f9e372bbb8fd2ec2c724d35
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Apr 11 16:42:20 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Apr 11 16:42:20 2009 +0200
conntrack: fix coupled-options sanity checkings
This patch extends the generic_opt_check() function to add
extra information on the possible option combinations. Under
some specific situations, like the creation and getting of
a conntrack, you may specify the original or the reply tuple
but at least one MUST be present. This handling has been
always tricky, it still remains but we're more user friendly
at least.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit f1ea9b9233406c479c91e36c250c21dd3ef76496
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Apr 11 15:28:11 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Apr 11 15:28:11 2009 +0200
conntrack: save one indent in the TCP support
This patch saves one extra indent in the switch().
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit b0295040203d269149fda14a3d6b5b4e2262c5ab
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Apr 11 15:22:18 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Apr 11 15:22:18 2009 +0200
conntrack: cleanup error output with `-p tcp --state'
This patch also removes a new line that is not required in the
error message.
# conntrack -L -p tcp --state CLOS
conntrack v0.9.12 (conntrack-tools): Unknown TCP state CLOS
> empty line <
Try `conntrack -h' or 'conntrack --help' for more information.
commit 379e25e374252f1eaf3d0d64eff2b8a19154836c
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Apr 10 20:11:24 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Apr 10 20:11:24 2009 +0200
conntrack: remove hardcoded iteration in TCP support
This patch is a cleanup, it removes a hardcoded iteration in the
TCP support.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit ef4c875db2b1b1a66ade8524516b898396beb721
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Apr 10 20:11:24 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Apr 10 20:11:24 2009 +0200
daemon: remove unused constants in header file
This patch removes a couple of constants that have no clients in
the conntrackd code.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
via 575fc906a302599cb9afeb136096dfd96bb57b17 (commit)
via dfb88dae65fbdc37d72483ddff23171ef4070dae (commit)
via 549d78e74c1140b1a4dcd35e44e64d51a3c613e6 (commit)
via 19f183958c1ce9d8faf312c7e4009dee5a10e1ac (commit)
via ff8cf014f089f1dc36898188f962974091c71c7d (commit)
via d406e609f664a8151f9e372bbb8fd2ec2c724d35 (commit)
via f1ea9b9233406c479c91e36c250c21dd3ef76496 (commit)
via b0295040203d269149fda14a3d6b5b4e2262c5ab (commit)
via 379e25e374252f1eaf3d0d64eff2b8a19154836c (commit)
via ef4c875db2b1b1a66ade8524516b898396beb721 (commit)
from 8180658a4881744c59903d35afd2166caa075068 (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 575fc906a302599cb9afeb136096dfd96bb57b17
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Apr 14 10:43:21 2009 +0200
conntrack: fix English typo in output message
This patch fixes an English typo in an output message.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit dfb88dae65fbdc37d72483ddff23171ef4070dae
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Apr 14 10:43:16 2009 +0200
conntrackd: change scheduler and priority via configuration file
With this patch, you can change the scheduler policy and priority
for conntrackd. Using a RT scheduler policy reduces the chances to
hit ENOBUFS in Netlink.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 549d78e74c1140b1a4dcd35e44e64d51a3c613e6
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Apr 11 16:42:20 2009 +0200
conntrack: add DCCP support
This patch adds DCCP support for the command line tool conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 19f183958c1ce9d8faf312c7e4009dee5a10e1ac
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Apr 11 16:42:20 2009 +0200
conntrack: add SCTP support
This patch adds SCTP support to the command line tool conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit ff8cf014f089f1dc36898188f962974091c71c7d
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Apr 11 16:42:20 2009 +0200
conntrack: add UDPlite support
This patch adds UDPlite support for the command line tool conntrack.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit d406e609f664a8151f9e372bbb8fd2ec2c724d35
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Apr 11 16:42:20 2009 +0200
conntrack: fix coupled-options sanity checkings
This patch extends the generic_opt_check() function to add
extra information on the possible option combinations. Under
some specific situations, like the creation and getting of
a conntrack, you may specify the original or the reply tuple
but at least one MUST be present. This handling has been
always tricky, it still remains but we're more user friendly
at least.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit f1ea9b9233406c479c91e36c250c21dd3ef76496
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Apr 11 15:28:11 2009 +0200
conntrack: save one indent in the TCP support
This patch saves one extra indent in the switch().
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit b0295040203d269149fda14a3d6b5b4e2262c5ab
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Apr 11 15:22:18 2009 +0200
conntrack: cleanup error output with `-p tcp --state'
This patch also removes a new line that is not required in the
error message.
# conntrack -L -p tcp --state CLOS
conntrack v0.9.12 (conntrack-tools): Unknown TCP state CLOS
> empty line <
Try `conntrack -h' or 'conntrack --help' for more information.
commit 379e25e374252f1eaf3d0d64eff2b8a19154836c
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Fri Apr 10 20:11:24 2009 +0200
conntrack: remove hardcoded iteration in TCP support
This patch is a cleanup, it removes a hardcoded iteration in the
TCP support.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit ef4c875db2b1b1a66ade8524516b898396beb721
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Fri Apr 10 20:11:24 2009 +0200
daemon: remove unused constants in header file
This patch removes a couple of constants that have no clients in
the conntrackd code.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
-----------------------------------------------------------------------
conntrack.8 | 57 +++++++++-
doc/stats/conntrackd.conf | 11 ++
doc/sync/alarm/conntrackd.conf | 11 ++
doc/sync/ftfw/conntrackd.conf | 11 ++
doc/sync/notrack/conntrackd.conf | 11 ++
extensions/Makefile.am | 6 +-
extensions/libct_proto_dccp.c | 230 +++++++++++++++++++++++++++++++++++
extensions/libct_proto_icmp.c | 2 +-
extensions/libct_proto_icmpv6.c | 7 +-
extensions/libct_proto_sctp.c | 246 ++++++++++++++++++++++++++++++++++++++
extensions/libct_proto_tcp.c | 194 +++++++++++++++---------------
extensions/libct_proto_udp.c | 52 ++++----
extensions/libct_proto_udplite.c | 197 ++++++++++++++++++++++++++++++
include/conntrack.h | 14 +-
include/conntrackd.h | 10 +-
src/Makefile.am | 2 +-
src/conntrack.c | 98 +++++++++++----
src/main.c | 19 +++-
src/read_config_lex.l | 3 +
src/read_config_yy.y | 30 +++++
20 files changed, 1038 insertions(+), 173 deletions(-)
create mode 100644 extensions/libct_proto_dccp.c
create mode 100644 extensions/libct_proto_sctp.c
create mode 100644 extensions/libct_proto_udplite.c
This patch removes a couple of constants that have no clients in
the conntrackd code.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
diff --git a/include/conntrackd.h b/include/conntrackd.h
index 83f4e24..737c7fd 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -204,12 +204,6 @@ extern struct ct_conf conf;
extern union ct_state state;
extern struct ct_general_state st;
-#ifndef IPPROTO_VRRP
-#define IPPROTO_VRRP 112
-#endif
-
-#define STEPS_PER_SECONDS 5
-
struct ct_mode {
int (*init)(void);
void (*run)(fd_set *readfds);
More information about the netfilter-cvslog
mailing list