Fix more Ubuntu warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19711 f5534014-38df-0310-8fa8-9805f1628bb7

3 files changed, 133 insertions, 190 deletions

diff --git a/asn1/camel/camel.asn b/asn1/camel/camel.asn
index 3d2b29fe65..2d81202d6e 100644
--- a/asn1/camel/camel.asn
+++ b/asn1/camel/camel.asn
@@ -896,9 +896,12 @@ FCIGPRSBillingChargingCharacteristics ::= CAMEL-FCIGPRSBillingChargingCharacteri
 
 -- FCISMSBillingChargingCharacteristics notes: not recursive, exported,
 -- locally refd 2 times, import refd 0 times
-FCISMSBillingChargingCharacteristics ::=
 
-OCTET STRING (SIZE (cAPSpecificBoundSetminFCIBillingChargingLength ..cAPSpecificBoundSetmaxFCIBillingChargingLength ))
+--FCISMSBillingChargingCharacteristics ::= OCTET STRING (SIZE (cAPSpecificBoundSetminFCIBillingChargingLength ..cAPSpecificBoundSetmaxFCIBillingChargingLength ))
+--	(CONSTRAINED BY { shall be the result of the BER-encoded value of type 
+--	CAMEL-FCISMSBillingChargingCharacteristics {bound}})
+
+FCISMSBillingChargingCharacteristics ::= CAMEL-FCISMSBillingChargingCharacteristics
 
 -- ForwardServiceInteractionInd notes: not recursive, exported,
 -- locally refd 1 times, import refd 0 times
@@ -1663,9 +1666,6 @@ TPShortMessageSpecificInfo ::= OCTET STRING (SIZE (1))
 -- contains the 1st octect of the applicable TPDU or the SMS-COMMAND TPDU as specified in
 -- 3GPP TS 23.040 [6].
 
--- TPShortMessageSubmissionInfo notes: not recursive, exported,
--- locally refd 1 times, import refd 0 times
-TPShortMessageSubmissionInfo ::= OCTET STRING (SIZE (1))
 
 -- TPValidityPeriod notes: not recursive, exported,
 -- locally refd 1 times, import refd 0 times
@@ -1777,22 +1777,6 @@ AddressString ::=
     
     OCTET STRING (SIZE(1..maxAddressLength))
 
--- CellIdFixedLength notes: not recursive, exported,
--- locally refd 1 times, import refd 0 times
-CellIdFixedLength ::=
-    
-    
-    OCTET STRING (SIZE (7))
-    -- Refers to Cell Global Identification defined in TS GSM 03.03.
-    -- Octets ares encoded according to TS GSM 04.08.
-    -- The internal structure is defined as follows:
-    --   Mobile Country Code:   3 digits according to CCITT Rec E.212.
-    --                          1 digits filler (1111)
-    --   Mobile Network Code:   2 digits according to CCITT Rec E.212.
-    --   Location Area Code:    2 octets according to TS GSM 04.08.
-    --   Cell Identify:         2 octets (CI) according to TS GSM 04.08.
-
-
 -- LAIFixedLength notes: not recursive, exported,
 -- locally refd 1 times, import refd 0 times
 -- IMPORTED fom GSM MAP
@@ -1810,19 +1794,6 @@ CellIdFixedLength ::=
 -- locally refd 6 times, import refd 0 times
 ServiceKey ::= INTEGER (0..2147483647)
 
--- Ext-TeleserviceCode notes: not recursive, exported,
--- locally refd 1 times, import refd 0 times
-Ext-TeleserviceCode ::=
-
-OCTET STRING (SIZE (1..5))
-
--- Ext-BearerServiceCode notes: not recursive, exported,
--- locally refd 1 times, import refd 0 times
-Ext-BearerServiceCode ::=
-
-OCTET STRING (SIZE (1..5))
-
-
 
 -- Duration notes: not recursive, exported,
 -- locally refd 1 times, import refd 0 times
@@ -2047,15 +2018,6 @@ EntityReleasedGPRSArg ::=
     pDPID     [1] PDPId      OPTIONAL
 }
 
--- FurnishChargingInformationGPRSArg notes: not recursive, exported,
--- locally refd 1 times, import refd 0 times
-FurnishChargingInformationGPRSArg ::= CAMEL-FCIGPRSBillingChargingCharacteristics
-
--- FCIGPRSBillingChargingCharacteristics type.
--- Shall be the result of the BER-encoded value of type
--- CAMEL-FCIGPRSBillingChargingCharacteristics
-
-
 -- ReleaseGPRSArg notes: not recursive, exported,
 -- locally refd 1 times, import refd 0 times
 ReleaseGPRSArg ::=
@@ -2494,21 +2456,6 @@ EventReportSMSArg ::=
 
 
 
--- RequestReportSMSEventArg notes: not recursive, exported,
--- locally refd 1 times, import refd 0 times
-RequestReportSMSEventArg ::=
-
- SEQUENCE
-{
-    sMSEvents  [0]  SMSEventArray,
-    extensions [10] ExtensionsArray OPTIONAL
-}
-
-SMSEventArray ::= 
-		  SEQUENCE SIZE (1..10) OF SMSEvent
-
-
-
 -- ResetTimerSMSArg notes: not recursive, exported,
 -- locally refd 1 times, import refd 0 times
 ResetTimerSMSArg ::=
@@ -2546,7 +2493,7 @@ ConnectSMSArg ::=
 
  SEQUENCE
 {
-    callingPartysNumber         [0] ISDN-AddressString   OPTIONAL,
+    callingPartysNumber         [0] SMS-AddressString   OPTIONAL,
     destinationSubscriberNumber [1] CalledPartyBCDNumber OPTIONAL,
     sMSCAddress                 [2] ISDN-AddressString   OPTIONAL,
     extensions                  [10] ExtensionsArray     OPTIONAL
@@ -2593,6 +2540,26 @@ PromptAndCollectUserInformationArg ::=
     extensions                [3] ExtensionsArray   OPTIONAL
 }
 
+--furnishChargingInformationGPRS {PARAMETERS-BOUND : bound} OPERATION ::= {
+--	ARGUMENT		FurnishChargingInformationGPRSArg {bound}
+--	RETURN RESULT	FALSE
+--	ERRORS			{missingParameter |
+--					taskRefused |
+--					unexpectedComponentSequence |
+--					unexpectedDataValue |
+--					unexpectedParameter |
+--					unknownPDPID}
+--	CODE			opcode-furnishChargingInformationGPRS}
+-- Direction: gsmSCF -> gprsSSF, Timer: Tfcig 
+-- This operation is used to request the gprsSSF to generate, register a logical record or to 
+-- include some information in the default logical GPRS record.
+-- The registered logical record is intended for off line charging of the GPRS session
+-- or PDP Context.
+
+-- FurnishChargingInformationGPRSArg {PARAMETERS-BOUND : bound} ::=
+--	FCIGPRSBillingChargingCharacteristics{bound}
+
+FurnishChargingInformationGPRSArg ::= FCIGPRSBillingChargingCharacteristics
 
 
 -- InitialDPGPRSArg notes: not recursive, exported,
@@ -2688,7 +2655,7 @@ InitialDPSMSArg ::=
 {
     serviceKey                          [0]  ServiceKey,
     destinationSubscriberNumber         [1]  CalledPartyBCDNumber         OPTIONAL,
-    callingPartyNumberas                [2]  ISDN-AddressString           OPTIONAL,
+    callingPartyNumberas                [2]  SMS-AddressString            OPTIONAL,
     eventTypeSMS                        [3]  EventTypeSMS                 OPTIONAL,
     iMSI                                [4]  IMSI                         OPTIONAL,
     locationInformationMSC              [5]  LocationInformation          OPTIONAL,
@@ -2700,11 +2667,32 @@ InitialDPSMSArg ::=
     tPDataCodingScheme                  [11] TPDataCodingScheme           OPTIONAL,
     tPValidityPeriod                    [12] TPValidityPeriod             OPTIONAL,
     extensions                          [13] ExtensionsArray              OPTIONAL,
+	...,
     smsReferenceNumber                  [14] CallReferenceNumber          OPTIONAL,
     mscAddress                          [15] ISDN-AddressString           OPTIONAL,
-    sgsnNumber                          [16] ISDN-AddressString           OPTIONAL
+    sgsnNumber                          [16] ISDN-AddressString           OPTIONAL,
+	ms-Classmark2						[17] MS-Classmark2							OPTIONAL,
+	gPRSMSClass 						[18] GPRSMSClass							OPTIONAL,
+	iMEI								[19] IMEI									OPTIONAL,
+	calledPartyNumber					[20] ISDN-AddressString						OPTIONAL
+}
+
+-- ReleaseSMSArg notes: not recursive, exported,
+-- locally refd 0 times, import refd 0 times
+ReleaseSMSArg ::= RPCause
+
+-- RequestReportSMSEventArg notes: not recursive, exported,
+-- locally refd 1 times, import refd 0 times
+RequestReportSMSEventArg ::=
+
+ SEQUENCE
+{
+    sMSEvents  [0]  SMSEventArray,
+    extensions [10] ExtensionsArray OPTIONAL
 }
 
+SMSEventArray ::= 
+		  SEQUENCE SIZE (1..10) OF SMSEvent
 
 
 -- ExtensionContainer notes: not recursive, exported,
@@ -2716,12 +2704,6 @@ ExtensionContainer ::=   SEQUENCE
 }
 
 
--- ReleaseSMSArg notes: not recursive, exported,
--- locally refd 0 times, import refd 0 times
-ReleaseSMSArg ::= RPCause
-
-
---OCTET STRING (SIZE (1))
 
 -- ApplyChargingGPRSArg notes: not recursive, exported,
 -- locally refd 0 times, import refd 0 times
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index 053cec0750..d77a9f6102 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -75,14 +75,9 @@ static int hf_camel_invokeId = -1;              /* InvokeId */
 static int hf_camel_invoke = -1;                /* InvokePDU */
 static int hf_camel_returnResult = -1;          /* InvokePDU */
 static int hf_camel_returnResult_result = -1;
-static int hf_camel_getPassword = -1;  
-static int hf_camel_currentPassword = -1;  
-static int hf_camel_nature_of_number = -1;
-static int hf_camel_number_plan = -1;
 static int hf_camel_imsi_digits = -1;
 static int hf_camel_addr_extension = -1;
 static int hf_camel_addr_natureOfAddressIndicator = -1;
-static int hf_camel_addr_nature_of_number = -1;
 static int hf_camel_addr_numberingPlanInd = -1;
 static int hf_camel_addr_digits = -1;
 static int hf_camel_cause_indicator = -1;
@@ -313,7 +308,7 @@ char camel_number_to_char(int number)
  * 24.011 8.2.5.4
  */   
 static guint8
-dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, guint len,
+dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len,
 		    proto_tree *tree, int hf_cause_value, guint8 *cause_value)
 {
   guint8	oct;
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index c3131ff856..acc86132ad 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -83,14 +83,9 @@ static int hf_camel_invokeId = -1;              /* InvokeId */
 static int hf_camel_invoke = -1;                /* InvokePDU */
 static int hf_camel_returnResult = -1;          /* InvokePDU */
 static int hf_camel_returnResult_result = -1;
-static int hf_camel_getPassword = -1;  
-static int hf_camel_currentPassword = -1;  
-static int hf_camel_nature_of_number = -1;
-static int hf_camel_number_plan = -1;
 static int hf_camel_imsi_digits = -1;
 static int hf_camel_addr_extension = -1;
 static int hf_camel_addr_natureOfAddressIndicator = -1;
-static int hf_camel_addr_nature_of_number = -1;
 static int hf_camel_addr_numberingPlanInd = -1;
 static int hf_camel_addr_digits = -1;
 static int hf_camel_cause_indicator = -1;
@@ -476,11 +471,9 @@ static int hf_camel_legToBeSplit = -1;            /* LegID */
 static int hf_camel_destinationReference = -1;    /* Integer4 */
 static int hf_camel_originationReference = -1;    /* Integer4 */
 static int hf_camel_eventSpecificInformationSMS = -1;  /* EventSpecificInformationSMS */
-static int hf_camel_sMSEvents = -1;               /* SMSEventArray */
-static int hf_camel_SMSEventArray_item = -1;      /* SMSEvent */
 static int hf_camel_bcsmEvents = -1;              /* BCSMEventArray */
 static int hf_camel_BCSMEventArray_item = -1;     /* BCSMEvent */
-static int hf_camel_callingPartysNumber = -1;     /* ISDN_AddressString */
+static int hf_camel_callingPartysNumber = -1;     /* SMS_AddressString */
 static int hf_camel_destinationSubscriberNumber = -1;  /* CalledPartyBCDNumber */
 static int hf_camel_sMSCAddress = -1;             /* ISDN_AddressString */
 static int hf_camel_requestedInformationList = -1;  /* RequestedInformationList */
@@ -509,7 +502,7 @@ static int hf_camel_calledPartyBCDNumber = -1;    /* CalledPartyBCDNumber */
 static int hf_camel_timeAndTimezone = -1;         /* TimeAndTimezone */
 static int hf_camel_gsm_ForwardingPending = -1;   /* NULL */
 static int hf_camel_initialDPArgExtension = -1;   /* InitialDPArgExtension */
-static int hf_camel_callingPartyNumberas = -1;    /* ISDN_AddressString */
+static int hf_camel_callingPartyNumberas = -1;    /* SMS_AddressString */
 static int hf_camel_locationInformationMSC = -1;  /* LocationInformation */
 static int hf_camel_tPShortMessageSpecificInfo = -1;  /* TPShortMessageSpecificInfo */
 static int hf_camel_tPProtocolIdentifier = -1;    /* TPProtocolIdentifier */
@@ -517,6 +510,9 @@ static int hf_camel_tPDataCodingScheme = -1;      /* TPDataCodingScheme */
 static int hf_camel_tPValidityPeriod = -1;        /* TPValidityPeriod */
 static int hf_camel_smsReferenceNumber = -1;      /* CallReferenceNumber */
 static int hf_camel_sgsnNumber = -1;              /* ISDN_AddressString */
+static int hf_camel_calledPartyNumber1 = -1;      /* ISDN_AddressString */
+static int hf_camel_sMSEvents = -1;               /* SMSEventArray */
+static int hf_camel_SMSEventArray_item = -1;      /* SMSEvent */
 static int hf_camel_privateExtensionList = -1;    /* PrivateExtensionList */
 static int hf_camel_pcs_Extensions = -1;          /* PCS_Extensions */
 static int hf_camel_chargingCharacteristics = -1;  /* ChargingCharacteristics */
@@ -551,7 +547,7 @@ static int hf_camel_OfferedCamel4Functionalities_criteriaForChangeOfPositionDP =
 static int hf_camel_OfferedCamel4Functionalities_serviceChangeDP = -1;
 
 /*--- End of included file: packet-camel-hf.c ---*/
-#line 114 "packet-camel-template.c"
+#line 109 "packet-camel-template.c"
 
 gboolean gcamel_HandleSRT=FALSE;
 extern gboolean gcamel_PersistentSRT;
@@ -746,8 +742,6 @@ static gint ett_camel_SendChargingInformationArg = -1;
 static gint ett_camel_SplitLegArg = -1;
 static gint ett_camel_CAPGPRSReferenceNumber = -1;
 static gint ett_camel_EventReportSMSArg = -1;
-static gint ett_camel_RequestReportSMSEventArg = -1;
-static gint ett_camel_SMSEventArray = -1;
 static gint ett_camel_ResetTimerSMSArg = -1;
 static gint ett_camel_RequestReportBCSMEventArg = -1;
 static gint ett_camel_BCSMEventArray = -1;
@@ -759,6 +753,8 @@ static gint ett_camel_InitialDPGPRSArg = -1;
 static gint ett_camel_CallGapArg = -1;
 static gint ett_camel_InitialDPArg = -1;
 static gint ett_camel_InitialDPSMSArg = -1;
+static gint ett_camel_RequestReportSMSEventArg = -1;
+static gint ett_camel_SMSEventArray = -1;
 static gint ett_camel_ExtensionContainer = -1;
 static gint ett_camel_ApplyChargingGPRSArg = -1;
 static gint ett_camel_ApplyChargingReportGPRSArg = -1;
@@ -768,7 +764,7 @@ static gint ett_camel_ResetTimerGPRSArg = -1;
 static gint ett_camel_CancelFailedPARAM = -1;
 
 /*--- End of included file: packet-camel-ett.c ---*/
-#line 136 "packet-camel-template.c"
+#line 131 "packet-camel-template.c"
 
 
 /* Preference settings default */
@@ -2339,9 +2335,6 @@ static int dissect_gmscAddress_impl(packet_info *pinfo, proto_tree *tree, tvbuff
 static int dissect_gsmSCFAddress_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_camel_ISDN_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_gsmSCFAddress);
 }
-static int dissect_callingPartysNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_camel_ISDN_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_callingPartysNumber);
-}
 static int dissect_sMSCAddress_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_camel_ISDN_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_sMSCAddress);
 }
@@ -2351,12 +2344,12 @@ static int dissect_mSISDN_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 static int dissect_mscAddress_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_camel_ISDN_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_mscAddress);
 }
-static int dissect_callingPartyNumberas_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_camel_ISDN_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_callingPartyNumberas);
-}
 static int dissect_sgsnNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_camel_ISDN_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_sgsnNumber);
 }
+static int dissect_calledPartyNumber1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_camel_ISDN_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_calledPartyNumber1);
+}
 
 
 
@@ -4337,8 +4330,7 @@ dissect_camel_FCIGPRSBillingChargingCharacteristics(gboolean implicit_tag _U_, t
 
 static int
 dissect_camel_FCISMSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                       NULL);
+  offset = dissect_camel_CAMEL_FCISMSBillingChargingCharacteristics(implicit_tag, tvb, offset, pinfo, tree, hf_index);
 
   return offset;
 }
@@ -5826,6 +5818,12 @@ dissect_camel_SMS_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 
   return offset;
 }
+static int dissect_callingPartysNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_camel_SMS_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_callingPartysNumber);
+}
+static int dissect_callingPartyNumberas_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_camel_SMS_AddressString(TRUE, tvb, offset, pinfo, tree, hf_camel_callingPartyNumberas);
+}
 
 
 static const ber_sequence_t SMSEvent_sequence[] = {
@@ -5917,16 +5915,6 @@ static int dissect_tPShortMessageSpecificInfo_impl(packet_info *pinfo, proto_tre
 
 
 static int
-dissect_camel_TPShortMessageSubmissionInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                       NULL);
-
-  return offset;
-}
-
-
-
-static int
 dissect_camel_TPValidityPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                        NULL);
@@ -6024,36 +6012,6 @@ static int dissect_netDetNotReachable(packet_info *pinfo, proto_tree *tree, tvbu
 
 
 static int
-dissect_camel_CellIdFixedLength(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                       NULL);
-
-  return offset;
-}
-
-
-
-static int
-dissect_camel_Ext_TeleserviceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                       NULL);
-
-  return offset;
-}
-
-
-
-static int
-dissect_camel_Ext_BearerServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                       NULL);
-
-  return offset;
-}
-
-
-
-static int
 dissect_camel_CallingPartysCategory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                        NULL);
@@ -6306,15 +6264,6 @@ dissect_camel_EntityReleasedGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, in
 }
 
 
-
-static int
-dissect_camel_FurnishChargingInformationGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_camel_CAMEL_FCIGPRSBillingChargingCharacteristics(implicit_tag, tvb, offset, pinfo, tree, hf_index);
-
-  return offset;
-}
-
-
 static const ber_sequence_t ReleaseGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprsCause_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pDPID_impl },
@@ -6918,37 +6867,6 @@ dissect_camel_EventReportSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 }
 
 
-static const ber_sequence_t SMSEventArray_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SMSEventArray_item },
-};
-
-static int
-dissect_camel_SMSEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                      SMSEventArray_sequence_of, hf_index, ett_camel_SMSEventArray);
-
-  return offset;
-}
-static int dissect_sMSEvents_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_camel_SMSEventArray(TRUE, tvb, offset, pinfo, tree, hf_camel_sMSEvents);
-}
-
-
-static const ber_sequence_t RequestReportSMSEventArg_sequence[] = {
-  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sMSEvents_impl },
-  { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
-  { 0, 0, 0, NULL }
-};
-
-static int
-dissect_camel_RequestReportSMSEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                   RequestReportSMSEventArg_sequence, hf_index, ett_camel_RequestReportSMSEventArg);
-
-  return offset;
-}
-
-
 static const ber_sequence_t ResetTimerSMSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_timerID_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timervalue_impl },
@@ -7063,6 +6981,15 @@ dissect_camel_PromptAndCollectUserInformationArg(gboolean implicit_tag _U_, tvbu
 }
 
 
+
+static int
+dissect_camel_FurnishChargingInformationGPRSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_camel_FCIGPRSBillingChargingCharacteristics(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+
+
 static const ber_sequence_t InitialDPGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceKey_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gPRSEventType_impl },
@@ -7173,6 +7100,10 @@ static const ber_sequence_t InitialDPSMSArg_sequence[] = {
   { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_smsReferenceNumber_impl },
   { BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mscAddress_impl },
   { BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sgsnNumber_impl },
+  { BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ms_Classmark2_impl },
+  { BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gPRSMSClass_impl },
+  { BER_CLASS_CON, 19, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iMEI_impl },
+  { BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calledPartyNumber1_impl },
   { 0, 0, 0, NULL }
 };
 
@@ -7194,6 +7125,37 @@ dissect_camel_ReleaseSMSArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
 }
 
 
+static const ber_sequence_t SMSEventArray_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SMSEventArray_item },
+};
+
+static int
+dissect_camel_SMSEventArray(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                      SMSEventArray_sequence_of, hf_index, ett_camel_SMSEventArray);
+
+  return offset;
+}
+static int dissect_sMSEvents_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_camel_SMSEventArray(TRUE, tvb, offset, pinfo, tree, hf_camel_sMSEvents);
+}
+
+
+static const ber_sequence_t RequestReportSMSEventArg_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sMSEvents_impl },
+  { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensions_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_camel_RequestReportSMSEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                   RequestReportSMSEventArg_sequence, hf_index, ett_camel_RequestReportSMSEventArg);
+
+  return offset;
+}
+
+
 static const ber_sequence_t ApplyChargingGPRSArg_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_chargingCharacteristics_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tariffSwitchInterval_impl },
@@ -7340,7 +7302,7 @@ dissect_camel_TaskRefusedPARAM(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 
 
 /*--- End of included file: packet-camel-fn.c ---*/
-#line 244 "packet-camel-template.c"
+#line 239 "packet-camel-template.c"
 
 const value_string camel_opr_code_strings[] = {
 
@@ -7413,7 +7375,7 @@ char camel_number_to_char(int number)
  * 24.011 8.2.5.4
  */   
 static guint8
-dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, guint len,
+dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len,
 		    proto_tree *tree, int hf_cause_value, guint8 *cause_value)
 {
   guint8	oct;
@@ -9483,14 +9445,6 @@ void proto_register_camel(void) {
       { "eventSpecificInformationSMS", "camel.eventSpecificInformationSMS",
         FT_UINT32, BASE_DEC, VALS(camel_EventSpecificInformationSMS_vals), 0,
         "camel.EventSpecificInformationSMS", HFILL }},
-    { &hf_camel_sMSEvents,
-      { "sMSEvents", "camel.sMSEvents",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "camel.SMSEventArray", HFILL }},
-    { &hf_camel_SMSEventArray_item,
-      { "Item", "camel.SMSEventArray_item",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "camel.SMSEvent", HFILL }},
     { &hf_camel_bcsmEvents,
       { "bcsmEvents", "camel.bcsmEvents",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -9502,7 +9456,7 @@ void proto_register_camel(void) {
     { &hf_camel_callingPartysNumber,
       { "callingPartysNumber", "camel.callingPartysNumber",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "camel.ISDN_AddressString", HFILL }},
+        "camel.SMS_AddressString", HFILL }},
     { &hf_camel_destinationSubscriberNumber,
       { "destinationSubscriberNumber", "camel.destinationSubscriberNumber",
         FT_BYTES, BASE_HEX, NULL, 0,
@@ -9618,7 +9572,7 @@ void proto_register_camel(void) {
     { &hf_camel_callingPartyNumberas,
       { "callingPartyNumberas", "camel.callingPartyNumberas",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "camel.ISDN_AddressString", HFILL }},
+        "camel.SMS_AddressString", HFILL }},
     { &hf_camel_locationInformationMSC,
       { "locationInformationMSC", "camel.locationInformationMSC",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -9647,6 +9601,18 @@ void proto_register_camel(void) {
       { "sgsnNumber", "camel.sgsnNumber",
         FT_BYTES, BASE_HEX, NULL, 0,
         "camel.ISDN_AddressString", HFILL }},
+    { &hf_camel_calledPartyNumber1,
+      { "calledPartyNumber", "camel.calledPartyNumber",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "camel.ISDN_AddressString", HFILL }},
+    { &hf_camel_sMSEvents,
+      { "sMSEvents", "camel.sMSEvents",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "camel.SMSEventArray", HFILL }},
+    { &hf_camel_SMSEventArray_item,
+      { "Item", "camel.SMSEventArray_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "camel.SMSEvent", HFILL }},
     { &hf_camel_privateExtensionList,
       { "privateExtensionList", "camel.privateExtensionList",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -9773,7 +9739,7 @@ void proto_register_camel(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-camel-hfarr.c ---*/
-#line 964 "packet-camel-template.c"
+#line 959 "packet-camel-template.c"
   };
 
   /* List of subtrees */
@@ -9966,8 +9932,6 @@ void proto_register_camel(void) {
     &ett_camel_SplitLegArg,
     &ett_camel_CAPGPRSReferenceNumber,
     &ett_camel_EventReportSMSArg,
-    &ett_camel_RequestReportSMSEventArg,
-    &ett_camel_SMSEventArray,
     &ett_camel_ResetTimerSMSArg,
     &ett_camel_RequestReportBCSMEventArg,
     &ett_camel_BCSMEventArray,
@@ -9979,6 +9943,8 @@ void proto_register_camel(void) {
     &ett_camel_CallGapArg,
     &ett_camel_InitialDPArg,
     &ett_camel_InitialDPSMSArg,
+    &ett_camel_RequestReportSMSEventArg,
+    &ett_camel_SMSEventArray,
     &ett_camel_ExtensionContainer,
     &ett_camel_ApplyChargingGPRSArg,
     &ett_camel_ApplyChargingReportGPRSArg,
@@ -9988,7 +9954,7 @@ void proto_register_camel(void) {
     &ett_camel_CancelFailedPARAM,
 
 /*--- End of included file: packet-camel-ettarr.c ---*/
-#line 984 "packet-camel-template.c"
+#line 979 "packet-camel-template.c"
   };
   /* Register protocol */
   proto_camel = proto_register_protocol(PNAME, PSNAME, PFNAME);