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>
134 lines
3.9 KiB
C
134 lines
3.9 KiB
C
/* packet-vicp.c
|
|
* LeCroy VICP (GPIB-over-Ethernet-but-lets-not-do-LXI) dissector
|
|
*
|
|
* Written by Frank Kingswood <frank.kingswood@artimi.com>
|
|
* Copyright 2008, Artimi Ltd.
|
|
*
|
|
* 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/ptvcursor.h>
|
|
|
|
/* registration object IDs */
|
|
static int proto_vicp = -1;
|
|
static int hf_vicp_operation = -1;
|
|
static int hf_vicp_version = -1;
|
|
static int hf_vicp_sequence = -1;
|
|
static int hf_vicp_unused = -1;
|
|
static int hf_vicp_length = -1;
|
|
static int hf_vicp_data = -1;
|
|
static gint ett_vicp = -1;
|
|
|
|
#define VICP_PORT 1861
|
|
|
|
void proto_register_vicp(void);
|
|
void proto_reg_handoff_vicp(void);
|
|
|
|
static int dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|
{
|
|
proto_item *ti;
|
|
proto_tree *vicp_tree;
|
|
ptvcursor_t* cursor;
|
|
|
|
guint len;
|
|
|
|
if (tvb_reported_length_remaining(tvb, 0) < 8)
|
|
{
|
|
/* Payload too small for VICP */
|
|
return 0;
|
|
}
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "VICP");
|
|
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
|
|
|
ti = proto_tree_add_item(tree, proto_vicp, tvb, 0, -1, ENC_NA);
|
|
vicp_tree = proto_item_add_subtree(ti, ett_vicp);
|
|
cursor = ptvcursor_new(vicp_tree, tvb, 0);
|
|
|
|
ptvcursor_add(cursor, hf_vicp_operation, 1, ENC_BIG_ENDIAN);
|
|
ptvcursor_add(cursor, hf_vicp_version, 1, ENC_BIG_ENDIAN);
|
|
ptvcursor_add(cursor, hf_vicp_sequence, 1, ENC_BIG_ENDIAN);
|
|
ptvcursor_add(cursor, hf_vicp_unused, 1, ENC_BIG_ENDIAN);
|
|
|
|
len=tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor));
|
|
ptvcursor_add(cursor, hf_vicp_length, 4, ENC_BIG_ENDIAN);
|
|
|
|
ptvcursor_add(cursor, hf_vicp_data, len, ENC_NA);
|
|
|
|
ptvcursor_free(cursor);
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
void proto_register_vicp(void)
|
|
{
|
|
static hf_register_info hf[] =
|
|
{
|
|
{ &hf_vicp_operation,
|
|
{ "Operation","vicp.operation",FT_UINT8,BASE_HEX,NULL,0x0,NULL,HFILL }
|
|
},
|
|
{ &hf_vicp_version,
|
|
{ "Protocol version","vicp.version",FT_UINT8,BASE_DEC,NULL,0x0,NULL,HFILL }
|
|
},
|
|
{ &hf_vicp_sequence,
|
|
{ "Sequence number","vicp.sequence",FT_UINT8,BASE_DEC,NULL,0x0,NULL,HFILL }
|
|
},
|
|
{ &hf_vicp_unused,
|
|
{ "Unused","vicp.unused",FT_UINT8,BASE_HEX,NULL,0x0,NULL,HFILL }
|
|
},
|
|
{ &hf_vicp_length,
|
|
{ "Data length","vicp.length",FT_UINT32,BASE_DEC,NULL,0x0,NULL,HFILL }
|
|
},
|
|
{ &hf_vicp_data,
|
|
{ "Data","vicp.data",FT_BYTES,BASE_NONE,NULL,0x0,NULL,HFILL }
|
|
}
|
|
};
|
|
|
|
static gint *ett[] =
|
|
{ &ett_vicp
|
|
};
|
|
|
|
proto_vicp = proto_register_protocol("LeCroy VICP", "VICP", "vicp");
|
|
proto_register_field_array(proto_vicp, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
void proto_reg_handoff_vicp(void)
|
|
{ dissector_handle_t vicp_handle;
|
|
|
|
vicp_handle = create_dissector_handle(dissect_vicp, proto_vicp);
|
|
dissector_add_uint_with_preference("tcp.port", VICP_PORT, vicp_handle);
|
|
}
|
|
|
|
/*
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local Variables:
|
|
* c-basic-offset: 3
|
|
* tab-width: 8
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*
|
|
* ex: set shiftwidth=3 tabstop=8 expandtab:
|
|
* :indentSize=3:tabSize=8:noTabs=true:
|
|
*/
|