From 59f5b36aaee6341cdd03981476d91e167c5b6b31 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 17 Mar 2009 16:43:34 +0100 Subject: 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 --- src/main.c | 11 +++++++++-- src/sync-mode.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src') 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; -- cgit v1.2.3