diff options
author | Guy Harris <guy@alum.mit.edu> | 2002-01-10 11:27:57 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2002-01-10 11:27:57 +0000 |
commit | 381c21783e5a3d0f406ee3ddbb328413464c4ef8 (patch) | |
tree | 4016e78c363af0de71ba41cceb67045adf3f9e5f | |
parent | 65b96f652dc2dc47ed8f98ecadc87b45b9595254 (diff) | |
download | wireshark-381c21783e5a3d0f406ee3ddbb328413464c4ef8.tar.gz wireshark-381c21783e5a3d0f406ee3ddbb328413464c4ef8.tar.bz2 wireshark-381c21783e5a3d0f406ee3ddbb328413464c4ef8.zip |
As per a comment from Ronnie Sahlberg, display TCP sequence numbers in
the list of segments in a desegmented PDU as unsigned, rather than
signed.
Fix some other displays of unsigned quantities with "%d" while we're at
it.
svn path=/trunk/; revision=4516
-rw-r--r-- | packet-clnp.c | 6 | ||||
-rw-r--r-- | packet-ip.c | 10 | ||||
-rw-r--r-- | packet-ipv6.c | 6 | ||||
-rw-r--r-- | packet-tcp.c | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/packet-clnp.c b/packet-clnp.c index 4d128b94ab..6eb70a489d 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,7 +1,7 @@ /* packet-clnp.c * Routines for ISO/OSI network and transport protocol packet disassembly * - * $Id: packet-clnp.c,v 1.43 2001/12/10 00:25:26 guy Exp $ + * $Id: packet-clnp.c,v 1.44 2002/01/10 11:27:56 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -1864,7 +1864,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } fei = proto_tree_add_none_format(ft, hf, tvb, 0, 0, - "Frame:%d payload:%d-%d", + "Frame:%u payload:%u-%u", fd->frame, fd->offset, fd->offset+fd->len-1 @@ -1894,7 +1894,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* nothing of interest for this segment */ proto_tree_add_none_format(ft, hf_clnp_segment, tvb, 0, 0, - "Frame:%d payload:%d-%d", + "Frame:%u payload:%u-%u", fd->frame, fd->offset, fd->offset+fd->len-1 diff --git a/packet-ip.c b/packet-ip.c index aaab2fad27..8793e96323 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.154 2001/12/29 22:01:11 guy Exp $ + * $Id: packet-ip.c,v 1.155 2002/01/10 11:27:56 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1010,7 +1010,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } fei = proto_tree_add_none_format(ft, hf, tvb, 0, 0, - "Frame:%d payload:%d-%d", + "Frame:%u payload:%u-%u", ipfd->frame, ipfd->offset, ipfd->offset+ipfd->len-1 @@ -1040,7 +1040,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* nothing of interest for this fragment */ proto_tree_add_none_format(ft, hf_ip_fragment, tvb, 0, 0, - "Frame:%d payload:%d-%d", + "Frame:%u payload:%u-%u", ipfd->frame, ipfd->offset, ipfd->offset+ipfd->len-1 @@ -1170,7 +1170,7 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, packet_info *pinfo, type?(length + 2):1, "Ext: %s", val_to_str(type, mip_extensions, - "Unknown ext %d")); + "Unknown ext %u")); mip_tree = proto_item_add_subtree(ti, ett_icmp_mip); @@ -1266,7 +1266,7 @@ dissect_mip_extensions(tvbuff_t *tvb, size_t offset, packet_info *pinfo, break; default: - g_warning("Unknown type(%d)! I hope the length is right (%d)", + g_warning("Unknown type(%u)! I hope the length is right (%u)", type, length); offset += length; break; diff --git a/packet-ipv6.c b/packet-ipv6.c index 96385bab20..42c15a9d94 100644 --- a/packet-ipv6.c +++ b/packet-ipv6.c @@ -1,7 +1,7 @@ /* packet-ipv6.c * Routines for IPv6 packet disassembly * - * $Id: packet-ipv6.c,v 1.71 2001/12/10 00:25:29 guy Exp $ + * $Id: packet-ipv6.c,v 1.72 2002/01/10 11:27:56 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -850,7 +850,7 @@ again: } fei = proto_tree_add_none_format(ft, hf, tvb, 0, 0, - "Frame:%d payload:%d-%d", + "Frame:%u payload:%u-%u", ipfd->frame, ipfd->offset, ipfd->offset+ipfd->len-1 @@ -880,7 +880,7 @@ again: /* nothing of interest for this fragment */ proto_tree_add_none_format(ft, hf_ipv6_fragment, tvb, 0, 0, - "Frame:%d payload:%d-%d", + "Frame:%u payload:%u-%u", ipfd->frame, ipfd->offset, ipfd->offset+ipfd->len-1 diff --git a/packet-tcp.c b/packet-tcp.c index ccb5aac324..899942a4fc 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.123 2001/12/10 00:25:39 guy Exp $ + * $Id: packet-tcp.c,v 1.124 2002/01/10 11:27:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -360,7 +360,7 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, st = proto_item_add_subtree(si, ett_tcp_segments); for(ipfd=ipfd_head->next; ipfd; ipfd=ipfd->next){ proto_tree_add_text(st, tvb, 0, 0, - "Frame:%d seq#:%d-%d [%d-%d]", + "Frame:%u seq#:%u-%u [%u-%u]", ipfd->frame, tsk->start_seq + ipfd->offset, tsk->start_seq + ipfd->offset + ipfd->len - 1, @@ -1041,7 +1041,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tcpinfo.urgent = FALSE; if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " Len=%d", seglen); + col_append_fstr(pinfo->cinfo, COL_INFO, " Len=%u", seglen); /* Decode TCP options, if any. */ if (tree && hlen > TCPH_MIN_LEN) { @@ -1049,7 +1049,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) options. */ optlen = hlen - TCPH_MIN_LEN; /* length of options, in bytes */ tf = proto_tree_add_text(tcp_tree, tvb, offset + 20, optlen, - "Options: (%d bytes)", optlen); + "Options: (%u bytes)", optlen); field_tree = proto_item_add_subtree(tf, ett_tcp_options); dissect_ip_tcp_options(tvb, offset + 20, optlen, tcpopts, N_TCP_OPTS, TCPOPT_EOL, pinfo, field_tree); |