osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid defining 2 entries with incompatible types (FT_BYTES vs FT_NONE) and same filter 

svn path=/trunk/; revision=44595
This commit is contained in:
Pascal Quantin 2012-08-20 09:28:01 +00:00
parent 2f9b5d31e4
commit 45a25dbf9e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asn1/gsm_map/gsm_map.cnf
View File

@ -925,4 +925,9 @@ Ext-TeleserviceCode TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(Teleserv
Ext-BearerServiceCode TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(Bearerservice_vals)
ChargingCharacteristics TYPE = FT_UINT16 DISPLAY = BASE_DEC BITMASK = 0x0f00 STRINGS = VALS(chargingcharacteristics_values)
RoutingInfo TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(gsm_map_ch_RoutingInfo_vals)
#----------------------------------------------------------------------------------------
#.FIELD_ATTR
RequestedInfo/imei ABBREV = imei_null
#.END

2
epan/dissectors/packet-gsm_map.c
View File

@ -22990,7 +22990,7 @@ void proto_register_gsm_map(void) {
FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DomainType_vals), 0,
"DomainType", HFILL }},
{ &hf_gsm_map_ms_imei_01,
{ "imei", "gsm_map.ms.imei",
{ "imei", "gsm_map.ms.imei_null",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gsm_map_ms_ms_classmark,