Fix decoding of Ext-GeographicalInformation.

svn path=/trunk/; revision=18181

3 files changed, 33 insertions, 25 deletions

diff --git a/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c
index 0ad8710bfe..8a23a5ff7b 100644
--- a/asn1/rrlp/packet-rrlp-template.c
+++ b/asn1/rrlp/packet-rrlp-template.c
@@ -63,20 +63,6 @@ static gint ett_rrlp = -1;
 /* Include constants */
 #include "packet-rrlp-val.h"
 
-/* If trying to use module import the "dissect_gsm_map_ExtensionContainer" will be wrongly constructed
- * presumably because it assumes it will be PER encoded
- */
-static int
-dissect_MAP_ExtensionDataTypes_ExtensionContainer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index){
-
-	return dissect_gsm_map_ExtensionContainer(TRUE, tvb, offset, pinfo, tree, hf_index);
-}
-
-static int
-dissect_MAP_LCS_DataTypes_Ext_GeographicalInformation(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index){
-
-	return dissect_gsm_map_Ext_GeographicalInformation(TRUE, tvb, offset, pinfo, tree, hf_index);
-}
 
 #include "packet-rrlp-fn.c"
 
diff --git a/asn1/rrlp/rrlp.asn b/asn1/rrlp/rrlp.asn
index 31bdda3691..0379f80ce4 100644
--- a/asn1/rrlp/rrlp.asn
+++ b/asn1/rrlp/rrlp.asn
@@ -16,17 +16,38 @@ BEGIN
 --;
 
 IMPORTS
-	Ext-GeographicalInformation
-FROM
-	MAP-LCS-DataTypes {
-	ccitt identified-organization (4) etsi (0) mobileDomain (0)
-	gsm-Network (1) modules (3) map-LCS-DataTypes (25) version5 (5)}
-
-	ExtensionContainer
-FROM MAP-ExtensionDataTypes {
-	ccitt identified-organization (4) etsi (0) mobileDomain (0)
-	gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version4 (4)}
+--	Ext-GeographicalInformation
+--FROM
+--	MAP-LCS-DataTypes {
+--	ccitt identified-organization (4) etsi (0) mobileDomain (0)
+--	gsm-Network (1) modules (3) map-LCS-DataTypes (25) version5 (5)}
+
+--	ExtensionContainer
+--FROM MAP-ExtensionDataTypes {
+--	ccitt identified-organization (4) etsi (0) mobileDomain (0)
+--	gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version4 (4)}
 	;
+-- local import
+-- maxExt-GeographicalInformation INTEGER ::= 20
+Ext-GeographicalInformation ::= OCTET STRING (SIZE (1..20))
+ExtensionContainer ::= OCTET STRING
+
+--ExtensionContainer ::=    SEQUENCE {
+--   privateExtensionList [0] IMPLICIT PrivateExtensionList OPTIONAL, 
+--   pcsExtensions     [1] IMPLICIT PcsExtensions OPTIONAL, 
+--   ... }
+
+--PrivateExtensionList ::= SEQUENCE OF PrivateExtension
+
+--PrivateExtension ::=  SEQUENCE {
+--  extId      OBJECT IDENTIFIER,  MAP-EXTENSION .&extensionId
+--  extType    ANY OPTIONAL  { @extId   }
+--} 
+
+--PcsExtensions ::= SEQUENCE {
+--          ...
+-- }
+
 
 PDU ::= SEQUENCE {
 	referenceNumber 	INTEGER (0..7),
diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf
index 115469081b..d04d92f83d 100644
--- a/asn1/rrlp/rrlp.cnf
+++ b/asn1/rrlp/rrlp.cnf
@@ -7,7 +7,7 @@
 PDU
 
 #.FN_BODY PDU
-
+	
 	proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE);
 
 	if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
@@ -18,3 +18,4 @@ PDU
   %(DEFAULT_BODY)s
 #.END
 
+