diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.nmake | 3 | ||||
| -rw-r--r-- | packet-mtp2.c | 260 | ||||
| -rw-r--r-- | packet-mtp3.c | 369 |
5 files changed, 418 insertions, 218 deletions
@@ -401,6 +401,7 @@ Michael Tuexen <Michael.Tuexen[AT]icn.siemens.de> { MTP3 support MacOS X support Update of M2PA support to draft 3 + MTP2 support } Bruce Korb <bkorb[AT]sco.com> { diff --git a/Makefile.am b/Makefile.am index 63a96a2736..03b1a08418 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.392 2001/12/08 01:45:35 guy Exp $ +# $Id: Makefile.am,v 1.393 2001/12/11 03:04:26 gram Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -187,6 +187,7 @@ DISSECTOR_SRC = \ packet-msdp.c \ packet-msnip.c \ packet-msproxy.c \ + packet-mtp2.c \ packet-mtp3.c \ packet-nbipx.c \ packet-nbns.c \ diff --git a/Makefile.nmake b/Makefile.nmake index e394ca4051..5e6f4e0c7a 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.151 2001/12/08 01:45:35 guy Exp $ +# $Id: Makefile.nmake,v 1.152 2001/12/11 03:04:26 gram Exp $ include config.nmake include <win32.mak> @@ -138,6 +138,7 @@ DISSECTOR_SRC = \ packet-msdp.c \ packet-msnip.c \ packet-msproxy.c \ + packet-mtp2.c \ packet-mtp3.c \ packet-nbipx.c \ packet-nbns.c \ diff --git a/packet-mtp2.c b/packet-mtp2.c new file mode 100644 index 0000000000..f7fd28f4f1 --- /dev/null +++ b/packet-mtp2.c @@ -0,0 +1,260 @@ +/* packet-mtp2.c + * Routines for MTP2 dissection + * It is hopefully (needs testing) compliant to + * ITU-T Q. 703 + * + * Copyright 2001, Michael Tuexen <michael.tuexen[AT]icn.siemens.de> + * + * $Id: packet-mtp2.c,v 1.1 2001/12/11 03:04:26 gram Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * Copied from packet-m2pa.c + * + * 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 <glib.h> + +#include "packet.h" + +/* Initialize the protocol and registered fields */ +static int proto_mtp2 = -1; +static int hf_mtp2_bsn = -1; +static int hf_mtp2_bib = -1; +static int hf_mtp2_fsn = -1; +static int hf_mtp2_fib = -1; +static int hf_mtp2_li = -1; +static int hf_mtp2_spare = -1; +static int hf_mtp2_sf = -1; +static int hf_mtp2_long_sf = -1; + +/* Initialize the subtree pointers */ +static gint ett_mtp2 = -1; + +static dissector_handle_t mtp3_handle; +static int mtp3_proto_id; + +#define BSN_BIB_LENGTH 1 +#define FSN_FIB_LENGTH 1 +#define LI_LENGTH 1 +#define HEADER_LENGTH (BSN_BIB_LENGTH + FSN_FIB_LENGTH + LI_LENGTH) +#define SF_LENGTH 1 +#define LONG_SF_LENGTH 2 + +#define BSN_BIB_OFFSET 0 +#define FSN_FIB_OFFSET (BSN_BIB_OFFSET + BSN_BIB_LENGTH) +#define LI_OFFSET (FSN_FIB_OFFSET + FSN_FIB_LENGTH) +#define SIO_OFFSET (LI_OFFSET + LI_LENGTH) +#define SF_OFFSET (LI_OFFSET + LI_LENGTH) + +#define BSN_MASK 0x7f +#define BIB_MASK 0x80 +#define FSN_MASK 0x7f +#define FIB_MASK 0x80 +#define LI_MASK 0x3f +#define SPARE_MASK 0xc0 + +#define STATUS_O 0x0 +#define STATUS_N 0x1 +#define STATUS_E 0x2 +#define STATUS_OS 0x3 +#define STATUS_PO 0x4 +#define STATUS_B 0x5 + +static const value_string status_field_vals[] = { + { STATUS_O, "Status Indication O" }, + { STATUS_N, "Status Indication N" }, + { STATUS_E, "Status Indication E" }, + { STATUS_OS, "Status Indication OS" }, + { STATUS_PO, "Status Indication PO" }, + { STATUS_B, "Status Indication BO" }, + { 0, NULL} +}; + +static void +dissect_mtp2_header(tvbuff_t *su_tvb, proto_item *mtp2_tree) +{ + guint8 bsn_bib, fsn_fib, li; + + bsn_bib = tvb_get_guint8(su_tvb, BSN_BIB_OFFSET); + fsn_fib = tvb_get_guint8(su_tvb, FSN_FIB_OFFSET); + li = tvb_get_guint8(su_tvb, LI_OFFSET); + + if (mtp2_tree) { + proto_tree_add_uint(mtp2_tree, hf_mtp2_bsn, su_tvb, BSN_BIB_OFFSET, BSN_BIB_LENGTH, bsn_bib); + proto_tree_add_uint(mtp2_tree, hf_mtp2_bib, su_tvb, BSN_BIB_OFFSET, BSN_BIB_LENGTH, bsn_bib); + proto_tree_add_uint(mtp2_tree, hf_mtp2_fsn, su_tvb, FSN_FIB_OFFSET, FSN_FIB_LENGTH, fsn_fib); + proto_tree_add_uint(mtp2_tree, hf_mtp2_fib, su_tvb, FSN_FIB_OFFSET, FSN_FIB_LENGTH, fsn_fib); + proto_tree_add_uint(mtp2_tree, hf_mtp2_li, su_tvb, LI_OFFSET, LI_LENGTH, li); + proto_tree_add_uint(mtp2_tree, hf_mtp2_spare, su_tvb, LI_OFFSET, LI_LENGTH, li); + } +} + +static void +dissect_mtp2_fisu(packet_info *pinfo) +{ + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_str(pinfo->cinfo, COL_INFO, "FISU"); +} + +static void +dissect_mtp2_lssu(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_tree) +{ + guint8 li, sf; + guint16 long_sf; + + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_str(pinfo->cinfo, COL_INFO, "LSSU"); + + if (mtp2_tree) { + li = tvb_get_guint8(su_tvb, LI_OFFSET); + if ((li & LI_MASK) == 1) { + sf = tvb_get_guint8(su_tvb, SF_OFFSET); + proto_tree_add_uint(mtp2_tree, hf_mtp2_sf, su_tvb, SF_OFFSET, SF_LENGTH, sf); + } else { + long_sf = tvb_get_letohs(su_tvb, SF_OFFSET); + proto_tree_add_uint(mtp2_tree, hf_mtp2_long_sf, su_tvb, SF_OFFSET, LONG_SF_LENGTH, long_sf); + } + } +} + +static void +dissect_mtp2_msu(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_item, proto_item *tree) +{ + gint sif_sio_length; + tvbuff_t *sif_sio_tvb; + + if ((check_col(pinfo->cinfo, COL_INFO)) && (!proto_is_protocol_enabled(mtp3_proto_id))) + col_append_str(pinfo->cinfo, COL_INFO, "MSU"); + + sif_sio_length = tvb_length(su_tvb) - HEADER_LENGTH; + sif_sio_tvb = tvb_new_subset(su_tvb, SIO_OFFSET, sif_sio_length, sif_sio_length); + call_dissector(mtp3_handle, sif_sio_tvb, pinfo, tree); + + if (tree) + proto_item_set_len(mtp2_item, HEADER_LENGTH); + +} + +static void +dissect_mtp2_su(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_item, proto_item *mtp2_tree, proto_tree *tree) +{ + guint8 li; + + dissect_mtp2_header(su_tvb, mtp2_tree); + li = tvb_get_guint8(su_tvb, LI_OFFSET); + switch(li & LI_MASK) { + case 0: + dissect_mtp2_fisu(pinfo); + break; + case 1: + case 2: + dissect_mtp2_lssu(su_tvb, pinfo, mtp2_tree); + break; + default: + dissect_mtp2_msu(su_tvb, pinfo, mtp2_item, tree); + break; + } +} + +static void +dissect_mtp2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + proto_item *mtp2_item = NULL; + proto_tree *mtp2_tree = NULL; + + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); + + if (tree) { + mtp2_item = proto_tree_add_item(tree, proto_mtp2, tvb, 0, tvb_length(tvb), FALSE); + mtp2_tree = proto_item_add_subtree(mtp2_item, ett_mtp2); + }; + + dissect_mtp2_su(tvb, pinfo, mtp2_item, mtp2_tree, tree); +} + +void +proto_register_mtp2(void) +{ + + static hf_register_info hf[] = { + { &hf_mtp2_bsn, + { "Backward sequence number", "mtp2.bsn", + FT_UINT8, BASE_DEC, NULL, BSN_MASK, + "", HFILL } + }, + { &hf_mtp2_bib, + { "Backward indicator bit", "mtp2.bib", + FT_UINT8, BASE_DEC, NULL, BIB_MASK, + "", HFILL } + }, + { &hf_mtp2_fsn, + { "Forward sequence number", "mtp2.fsn", + FT_UINT8, BASE_DEC, NULL, FSN_MASK, + "", HFILL } + }, + { &hf_mtp2_fib, + { "Forward indicator bit", "mtp2.fib", + FT_UINT8, BASE_DEC, NULL, FIB_MASK, + "", HFILL } + }, + { &hf_mtp2_li, + { "Length Indicator", "mtp2.li", + FT_UINT8, BASE_DEC, NULL, LI_MASK, + "", HFILL } + }, + { &hf_mtp2_spare, + { "Spare", "mtp2.spare", + FT_UINT8, BASE_DEC, NULL, SPARE_MASK, + "", HFILL } + }, + { &hf_mtp2_sf, + { "Status field", "mtp2.sf", + FT_UINT8, BASE_DEC, VALS(status_field_vals), 0x0, + "", HFILL } + }, + { &hf_mtp2_long_sf, + { "Status field", "mtp2.long_sf", + FT_UINT16, BASE_HEX, NULL, 0x0, + "", HFILL } + } + }; + + static gint *ett[] = { + &ett_mtp2 + }; + + proto_mtp2 = proto_register_protocol("Message Transfer Part Level 2", "MTP2", "mtp2"); + register_dissector("mtp2", dissect_mtp2, proto_mtp2); + + proto_register_field_array(proto_mtp2, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +}; + +void +proto_reg_handoff_mtp2(void) +{ + mtp3_handle = find_dissector("mtp3"); + mtp3_proto_id = proto_get_id_by_filter_name("mtp3"); +} diff --git a/packet-mtp3.c b/packet-mtp3.c index c198da4400..8d1fb39383 100644 --- a/packet-mtp3.c +++ b/packet-mtp3.c @@ -2,7 +2,7 @@ * Routines for Message Transfer Part Level 3 dissection * Copyright 2001, Michael Tuexen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-mtp3.c,v 1.7 2001/12/10 00:25:30 guy Exp $ + * $Id: packet-mtp3.c,v 1.8 2001/12/11 03:04:26 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,18 +29,6 @@ # include "config.h" #endif -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #include <glib.h> #include "packet.h" @@ -73,48 +61,51 @@ static gint ett_mtp3_label_dpc = -1; static gint ett_mtp3_label_opc = -1; static dissector_table_t mtp3_sio_dissector_table; - -#define ITU_STANDARD 1 -#define ANSI_STANDARD 2 - -static gint mtp3_standard = ITU_STANDARD; - -#define SIO_OFFSET 0 -#define SIO_LENGTH 1 -#define ITU_ROUTING_LABEL_OFFSET 1 -#define ITU_ROUTING_LABEL_LENGTH 4 -#define ITU_SLS_OFFSET 1 -#define ITU_SLS_LENGTH 1 -#define ITU_MTP_PAYLOAD_OFFSET 5 - -#define ANSI_ROUTING_LABEL_OFFSET 1 -#define ANSI_ROUTING_LABEL_LENGTH 7 -#define ANSI_MTP_PAYLOAD_OFFSET 8 -#define ANSI_DPC_OFFSET 1 -#define ANSI_DPC_LENGTH 3 -#define ANSI_OPC_OFFSET 4 -#define ANSI_OPC_LENGTH 3 -#define ANSI_SLS_OFFSET 7 -#define ANSI_SLS_LENGTH 1 - -#define ANSI_NCM_LENGTH 3 -#define ANSI_DPC_OFFSET 1 -#define ANSI_OPC_OFFSET 4 - -#define SERVICE_INDICATOR_MASK 0x0F -#define SPARE_MASK 0x30 -#define ANSI_PRIORITY_MASK SPARE_MASK -#define NETWORK_INDICATOR_MASK 0xC0 -#define ITU_DPC_MASK 0x00003FFF -#define ITU_OPC_MASK 0x0FFFC000 -#define ITU_SLS_MASK 0xF0000000 - -#define ANSI_NETWORK_MASK 0x0000FF -#define ANSI_CLUSTER_MASK 0x00FF00 -#define ANSI_MEMBER_MASK 0xFF0000 -#define ANSI_5BIT_SLS_MASK 0x1F +typedef enum { + ITU_STANDARD = 1, + ANSI_STANDARD = 2 +} Standard_Type; + + +static Standard_Type mtp3_standard = ITU_STANDARD; + +#define SIO_LENGTH 1 + +#define ITU_ROUTING_LABEL_LENGTH 4 +#define ITU_HEADER_LENGTH (SIO_LENGTH + ITU_ROUTING_LABEL_LENGTH) +#define ITU_SLS_LENGTH 1 + +#define SIO_OFFSET 0 +#define ITU_SLS_OFFSET (SIO_OFFSET + ITU_HEADER_LENGTH - ITU_SLS_LENGTH) +#define ITU_ROUTING_LABEL_OFFSET (SIO_OFFSET + SIO_LENGTH) +#define ITU_MTP_PAYLOAD_OFFSET (SIO_OFFSET + ITU_HEADER_LENGTH) + +#define ANSI_DPC_LENGTH 3 +#define ANSI_OPC_LENGTH 3 +#define ANSI_SLS_LENGTH 1 +#define ANSI_ROUTING_LABEL_LENGTH (ANSI_DPC_LENGTH + ANSI_OPC_LENGTH + ANSI_SLS_LENGTH) +#define ANSI_HEADER_LENGTH (SIO_LENGTH + ANSI_ROUTING_LABEL_LENGTH) + +#define ANSI_ROUTING_LABEL_OFFSET (SIO_OFFSET + SIO_LENGTH) +#define ANSI_DPC_OFFSET ANSI_ROUTING_LABEL_OFFSET +#define ANSI_OPC_OFFSET (ANSI_DPC_OFFSET + ANSI_DPC_LENGTH) +#define ANSI_SLS_OFFSET (ANSI_OPC_OFFSET + ANSI_OPC_LENGTH) +#define ANSI_MTP_PAYLOAD_OFFSET (SIO_OFFSET + ANSI_HEADER_LENGTH) + +#define SERVICE_INDICATOR_MASK 0x0F +#define SPARE_MASK 0x30 +#define ANSI_PRIORITY_MASK SPARE_MASK +#define NETWORK_INDICATOR_MASK 0xC0 +#define ITU_DPC_MASK 0x00003FFF +#define ITU_OPC_MASK 0x0FFFC000 +#define ITU_SLS_MASK 0xF0000000 + +#define ANSI_NETWORK_MASK 0x0000FF +#define ANSI_CLUSTER_MASK 0x00FF00 +#define ANSI_MEMBER_MASK 0xFF0000 +#define ANSI_5BIT_SLS_MASK 0x1F /* TODO: eventually add support for ANSI 8-bit SLS */ -#define ANSI_8BIT_SLS_MASK 0xFF +#define ANSI_8BIT_SLS_MASK 0xFF static const value_string service_indicator_code_vals[] = { { 0x0, "Signalling Network Management Message (SNM)" }, @@ -144,6 +135,8 @@ static const value_string network_indicator_vals[] = { { 0, NULL } }; +static dissector_handle_t data_handle; + static void dissect_mtp3_sio(tvbuff_t *tvb, proto_tree *mtp3_tree) { @@ -155,20 +148,18 @@ dissect_mtp3_sio(tvbuff_t *tvb, proto_tree *mtp3_tree) sio_tree = proto_item_add_subtree(sio_item, ett_mtp3_sio); sio = tvb_get_guint8(tvb, SIO_OFFSET); - proto_tree_add_uint(sio_tree, hf_mtp3_network_indicator, - tvb, SIO_OFFSET, SIO_LENGTH, - sio); - if (mtp3_standard == ANSI_STANDARD) - proto_tree_add_uint(sio_tree, hf_mtp3_ansi_priority, - tvb, SIO_OFFSET, SIO_LENGTH, - sio); - else - proto_tree_add_uint(sio_tree, hf_mtp3_itu_spare, - tvb, SIO_OFFSET, SIO_LENGTH, - sio); - proto_tree_add_uint(sio_tree, hf_mtp3_service_indicator, - tvb, SIO_OFFSET, SIO_LENGTH, - sio); + proto_tree_add_uint(sio_tree, hf_mtp3_network_indicator, tvb, SIO_OFFSET, SIO_LENGTH, sio); + + switch(mtp3_standard){ + case ANSI_STANDARD: + proto_tree_add_uint(sio_tree, hf_mtp3_ansi_priority, tvb, SIO_OFFSET, SIO_LENGTH, sio); + break; + case ITU_STANDARD: + proto_tree_add_uint(sio_tree, hf_mtp3_itu_spare, tvb, SIO_OFFSET, SIO_LENGTH, sio); + break; + } + + proto_tree_add_uint(sio_tree, hf_mtp3_service_indicator, tvb, SIO_OFFSET, SIO_LENGTH, sio); } static void @@ -181,22 +172,15 @@ dissect_mtp3_routing_label(tvbuff_t *tvb, proto_tree *mtp3_tree) switch (mtp3_standard) { case ITU_STANDARD: - label_item = proto_tree_add_text(mtp3_tree, tvb, ITU_ROUTING_LABEL_OFFSET, - ITU_ROUTING_LABEL_LENGTH, "Routing label"); + label_item = proto_tree_add_text(mtp3_tree, tvb, ITU_ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, "Routing label"); label_tree = proto_item_add_subtree(label_item, ett_mtp3_label); label = tvb_get_letohl(tvb, ITU_ROUTING_LABEL_OFFSET); - sls = tvb_get_guint8(tvb, ITU_ROUTING_LABEL_OFFSET); - - proto_tree_add_uint(label_tree, hf_mtp3_itu_dpc, tvb, - ITU_ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, - label); - proto_tree_add_uint(label_tree, hf_mtp3_itu_opc, tvb, - ITU_ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, - label); - proto_tree_add_uint(label_tree, hf_mtp3_itu_sls, tvb, - ITU_SLS_OFFSET, ITU_SLS_LENGTH, - sls); + sls = tvb_get_guint8(tvb, ITU_ROUTING_LABEL_OFFSET); + + proto_tree_add_uint(label_tree, hf_mtp3_itu_dpc, tvb, ITU_ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, label); + proto_tree_add_uint(label_tree, hf_mtp3_itu_opc, tvb, ITU_ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, label); + proto_tree_add_uint(label_tree, hf_mtp3_itu_sls, tvb, ITU_SLS_OFFSET, ITU_SLS_LENGTH, sls); break; case ANSI_STANDARD: @@ -204,71 +188,46 @@ dissect_mtp3_routing_label(tvbuff_t *tvb, proto_tree *mtp3_tree) sls = tvb_get_guint8(tvb, ANSI_SLS_OFFSET); /* Create the Routing Label Tree */ - label_item = proto_tree_add_text(mtp3_tree, tvb, ANSI_ROUTING_LABEL_OFFSET, - ANSI_ROUTING_LABEL_LENGTH, "Routing label"); + label_item = proto_tree_add_text(mtp3_tree, tvb, ANSI_ROUTING_LABEL_OFFSET, ANSI_ROUTING_LABEL_LENGTH, "Routing label"); label_tree = proto_item_add_subtree(label_item, ett_mtp3_label); /* create the DPC tree */ dpc = tvb_get_ntoh24(tvb, ANSI_DPC_OFFSET); - label_dpc_item = proto_tree_add_text(label_tree, tvb, ANSI_DPC_OFFSET, - ANSI_DPC_LENGTH, - "DPC (%d-%d-%d)", - (dpc & ANSI_NETWORK_MASK), - ((dpc & ANSI_CLUSTER_MASK) >> 8), - ((dpc & ANSI_MEMBER_MASK) >> 16)); - - label_dpc_tree = proto_item_add_subtree(label_dpc_item, - ett_mtp3_label_dpc); - - proto_tree_add_uint(label_dpc_tree, hf_mtp3_dpc_member, - tvb, ANSI_DPC_OFFSET, ANSI_NCM_LENGTH, dpc); - proto_tree_add_uint(label_dpc_tree, hf_mtp3_dpc_cluster, - tvb, ANSI_DPC_OFFSET, ANSI_NCM_LENGTH, dpc); - proto_tree_add_uint(label_dpc_tree, hf_mtp3_dpc_network, - tvb, ANSI_DPC_OFFSET, ANSI_NCM_LENGTH, dpc); - - /* create the OPC tree */ + label_dpc_item = proto_tree_add_text(label_tree, tvb, ANSI_DPC_OFFSET, ANSI_DPC_LENGTH, + "DPC (%d-%d-%d)", (dpc & ANSI_NETWORK_MASK), ((dpc & ANSI_CLUSTER_MASK) >> 8), ((dpc & ANSI_MEMBER_MASK) >> 16)); + + label_dpc_tree = proto_item_add_subtree(label_dpc_item, ett_mtp3_label_dpc); + + proto_tree_add_uint(label_dpc_tree, hf_mtp3_dpc_member, tvb, ANSI_DPC_OFFSET, ANSI_DPC_LENGTH, dpc); + proto_tree_add_uint(label_dpc_tree, hf_mtp3_dpc_cluster,tvb, ANSI_DPC_OFFSET, ANSI_DPC_LENGTH, dpc); + proto_tree_add_uint(label_dpc_tree, hf_mtp3_dpc_network,tvb, ANSI_DPC_OFFSET, ANSI_DPC_LENGTH, dpc); + + /* create the OPC tree */ opc = tvb_get_ntoh24(tvb, ANSI_OPC_OFFSET); - label_opc_item = proto_tree_add_text(label_tree, tvb, ANSI_OPC_OFFSET, - ANSI_OPC_LENGTH, - "OPC (%d-%d-%d)", - (opc & ANSI_NETWORK_MASK), - ((opc & ANSI_CLUSTER_MASK) >> 8), - ((opc & ANSI_MEMBER_MASK) >> 16)); - - label_opc_tree = proto_item_add_subtree(label_opc_item, - ett_mtp3_label_opc); - - proto_tree_add_uint(label_opc_tree, hf_mtp3_opc_member, - tvb, ANSI_OPC_OFFSET, ANSI_NCM_LENGTH, opc); - proto_tree_add_uint(label_opc_tree, hf_mtp3_opc_cluster, - tvb, ANSI_OPC_OFFSET, ANSI_NCM_LENGTH, opc); - proto_tree_add_uint(label_opc_tree, hf_mtp3_opc_network, - tvb, ANSI_OPC_OFFSET, ANSI_NCM_LENGTH, - opc); + label_opc_item = proto_tree_add_text(label_tree, tvb, ANSI_OPC_OFFSET, ANSI_OPC_LENGTH, + "OPC (%d-%d-%d)", (opc & ANSI_NETWORK_MASK), ((opc & ANSI_CLUSTER_MASK) >> 8), ((opc & ANSI_MEMBER_MASK) >> 16)); + label_opc_tree = proto_item_add_subtree(label_opc_item, ett_mtp3_label_opc); + + proto_tree_add_uint(label_opc_tree, hf_mtp3_opc_member, tvb, ANSI_OPC_OFFSET, ANSI_OPC_LENGTH, opc); + proto_tree_add_uint(label_opc_tree, hf_mtp3_opc_cluster, tvb, ANSI_OPC_OFFSET, ANSI_OPC_LENGTH, opc); + proto_tree_add_uint(label_opc_tree, hf_mtp3_opc_network,tvb, ANSI_OPC_OFFSET, ANSI_OPC_LENGTH, opc); /* SLS */ /* TODO: separate 5-bit and 8-bit SLS */ - proto_tree_add_item(label_tree, hf_mtp3_ansi_sls, tvb, ANSI_SLS_OFFSET, - ANSI_SLS_LENGTH, sls); - /* proto_tree_add_uint(label_tree, hf_mtp3_ansi_sls, tvb, - ANSI_SLS_OFFSET, ANSI_SLS_LENGTH, - sls);*/ + proto_tree_add_item(label_tree, hf_mtp3_ansi_sls, tvb, ANSI_SLS_OFFSET, ANSI_SLS_LENGTH, sls); + /* proto_tree_add_uint(label_tree, hf_mtp3_ansi_sls, tvb,ANSI_SLS_OFFSET, ANSI_SLS_LENGTH, sls);*/ break; - - default: - printf("MTP3: unknown standard: %d\n", mtp3_standard); } } static void -dissect_mtp3_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_mtp3_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mtp3_tree, proto_tree *tree) { guint8 sio; guint8 service_indicator; - tvbuff_t *payload_tvb; + tvbuff_t *payload_tvb = NULL; - sio = tvb_get_guint8(tvb, SIO_OFFSET); + sio = tvb_get_guint8(tvb, SIO_OFFSET); service_indicator = sio & SERVICE_INDICATOR_MASK; switch (mtp3_standard) { @@ -278,15 +237,12 @@ dissect_mtp3_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ANSI_STANDARD: payload_tvb = tvb_new_subset(tvb, ANSI_MTP_PAYLOAD_OFFSET, -1, -1); break; - default: - printf("MTP3: unknown standard: %d\n", mtp3_standard); - return; } if (!dissector_try_port(mtp3_sio_dissector_table, service_indicator, payload_tvb, pinfo, tree)) { - proto_tree_add_text(tree, payload_tvb, 0, tvb_length(payload_tvb), - "Payload (%u byte%s)", - tvb_length(payload_tvb), plurality(tvb_length(payload_tvb), "", "s")); + call_dissector(data_handle, payload_tvb, pinfo, tree); + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_str(pinfo->cinfo, COL_INFO, "DATA"); } } @@ -296,29 +252,29 @@ dissect_mtp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *mtp3_item; - proto_tree *mtp3_tree; + proto_item *mtp3_item = NULL; + proto_tree *mtp3_tree = NULL; /* Make entries in Protocol column and Info column on summary display */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); - - /* In the interest of speed, if "tree" is NULL, don't do any work not - necessary to generate protocol tree items. */ if (tree) { - /* create display subtree for the protocol */ - mtp3_item = proto_tree_add_item(tree, proto_mtp3, tvb, 0, tvb_length(tvb), - FALSE); + switch (mtp3_standard) { + case ITU_STANDARD: + mtp3_item = proto_tree_add_item(tree, proto_mtp3, tvb, 0, ITU_HEADER_LENGTH, FALSE); + break; + case ANSI_STANDARD: + mtp3_item = proto_tree_add_item(tree, proto_mtp3, tvb, 0, ANSI_HEADER_LENGTH, FALSE); + break; + } mtp3_tree = proto_item_add_subtree(mtp3_item, ett_mtp3); /* dissect the packet */ dissect_mtp3_sio(tvb, mtp3_tree); dissect_mtp3_routing_label(tvb, mtp3_tree); - dissect_mtp3_payload(tvb, pinfo, mtp3_tree); + dissect_mtp3_payload(tvb, pinfo, mtp3_tree, tree); } } @@ -329,75 +285,61 @@ proto_register_mtp3(void) /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_mtp3_service_indicator, - { "Service indicator", - "mtp3.service_indicator", - FT_UINT8, BASE_HEX, VALS(service_indicator_code_vals), SERVICE_INDICATOR_MASK, - "", HFILL }}, + { "Service indicator", "mtp3.service_indicator", + FT_UINT8, BASE_HEX, VALS(service_indicator_code_vals), SERVICE_INDICATOR_MASK, + "", HFILL }}, { &hf_mtp3_network_indicator, - { "Network indicator", - "mtp3.network_indicator", - FT_UINT8, BASE_HEX, VALS(network_indicator_vals), NETWORK_INDICATOR_MASK, - "", HFILL }}, + { "Network indicator", "mtp3.network_indicator", + FT_UINT8, BASE_HEX, VALS(network_indicator_vals), NETWORK_INDICATOR_MASK, + "", HFILL }}, { &hf_mtp3_itu_spare, - { "Spare", - "mtp3.spare", - FT_UINT8, BASE_HEX, NULL, SPARE_MASK, - "", HFILL }}, + { "Spare", "mtp3.spare", + FT_UINT8, BASE_HEX, NULL, SPARE_MASK, + "", HFILL }}, { &hf_mtp3_ansi_priority, - { "Priority", - "mtp3.priority", - FT_UINT8, BASE_HEX, NULL, ANSI_PRIORITY_MASK, - "", HFILL }}, + { "Priority", "mtp3.priority", + FT_UINT8, BASE_HEX, NULL, ANSI_PRIORITY_MASK, + "", HFILL }}, { &hf_mtp3_itu_opc, - { "OPC", - "mtp3.opc", - FT_UINT32, BASE_DEC, NULL, ITU_OPC_MASK, - "", HFILL }}, + { "OPC", "mtp3.opc", + FT_UINT32, BASE_DEC, NULL, ITU_OPC_MASK, + "", HFILL }}, { &hf_mtp3_opc_network, - { "OPC Network", - "mtp3.opc.network", - FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK, - "", HFILL }}, + { "OPC Network", "mtp3.opc.network", + FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK, + "", HFILL }}, { &hf_mtp3_opc_cluster, - { "OPC Cluster", - "mtp3.opc.cluster", - FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK, - "", HFILL }}, + { "OPC Cluster", "mtp3.opc.cluster", + FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK, + "", HFILL }}, { &hf_mtp3_opc_member, - { "OPC Member", - "mtp3.opc.member", - FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK, - "", HFILL }}, + { "OPC Member", "mtp3.opc.member", + FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK, + "", HFILL }}, { &hf_mtp3_itu_dpc, - { "DPC", - "mtp3.dpc", - FT_UINT32, BASE_DEC, NULL, ITU_DPC_MASK, - "", HFILL }}, + { "DPC", "mtp3.dpc", + FT_UINT32, BASE_DEC, NULL, ITU_DPC_MASK, + "", HFILL }}, { &hf_mtp3_dpc_network, - { "DPC Network", - "mtp3.dpc.network", - FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK, - "", HFILL }}, + { "DPC Network", "mtp3.dpc.network", + FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK, + "", HFILL }}, { &hf_mtp3_dpc_cluster, - { "DPC Cluster", - "mtp3.dpc.cluster", - FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK, - "", HFILL }}, + { "DPC Cluster", "mtp3.dpc.cluster", + FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK, + "", HFILL }}, { &hf_mtp3_dpc_member, - { "DPC Member", - "mtp3.dpc.member", - FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK, - "", HFILL }}, + { "DPC Member", "mtp3.dpc.member", + FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK, + "", HFILL }}, { &hf_mtp3_itu_sls, - { "Signalling Link Selector", - "mtp3.sls", - FT_UINT32, BASE_DEC, NULL, ITU_SLS_MASK, - "", HFILL }}, + { "Signalling Link Selector", "mtp3.sls", + FT_UINT32, BASE_DEC, NULL, ITU_SLS_MASK, + "", HFILL }}, { &hf_mtp3_ansi_sls, - { "Signalling Link Selector", - "mtp3.sls", - FT_UINT8, BASE_DEC, NULL, ANSI_5BIT_SLS_MASK, - "", HFILL }} + { "Signalling Link Selector", "mtp3.sls", + FT_UINT8, BASE_DEC, NULL, ANSI_5BIT_SLS_MASK, + "", HFILL }} }; /* Setup protocol subtree array */ @@ -416,25 +358,20 @@ proto_register_mtp3(void) }; /* Register the protocol name and description */ - proto_mtp3 = proto_register_protocol("Message Transfer Part Level 3", - "MTP3", "mtp3"); + proto_mtp3 = proto_register_protocol("Message Transfer Part Level 3", "MTP3", "mtp3"); + register_dissector("mtp3", dissect_mtp3, proto_mtp3); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_mtp3, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - /* Register the dissector */ - register_dissector("mtp3", dissect_mtp3, proto_mtp3); - - mtp3_sio_dissector_table = register_dissector_table("mtp3.service_indicator", - "MTP3 Service indicator", FT_UINT8, BASE_HEX); - + mtp3_sio_dissector_table = register_dissector_table("mtp3.service_indicator", "MTP3 Service indicator", FT_UINT8, BASE_HEX); mtp3_module = prefs_register_protocol(proto_mtp3, NULL); + prefs_register_enum_preference(mtp3_module, "mtp3_standard", "MTP3 standard", "MTP3 standard", (gint *)&mtp3_standard, mtp3_options, FALSE); +} - prefs_register_enum_preference(mtp3_module, - "mtp3_standard", - "MTP3 standard", - "MTP3 standard", - &mtp3_standard, - mtp3_options, FALSE); +void +proto_reg_handoff_mtp3(void) +{ + data_handle = find_dissector("data"); } |