[conntrack-tools] sync-mode: change `multicast' by `link' for `-s' option

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=59f5b36aaee6341cdd03981476d91e167c5b6b31
commit 59f5b36aaee6341cdd03981476d91e167c5b6b31
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Mar 17 16:43:34 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Mar 17 16:43:34 2009 +0100

    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 at netfilter.org>

commit 0d3d11e1bf8b10214f547c2e7b38b4ea9edb6f5f
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Mar 17 16:36:41 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Mar 17 16:36:41 2009 +0100

    mcast: mcast_send() takes a const pointer to buffer
    
    This patch removes a compilation warning. The buffer passed to
    be sent must be const.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 7d02950e06511a83f80deee96cc79428ba83dd7f
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Mar 17 16:34:53 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Mar 17 16:34:53 2009 +0100

    sync-mode: cleanup reminiscent of multicast dependency
    
    This patch is a cleanup, it removes a couple of reminiscent
    references to multicast (as now conntrackd is independent of
    the protocol used to replicate state-changes, currently supports
    unicast UDP and multicast).
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit e36d5e5750801f764a1a899891d4da70934074e7
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Mar 13 21:40:44 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Mar 13 21:40:44 2009 +0100

    sync-mode: save one tab inside switch, cleanup
    
    This patch saves one tab in the code.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 5dda1cf738b529d25b22344f9cd1851c8bdab713
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Mar 13 21:20:08 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Mar 13 21:20:08 2009 +0100

    sync-mode: fix wrong output stats refering lost/malformed packets
    
    This patch fixes a misleading output that shows the number of lost
    and malformed packets. Instead, those numbers show the number of
    the number of lost and malformed messages.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  59f5b36aaee6341cdd03981476d91e167c5b6b31 (commit)
       via  0d3d11e1bf8b10214f547c2e7b38b4ea9edb6f5f (commit)
       via  7d02950e06511a83f80deee96cc79428ba83dd7f (commit)
       via  e36d5e5750801f764a1a899891d4da70934074e7 (commit)
       via  5dda1cf738b529d25b22344f9cd1851c8bdab713 (commit)
      from  41e8560ea7c09533d03f523380c1cb5c62d87261 (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 59f5b36aaee6341cdd03981476d91e167c5b6b31
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue Mar 17 16:43:34 2009 +0100

    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 at netfilter.org>

commit 0d3d11e1bf8b10214f547c2e7b38b4ea9edb6f5f
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue Mar 17 16:36:41 2009 +0100

    mcast: mcast_send() takes a const pointer to buffer
    
    This patch removes a compilation warning. The buffer passed to
    be sent must be const.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 7d02950e06511a83f80deee96cc79428ba83dd7f
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue Mar 17 16:34:53 2009 +0100

    sync-mode: cleanup reminiscent of multicast dependency
    
    This patch is a cleanup, it removes a couple of reminiscent
    references to multicast (as now conntrackd is independent of
    the protocol used to replicate state-changes, currently supports
    unicast UDP and multicast).
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit e36d5e5750801f764a1a899891d4da70934074e7
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Mar 13 21:40:44 2009 +0100

    sync-mode: save one tab inside switch, cleanup
    
    This patch saves one tab in the code.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 5dda1cf738b529d25b22344f9cd1851c8bdab713
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Mar 13 21:20:08 2009 +0100

    sync-mode: fix wrong output stats refering lost/malformed packets
    
    This patch fixes a misleading output that shows the number of lost
    and malformed packets. Instead, those numbers show the number of
    the number of lost and malformed messages.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 conntrackd.8         |    2 +-
 include/conntrackd.h |    2 +-
 include/mcast.h      |    2 +-
 src/main.c           |   11 +++++++++--
 src/mcast.c          |    2 +-
 src/sync-mode.c      |   40 ++++++++++++++++++++--------------------
 6 files changed, 33 insertions(+), 26 deletions(-)
This patch fixes a misleading output that shows the number of lost
and malformed packets. Instead, those numbers show the number of
the number of lost and malformed messages.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/sync-mode.c b/src/sync-mode.c
index 22609df..04b2171 100644
--- a/src/sync-mode.c
+++ b/src/sync-mode.c
@@ -347,9 +347,9 @@ static void dump_stats_sync(int fd)
 	char buf[512];
 	int size;
 
-	size = sprintf(buf, "multicast sequence tracking:\n"
-			    "%20llu Pckts mfrm "
-			    "%20llu Pckts lost\n\n",
+	size = sprintf(buf, "message sequence tracking:\n"
+			    "%20llu Msgs mfrm "
+			    "%20llu Msgs lost\n\n",
 			(unsigned long long)STATE_SYNC(error).msg_rcv_malformed,
 			(unsigned long long)STATE_SYNC(error).msg_rcv_lost);