diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2008-01-09 21:14:01 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2008-01-09 21:14:01 +0000 |
| commit | 1b73351c8db6db6cc9f197d61a75d306883de363 (patch) | |
| tree | 0d8ed01b93bf1490607c12141113ba45b4c5543b /asn1 | |
| parent | 555355cef3807b76c008a81735281407db1575e5 (diff) | |
From Shmulik Bezalel:
Present the country code description gsmmap and SCCP.
Added small ASN1 bugfix - missing EXPORTS used by gsmmap.asn(Handle older ver).
svn path=/trunk/; revision=24048
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/gsmmap/MAP-CH-DataTypes.asn | 5 | ||||
| -rw-r--r-- | asn1/gsmmap/MAP-CommonDataTypes.asn | 4 | ||||
| -rw-r--r-- | asn1/gsmmap/gsmmap.cnf | 2 | ||||
| -rw-r--r-- | asn1/gsmmap/packet-gsmmap-template.c | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/asn1/gsmmap/MAP-CH-DataTypes.asn b/asn1/gsmmap/MAP-CH-DataTypes.asn index 1632e05329..0f10e9a794 100644 --- a/asn1/gsmmap/MAP-CH-DataTypes.asn +++ b/asn1/gsmmap/MAP-CH-DataTypes.asn @@ -35,7 +35,10 @@ EXPORTS IST-CommandRes, UU-Data, ReleaseResourcesArg, -ReleaseResourcesRes +ReleaseResourcesRes, +-- WS added exports needed by gsmmap.asn (extra asn1 file to handle older proto. ver.) +RoutingInfo, +CUG-CheckInfo ; IMPORTS diff --git a/asn1/gsmmap/MAP-CommonDataTypes.asn b/asn1/gsmmap/MAP-CommonDataTypes.asn index 0c1df1cce0..3960535eb2 100644 --- a/asn1/gsmmap/MAP-CommonDataTypes.asn +++ b/asn1/gsmmap/MAP-CommonDataTypes.asn @@ -65,7 +65,9 @@ AccessNetworkSignalInfo, AgeOfLocationInformation, LCSClientExternalID, LCSClientInternalID, - LCSServiceTypeID + LCSServiceTypeID, +-- WS added exports needed by gsmmap.asn (extra asn1 file to handle older proto. ver.) +ProtocolId ; IMPORTS diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf index 6dd7ead968..2da5b18c19 100644 --- a/asn1/gsmmap/gsmmap.cnf +++ b/asn1/gsmmap/gsmmap.cnf @@ -189,6 +189,8 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" np = octet & 0x0f; if ((na == 1) && (np==1))/*International Number & E164*/ dissect_e164_cc(parameter_tvb, subtree, 1, TRUE); + else if(np==6) + dissect_e212_mcc_mnc(parameter_tvb, subtree, 1); #.FN_BODY TBCD-STRING VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c index bb188e5aaa..bdc3ac4375 100644 --- a/asn1/gsmmap/packet-gsmmap-template.c +++ b/asn1/gsmmap/packet-gsmmap-template.c @@ -1,7 +1,7 @@ /* packet-gsm_map-template.c * Routines for GSM MobileApplication packet dissection * including GSM SS. - * Copyright 2004 - 2007 , Anders Broman <anders.broman [AT] ericsson.com> + * Copyright 2004 - 2008 , 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> |