diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-07-31 12:13:08 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-07-31 19:13:41 +0000 |
commit | 20a3248ebb8648928c456e8c0da138dfe966a411 (patch) | |
tree | 4f3761a0b8f164ce001886e8cca3d543ec023cae | |
parent | a9dcc80f1ba9b3407ac3591940b1bbcefb865f39 (diff) |
Frame numbers are unsigned.
Change-Id: I07641b0a759058fe5111e10c3ccd4c8f69eeccef
Reviewed-on: https://code.wireshark.org/review/28894
Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r-- | epan/conversation.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index d534edf69a..8186ecf89d 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -639,7 +639,7 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address /* * Ports 1 and 2. */ - DPRINT(("creating conversation for frame #%d: %u -> %u (etype=%d)", + DPRINT(("creating conversation for frame #%u: %u -> %u (etype=%d)", setup_frame, port1, port2, etype)); } } else { @@ -650,14 +650,14 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address /* * Port 1 but not port 2. */ - DPRINT(("creating conversation for frame #%d: ID %u, address %s (etype=%d)", + DPRINT(("creating conversation for frame #%u: ID %u, address %s (etype=%d)", setup_frame, port1, address_to_str(wmem_packet_scope(), addr2), etype)); } else { /* * Ports 1 and 2. */ - DPRINT(("creating conversation for frame #%d: %u -> %s:%u (etype=%d)", + DPRINT(("creating conversation for frame #%u: %u -> %s:%u (etype=%d)", setup_frame, port1, address_to_str(wmem_packet_scope(), addr2), port2, etype)); } @@ -674,14 +674,14 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address /* * Port 1 but not port 2. */ - DPRINT(("creating conversation for frame #%d: %s:%u (etype=%d)", + DPRINT(("creating conversation for frame #%u: %s:%u (etype=%d)", setup_frame, address_to_str(wmem_packet_scope(), addr1), port1, etype)); } else { /* * Ports 1 and 2. */ - DPRINT(("creating conversation for frame #%d: %s:%u -> %u (etype=%d)", + DPRINT(("creating conversation for frame #%u: %s:%u -> %u (etype=%d)", setup_frame, address_to_str(wmem_packet_scope(), addr1), port1, port2, etype)); } @@ -693,14 +693,14 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address /* * Port 1 but not port 2. */ - DPRINT(("creating conversation for frame #%d: %s:%u -> %s (etype=%d)", + DPRINT(("creating conversation for frame #%u: %s:%u -> %s (etype=%d)", setup_frame, address_to_str(wmem_packet_scope(), addr1), port1, address_to_str(wmem_packet_scope(), addr2), etype)); } else { /* * Ports 1 and 2. */ - DPRINT(("creating conversation for frame #%d: %s:%u -> %s:%u (etype=%d)", + DPRINT(("creating conversation for frame #%u: %s:%u -> %s:%u (etype=%d)", setup_frame, address_to_str(wmem_packet_scope(), addr1), port1, address_to_str(wmem_packet_scope(), addr2), port2, etype)); } @@ -1422,7 +1422,7 @@ find_conversation_pinfo(packet_info *pinfo, const guint options) { conversation_t *conv=NULL; - DPRINT(("called for frame #%d: %s:%d -> %s:%d (ptype=%d)", + DPRINT(("called for frame #%u: %s:%d -> %s:%d (ptype=%d)", pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, pinfo->ptype)); DINDENT(); @@ -1433,7 +1433,7 @@ find_conversation_pinfo(packet_info *pinfo, const guint options) if ((conv = find_conversation(pinfo->num, &pinfo->conv_endpoint->addr1, &pinfo->conv_endpoint->addr2, pinfo->conv_endpoint->etype, pinfo->conv_endpoint->port1, pinfo->conv_endpoint->port2, pinfo->conv_endpoint->options)) != NULL) { - DPRINT(("found previous conversation for frame #%d (last_frame=%d)", + DPRINT(("found previous conversation for frame #%u (last_frame=%d)", pinfo->num, conv->last_frame)); if (pinfo->num > conv->last_frame) { conv->last_frame = pinfo->num; @@ -1443,7 +1443,7 @@ find_conversation_pinfo(packet_info *pinfo, const guint options) if ((conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, conversation_pt_to_endpoint_type(pinfo->ptype), pinfo->srcport, pinfo->destport, options)) != NULL) { - DPRINT(("found previous conversation for frame #%d (last_frame=%d)", + DPRINT(("found previous conversation for frame #%u (last_frame=%d)", pinfo->num, conv->last_frame)); if (pinfo->num > conv->last_frame) { conv->last_frame = pinfo->num; @@ -1468,7 +1468,7 @@ find_or_create_conversation(packet_info *pinfo) /* Have we seen this conversation before? */ if ((conv = find_conversation_pinfo(pinfo, 0)) == NULL) { /* No, this is a new conversation. */ - DPRINT(("did not find previous conversation for frame #%d", + DPRINT(("did not find previous conversation for frame #%u", pinfo->num)); DINDENT(); conv = conversation_new(pinfo->num, &pinfo->src, |