![Guy Harris](/assets/img/avatar_default.png)
statements. Move the setting of the Protocol column in various dissectors before anything is fetched from the packet, and also clear the Info column at that point in those and some other dissectors, so that if an exception is thrown, the columns don't reflect the previous protocol. Don't use col_add_fstr(..., "%s", string); Use col_add_str(..., string); as it does the same thing, but doesn't drag all the heavy *printf machinery in. Fix the DDTP dissector to set the Info column regardless of whether we're building a protocol tree or not, and to set it to "Encrypted payload" if the payload is encrypted. Also fix a typo in a field name. Register the FTP data dissector as being associated with the FTP data protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()" call checked "proto_ftp_data", and the removed "pinfo->current_proto =" line set it to "FTP-DATA", so it should be associated with "proto_ftp_data"). Make the H1 dissector check whether the frame has at least 2 bytes in it before checking the first two bytes; heuristic dissectors must not throw exceptions until they've accepted the packet as one of theirs. Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()" in some dissectors where the result of "tvb_get_ptr()" is used only in the "format_text()" call. In the Quake dissector, don't check whether there are at least 4 bytes in the packet - if we return, the packet won't be dissected at all (it's not as if some other dissector will get to handle it), and, if we don't return, we'll throw an exception if there aren't at least 4 bytes in the packet, so the packet will be marked as short or malformed, as appropriate. In the RIPng dissector, associate the table of strings for the command field with the command field, so that the dissector doesn't have to format the string for the protocol tree entry itself, and so that the filter construction dialog box can let you select "Request" or "Response" from a list rather than requiring you to know the values for "Request" and "Response". Make "dissect_rpc()" static, as it's called only through a heuristic dissector list. Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols; the string used is from a table provided by the dissector, and is a string constant. Don't format the Info column for WSP into a buffer and then format that buffer into the column with "%s" - "col_add_fstr()" can do the formatting for you, without having to allocate your own buffer (or run through the *printf machinery twice). Don't fetch fields from the WTP packet until you're ready to use them, so that you don't throw an exception before you even set the Protocol column or clear the Info column. Use "pinfo->destport", not "pi.destport", in the Zebra dissector when checking whether the packet is a request or reply, and do the check by comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that if the dissector is ever registered on another port, it still correctly determines whether the packet is a request or reply - the Network Monitor HTTP dissector has port 80 wired into its brain, which is a bit irritating if you're trying to get it to dissect HTTP proxy traffic on port 3128 or proxy administration UI traffic on port 3132). svn path=/trunk/; revision=2931
266 lines
7 KiB
C
266 lines
7 KiB
C
/* packet-ftp.c
|
|
* Routines for ftp packet dissection
|
|
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
|
*
|
|
* $Id: packet-ftp.c,v 1.27 2001/01/22 08:03:45 guy Exp $
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@zing.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* Copied from packet-pop.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include "config.h"
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
# include <netinet/in.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include <glib.h>
|
|
#include "packet.h"
|
|
#include "strutil.h"
|
|
|
|
static int proto_ftp = -1;
|
|
static int proto_ftp_data = -1;
|
|
static int hf_ftp_response = -1;
|
|
static int hf_ftp_request = -1;
|
|
static int hf_ftp_request_command = -1;
|
|
static int hf_ftp_request_data = -1;
|
|
static int hf_ftp_response_code = -1;
|
|
static int hf_ftp_response_data = -1;
|
|
|
|
static gint ett_ftp = -1;
|
|
static gint ett_ftp_data = -1;
|
|
|
|
#define TCP_PORT_FTPDATA 20
|
|
#define TCP_PORT_FTP 21
|
|
|
|
static void
|
|
dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
{
|
|
gboolean is_request;
|
|
proto_tree *ftp_tree;
|
|
proto_item *ti;
|
|
gint offset = 0;
|
|
const u_char *line;
|
|
gint next_offset;
|
|
int linelen;
|
|
int tokenlen;
|
|
const u_char *next_token;
|
|
|
|
if (pinfo->match_port == pinfo->destport)
|
|
is_request = TRUE;
|
|
else
|
|
is_request = FALSE;
|
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "FTP");
|
|
|
|
/*
|
|
* Find the end of the first line.
|
|
*
|
|
* Note that "tvb_find_line_end()" will return a value that is
|
|
* not longer than what's in the buffer, so the "tvb_get_ptr()"
|
|
* call won't throw an exception.
|
|
*/
|
|
linelen = tvb_find_line_end(tvb, offset, -1, &next_offset);
|
|
line = tvb_get_ptr(tvb, offset, linelen);
|
|
|
|
if (check_col(pinfo->fd, COL_INFO)) {
|
|
/*
|
|
* Put the first line from the buffer into the summary
|
|
* (but leave out the line terminator).
|
|
*/
|
|
col_add_fstr(pinfo->fd, COL_INFO, "%s: %s",
|
|
is_request ? "Request" : "Response",
|
|
format_text(line, linelen));
|
|
}
|
|
|
|
if (tree) {
|
|
ti = proto_tree_add_item(tree, proto_ftp, tvb, offset,
|
|
tvb_length_remaining(tvb, offset), FALSE);
|
|
ftp_tree = proto_item_add_subtree(ti, ett_ftp);
|
|
|
|
if (is_request) {
|
|
proto_tree_add_boolean_hidden(ftp_tree,
|
|
hf_ftp_request, tvb, 0, 0, TRUE);
|
|
proto_tree_add_boolean_hidden(ftp_tree,
|
|
hf_ftp_response, tvb, 0, 0, FALSE);
|
|
} else {
|
|
proto_tree_add_boolean_hidden(ftp_tree,
|
|
hf_ftp_request, tvb, 0, 0, FALSE);
|
|
proto_tree_add_boolean_hidden(ftp_tree,
|
|
hf_ftp_response, tvb, 0, 0, TRUE);
|
|
}
|
|
|
|
/*
|
|
* Extract the first token, and, if there is a first
|
|
* token, add it as the request or reply code.
|
|
*/
|
|
tokenlen = get_token_len(line, line + linelen, &next_token);
|
|
if (tokenlen != 0) {
|
|
if (is_request) {
|
|
proto_tree_add_string_format(ftp_tree,
|
|
hf_ftp_request_command, tvb, offset,
|
|
tokenlen, line, "Request: %s",
|
|
format_text(line, tokenlen));
|
|
} else {
|
|
proto_tree_add_uint_format(ftp_tree,
|
|
hf_ftp_response_code, tvb, offset,
|
|
tokenlen, atoi(line), "Response: %s",
|
|
format_text(line, tokenlen));
|
|
}
|
|
offset += next_token - line;
|
|
linelen -= next_token - line;
|
|
line = next_token;
|
|
}
|
|
|
|
/*
|
|
* Add the rest of the first line as request or
|
|
* reply data.
|
|
*/
|
|
if (linelen != 0) {
|
|
if (is_request) {
|
|
proto_tree_add_string_format(ftp_tree,
|
|
hf_ftp_request_data, tvb, offset,
|
|
linelen, line, "Request Arg: %s",
|
|
format_text(line, linelen));
|
|
} else {
|
|
proto_tree_add_string_format(ftp_tree,
|
|
hf_ftp_response_data, tvb, offset,
|
|
linelen, line, "Response Arg: %s",
|
|
format_text(line, linelen));
|
|
}
|
|
}
|
|
offset = next_offset;
|
|
|
|
/*
|
|
* Show the rest of the request or response as text,
|
|
* a line at a time.
|
|
*/
|
|
while (tvb_offset_exists(tvb, offset)) {
|
|
/*
|
|
* Find the end of the line.
|
|
*/
|
|
linelen = tvb_find_line_end(tvb, offset, -1,
|
|
&next_offset);
|
|
|
|
/*
|
|
* Put this line.
|
|
*/
|
|
proto_tree_add_text(ftp_tree, tvb, offset,
|
|
next_offset - offset, "%s",
|
|
tvb_format_text(tvb, offset, next_offset - offset));
|
|
offset = next_offset;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
{
|
|
proto_tree *ti, *ftp_data_tree;
|
|
int data_length;
|
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "FTP-DATA");
|
|
|
|
if (check_col(pinfo->fd, COL_INFO)) {
|
|
col_add_fstr(pinfo->fd, COL_INFO, "FTP Data: %u bytes",
|
|
tvb_length(tvb));
|
|
}
|
|
|
|
if (tree) {
|
|
data_length = tvb_length(tvb);
|
|
|
|
ti = proto_tree_add_item(tree, proto_ftp_data, tvb, 0,
|
|
data_length, FALSE);
|
|
ftp_data_tree = proto_item_add_subtree(ti, ett_ftp_data);
|
|
|
|
/*
|
|
* XXX - if this is binary data, it'll produce
|
|
* a *really* long line.
|
|
*/
|
|
proto_tree_add_text(ftp_data_tree, tvb, 0, data_length,
|
|
"FTP Data: %s", tvb_format_text(tvb, 0, data_length));
|
|
}
|
|
}
|
|
|
|
void
|
|
proto_register_ftp(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_ftp_response,
|
|
{ "Response", "ftp.response",
|
|
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
|
"TRUE if FTP response" }},
|
|
|
|
{ &hf_ftp_request,
|
|
{ "Request", "ftp.request",
|
|
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
|
"TRUE if FTP request" }},
|
|
|
|
{ &hf_ftp_request_command,
|
|
{ "Request command", "ftp.request.command",
|
|
FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_ftp_request_data,
|
|
{ "Request data", "ftp.request.data",
|
|
FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_ftp_response_code,
|
|
{ "Response code", "ftp.response.code",
|
|
FT_UINT8, BASE_DEC, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_ftp_response_data,
|
|
{ "Response data", "ftp.reponse.data",
|
|
FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }}
|
|
};
|
|
static gint *ett[] = {
|
|
&ett_ftp,
|
|
&ett_ftp_data,
|
|
};
|
|
|
|
proto_ftp = proto_register_protocol("File Transfer Protocol (FTP)", "FTP",
|
|
"ftp");
|
|
proto_ftp_data = proto_register_protocol("FTP Data", "FTP-DATA", "ftp-data");
|
|
proto_register_field_array(proto_ftp, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_ftp(void)
|
|
{
|
|
dissector_add("tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata, proto_ftp_data);
|
|
dissector_add("tcp.port", TCP_PORT_FTP, &dissect_ftp, proto_ftp_data);
|
|
}
|