From Harald Welte:

GSMTAP dissector: introduce a dissector table.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6810

svn path=/trunk/; revision=40934

diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index 17c0491b6c53d2d5de59b5fd5ddf54d386431b42..83c90f7985048aa64737c2e7cf7909f33f2fe6cf 100644 (file)
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -1668,6 +1668,10 @@ proto_reg_handoff_gsm_sim(void)
        static gboolean initialized = FALSE;
 
        if (!initialized) {
+               dissector_handle_t dtap_handle;
+               dtap_handle = find_dissector("gsm_sim");
+               dissector_add_uint("gsmtap.type", 4, dtap_handle);
+
                sub_handle_cap = find_dissector("etsi_cat");
        } else {
                /* preferences have been changed */

diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c
index 869fcd5d2137716ea0a13bb4797ac5e27e9c8c9d..2c9848930d70f8715d4a8cddc489f41a9cacfafa 100644 (file)
--- a/epan/dissectors/packet-gsmtap.c
+++ b/epan/dissectors/packet-gsmtap.c
@@ -225,6 +225,8 @@ enum {
 
 static dissector_handle_t sub_handles[GSMTAP_SUB_MAX];
 
+static dissector_table_t gsmtap_dissector_table;
+
 static const value_string gsmtap_bursts[] = {
        { GSMTAP_BURST_UNKNOWN,         "UNKNOWN" },
        { GSMTAP_BURST_FCCH,            "FCCH" },
@@ -420,11 +422,9 @@ dissect_gsmtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSMTAP");
 
        /* Some GSMTAP types are completely unrelated to the Um air interface */
-       switch (type) {
-       case GSMTAP_TYPE_SIM:
-               call_dissector(sub_handles[GSMTAP_SUB_SIM], payload_tvb, pinfo, tree);
+       if (dissector_try_uint(gsmtap_dissector_table, type, payload_tvb,
+                              pinfo, tree))
                return;
-       }
 
        if (arfcn & GSMTAP_ARFCN_F_UPLINK) {
                col_append_str(pinfo->cinfo, COL_RES_NET_SRC, "MS");
@@ -663,6 +663,9 @@ proto_register_gsmtap(void)
        proto_gsmtap = proto_register_protocol("GSM Radiotap", "GSMTAP", "gsmtap");
        proto_register_field_array(proto_gsmtap, hf, array_length(hf));
        proto_register_subtree_array(ett, array_length(ett));
+
+       gsmtap_dissector_table = register_dissector_table("gsmtap.type",
+                                               "GSMTAP type", FT_UINT8, BASE_HEX);
 }
 
 void
@@ -678,7 +681,6 @@ proto_reg_handoff_gsmtap(void)
        sub_handles[GSMTAP_SUB_LLC] = find_dissector("llcgprs");
        sub_handles[GSMTAP_SUB_SNDCP] = find_dissector("sndcp");
        sub_handles[GSMTAP_SUB_ABIS] = find_dissector("gsm_a_dtap");
-       sub_handles[GSMTAP_SUB_SIM] = find_dissector("gsm_sim");
        sub_handles[GSMTAP_SUB_CDMA_CODE] = find_dissector("wimax_cdma_code_burst_handler");
        sub_handles[GSMTAP_SUB_FCH] = find_dissector("wimax_fch_burst_handler");
        sub_handles[GSMTAP_SUB_FFB] = find_dissector("wimax_ffb_burst_handler");