wireshark/epan/dissectors/packet-opa-fe.c
Michael Mann 268841f3e0 Combine Decode As and port preferences for tcp.port dissector table.
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>
2016-10-08 02:44:53 +00:00

175 lines
5.4 KiB
C

/* packet-opa-fe.c
* Routines for Omni-Path FE header dissection
* Copyright (c) 2016, Intel Corporation.
*
* 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>
#include <epan/prefs.h>
#include "packet-ssl.h"
void proto_reg_handoff_opa_fe(void);
void proto_register_opa_fe(void);
#define OPA_FE_TCP_RANGE "3245-3248" /* Not IANA registered */
#define OPA_FE_SSL_RANGE "3249-3252"
/* Wireshark ID */
static gint proto_opa_fe = -1;
/* Variables to hold expansion values between packets */
static gint ett_fe = -1;
/* SnC Fields */
static gint hf_opa_fe_magicnumber = -1;
static gint hf_opa_fe_length_oob = -1;
static gint hf_opa_fe_headerversion = -1;
static gint hf_opa_fe_length = -1;
static gint hf_opa_fe_Reserved64 = -1;
/* Dissector Declarations */
static dissector_handle_t opa_fe_handle;
static dissector_handle_t opa_mad_handle;
static range_t *global_fe_ssl_range = NULL;
static range_t *fe_ssl_range = NULL;
static int dissect_opa_fe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
gint offset = 0; /* Current Offset */
proto_item *FE_item;
proto_tree *FE_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Omni-Path");
col_clear(pinfo->cinfo, COL_INFO);
tree = proto_tree_get_root(tree);
FE_item = proto_tree_add_item(tree, proto_opa_fe, tvb, offset, 24, ENC_NA);
FE_tree = proto_item_add_subtree(FE_item, ett_fe);
proto_tree_add_item(FE_tree, hf_opa_fe_magicnumber, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(FE_tree, hf_opa_fe_length_oob, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(FE_tree, hf_opa_fe_headerversion, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(FE_tree, hf_opa_fe_length, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
proto_tree_add_item(FE_tree, hf_opa_fe_Reserved64, tvb, offset, 8, ENC_BIG_ENDIAN);
offset += 8;
/* Pass to OPA MAD dissector */
call_dissector(opa_mad_handle, tvb_new_subset_remaining(tvb, offset), pinfo, FE_tree);
return tvb_captured_length(tvb);
}
static void range_delete_fe_ssl_callback(guint32 port)
{
ssl_dissector_delete(port, opa_fe_handle);
}
static void range_add_fe_ssl_callback(guint32 port)
{
ssl_dissector_add(port, opa_fe_handle);
}
void proto_register_opa_fe(void)
{
module_t *opa_fe_module;
static hf_register_info hf[] = {
{ &hf_opa_fe_magicnumber, {
"Magic Number", "opa.fe.magicnumber",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
},
{ &hf_opa_fe_length_oob, {
"Length OOB", "opa.fe.lengthoob",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
},
{ &hf_opa_fe_headerversion, {
"Header Version", "opa.fe.headerversion",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
},
{ &hf_opa_fe_length, {
"Length", "opa.fe.length",
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
{ &hf_opa_fe_Reserved64, {
"Reserved (64 bits)", "opa.fe.reserved64",
FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }
}
};
static gint *ett[] = {
&ett_fe
};
proto_opa_fe = proto_register_protocol(
"Intel Omni-Path FE Header - Omni-Path Fabric Excutive Header",
"OPA FE", "opa.fe");
opa_fe_handle = register_dissector("opa.fe", dissect_opa_fe, proto_opa_fe);
proto_register_field_array(proto_opa_fe, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
opa_fe_module = prefs_register_protocol(proto_opa_fe, proto_reg_handoff_opa_fe);
range_convert_str(&global_fe_ssl_range, OPA_FE_SSL_RANGE, 65535);
fe_ssl_range = range_empty();
prefs_register_range_preference(opa_fe_module, "ssl.port", "SSL/TLS Ports",
"SSL/TLS Ports range",
&global_fe_ssl_range, 65535);
}
void proto_reg_handoff_opa_fe(void)
{
static gboolean initialized = FALSE;
if (!initialized)
{
opa_mad_handle = find_dissector("opa.mad");
dissector_add_uint_range_with_preference("tcp.port", OPA_FE_TCP_RANGE, opa_fe_handle);
initialized = TRUE;
}
range_foreach(fe_ssl_range, range_delete_fe_ssl_callback);
g_free(fe_ssl_range);
fe_ssl_range = range_copy(global_fe_ssl_range);
range_foreach(fe_ssl_range, range_add_fe_ssl_callback);
}
/*
* Editor modelines - https://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:
*/