1999-04-05 21:54:41 +00:00
|
|
|
/* packet-ftp.c
|
|
|
|
* Routines for ftp packet dissection
|
|
|
|
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
|
|
|
*
|
Add the "Edit:Protocols..." feature which currently only implements
the following:
It is now possible to enable/disable a particular protocol decoding
(i.e. the protocol dissector is void or not). When a protocol
is disabled, it is displayed as Data and of course, all linked
sub-protocols are disabled as well.
Disabling a protocol could be interesting:
- in case of buggy dissectors
- in case of wrong heuristics
- for performance reasons
- to decode the data as another protocol (TODO)
Currently (if I am not wrong), all dissectors but NFS can be disabled
(and dissectors that do not register protocols :-)
I do not like the way the RPC sub-dissectors are disabled (in the
sub-dissectors) since this could be done in the RPC dissector itself,
knowing the sub-protocol hfinfo entry (this is why, I've not modified
the NFS one yet).
Two functions are added in proto.c :
gboolean proto_is_protocol_enabled(int n);
void proto_set_decoding(int n, gboolean enabled);
and two MACROs which can be used in dissectors:
OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree)
CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree)
See also the XXX in proto_dlg.c and proto.c around the new functions.
svn path=/trunk/; revision=2267
2000-08-13 14:09:15 +00:00
|
|
|
* $Id: packet-ftp.c,v 1.18 2000/08/13 14:08:11 deniel Exp $
|
1999-04-05 21:54:41 +00:00
|
|
|
*
|
|
|
|
* Ethereal - Network traffic analyzer
|
2000-01-07 22:05:43 +00:00
|
|
|
* By Gerald Combs <gerald@zing.org>
|
1999-04-05 21:54:41 +00:00
|
|
|
* 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>
|
1999-10-09 11:56:15 +00:00
|
|
|
#include <stdlib.h>
|
1999-04-05 21:54:41 +00:00
|
|
|
|
|
|
|
#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"
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
static int proto_ftp = -1;
|
1999-10-09 11:56:15 +00:00
|
|
|
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;
|
1999-07-29 05:47:07 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_ftp = -1;
|
|
|
|
|
2000-04-08 07:07:42 +00:00
|
|
|
#define TCP_PORT_FTPDATA 20
|
|
|
|
#define TCP_PORT_FTP 21
|
|
|
|
|
|
|
|
static void
|
1999-08-18 00:57:54 +00:00
|
|
|
dissect_ftp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
|
1999-04-05 21:54:41 +00:00
|
|
|
{
|
|
|
|
proto_tree *ftp_tree, *ti;
|
|
|
|
gchar rr[50], rd[1500];
|
|
|
|
int i1 = (u_char *)strchr(pd + offset, ' ') - (pd + offset); /* Where is that space */
|
|
|
|
int i2;
|
1999-08-18 00:57:54 +00:00
|
|
|
int max_data = pi.captured_len - offset;
|
1999-04-05 21:54:41 +00:00
|
|
|
|
Add the "Edit:Protocols..." feature which currently only implements
the following:
It is now possible to enable/disable a particular protocol decoding
(i.e. the protocol dissector is void or not). When a protocol
is disabled, it is displayed as Data and of course, all linked
sub-protocols are disabled as well.
Disabling a protocol could be interesting:
- in case of buggy dissectors
- in case of wrong heuristics
- for performance reasons
- to decode the data as another protocol (TODO)
Currently (if I am not wrong), all dissectors but NFS can be disabled
(and dissectors that do not register protocols :-)
I do not like the way the RPC sub-dissectors are disabled (in the
sub-dissectors) since this could be done in the RPC dissector itself,
knowing the sub-protocol hfinfo entry (this is why, I've not modified
the NFS one yet).
Two functions are added in proto.c :
gboolean proto_is_protocol_enabled(int n);
void proto_set_decoding(int n, gboolean enabled);
and two MACROs which can be used in dissectors:
OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree)
CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree)
See also the XXX in proto_dlg.c and proto.c around the new functions.
svn path=/trunk/; revision=2267
2000-08-13 14:09:15 +00:00
|
|
|
OLD_CHECK_DISPLAY_AS_DATA(proto_ftp, pd, offset, fd, tree);
|
|
|
|
|
1999-04-05 21:54:41 +00:00
|
|
|
memset(rr, '\0', sizeof(rr));
|
|
|
|
memset(rd, '\0', sizeof(rd));
|
|
|
|
|
1999-10-09 11:56:15 +00:00
|
|
|
if (i1 >= 0) {
|
1999-04-05 21:54:41 +00:00
|
|
|
|
|
|
|
/* Hmmm, check if there was no space in there ... */
|
|
|
|
|
|
|
|
if (i1 > max_data) {
|
|
|
|
|
|
|
|
i1 = max_data; /* Make things below work */
|
|
|
|
strncpy(rr, pd + offset, MIN(max_data - 2, sizeof(rr) - 1));
|
|
|
|
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
strncpy(rr, pd + offset, MIN(i1, sizeof(rr) - 1));
|
|
|
|
i2 = ((u_char *)strchr(pd + offset + i1 + 1, '\r') - (pd + offset)) - i1 - 1;
|
1999-10-09 11:56:15 +00:00
|
|
|
if (i2 > max_data - i1 - 1 || i2 < 0) {
|
|
|
|
i2 = max_data - i1 - 1;
|
|
|
|
}
|
|
|
|
|
1999-04-05 21:54:41 +00:00
|
|
|
strncpy(rd, pd + offset + i1 + 1, MIN(i2, sizeof(rd) - 1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
i1 = max_data;
|
|
|
|
strncpy(rr, pd + offset, MIN(max_data - 2, sizeof(rr) - 1)); /* Lazy, CRLF */
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (check_col(fd, COL_PROTOCOL))
|
|
|
|
col_add_str(fd, COL_PROTOCOL, "FTP");
|
|
|
|
|
|
|
|
if (check_col(fd, COL_INFO)) {
|
|
|
|
|
|
|
|
col_add_fstr(fd, COL_INFO, "%s: %s %s", (pi.match_port == pi.destport)? "Request" : "Response", rr, rd);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
|
2000-05-31 05:09:07 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_ftp, NullTVB, offset, END_OF_FRAME, FALSE);
|
1999-11-16 11:44:20 +00:00
|
|
|
ftp_tree = proto_item_add_subtree(ti, ett_ftp);
|
1999-04-05 21:54:41 +00:00
|
|
|
|
|
|
|
if (pi.match_port == pi.destport) { /* Request */
|
|
|
|
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_boolean_hidden(ftp_tree, hf_ftp_request, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset, i1, TRUE);
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_boolean_hidden(ftp_tree, hf_ftp_response, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset, i1, FALSE);
|
2000-05-11 08:18:09 +00:00
|
|
|
proto_tree_add_string_format(ftp_tree, hf_ftp_request_command, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset, i1, rr, "Request: %s", rr);
|
2000-05-11 08:18:09 +00:00
|
|
|
proto_tree_add_string_format(ftp_tree, hf_ftp_request_data, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset + i1 + 1, END_OF_FRAME,
|
|
|
|
rd, "Request Arg: %s", rd);
|
1999-04-05 21:54:41 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_boolean_hidden(ftp_tree, hf_ftp_request, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset, i1, FALSE);
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_boolean_hidden(ftp_tree, hf_ftp_response, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset, i1, TRUE);
|
2000-05-11 08:18:09 +00:00
|
|
|
proto_tree_add_uint_format(ftp_tree, hf_ftp_response_code, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset, i1,
|
|
|
|
atoi(rr), "Response: %s", rr);
|
2000-05-11 08:18:09 +00:00
|
|
|
proto_tree_add_string_format(ftp_tree, hf_ftp_response_data, NullTVB,
|
1999-10-09 11:56:15 +00:00
|
|
|
offset + i1 + 1, END_OF_FRAME,
|
|
|
|
rd, "Response Arg: %s", rd);
|
1999-04-05 21:54:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-04-08 07:07:42 +00:00
|
|
|
static void
|
1999-08-18 00:57:54 +00:00
|
|
|
dissect_ftpdata(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
|
1999-04-05 21:54:41 +00:00
|
|
|
{
|
|
|
|
proto_tree *ti;
|
|
|
|
|
|
|
|
if (check_col(fd, COL_PROTOCOL))
|
|
|
|
col_add_str(fd, COL_PROTOCOL, "FTP DATA");
|
|
|
|
|
|
|
|
if (check_col(fd, COL_INFO)) {
|
|
|
|
|
2000-04-15 02:26:17 +00:00
|
|
|
col_add_fstr(fd, COL_INFO, "FTP Data: %u bytes", pi.captured_len - offset);
|
1999-04-05 21:54:41 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
ti = proto_tree_add_text(tree, NullTVB, offset, END_OF_FRAME,
|
2000-04-15 02:26:17 +00:00
|
|
|
"FTP Data: %s",
|
|
|
|
format_text(&pd[offset], pi.captured_len - offset));
|
1999-04-05 21:54:41 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
void
|
|
|
|
proto_register_ftp(void)
|
|
|
|
{
|
1999-10-09 11:56:15 +00:00
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_ftp_response,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Response", "ftp.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
|
|
|
"" }},
|
|
|
|
|
1999-10-09 11:56:15 +00:00
|
|
|
{ &hf_ftp_request,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Request", "ftp.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
|
|
|
"" }},
|
|
|
|
|
1999-10-09 11:56:15 +00:00
|
|
|
{ &hf_ftp_request_command,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Request command", "ftp.request.command", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
|
|
"" }},
|
|
|
|
|
1999-10-09 11:56:15 +00:00
|
|
|
{ &hf_ftp_request_data,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Request data", "ftp.request.data", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
|
|
"" }},
|
|
|
|
|
1999-10-09 11:56:15 +00:00
|
|
|
{ &hf_ftp_response_code,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Response code", "ftp.response.code", FT_UINT8, BASE_DEC, NULL, 0x0,
|
|
|
|
"" }},
|
|
|
|
|
1999-10-09 11:56:15 +00:00
|
|
|
{ &hf_ftp_response_data,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Response data", "ftp.reponse.data", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
|
|
"" }}
|
1999-10-09 11:56:15 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_ftp,
|
|
|
|
};
|
1999-10-09 11:56:15 +00:00
|
|
|
|
|
|
|
proto_ftp = proto_register_protocol("File Transfer Protocol", "ftp");
|
|
|
|
proto_register_field_array(proto_ftp, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
1999-07-29 05:47:07 +00:00
|
|
|
}
|
2000-04-08 07:07:42 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_ftp(void)
|
|
|
|
{
|
Allow either old-style (pre-tvbuff) or new-style (tvbuffified)
dissectors to be registered as dissectors for particular ports,
registered as heuristic dissectors, and registered as dissectors for
conversations, and have routines to be used both by old-style and
new-style dissectors to call registered dissectors.
Have the code that calls those dissectors translate the arguments as
necessary. (For conversation dissectors, replace
"find_conversation_dissector()", which just returns a pointer to the
dissector, with "old_try_conversation_dissector()" and
"try_conversation_dissector()", which actually call the dissector, so
that there's a single place at which we can do that translation. Also
make "dissector_lookup()" static and, instead of calling it and, if it
returns a non-null pointer, calling that dissector, just use
"old_dissector_try_port()" or "dissector_try_port()", for the same
reason.)
This allows some dissectors that took old-style arguments and
immediately translated them to new-style arguments to just take
new-style arguments; make them do so. It also allows some new-style
dissectors not to have to translate arguments before calling routines to
look up and call dissectors; make them not do so.
Get rid of checks for too-short frames in new-style dissectors - the
tvbuff code does those checks for you.
Give the routines to register old-style dissectors, and to call
dissectors from old-style dissectors, names beginning with "old_", with
the routines for new-style dissectors not having the "old_". Update the
dissectors that use those routines appropriately.
Rename "dissect_data()" to "old_dissect_data()", and
"dissect_data_tvb()" to "dissect_data()".
svn path=/trunk/; revision=2218
2000-08-07 03:21:25 +00:00
|
|
|
old_dissector_add("tcp.port", TCP_PORT_FTPDATA, &dissect_ftpdata);
|
|
|
|
old_dissector_add("tcp.port", TCP_PORT_FTP, &dissect_ftp);
|
2000-04-08 07:07:42 +00:00
|
|
|
}
|
|
|
|
|