forked from osmocom/wireshark
![Michael Mann](/assets/img/avatar_default.png)
This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
152 lines
4.1 KiB
C
152 lines
4.1 KiB
C
/* packet-nntp.c
|
|
* Routines for nntp packet dissection
|
|
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
|
|
void proto_register_nntp(void);
|
|
void proto_reg_handoff_nntp(void);
|
|
|
|
static int proto_nntp = -1;
|
|
static int hf_nntp_response = -1;
|
|
static int hf_nntp_request = -1;
|
|
|
|
static gint ett_nntp = -1;
|
|
|
|
#define TCP_PORT_NNTP 119
|
|
|
|
static int
|
|
dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|
{
|
|
const gchar *type;
|
|
proto_tree *nntp_tree;
|
|
proto_item *ti;
|
|
gint offset = 0;
|
|
gint next_offset;
|
|
int linelen;
|
|
|
|
if (pinfo->match_uint == pinfo->destport)
|
|
type = "Request";
|
|
else
|
|
type = "Response";
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NNTP");
|
|
|
|
/*
|
|
* Put the first line from the buffer into the summary
|
|
* (but leave out the line terminator).
|
|
*
|
|
* 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, FALSE);
|
|
col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", type,
|
|
tvb_format_text(tvb, offset, linelen));
|
|
|
|
if (tree) {
|
|
ti = proto_tree_add_item(tree, proto_nntp, tvb, offset, -1,
|
|
ENC_NA);
|
|
nntp_tree = proto_item_add_subtree(ti, ett_nntp);
|
|
|
|
if (pinfo->match_uint == pinfo->destport) {
|
|
ti = proto_tree_add_boolean(nntp_tree,
|
|
hf_nntp_request, tvb, 0, 0, TRUE);
|
|
} else {
|
|
ti = proto_tree_add_boolean(nntp_tree,
|
|
hf_nntp_response, tvb, 0, 0, TRUE);
|
|
}
|
|
PROTO_ITEM_SET_HIDDEN(ti);
|
|
|
|
/*
|
|
* Show the request or response as text, a line at a time.
|
|
* XXX - for requests, we could display the stuff after the
|
|
* first line, if any, based on what the request was, and
|
|
* for responses, we could display it based on what the
|
|
* matching request was, although the latter requires us to
|
|
* know what the matching request was....
|
|
*/
|
|
while (tvb_offset_exists(tvb, offset)) {
|
|
/*
|
|
* Find the end of the line.
|
|
*/
|
|
tvb_find_line_end(tvb, offset, -1, &next_offset,
|
|
FALSE);
|
|
|
|
/*
|
|
* Put this line.
|
|
*/
|
|
proto_tree_add_format_text(nntp_tree, tvb, offset, next_offset - offset);
|
|
offset = next_offset;
|
|
}
|
|
}
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
void
|
|
proto_register_nntp(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_nntp_response,
|
|
{ "Response", "nntp.response",
|
|
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
|
"TRUE if NNTP response", HFILL }},
|
|
|
|
{ &hf_nntp_request,
|
|
{ "Request", "nntp.request",
|
|
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
|
|
"TRUE if NNTP request", HFILL }}
|
|
};
|
|
static gint *ett[] = {
|
|
&ett_nntp,
|
|
};
|
|
|
|
proto_nntp = proto_register_protocol("Network News Transfer Protocol",
|
|
"NNTP", "nntp");
|
|
proto_register_field_array(proto_nntp, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_nntp(void)
|
|
{
|
|
dissector_handle_t nntp_handle;
|
|
|
|
nntp_handle = create_dissector_handle(dissect_nntp, proto_nntp);
|
|
dissector_add_uint_with_preference("tcp.port", TCP_PORT_NNTP, nntp_handle);
|
|
}
|
|
|
|
/*
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local variables:
|
|
* c-basic-offset: 8
|
|
* tab-width: 8
|
|
* indent-tabs-mode: t
|
|
* End:
|
|
*
|
|
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
|
* :indentSize=8:tabSize=8:noTabs=false:
|
|
*/
|