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

GSM-MAP: Dissect SM-DeliveryFailureCause variants 

V1 version may omit SEQUENCE and have only the SM_EnumeratedDeliveryFailureCause element.
This commit is contained in:
Anders Broman 2021-11-08 14:39:54 +01:00
parent 77da5163a6
commit 6e4e4ebd50
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
View File

@ -1972,7 +1972,11 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,
offset=dissect_gsm_map_er_SubBusyForMT_SMS_Param(FALSE, tvb, offset, actx, tree, -1);
break;
case 32: /* SM-DeliveryFailureCause */
offset=dissect_gsm_map_er_SM_DeliveryFailureCause(FALSE, tvb, offset, actx, tree, -1);
offset = dissect_mc_message(tvb, offset, actx, tree,
FALSE, dissect_gsm_map_er_SM_EnumeratedDeliveryFailureCause, hf_gsm_map_er_sm_EnumeratedDeliveryFailureCause,
FALSE, dissect_gsm_map_er_SM_DeliveryFailureCause, -1,
FALSE, NULL, -1);
break;
case 33: /* MessageWaitListFullParam */
offset=dissect_gsm_map_er_MessageWaitListFullParam(FALSE, tvb, offset, actx, tree, -1);

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

@ -23364,7 +23364,11 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,
offset=dissect_gsm_map_er_SubBusyForMT_SMS_Param(FALSE, tvb, offset, actx, tree, -1);
break;
case 32: /* SM-DeliveryFailureCause */
offset=dissect_gsm_map_er_SM_DeliveryFailureCause(FALSE, tvb, offset, actx, tree, -1);
offset = dissect_mc_message(tvb, offset, actx, tree,
FALSE, dissect_gsm_map_er_SM_EnumeratedDeliveryFailureCause, hf_gsm_map_er_sm_EnumeratedDeliveryFailureCause,
FALSE, dissect_gsm_map_er_SM_DeliveryFailureCause, -1,
FALSE, NULL, -1);
break;
case 33: /* MessageWaitListFullParam */
offset=dissect_gsm_map_er_MessageWaitListFullParam(FALSE, tvb, offset, actx, tree, -1);
@ -32093,7 +32097,7 @@ void proto_register_gsm_map(void) {
NULL, HFILL }},
/*--- End of included file: packet-gsm_map-hfarr.c ---*/
#line 3335 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 3339 "./asn1/gsm_map/packet-gsm_map-template.c"
};
/* List of subtrees */
@ -32849,7 +32853,7 @@ void proto_register_gsm_map(void) {
&ett_NokiaMAP_Extensions_AllowedServiceData,
/*--- End of included file: packet-gsm_map-ettarr.c ---*/
#line 3374 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 3378 "./asn1/gsm_map/packet-gsm_map-template.c"
};
static ei_register_info ei[] = {
@ -32993,7 +32997,7 @@ void proto_register_gsm_map(void) {
/*--- End of included file: packet-gsm_map-dis-tab.c ---*/
#line 3434 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 3438 "./asn1/gsm_map/packet-gsm_map-template.c"
oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" );
oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2");
/*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" );