![Jaap Keuter](/assets/img/avatar_default.png)
Added src and dst to BACnet MS/TP WTAP dissector. Added BACnet MS/TP summary with src, dst, and frame type to tree. Removed src and dst in column info text since this was duplicated. Changed field names for src, dst, hdr, and len to be more consistent with other protocols. svn path=/trunk/; revision=25323
136 lines
3.8 KiB
C
136 lines
3.8 KiB
C
/* packet-cimetrics.c
|
|
* Routines for Cimetrics LLC OUI dissection
|
|
* Copyright 2008 Steve Karg <skarg@users.sourceforge.net> Alabama
|
|
*
|
|
* $Id$
|
|
*
|
|
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include "config.h"
|
|
#endif
|
|
|
|
#include <epan/packet.h>
|
|
#include "packet-llc.h"
|
|
#include <epan/oui.h>
|
|
#include "packet-mstp.h"
|
|
|
|
/* Probably should be a preference, but here for now */
|
|
#define BACNET_MSTP_SUMMARY_IN_TREE
|
|
|
|
/* the U+4 device does MS/TP, uLAN, Modbus */
|
|
static const value_string cimetrics_pid_vals[] = {
|
|
{ 0x0001, "U+4 MS/TP" },
|
|
{ 0, NULL }
|
|
};
|
|
|
|
static dissector_handle_t bacnet_handle;
|
|
static dissector_handle_t data_handle;
|
|
|
|
static int proto_cimetrics_mstp = -1;
|
|
static int hf_llc_cimetrics_pid = -1;
|
|
static gint ett_cimetrics_mstp = -1;
|
|
|
|
static int hf_cimetrics_mstp_timer = -1;
|
|
static int hf_cimetrics_mstp_value = -1;
|
|
|
|
|
|
static void
|
|
dissect_cimetrics_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
{
|
|
proto_item *ti;
|
|
proto_tree *subtree;
|
|
gint offset = 0;
|
|
#ifdef BACNET_MSTP_SUMMARY_IN_TREE
|
|
guint8 mstp_frame_type = 0;
|
|
guint8 mstp_frame_source = 0;
|
|
guint8 mstp_frame_destination = 0;
|
|
#endif
|
|
|
|
#ifdef BACNET_MSTP_SUMMARY_IN_TREE
|
|
mstp_frame_type = tvb_get_guint8(tvb, offset+3);
|
|
mstp_frame_destination = tvb_get_guint8(tvb, offset+4);
|
|
mstp_frame_source = tvb_get_guint8(tvb, offset+5);
|
|
ti = proto_tree_add_protocol_format(tree,
|
|
proto_cimetrics_mstp, tvb, offset, 9,
|
|
"BACnet MS/TP, Src (%u), Dst (%u), %s",
|
|
mstp_frame_source, mstp_frame_destination,
|
|
mstp_frame_type_text(mstp_frame_type));
|
|
#else
|
|
ti = proto_tree_add_item(tree, proto_cimetrics_mstp, tvb, offset, 9, FALSE);
|
|
#endif
|
|
subtree = proto_item_add_subtree(ti, ett_cimetrics_mstp);
|
|
proto_tree_add_item(subtree, hf_cimetrics_mstp_timer, tvb,
|
|
offset++, 2, TRUE);
|
|
offset++;
|
|
proto_tree_add_item(subtree, hf_cimetrics_mstp_value, tvb,
|
|
offset++, 1, TRUE);
|
|
dissect_mstp(tvb, pinfo, tree, subtree, offset);
|
|
}
|
|
|
|
void
|
|
proto_register_cimetrics(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_cimetrics_mstp_timer,
|
|
{ "Delta Time", "cimetrics_mstp.timer",
|
|
FT_UINT16, BASE_DEC, NULL, 0,
|
|
"Milliseconds", HFILL }
|
|
},
|
|
{ &hf_cimetrics_mstp_value,
|
|
{ "8-bit value", "cimetrics_mstp.value",
|
|
FT_UINT8, BASE_DEC, NULL, 0,
|
|
"value", HFILL }
|
|
}
|
|
};
|
|
static hf_register_info hf2 = {
|
|
&hf_llc_cimetrics_pid,
|
|
{ "PID", "llc.cimetrics_pid",
|
|
FT_UINT16, BASE_HEX, VALS(cimetrics_pid_vals), 0,
|
|
NULL, HFILL }
|
|
};
|
|
static gint *ett[] = {
|
|
&ett_cimetrics_mstp
|
|
};
|
|
|
|
proto_cimetrics_mstp = proto_register_protocol("Cimetrics MS/TP",
|
|
"Cimetrics MS/TP", "cimetrics");
|
|
|
|
proto_register_field_array(proto_cimetrics_mstp, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
register_dissector("cimetrics", dissect_cimetrics_mstp,
|
|
proto_cimetrics_mstp);
|
|
|
|
llc_add_oui(OUI_CIMETRICS, "llc.cimetrics_pid",
|
|
"Cimetrics OUI PID", &hf2);
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_cimetrics(void)
|
|
{
|
|
dissector_handle_t mstp_handle;
|
|
|
|
mstp_handle = find_dissector("cimetrics");
|
|
dissector_add("llc.cimetrics_pid", 1, mstp_handle);
|
|
bacnet_handle = find_dissector("bacnet");
|
|
data_handle = find_dissector("data");
|
|
}
|