Decode some RANAP elements.

svn path=/trunk/; revision=20854

4 files changed, 60 insertions, 0 deletions

diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf
index d9e47d3ccc..ffb306205c 100644
--- a/asn1/gsmmap/gsmmap.cnf
+++ b/asn1/gsmmap/gsmmap.cnf
@@ -679,6 +679,42 @@ Component
     subtree = proto_item_add_subtree(item, ett_gsm_map_RadioResourceInformation); 
 	be_chan_type(tvb, subtree, 0, tvb_length_remaining(tvb,0), NULL, 0);
 
+#.FN_BODY RANAP-ServiceHandover VAL_PTR = &parameter_tvb
+    tvbuff_t        *parameter_tvb;
+	asn1_ctx_t		asn1_ctx;
+
+%(DEFAULT_BODY)s 
+
+	if (!parameter_tvb) 
+                return offset;
+
+	asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+	dissect_ranap_Service_Handover(parameter_tvb, 0, &asn1_ctx, tree, hf_gsm_map_ranap_service_Handover);
+
+#.FN_BODY IntegrityProtectionInformation VAL_PTR = &parameter_tvb
+    tvbuff_t        *parameter_tvb;
+	asn1_ctx_t		asn1_ctx;
+
+%(DEFAULT_BODY)s 
+
+	if (!parameter_tvb) 
+                return offset;
+
+	asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+	dissect_ranap_IntegrityProtectionInformation(parameter_tvb, 0, &asn1_ctx, tree, hf_gsm_mapIntegrityProtectionInformation);
+
+#.FN_BODY EncryptionInformation VAL_PTR = &parameter_tvb
+    tvbuff_t        *parameter_tvb;
+	asn1_ctx_t		asn1_ctx;
+
+%(DEFAULT_BODY)s 
+
+	if (!parameter_tvb) 
+                return offset;
+
+	asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+	dissect_ranap_EncryptionInformation(parameter_tvb, 0, &asn1_ctx, tree, hf_gsm_mapEncryptionInformation);
+
 #----------------------------------------------------------------------------------------
 #.TYPE_ATTR
 SS-Code  TYPE = FT_UINT8  DISPLAY = BASE_DEC  STRINGS = VALS(ssCode_vals)
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index 0cebe542fe..6c3f617238 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -45,6 +45,7 @@
 #include <string.h>
 
 #include "packet-ber.h"
+#include "packet-per.h"
 #include "packet-q931.h"
 #include "packet-gsm_map.h"
 #include "packet-gsm_a.h"
@@ -53,6 +54,7 @@
 #include "packet-e212.h"
 #include "packet-smpp.h"
 #include "packet-gsm_sms.h"
+#include "packet-ranap.h"
 
 #define PNAME  "GSM Mobile Application"
 #define PSNAME "GSM_MAP"
@@ -132,6 +134,9 @@ static int hf_geo_loc_inner_radius = -1;
 static int hf_geo_loc_uncertainty_radius = -1;
 static int hf_geo_loc_offset_angle = -1;
 static int hf_geo_loc_included_angle = -1;
+static int hf_gsm_map_ranap_service_Handover = -1;
+static int hf_gsm_mapIntegrityProtectionInformation = -1;
+static int hf_gsm_mapEncryptionInformation = -1;
 
 #include "packet-gsm_map-hf.c"
 
@@ -2277,6 +2282,19 @@ void proto_register_gsm_map(void) {
 		"Included angle", HFILL }
 	},
 
+    { &hf_gsm_map_ranap_service_Handover,
+      { "service-Handover", "gsm_map.ranap.service_Handover",
+        FT_UINT32, BASE_DEC, VALS(ranap_Service_Handover_vals), 0,
+        "gsm_map.ranap.Service_Handover", HFILL }},
+    { &hf_gsm_mapIntegrityProtectionInformation,
+      { "IntegrityProtectionInformation", "gsm_map.ranap.IntegrityProtectionInformation",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map.ranap.IntegrityProtectionInformation", HFILL }},
+    { &hf_gsm_mapEncryptionInformation,
+      { "EncryptionInformation", "gsm_map.ranap.EncryptionInformation",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map.ranap.EncryptionInformation", HFILL }},
+
 #include "packet-gsm_map-hfarr.c"
   };
 
diff --git a/asn1/ranap/ranap-exp.cnf b/asn1/ranap/ranap-exp.cnf
index 1dcb0185f2..fdf70d024f 100644
--- a/asn1/ranap/ranap-exp.cnf
+++ b/asn1/ranap/ranap-exp.cnf
@@ -8,6 +8,9 @@ RANAP-PDU-Descriptions  ranap
 #.END
 
 #.TYPE_ATTR
+EncryptionInformation    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+IntegrityProtectionInformation TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+Service-Handover         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(ranap_Service_Handover_vals)  BITMASK = 0
 TargetID                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(ranap_TargetID_vals)  BITMASK = 0
 #.END
 
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index f822d238fb..4c2efba880 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -5,6 +5,9 @@
 
 #.EXPORTS
 TargetID
+Service-Handover
+IntegrityProtectionInformation
+EncryptionInformation
 
 #.PDU_NEW
 RANAP-PDU