forked from osmocom/wireshark
a4c8ebc18b
Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
154 lines
4.1 KiB
C
154 lines
4.1 KiB
C
/* packet-hpext.c
|
|
* Routines for HP extended IEEE 802.2 LLC layer
|
|
* Jochen Friedrich <jochen@scram.de>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#define NEW_PROTO_TREE_API
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
#include <epan/llcsaps.h>
|
|
#include "packet-hpext.h"
|
|
|
|
void proto_register_hpext(void);
|
|
void proto_reg_handoff_hpext(void);
|
|
|
|
static dissector_handle_t hpext_handle;
|
|
|
|
static dissector_table_t subdissector_table;
|
|
|
|
static const value_string xsap_vals[] = {
|
|
{ HPEXT_DXSAP, "RBOOT Destination Service Access Point" },
|
|
{ HPEXT_SXSAP, "RBOOT Source Service Access Point" },
|
|
{ HPEXT_HPSW, "HP Switch Protocol" },
|
|
{ HPEXT_SNMP, "SNMP" },
|
|
{ 0x00, NULL }
|
|
};
|
|
|
|
|
|
static header_field_info *hfi_hpext = NULL;
|
|
|
|
#define HPEXT_HFI_INIT HFI_INIT(proto_hpext)
|
|
|
|
static header_field_info hfi_hpext_dxsap HPEXT_HFI_INIT =
|
|
{ "DXSAP", "hpext.dxsap", FT_UINT16, BASE_HEX,
|
|
VALS(xsap_vals), 0x0, NULL, HFILL };
|
|
|
|
static header_field_info hfi_hpext_sxsap HPEXT_HFI_INIT =
|
|
{ "SXSAP", "hpext.sxsap", FT_UINT16, BASE_HEX,
|
|
VALS(xsap_vals), 0x0, NULL, HFILL };
|
|
|
|
static header_field_info hfi_hpext_reserved HPEXT_HFI_INIT =
|
|
{ "Reserved", "hpext.reserved", FT_UINT24, BASE_HEX,
|
|
NULL, 0x0, NULL, HFILL };
|
|
|
|
|
|
static gint ett_hpext = -1;
|
|
|
|
static int
|
|
dissect_hpext(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|
{
|
|
proto_tree *hpext_tree = NULL;
|
|
proto_item *ti = NULL;
|
|
guint16 dxsap, sxsap;
|
|
tvbuff_t *next_tvb;
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HPEXT");
|
|
|
|
dxsap = tvb_get_ntohs(tvb, 3);
|
|
sxsap = tvb_get_ntohs(tvb, 5);
|
|
|
|
if (tree) {
|
|
ti = proto_tree_add_item(tree, hfi_hpext, tvb, 0, 7, ENC_NA);
|
|
hpext_tree = proto_item_add_subtree(ti, ett_hpext);
|
|
proto_tree_add_item(hpext_tree, &hfi_hpext_reserved, tvb, 0, 3, ENC_NA);
|
|
proto_tree_add_uint(hpext_tree, &hfi_hpext_dxsap, tvb, 3,
|
|
2, dxsap);
|
|
proto_tree_add_uint(hpext_tree, &hfi_hpext_sxsap, tvb, 5,
|
|
2, sxsap);
|
|
}
|
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO,
|
|
"; HPEXT; DXSAP %s, SXSAP %s",
|
|
val_to_str(dxsap, xsap_vals, "%04x"),
|
|
val_to_str(sxsap, xsap_vals, "%04x"));
|
|
|
|
if (tvb_reported_length_remaining(tvb, 7) > 0) {
|
|
next_tvb = tvb_new_subset_remaining(tvb, 7);
|
|
if (!dissector_try_uint(subdissector_table,
|
|
dxsap, next_tvb, pinfo, tree)) {
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
|
}
|
|
}
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
void
|
|
proto_register_hpext(void)
|
|
{
|
|
#ifndef HAVE_HFI_SECTION_INIT
|
|
static header_field_info *hfi[] = {
|
|
&hfi_hpext_reserved,
|
|
&hfi_hpext_dxsap,
|
|
&hfi_hpext_sxsap,
|
|
};
|
|
#endif
|
|
|
|
static gint *ett[] = {
|
|
&ett_hpext
|
|
};
|
|
|
|
int proto_hpext;
|
|
|
|
proto_hpext = proto_register_protocol(
|
|
"HP Extended Local-Link Control", "HPEXT", "hpext");
|
|
hfi_hpext = proto_registrar_get_nth(proto_hpext);
|
|
|
|
proto_register_fields(proto_hpext, hfi, array_length(hfi));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
/* subdissector code */
|
|
subdissector_table = register_dissector_table("hpext.dxsap",
|
|
"HPEXT XSAP", proto_hpext, FT_UINT16, BASE_HEX);
|
|
|
|
hpext_handle = register_dissector("hpext", dissect_hpext, proto_hpext);
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_hpext(void)
|
|
{
|
|
dissector_add_uint("llc.dsap", SAP_HPEXT, hpext_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:
|
|
*/
|