diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-07-08 19:59:56 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-07-08 19:59:56 +0000 |
| commit | e46f6e0acc059df6c0f0c7938f0ae91de787ad37 (patch) | |
| tree | f553a82bf4d5a96f38165f12f375ad4779b23916 /asn1 | |
| parent | 3d4375731a31cae1e7c5f965b279553f9c43d0fd (diff) | |
Add some missing IMPLICIT tags, and use FN_PARS directive.
svn path=/trunk/; revision=14877
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/gsmmap/GSMMAP.asn | 14 | ||||
| -rw-r--r-- | asn1/gsmmap/gsmmap.cnf | 8 | ||||
| -rw-r--r-- | asn1/gsmmap/packet-gsm_map-template.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/asn1/gsmmap/GSMMAP.asn b/asn1/gsmmap/GSMMAP.asn index bd2040beac..3d73091da5 100644 --- a/asn1/gsmmap/GSMMAP.asn +++ b/asn1/gsmmap/GSMMAP.asn @@ -776,11 +776,11 @@ SubscriberStatus ::= ENUMERATED { operatorDeterminedBarring ( 1 ) } BcsmTriggerDetectionPoint ::= ENUMERATED { - collectedInfo ( 2 ), - routeSelectFailure (4 ), - termAttemptAuthorized ( 12 ), - tBusy (13 ), - tNoAnswer (14 ), + collectedInfo ( 2 ), + routeSelectFailure (4 ), + termAttemptAuthorized ( 12 ), + tBusy (13 ), + tNoAnswer (14 ), ... } ServiceKey ::= INTEGER ( 0 .. 2147483647 ) @@ -3249,8 +3249,8 @@ CallBarringData ::= SEQUENCE { Password ::= NumericString (SIZE( 4 ) ) BasicServiceCode ::= CHOICE { - bearerService [2] BearerServiceCode, - teleservice [3] TeleserviceCode} + bearerService [2] IMPLICIT BearerServiceCode, + teleservice [3] IMPLICIT TeleserviceCode} BearerServiceCode ::= OCTET STRING (SIZE (1)) -- This type is used to represent the code identifying a single diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf index 2c8178b153..02e565cae1 100644 --- a/asn1/gsmmap/gsmmap.cnf +++ b/asn1/gsmmap/gsmmap.cnf @@ -188,14 +188,14 @@ ModificationRequestFor-CF-Info/noReplyConditionTime ext-noReplyConditionTime #.END #---------------------------------------------------------------------------------------- -#.FN_BODY ProtocolId +#.FN_PARS ProtocolId - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &protocolId); + VAL_PTR = &protocolId #---------------------------------------------------------------------------------------- -#.FN_BODY AccessNetworkProtocolId +#.FN_PARS AccessNetworkProtocolId - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &AccessNetworkProtocolId); + VAL_PTR = &AccessNetworkProtocolId #---------------------------------------------------------------------------------------- #.FN_BODY SignalInfo diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index 3f454b49f8..6771f48f9f 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -1,6 +1,6 @@ /* packet-gsm_map-template.c * Routines for GSM MobileApplication packet dissection - * Copyright 2004 - 2005 , Anders Broman <anders.broman@ericsson.com> + * Copyright 2004 - 2005 , Anders Broman <anders.broman [AT] ericsson.com> * Based on the dissector by: * Felix Fei <felix.fei [AT] utstar.com> * and Michael Lum <mlum [AT] telostech.com> @@ -516,7 +516,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv offset=dissect_gsm_map_TMSI(FALSE, tvb, offset, pinfo, tree, -1); break; case 56: /*sendAuthenticationInfo*/ - if (application_context_version < 2 ){ + if (application_context_version < 3 ){ offset=dissect_gsm_map_SendAuthenticationInfoArg(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_imsi); }else{ offset=dissect_gsm_map_SendAuthenticationInfoArgV2(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_SendAuthenticationInfoArg); |