forked from osmocom/wireshark
268841f3e0
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>
156 lines
4.3 KiB
C
156 lines
4.3 KiB
C
/* packet-atmtcp.c
|
|
* Routines for ATM over TCP dissection
|
|
* Copyright 2011, Alexis La Goutte <alexis.lagoutte at gmail dot 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.
|
|
*/
|
|
|
|
/* Specification...
|
|
* http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=blob;f=include/linux/atm_tcp.h;hb=HEAD
|
|
* http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=blob;f=drivers/atm/atmtcp.c;hb=HEAD
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
|
|
void proto_register_atmtcp(void);
|
|
void proto_reg_handoff_atmtcp(void);
|
|
|
|
static int proto_atmtcp = -1;
|
|
static int hf_atmtcp_vpi = -1;
|
|
static int hf_atmtcp_vci = -1;
|
|
static int hf_atmtcp_length = -1;
|
|
|
|
#define ATMTCP_TCP_PORT 2812
|
|
|
|
static gint ett_atmtcp = -1;
|
|
|
|
#define ATMTCP_HDR_MAGIC (~0) /* this length indicates a command */
|
|
#define ATMTCP_CTRL_OPEN 1 /* request/reply */
|
|
#define ATMTCP_CTRL_CLOSE 2 /* request/reply */
|
|
|
|
static int
|
|
dissect_atmtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
|
{
|
|
|
|
proto_item *ti;
|
|
proto_tree *atmtcp_tree;
|
|
guint offset = 0;
|
|
gint32 length;
|
|
tvbuff_t *next_tvb;
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATMTCP");
|
|
|
|
col_add_str(pinfo->cinfo, COL_INFO, "ATMTCP");
|
|
|
|
if (tree) {
|
|
ti = proto_tree_add_item(tree, proto_atmtcp, tvb, 0, -1, ENC_NA);
|
|
|
|
atmtcp_tree = proto_item_add_subtree(ti, ett_atmtcp);
|
|
|
|
/* VPI */
|
|
proto_tree_add_item(atmtcp_tree, hf_atmtcp_vpi, tvb, offset, 2, ENC_BIG_ENDIAN);
|
|
}
|
|
offset += 2;
|
|
|
|
|
|
if (tree) {
|
|
/* VCI */
|
|
proto_tree_add_item(atmtcp_tree, hf_atmtcp_vci, tvb, offset, 2, ENC_BIG_ENDIAN);
|
|
}
|
|
offset += 2;
|
|
|
|
|
|
if (tree) {
|
|
/* Length */
|
|
proto_tree_add_item(atmtcp_tree, hf_atmtcp_length, tvb, offset, 4, ENC_BIG_ENDIAN);
|
|
}
|
|
length = tvb_get_ntohl(tvb, offset);
|
|
if(length == ATMTCP_HDR_MAGIC)
|
|
{
|
|
col_append_str(pinfo->cinfo, COL_INFO, " Command");
|
|
}
|
|
else
|
|
{
|
|
col_append_str(pinfo->cinfo, COL_INFO, " Data");
|
|
}
|
|
offset += 4;
|
|
|
|
/* Data (for the moment...) */
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset);
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
|
return tvb_reported_length(tvb);
|
|
}
|
|
|
|
|
|
void
|
|
proto_register_atmtcp(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_atmtcp_vpi,
|
|
{ "VPI", "atmtcp.vpi", FT_UINT16, BASE_DEC, NULL, 0x0,
|
|
"Virtual Path Identifier", HFILL }
|
|
},
|
|
{ &hf_atmtcp_vci,
|
|
{ "VCI", "atmtcp.vci", FT_UINT16, BASE_DEC, NULL, 0x0,
|
|
"Virtual Channel Identifier", HFILL }
|
|
},
|
|
{ &hf_atmtcp_length,
|
|
{ "Length", "atmtcp.length", FT_UINT32, BASE_DEC, NULL, 0x0,
|
|
"length of data", HFILL }
|
|
}
|
|
};
|
|
|
|
|
|
static gint *ett[] = {
|
|
&ett_atmtcp
|
|
};
|
|
|
|
|
|
proto_atmtcp = proto_register_protocol("ATM over TCP", "ATMTCP", "atmtcp");
|
|
|
|
proto_register_field_array(proto_atmtcp, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
|
|
void
|
|
proto_reg_handoff_atmtcp(void)
|
|
{
|
|
dissector_handle_t atmtcp_handle;
|
|
|
|
atmtcp_handle = create_dissector_handle(dissect_atmtcp, proto_atmtcp);
|
|
|
|
dissector_add_uint_with_preference("tcp.port", ATMTCP_TCP_PORT, atmtcp_handle);
|
|
}
|
|
|
|
/*
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local variables:
|
|
* c-basic-offset: 4
|
|
* tab-width: 8
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*
|
|
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
|
* :indentSize=4:tabSize=8:noTabs=true:
|
|
*/
|