diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-12-11 03:04:26 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-12-11 03:04:26 +0000 |
commit | ad4353006354b97a0cac1074032e4b503d5b0d64 (patch) | |
tree | 6fa214e2c3498e073c2d74a842d205b1c084d39d /packet-mtp3.c | |
parent | 975be62d24f53097ab97d3428dac11533a54a83a (diff) |
Update mtp3 dissector. Add mtp2 dissector.
From ichael Tuexen <Michael.Tuexen@micmac.franken.de>
svn path=/trunk/; revision=4382
Diffstat (limited to 'packet-mtp3.c')
-rw-r--r-- | packet-mtp3.c | 369 |
1 files changed, 153 insertions, 216 deletions
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"); } |