diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-06-20 20:07:33 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-06-20 20:07:33 +0200 |
| commit | faea76e8bc626549f4d338a3bf22e466336264ca (patch) | |
| tree | 1a43e5d19143042f8b92c081f8fd45ed43ed9218 | |
| parent | d9c0564db6b3f3ecb196508458a91b03d45fadb2 (diff) | |
| download | conntrack-tools-faea76e8bc626549f4d338a3bf22e466336264ca.tar.gz conntrack-tools-faea76e8bc626549f4d338a3bf22e466336264ca.zip | |
conntrackd: rename `-s queue' option by `-s rsqueue'
This patch renames the statistics option that displays the content
of the resend queue which is used by the ftfw mode.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | conntrackd.8 | 2 | ||||
| -rw-r--r-- | include/conntrackd.h | 2 | ||||
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/sync-ftfw.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/conntrackd.8 b/conntrackd.8 index 1342c22..61a3e0e 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|link|queue|process]" +.BI "-s " "[|network|cache|runtime|link|rsqueue|process]" 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 04dc611..40566bd 100644 --- a/include/conntrackd.h +++ b/include/conntrackd.h @@ -31,7 +31,7 @@ #define STATS_CACHE 29 /* extended cache stats */ #define STATS_RUNTIME 30 /* extended runtime stats */ #define STATS_LINK 31 /* dedicated link stats */ -#define STATS_QUEUE 32 /* queue stats */ +#define STATS_RSQUEUE 32 /* resend queue stats */ #define FLUSH_INT_CACHE 33 /* flush internal cache */ #define FLUSH_EXT_CACHE 34 /* flush external cache */ #define STATS_PROCESS 35 /* child process stats */ @@ -44,7 +44,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|link|queue], dump statistics\n" + " -s [|network|cache|runtime|link|rsqueue], 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" @@ -210,9 +210,9 @@ int main(int argc, char *argv[]) strlen(argv[i+1])) == 0) { action = STATS_LINK; i++; - } else if (strncmp(argv[i+1], "queue", + } else if (strncmp(argv[i+1], "rsqueue", strlen(argv[i+1])) == 0) { - action = STATS_QUEUE; + action = STATS_RSQUEUE; i++; } else if (strncmp(argv[i+1], "process", strlen(argv[i+1])) == 0) { diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c index e026b1c..e7c9af2 100644 --- a/src/sync-ftfw.c +++ b/src/sync-ftfw.c @@ -226,7 +226,7 @@ static int ftfw_local(int fd, int type, void *data) dlog(LOG_NOTICE, "sending bulk update"); cache_iterate(STATE_SYNC(internal), NULL, do_cache_to_tx); break; - case STATS_QUEUE: + case STATS_RSQUEUE: ftfw_local_queue(fd); break; default: |