diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2008-02-16 17:04:59 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2008-02-16 17:04:59 +0000 |
| commit | 3a130af51bff85905b73030c259a1fcdb1e26875 (patch) | |
| tree | c7974cd1b27ae8b180b12fe5294ce554e741b848 | |
| parent | c1f721e4238082747fe72c6b3132959a35fc3cec (diff) | |
Add map operation 49.
svn path=/trunk/; revision=24360
| -rw-r--r-- | asn1/gsmmap/packet-gsmmap-template.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_map.c | 14 |
2 files changed, 18 insertions, 5 deletions
diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c index 75c7b42546..fe75bad941 100644 --- a/asn1/gsmmap/packet-gsmmap-template.c +++ b/asn1/gsmmap/packet-gsmmap-template.c @@ -1209,7 +1209,14 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset=dissect_gsm_map_sm_ReportSM_DeliveryStatusArg(FALSE, tvb, offset, actx, tree, -1); break; /* reserved noteSubscriberPresent (48) */ - /* reserved alertServiceCentreWithoutResult (49) */ + /* reserved alertServiceCentreWithoutResult (49) + * ETS 300 599: December 2000 (GSM 09.02 version 4.19.1) + * -- alertServiceCentreWithoutResult must not be used in + * -- version greater 1 + */ + case 49: + offset = dissect_gsm_map_sm_AlertServiceCentreArg(FALSE, tvb, offset, actx, tree, -1); + break; case 50: /*activateTraceMode*/ offset=dissect_gsm_map_om_ActivateTraceModeArg(FALSE, tvb, offset, actx, tree, -1); break; diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index f20f3a24f1..a6ee5c33d8 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -16308,7 +16308,13 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset=dissect_gsm_map_sm_ReportSM_DeliveryStatusArg(FALSE, tvb, offset, actx, tree, -1); break; /* reserved noteSubscriberPresent (48) */ - /* reserved alertServiceCentreWithoutResult (49) */ + /* reserved alertServiceCentreWithoutResult (49) + * -- alertServiceCentreWithoutResult must not be used in + * -- version greater 1 + */ + case 49: + offset = dissect_gsm_map_sm_AlertServiceCentreArg(FALSE, tvb, offset, actx, tree, -1); + break; case 50: /*activateTraceMode*/ offset=dissect_gsm_map_om_ActivateTraceModeArg(FALSE, tvb, offset, actx, tree, -1); break; @@ -22474,7 +22480,7 @@ void proto_register_gsm_map(void) { "gsm_map_lcs.LCS_QoS", HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 2636 "packet-gsmmap-template.c" +#line 2642 "packet-gsmmap-template.c" }; /* List of subtrees */ @@ -23060,7 +23066,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 2662 "packet-gsmmap-template.c" +#line 2668 "packet-gsmmap-template.c" }; /* Register protocol */ @@ -23136,7 +23142,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 2680 "packet-gsmmap-template.c" +#line 2686 "packet-gsmmap-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" ); |