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>

4 files changed, 12 insertions, 5 deletions

diff --git a/conntrackd.8 b/conntrackd.8
index cd7d084..cf15044 100644
--- a/conntrackd.8
+++ b/conntrackd.8
@@ -44,7 +44,7 @@ option will not flush your internal and external cache).
 .BI "-k "
 Kill the daemon
 .TP
-.BI "-s " "[|network|cache|runtime]"
+.BI "-s " "[|network|cache|runtime|link|queue]"
 Dump statistics. If no parameter is passed, it displays the general statistics.
 If "network" is passed as parameter it displays the networking statistics.
 If "cache" is passed as parameter, it shows the extended cache statistics.
diff --git a/include/conntrackd.h b/include/conntrackd.h
index f30a094..3411eb0 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -30,7 +30,7 @@
 #define STATS_NETWORK	28	/* extended network stats		*/
 #define STATS_CACHE	29	/* extended cache stats			*/
 #define STATS_RUNTIME	30	/* extended runtime stats		*/
-#define STATS_MULTICAST	31	/* multicast network stats		*/
+#define STATS_LINK	31	/* dedicated link stats			*/
 #define STATS_QUEUE	32	/* queue stats				*/
 #define FLUSH_INT_CACHE	33	/* flush internal cache			*/
 #define FLUSH_EXT_CACHE	34	/* flush external cache			*/
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;