osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

TFTP Option Extension (RFC 2347) support, from Craig Newell. 

svn path=/trunk/; revision=1573
This commit is contained in:
Guy Harris 2000-01-27 07:09:45 +00:00
parent ba520e3c93
commit 4410e4274c
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -234,6 +234,10 @@ Gerrit Gehnen <G.Gehnen@atrie.de> {
support for "Inactive Subset" of ISO CLNP
}
Craig Newell <craign@cheque.uq.edu.au> {
TFTP options (RFC 2347) support
}
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -818,6 +818,7 @@ B<http://ethereal.zing.org>.
Laurent Cazalet <laurent.cazalet@mailclub.net>
Thomas Parvais <thomas.parvais@advalvas.be>
Gerrit Gehnen <G.Gehnen@atrie.de>
Craig Newell <craign@cheque.uq.edu.au>
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

48
packet-tftp.c
View File

@ -2,8 +2,10 @@
* Routines for tftp packet dissection
*
* Richard Sharpe <rsharpe@ns.aus.com>
* Craig Newell <CraigN@cheque.uq.edu.au>
* RFC2347 TFTP Option Extension
*
* $Id: packet-tftp.c,v 1.8 2000/01/07 22:05:41 guy Exp $
* $Id: packet-tftp.c,v 1.9 2000/01/27 07:09:15 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -52,6 +54,7 @@ static gint ett_tftp = -1;
#define DATA 3
#define ACK 4
#define ERROR 5
#define OACK 6
char *tftp_opcodes[8] = {
"Unknown Request",
@ -60,7 +63,7 @@ char *tftp_opcodes[8] = {
"Data Packet",
"Acknowledgement",
"Error Code",
"Unknown Request",
"Option Acknowledgement",
"Unknown Request"
};
@ -88,7 +91,7 @@ dissect_tftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (check_col(fd, COL_INFO)) {
i1 = pntohs(&pd[offset]);
col_add_fstr(fd, COL_INFO, "TFTP %s", i1 <= ERROR ? tftp_opcodes[i1 % 8] : "Unknown Request");
col_add_fstr(fd, COL_INFO, "TFTP %s", i1 <= OACK ? tftp_opcodes[i1 % 8] : "Unknown Request");
}
@ -107,7 +110,17 @@ dissect_tftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
i1 = strlen(pd+offset);
proto_tree_add_text(tftp_tree, offset, i1+1, "Source File: %s", pd+offset);
offset += i1 + 1;
proto_tree_add_text(tftp_tree, offset, END_OF_FRAME, "Type: %s",pd+offset);
i1 = strlen(pd+offset);
proto_tree_add_text(tftp_tree, offset, i1+1, "Type: %s",pd+offset);
offset += i1 + 1;
while (offset < pi.captured_len) {
int i2;
i1 = strlen(pd+offset); /* length of option */
i2 = strlen(pd+offset+i1+1); /* length of value */
proto_tree_add_text(tftp_tree, offset, i1+i2+2, "Option: %s = %s",
pd+offset, pd+offset+i1+1);
offset += i1 + i2 + 2;
}
break;
case WRQ:
proto_tree_add_text(tftp_tree, offset, 2, "Write Request");
@ -115,7 +128,17 @@ dissect_tftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
i1 = strlen(pd+offset);
proto_tree_add_text(tftp_tree, offset, i1+1, "Destination File: %s", pd+offset);
offset += i1 + 1;
proto_tree_add_text(tftp_tree, offset+2, END_OF_FRAME, "Type: %s",pd+offset);
i1 = strlen(pd+offset);
proto_tree_add_text(tftp_tree, offset, i1+1, "Type: %s",pd+offset);
offset += i1 + 1;
while (offset < pi.captured_len) {
int i2;
i1 = strlen(pd+offset); /* length of option */
i2 = strlen(pd+offset+i1+1); /* length of value */
proto_tree_add_text(tftp_tree, offset, i1+i2+2, "Option: %s = %s",
pd+offset, pd+offset+i1+1);
offset += i1 + i2 + 2;
}
break;
case DATA:
proto_tree_add_text(tftp_tree, offset, 2, "Data Packet");
@ -141,6 +164,21 @@ dissect_tftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
offset += 2;
proto_tree_add_text(tftp_tree, offset, END_OF_FRAME, "Error Message: %s", pd + offset);
break;
case OACK:
proto_tree_add_text(tftp_tree, offset, 2, "Option Acknowledgement");
offset += 2;
i1 = pntohs(pd+offset);
proto_tree_add_text(tftp_tree, offset, 2, "Block = %u", i1);
offset += 2;
while (offset < pi.captured_len) {
int i2;
i1 = strlen(pd+offset); /* length of option */
i2 = strlen(pd+offset+i1+1); /* length of value */
proto_tree_add_text(tftp_tree, offset, i1+i2+2, "Option: %s = %s",
pd+offset, pd+offset+i1+1);
offset += i1 + i2 + 2;
}
break;
default:
proto_tree_add_text(tftp_tree, offset, 2, "Unknown TFTP Request: %0X.", i1);
offset += 2;