aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ftp.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-07-07 22:52:57 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-07-07 22:52:57 +0000
commit07f42b5b31f9523deeb147226521f77a2c8dd797 (patch)
treec720d2a42f11c9d14ac1a161eb785b438c2c4b14 /packet-ftp.c
parentfba49cfe85d4b23ebbffa97fae126a379e913ecd (diff)
Created a new protocol tree implementation and a new display filter
mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
Diffstat (limited to 'packet-ftp.c')
-rw-r--r--packet-ftp.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/packet-ftp.c b/packet-ftp.c
index a8feed5afd..7dddacd7a3 100644
--- a/packet-ftp.c
+++ b/packet-ftp.c
@@ -2,7 +2,7 @@
* Routines for ftp packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-ftp.c,v 1.3 1999/05/13 01:05:11 sharpe Exp $
+ * $Id: packet-ftp.c,v 1.4 1999/07/07 22:51:43 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -92,23 +92,22 @@ dissect_ftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int
if (tree) {
- ti = proto_tree_add_item(tree, offset, END_OF_FRAME,
+ ti = proto_tree_add_text(tree, offset, END_OF_FRAME,
"File Transfer Protocol");
- ftp_tree = proto_tree_new();
- proto_item_add_subtree(ti, ftp_tree, ETT_FTP);
+ ftp_tree = proto_item_add_subtree(ti, ETT_FTP);
if (pi.match_port == pi.destport) { /* Request */
- proto_tree_add_item(ftp_tree, offset, i1, "Request: %s", rr);
+ proto_tree_add_text(ftp_tree, offset, i1, "Request: %s", rr);
- proto_tree_add_item(ftp_tree, offset + i1 + 1, END_OF_FRAME, "Request Arg: %s", rd);
+ proto_tree_add_text(ftp_tree, offset + i1 + 1, END_OF_FRAME, "Request Arg: %s", rd);
}
else {
- proto_tree_add_item(ftp_tree, offset, i1, "Response: %s", rr);
+ proto_tree_add_text(ftp_tree, offset, i1, "Response: %s", rr);
- proto_tree_add_item(ftp_tree, offset + i1 + 1, END_OF_FRAME, "Response Arg: %s", rd);
+ proto_tree_add_text(ftp_tree, offset + i1 + 1, END_OF_FRAME, "Response Arg: %s", rd);
}
}
@@ -130,7 +129,7 @@ dissect_ftpdata(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
if (tree) {
- ti = proto_tree_add_item(tree, offset, END_OF_FRAME,
+ ti = proto_tree_add_text(tree, offset, END_OF_FRAME,
"File Transfer Protocol Data");
}