osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Joerg Mayer: mark last packet of TFTP transfer as such in the Info 

column.

Tweak some other stuff while we're at it.

svn path=/trunk/; revision=5552
This commit is contained in:
Guy Harris 2002-05-24 22:50:55 +00:00
parent 94e4e70cdf
commit d50725d623
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -89,7 +89,8 @@ Joerg Mayer <jmayer[AT]loplof.de> {
unused in GCC, and as nothing for other compilers
Add _U_ to unused arguments, and turn off "-Wno-unused"
.cvsignore fixes
Make a pile of stuff not used outside one source file static
Make a pile of stuff not used outside one source file static
Mark last packet of TFTP transfer as such in the Info column
}
Martin Maciaszek <fastjack[AT]i-s-o.net> {

30
packet-tftp.c
View File

@ -5,7 +5,7 @@
* Craig Newell <CraigN@cheque.uq.edu.au>
* RFC2347 TFTP Option Extension
*
* $Id: packet-tftp.c,v 1.36 2002/01/24 09:20:52 guy Exp $
* $Id: packet-tftp.c,v 1.37 2002/05/24 22:50:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -98,6 +98,8 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
conversation_t *conversation;
gint offset = 0;
guint16 opcode;
guint16 bytes;
guint16 blocknum;
u_int i1;
guint16 error;
@ -208,30 +210,36 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case TFTP_DATA:
blocknum = tvb_get_ntohs(tvb, offset);
if (tree) {
proto_tree_add_item(tftp_tree, hf_tftp_blocknum, tvb, offset, 2,
FALSE);
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Block: %i",
tvb_get_ntohs(tvb, offset));
proto_tree_add_uint(tftp_tree, hf_tftp_blocknum, tvb, offset, 2,
blocknum);
}
offset += 2;
bytes = tvb_reported_length_remaining(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Block: %i%s",
blocknum,
(bytes < 512)?" (last)":"" );
}
if (tree) {
proto_tree_add_text(tftp_tree, tvb, offset, -1,
"Data (%d bytes)", tvb_reported_length_remaining(tvb, offset));
"Data (%d bytes)", bytes);
}
break;
case TFTP_ACK:
blocknum = tvb_get_ntohs(tvb, offset);
if (tree) {
proto_tree_add_item(tftp_tree, hf_tftp_blocknum, tvb, offset, 2,
FALSE);
proto_tree_add_uint(tftp_tree, hf_tftp_blocknum, tvb, offset, 2,
blocknum);
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Block: %i",
tvb_get_ntohs(tvb, offset));
blocknum);
}
break;