diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /ui/cli/tap-iousers.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ui/cli/tap-iousers.c')
| -rw-r--r-- | ui/cli/tap-iousers.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c index 742f984c..922f0bf8 100644 --- a/ui/cli/tap-iousers.c +++ b/ui/cli/tap-iousers.c @@ -32,10 +32,10 @@ iousers_draw(void *arg) conv_hash_t *hash = (conv_hash_t*)arg; io_users_t *iu = (io_users_t *)hash->user_data; conv_item_t *iui; - guint64 last_frames, max_frames; + uint64_t last_frames, max_frames; struct tm * tm_time; - guint i; - gboolean display_ports = (!strncmp(iu->type, "TCP", 3) || !strncmp(iu->type, "UDP", 3) || !strncmp(iu->type, "SCTP", 4)) ? TRUE : FALSE; + unsigned i; + bool display_ports = (!strncmp(iu->type, "TCP", 3) || !strncmp(iu->type, "UDP", 3) || !strncmp(iu->type, "SCTP", 4)) ? true : false; printf("================================================================================\n"); printf("%s Conversations\n", iu->type); @@ -78,7 +78,7 @@ iousers_draw(void *arg) do { last_frames = 0; for (i=0; (iu->hash.conv_array && i < iu->hash.conv_array->len); i++) { - guint64 tot_frames; + uint64_t tot_frames; iui = &g_array_index(iu->hash.conv_array, conv_item_t, i); tot_frames = iui->rx_frames + iui->tx_frames; @@ -89,7 +89,7 @@ iousers_draw(void *arg) } for (i=0; (iu->hash.conv_array && i < iu->hash.conv_array->len); i++) { - guint64 tot_frames; + uint64_t tot_frames; char *src_addr, *dst_addr; iui = &g_array_index(iu->hash.conv_array, conv_item_t, i); @@ -103,12 +103,12 @@ iousers_draw(void *arg) total_bytes = format_size(iui->tx_bytes + iui->rx_bytes, FORMAT_SIZE_UNIT_BYTES, 0); /* XXX - TODO: make name / port resolution configurable (through gbl_resolv_flags?) */ - src_addr = get_conversation_address(NULL, &iui->src_address, TRUE); - dst_addr = get_conversation_address(NULL, &iui->dst_address, TRUE); + src_addr = get_conversation_address(NULL, &iui->src_address, true); + dst_addr = get_conversation_address(NULL, &iui->dst_address, true); if (display_ports) { char *src, *dst, *src_port, *dst_port; - src_port = get_conversation_port(NULL, iui->src_port, iui->ctype, TRUE); - dst_port = get_conversation_port(NULL, iui->dst_port, iui->ctype, TRUE); + src_port = get_conversation_port(NULL, iui->src_port, iui->ctype, true); + dst_port = get_conversation_port(NULL, iui->dst_port, iui->ctype, true); src = wmem_strconcat(NULL, src_addr, ":", src_port, NULL); dst = wmem_strconcat(NULL, dst_addr, ":", dst_port, NULL); printf("%-26s <-> %-26s %6" PRIu64 " %-9s" |