osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
wireshark/epan/dissectors/packet-idp.c
Michael Mann 1e60d63c8c Create call_data_dissector() to call data dissector. 
This saves many dissectors the need to find the data dissector and store a handle to it.

There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.

Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 17:38:03 +00:00

224 lines
6.3 KiB
C
Raw Blame History

/* packet-idp.c
* Routines for XNS IDP
* Based on the Netware IPX dissector by Gilbert Ramirez <gram@alumni.rice.edu>
*
* 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 "packet-idp.h"
#include <epan/etypes.h>
void proto_register_idp(void);
void proto_reg_handoff_idp(void);
static int proto_idp = -1;
static int hf_idp_checksum = -1;
static int hf_idp_len = -1;
/* static int hf_idp_src = -1; */
/* static int hf_idp_dst = -1; */
static int hf_idp_hops = -1;
static int hf_idp_packet_type = -1;
static int hf_idp_dnet = -1;
static int hf_idp_dnode = -1;
static int hf_idp_dsocket = -1;
static int hf_idp_snet = -1;
static int hf_idp_snode = -1;
static int hf_idp_ssocket = -1;
static gint ett_idp = -1;
static dissector_table_t idp_type_dissector_table;
/*
* See
*
* "Internet Transport Protocols", XSIS 028112, December 1981
*
* if you can find it; this is based on the headers in the BSD XNS
* implementation.
*/
#define IDP_HEADER_LEN 30 /* It's *always* 30 bytes */
static const value_string idp_packet_type_vals[] = {
{ IDP_PACKET_TYPE_RIP, "RIP" },
{ IDP_PACKET_TYPE_ECHO, "Echo" },
{ IDP_PACKET_TYPE_ERROR, "Error" },
{ IDP_PACKET_TYPE_PEP, "PEP" },
{ IDP_PACKET_TYPE_SPP, "SPP" },
{ 0, NULL }
};
static const value_string idp_socket_vals[] = {
{ IDP_SOCKET_SMB, "SMB" },
{ 0, NULL }
};
static int
dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_tree *idp_tree;
proto_item *ti;
guint16 length;
guint8 type;
tvbuff_t *next_tvb;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP");
col_clear(pinfo->cinfo, COL_INFO);
ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, ENC_NA);
idp_tree = proto_item_add_subtree(ti, ett_idp);
proto_tree_add_item(idp_tree, hf_idp_checksum, tvb, 0, 2, ENC_BIG_ENDIAN);
length = tvb_get_ntohs(tvb, 2);
proto_tree_add_uint_format_value(idp_tree, hf_idp_len, tvb, 2, 2, length,
"%u bytes", length);
/* Adjust the tvbuff length to include only the IDP datagram. */
set_actual_length(tvb, length);
proto_tree_add_item(idp_tree, hf_idp_hops, tvb, 4, 1, ENC_BIG_ENDIAN);
type = tvb_get_guint8(tvb, 5);
proto_tree_add_uint(idp_tree, hf_idp_packet_type, tvb, 5, 1, type);
pinfo->ptype = PT_IDP;
/* Destination */
proto_tree_add_item(idp_tree, hf_idp_dnet, tvb, 6, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(idp_tree, hf_idp_dnode, tvb, 10, 6, ENC_NA);
pinfo->destport = tvb_get_ntohs(tvb, 16);
proto_tree_add_uint(idp_tree, hf_idp_dsocket, tvb, 16, 2,
pinfo->destport);
/* Source */
proto_tree_add_item(idp_tree, hf_idp_snet, tvb, 18, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(idp_tree, hf_idp_snode, tvb, 22, 6, ENC_NA);
pinfo->srcport = tvb_get_ntohs(tvb, 28);
proto_tree_add_uint(idp_tree, hf_idp_ssocket, tvb, 28, 2,
pinfo->srcport);
/* Make the next tvbuff */
next_tvb = tvb_new_subset_remaining(tvb, IDP_HEADER_LEN);
/*
* Hand off to the dissector for the packet type.
*/
if (!dissector_try_uint(idp_type_dissector_table, type, next_tvb,
pinfo, tree))
{
call_data_dissector(next_tvb, pinfo, tree);
}
return tvb_captured_length(tvb);
}
void
proto_register_idp(void)
{
static hf_register_info hf_idp[] = {
{ &hf_idp_checksum,
{ "Checksum", "idp.checksum", FT_UINT16, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
#if 0
{ &hf_idp_src,
{ "Source Address", "idp.src", FT_STRING, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
#endif
#if 0
{ &hf_idp_dst,
{ "Destination Address", "idp.dst", FT_STRING, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
#endif
{ &hf_idp_len,
{ "Length", "idp.len", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
/* XXX - does this have separate hop count and time subfields? */
{ &hf_idp_hops,
{ "Transport Control (Hops)", "idp.hops", FT_UINT8, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
{ &hf_idp_packet_type,
{ "Packet Type", "idp.packet_type", FT_UINT8, BASE_DEC,
VALS(idp_packet_type_vals), 0x0, NULL, HFILL }},
{ &hf_idp_dnet,
{ "Destination Network","idp.dst.net", FT_UINT32, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
{ &hf_idp_dnode,
{ "Destination Node", "idp.dst.node", FT_ETHER, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
{ &hf_idp_dsocket,
{ "Destination Socket", "idp.dst.socket", FT_UINT16, BASE_HEX,
VALS(idp_socket_vals), 0x0, NULL, HFILL }},
{ &hf_idp_snet,
{ "Source Network","idp.src.net", FT_UINT32, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
{ &hf_idp_snode,
{ "Source Node", "idp.src.node", FT_ETHER, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
{ &hf_idp_ssocket,
{ "Source Socket", "idp.src.socket", FT_UINT16, BASE_HEX,
VALS(idp_socket_vals), 0x0, NULL, HFILL }},
};
static gint *ett[] = {
&ett_idp,
};
proto_idp = proto_register_protocol("Internetwork Datagram Protocol",
"IDP", "idp");
proto_register_field_array(proto_idp, hf_idp, array_length(hf_idp));
proto_register_subtree_array(ett, array_length(ett));
idp_type_dissector_table = register_dissector_table("idp.packet_type",
"IDP packet type", proto_idp, FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
}
void
proto_reg_handoff_idp(void)
{
dissector_handle_t idp_handle;
idp_handle = create_dissector_handle(dissect_idp, proto_idp);
dissector_add_uint("ethertype", ETHERTYPE_XNS_IDP, idp_handle);
dissector_add_uint("chdlc.protocol", ETHERTYPE_XNS_IDP, idp_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:
*/
View git blame Copy permalink