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>
88 lines
2.6 KiB
C
88 lines
2.6 KiB
C
/* packet-pcapng.c
|
|
* Dissector to handle pcap-ng file-type-specific blocks.
|
|
*
|
|
* 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 <wiretap/wtap.h>
|
|
|
|
void proto_register_pcapng_block(void);
|
|
void proto_reg_handoff_pcapng_block(void);
|
|
|
|
static int proto_pcapng_block = -1;
|
|
|
|
static dissector_table_t pcapng_block_type_dissector_table;
|
|
|
|
static int
|
|
dissect_pcapng_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|
{
|
|
/*
|
|
* Call the dissector for the block type of this block, if there
|
|
* is one.
|
|
*/
|
|
if (!dissector_try_uint(pcapng_block_type_dissector_table,
|
|
pinfo->pseudo_header->ftsrec.record_type, tvb, pinfo, tree)) {
|
|
/*
|
|
* There isn't one; just do a minimal display.
|
|
*/
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP-NG");
|
|
col_add_fstr(pinfo->cinfo, COL_INFO, "PCAP-NG block, type %u",
|
|
pinfo->pseudo_header->ftsrec.record_type);
|
|
|
|
proto_tree_add_item(tree, proto_pcapng_block, tvb, 0, -1, ENC_NA);
|
|
}
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
void proto_register_pcapng_block(void)
|
|
{
|
|
proto_pcapng_block = proto_register_protocol("PCAP-NG block",
|
|
"PCAP-NG", "pcapng");
|
|
pcapng_block_type_dissector_table = register_dissector_table("pcapng.block_type",
|
|
"pcap-ng block type", proto_pcapng_block, FT_UINT32, BASE_DEC);
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_pcapng_block(void)
|
|
{
|
|
dissector_handle_t pcapng_block_handle;
|
|
|
|
pcapng_block_handle = create_dissector_handle(dissect_pcapng_block,
|
|
proto_pcapng_block);
|
|
dissector_add_uint("wtap_fts_rec", WTAP_FILE_TYPE_SUBTYPE_PCAPNG,
|
|
pcapng_block_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:
|
|
*/
|