summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2009-03-17 16:43:34 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2009-03-17 16:43:34 +0100
commit59f5b36aaee6341cdd03981476d91e167c5b6b31 (patch)
tree4a1ddfe3b8d02ebb87b03313d2dd5641a1ec4aff /src
parent0d3d11e1bf8b10214f547c2e7b38b4ea9edb6f5f (diff)
sync-mode: change `multicast' by `link' for `-s' option
This patch obsoletes `-s multicast' by `-s link' to display the dedicated link statistics, as the current dedicated link protocol use can be unicast UDP or multicast. The term "link" is more generic. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/main.c11
-rw-r--r--src/sync-mode.c2
2 files changed, 10 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 26937e1..62ae599 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,7 @@ static const char usage_client_commands[] =
" -i, display content of the internal cache\n"
" -e, display the content of the external cache\n"
" -k, kill conntrack daemon\n"
- " -s [|network|cache|runtime|multicast|queue], dump statistics\n"
+ " -s [|network|cache|runtime|link|queue], dump statistics\n"
" -R, resync with kernel conntrack table\n"
" -n, request resync with other node (only FT-FW and NOTRACK modes)\n"
" -x, dump cache in XML format (requires -i or -e)\n"
@@ -200,7 +200,14 @@ int main(int argc, char *argv[])
i++;
} else if (strncmp(argv[i+1], "multicast",
strlen(argv[i+1])) == 0) {
- action = STATS_MULTICAST;
+ fprintf(stderr, "WARNING: use `link' "
+ "instead of `multicast' as "
+ "parameter.\n");
+ action = STATS_LINK;
+ i++;
+ } else if (strncmp(argv[i+1], "link",
+ strlen(argv[i+1])) == 0) {
+ action = STATS_LINK;
i++;
} else if (strncmp(argv[i+1], "queue",
strlen(argv[i+1])) == 0) {
diff --git a/src/sync-mode.c b/src/sync-mode.c
index bd831aa..776b4ab 100644
--- a/src/sync-mode.c
+++ b/src/sync-mode.c
@@ -478,7 +478,7 @@ static int local_handler_sync(int fd, int type, void *data)
cache_stats_extended(STATE_SYNC(internal), fd);
cache_stats_extended(STATE_SYNC(external), fd);
break;
- case STATS_MULTICAST:
+ case STATS_LINK:
multichannel_stats_extended(STATE_SYNC(channel),
STATE_SYNC(interface), fd);
break;