diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2013-11-13 23:10:01 +0000 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2013-11-13 23:10:01 +0000 |
| commit | 329873cf97fdcaefbb37bb6a26bde7884ddc87ae (patch) | |
| tree | 9c12cabeff78940bea07be7588eb3c670e45fdaf /epan | |
| parent | b0063a025bfb68a3bc05a69cadf528116325576f (diff) | |
| download | wireshark-329873cf97fdcaefbb37bb6a26bde7884ddc87ae.tar.gz | |
share service type descriptions between MPEG descriptor and DVB-CI
svn path=/trunk/; revision=53307
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.h | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 3898fd5a68..4ed7bbd65a 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -5707,8 +5707,9 @@ proto_register_dvbci(void) FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL } }, { &hf_dvbci_opp_srv_type, - { "Service type", "dvb-ci.opp.service_type", - FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } + { "Service type", "dvb-ci.opp.service_type", FT_UINT8, + BASE_HEX|BASE_EXT_STRING, &mpeg_descr_service_type_vals_ext, + 0, NULL, HFILL } }, { &hf_dvbci_dlv_cap_byte, { "Delivery capability byte", "dvb-ci.opp.dlv_cap_byte", diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 6756eb68c0..e892e3956d 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -995,7 +995,8 @@ static const value_string mpeg_descr_service_type_vals[] = { { 0x00, NULL } }; -static value_string_ext mpeg_descr_service_type_vals_ext = VALUE_STRING_EXT_INIT(mpeg_descr_service_type_vals); +/* global variable that's shared e.g. with DVB-CI */ +value_string_ext mpeg_descr_service_type_vals_ext = VALUE_STRING_EXT_INIT(mpeg_descr_service_type_vals); static void proto_mpeg_descriptor_dissect_service(tvbuff_t *tvb, guint offset, proto_tree *tree) diff --git a/epan/dissectors/packet-mpeg-descriptor.h b/epan/dissectors/packet-mpeg-descriptor.h index 83f80c9230..4c6adf03b8 100644 --- a/epan/dissectors/packet-mpeg-descriptor.h +++ b/epan/dissectors/packet-mpeg-descriptor.h @@ -29,6 +29,9 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/value_string.h> + +extern value_string_ext mpeg_descr_service_type_vals_ext; guint proto_mpeg_descriptor_dissect(tvbuff_t *tvb, guint offset, proto_tree *tree); guint proto_mpeg_descriptor_loop_dissect(tvbuff_t *tvb, guint offset, guint loop_len, proto_tree *tree); |