Dissect Cause and use %(DEFAULT_BODY)s use import for IMSI.

svn path=/trunk/; revision=16701

2 files changed, 32 insertions, 32 deletions

diff --git a/asn1/camel/camel.asn b/asn1/camel/camel.asn
index 05f8e8effa..9d2514c792 100644
--- a/asn1/camel/camel.asn
+++ b/asn1/camel/camel.asn
@@ -2073,14 +2073,6 @@ Ext-BearerServiceCode ::=
 
 OCTET STRING (SIZE (1..5))
 
--- Imsi notes: not recursive, exported,
--- locally refd 3 times, import refd 0 times
-Imsi ::=
-
-
-OCTET STRING (SIZE (3..8))
-   -- International Mobile Subscriber Indentity
-   -- digits of MCC, MNC, MSIN are concatenated in this order.
 
 
 -- Duration notes: not recursive, exported,
@@ -2874,7 +2866,7 @@ InitialDPGPRSArg ::=
     serviceKey              [0]  ServiceKey,
     gPRSEventType           [1]  GPRSEventType,
     mSISDN                  [2]  ISDN-AddressString,
-    iMSI                    [3]  Imsi,
+    iMSI                    [3]  IMSI,
     timeAndTimeZone         [4]  TimeAndTimezone,
     gPRSMSClass             [5]  GPRSMSClass             OPTIONAL,
     pDPType                 [6]  PDPType                 OPTIONAL,
@@ -2935,7 +2927,7 @@ InitialDPArg ::=
     cug-Index                       [45] CUG-Index                      OPTIONAL,
     cug-Interlock                   [46] CUG-Interlock                  OPTIONAL,
     cug-OutgoingAccess              [47] NULL                           OPTIONAL,
-    iMSI                            [50] Imsi                           OPTIONAL,
+    iMSI                            [50] IMSI                           OPTIONAL,
     subscriberState                 [51] SubscriberState                OPTIONAL,
     locationInformation             [52] LocationInformation            OPTIONAL,
     ext-basicServiceCode            [53] Ext-BasicServiceCode           OPTIONAL,
@@ -2960,7 +2952,7 @@ InitialDPSMSArg ::=
     destinationSubscriberNumber         [1]  CalledPartyBCDNumber         OPTIONAL,
     callingPartyNumberas                  [2]  ISDN-AddressString           OPTIONAL,
     eventTypeSMS                        [3]  EventTypeSMS                 OPTIONAL,
-    iMSI                                [4]  Imsi                         OPTIONAL,
+    iMSI                                [4]  IMSI                         OPTIONAL,
     locationInformationMSC              [5]  LocationInformation          OPTIONAL,
     locationInformationGPRS             [6]  LocationInformationGPRS      OPTIONAL,
     sMSCAddress                         [7]  ISDN-AddressString           OPTIONAL,
diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf
index 49aa9122e6..91a3e65887 100644
--- a/asn1/camel/camel.cnf
+++ b/asn1/camel/camel.cnf
@@ -56,31 +56,16 @@ MAP-CH-DataTypes gsm_map
  offset += len;
  
 #.END
-
 #----------------------------------------------------------------------------------------
-#.FN_BODY Imsi
-
-
- tvbuff_t	*parameter_tvb;
- char		*digit_str;
-
- offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                    &parameter_tvb);
- if (!parameter_tvb)
-	 return offset;
-
- digit_str = unpack_digits(parameter_tvb, 0);
- proto_tree_add_string(tree, hf_camel_imsi_digits, parameter_tvb, 0, -1, digit_str);
+#.FN_PARS ISDN-AddressString
+	VAL_PTR = &parameter_tvb
 
-#.END
-#----------------------------------------------------------------------------------------
 #.FN_BODY ISDN-AddressString
 
  tvbuff_t	*parameter_tvb;
  char		*digit_str;
 
- offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                    &parameter_tvb);
+%(DEFAULT_BODY)s
 
  if (!parameter_tvb)
 	return offset;
@@ -95,11 +80,13 @@ MAP-CH-DataTypes gsm_map
 #.END
 
 #----------------------------------------------------------------------------------------
+#.FN_PARS CallresultoctetPDU
+	VAL_PTR = &parameter_tvb
+
 #.FN_BODY CallresultoctetPDU
 tvbuff_t	*parameter_tvb;
- offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                    &parameter_tvb);
 
+%(DEFAULT_BODY)s
  if (!parameter_tvb)
 	return offset;
  dissect_camel_CAMEL_CallResult(implicit_tag, parameter_tvb, 0, pinfo, tree, -1);
@@ -107,11 +94,32 @@ tvbuff_t	*parameter_tvb;
 #.END
 
 #----------------------------------------------------------------------------------------
+#.FN_PARS Cause
+	VAL_PTR = &camel_tvb
+
+#.FN_BODY Cause
+
+       tvbuff_t *camel_tvb;
+       guint8 Cause_value;
+
+%(DEFAULT_BODY)s
+
+       if (camel_tvb)
+           dissect_q931_cause_ie(camel_tvb, 0, tvb_length_remaining(camel_tvb,0), tree, hf_camel_cause_indicator, &Cause_value);
+
+
+       return offset;
+#.END
+#----------------------------------------------------------------------------------------
+#.FN_PARS Q850Cause
+	VAL_PTR = &camel_tvb
+
 #.FN_BODY Q850Cause
 
        tvbuff_t *camel_tvb;
        guint8 Cause_value;
-       offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, &camel_tvb);
+
+%(DEFAULT_BODY)s
 
        if (camel_tvb)
            dissect_q931_cause_ie(camel_tvb, 0, tvb_length_remaining(camel_tvb,0), tree, hf_camel_cause_indicator, &Cause_value);