get rid of few warnings

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

4 files changed, 95 insertions, 171 deletions

diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 267b8f23ee..3653f64b18 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1179,7 +1179,7 @@ dissect_h225_ProtocolIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 
 static int
 dissect_h225_T_h245Ip(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 276 "h225.cnf"
+#line 281 "h225.cnf"
   tvbuff_t *value_tvb;
 
   ipv4_address = 0;
@@ -1419,7 +1419,7 @@ static const per_sequence_t H221NonStandard_sequence[] = {
 
 static int
 dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 565 "h225.cnf"
+#line 570 "h225.cnf"
   t35CountryCode = 0;
   t35Extension = 0;
   manufacturerCode = 0;
@@ -1427,7 +1427,7 @@ dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_H221NonStandard, H221NonStandard_sequence);
 
-#line 569 "h225.cnf"
+#line 574 "h225.cnf"
   h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
   proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard);
 
@@ -1449,7 +1449,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = {
 
 static int
 dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 546 "h225.cnf"
+#line 551 "h225.cnf"
 	guint32 value;
 
 	nsiOID = "";
@@ -1478,7 +1478,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static int
 dissect_h225_T_nsp_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 580 "h225.cnf"
+#line 585 "h225.cnf"
   tvbuff_t *next_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -1501,7 +1501,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = {
 
 int
 dissect_h225_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 578 "h225.cnf"
+#line 583 "h225.cnf"
   nsp_handle = NULL;
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -1535,7 +1535,7 @@ static const per_choice_t H245TransportAddress_choice[] = {
 
 static int
 dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 386 "h225.cnf"
+#line 391 "h225.cnf"
 	ipv4_address=0;
 	ipv4_port=0;
 
@@ -1544,7 +1544,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
                                  ett_h225_H245TransportAddress, H245TransportAddress_choice,
                                  NULL);
 
-#line 392 "h225.cnf"
+#line 397 "h225.cnf"
 	/* we need this info for TAPing */
 	h225_pi->is_h245 = TRUE;
 	h225_pi->h245_address = ipv4_address;	
@@ -1573,7 +1573,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static int
 dissect_h225_DialedDigits(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 258 "h225.cnf"
+#line 263 "h225.cnf"
   tvbuff_t *value_tvb = NULL;
   guint len = 0;
 
@@ -2643,13 +2643,13 @@ static const per_sequence_t TunnelledProtocol_sequence[] = {
 
 static int
 dissect_h225_TunnelledProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 523 "h225.cnf"
+#line 528 "h225.cnf"
   tpOID = "";
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_TunnelledProtocol, TunnelledProtocol_sequence);
 
-#line 525 "h225.cnf"
+#line 530 "h225.cnf"
   tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID);
 
   return offset;
@@ -2827,7 +2827,7 @@ dissect_h225_CallType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 
 static int
 dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 498 "h225.cnf"
+#line 503 "h225.cnf"
   tvbuff_t *guid_tvb;
 
   actx->value_ptr = &guid_tvb;
@@ -3040,7 +3040,7 @@ dissect_h225_SEQUENCE_OF_CryptoH323Token(tvbuff_t *tvb _U_, int offset _U_, asn1
 
 static int
 dissect_h225_FastStart_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 225 "h225.cnf"
+#line 230 "h225.cnf"
 	tvbuff_t *value_tvb = NULL;
 	char codec_str[50];
 
@@ -3843,7 +3843,7 @@ dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, as
 
 static int
 dissect_h225_ParallelH245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 287 "h225.cnf"
+#line 292 "h225.cnf"
 	tvbuff_t *h245_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -3954,13 +3954,13 @@ static const per_sequence_t Setup_UUIE_sequence[] = {
 
 static int
 dissect_h225_Setup_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 340 "h225.cnf"
+#line 345 "h225.cnf"
   contains_faststart = FALSE;
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_Setup_UUIE, Setup_UUIE_sequence);
 
-#line 344 "h225.cnf"
+#line 349 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_SETUP;
   if (contains_faststart == TRUE )
@@ -4010,7 +4010,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence);
 
-#line 353 "h225.cnf"
+#line 358 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_CALL_PROCEDING;
   if (contains_faststart == TRUE )
@@ -4050,7 +4050,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_Connect_UUIE, Connect_UUIE_sequence);
 
-#line 377 "h225.cnf"
+#line 382 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_CONNECT;
   if (contains_faststart == TRUE )
@@ -4088,7 +4088,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_Alerting_UUIE, Alerting_UUIE_sequence);
 
-#line 362 "h225.cnf"
+#line 367 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_ALERTING;
   if (contains_faststart == TRUE )
@@ -4116,7 +4116,7 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_Information_UUIE, Information_UUIE_sequence);
 
-#line 311 "h225.cnf"
+#line 316 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_INFORMATION;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@@ -4235,7 +4235,7 @@ static const per_choice_t ReleaseCompleteReason_choice[] = {
 
 static int
 dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 491 "h225.cnf"
+#line 496 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -4269,7 +4269,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence);
 
-#line 371 "h225.cnf"
+#line 376 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_RELEASE_COMPLET;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@@ -4310,7 +4310,7 @@ static const per_choice_t FacilityReason_choice[] = {
 
 static int
 dissect_h225_FacilityReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 415 "h225.cnf"
+#line 420 "h225.cnf"
 	guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -4383,7 +4383,7 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_Facility_UUIE, Facility_UUIE_sequence);
 
-#line 332 "h225.cnf"
+#line 337 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_FACILITY;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@@ -4412,7 +4412,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_Progress_UUIE, Progress_UUIE_sequence);
 
-#line 317 "h225.cnf"
+#line 322 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_PROGRESS;
   if (contains_faststart == TRUE )
@@ -4429,7 +4429,7 @@ static int
 dissect_h225_T_empty_flg(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_null(tvb, offset, actx, tree, hf_index);
 
-#line 301 "h225.cnf"
+#line 306 "h225.cnf"
   h225_pi->cs_type = H225_EMPTY;
 
   return offset;
@@ -4449,7 +4449,7 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_Status_UUIE, Status_UUIE_sequence);
 
-#line 305 "h225.cnf"
+#line 310 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_STATUS;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@@ -4488,7 +4488,7 @@ dissect_h225_SetupAcknowledge_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h225_SetupAcknowledge_UUIE, SetupAcknowledge_UUIE_sequence);
 
-#line 326 "h225.cnf"
+#line 331 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_SETUP_ACK;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
@@ -4553,7 +4553,7 @@ static const per_choice_t T_h323_message_body_choice[] = {
 
 static int
 dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 198 "h225.cnf"
+#line 203 "h225.cnf"
 	guint32 message_body_val;
 
 	contains_faststart = FALSE;
@@ -4590,7 +4590,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 
 static int
 dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 511 "h225.cnf"
+#line 516 "h225.cnf"
 	tvbuff_t *h4501_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -4630,7 +4630,7 @@ dissect_h225_T_h245Tunneling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 static int
 dissect_h225_H245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 294 "h225.cnf"
+#line 299 "h225.cnf"
 	tvbuff_t *h245_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -4687,7 +4687,7 @@ dissect_h225_CallLinkage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 static int
 dissect_h225_T_messageContent_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 533 "h225.cnf"
+#line 538 "h225.cnf"
   tvbuff_t *next_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -4723,7 +4723,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = {
 
 static int
 dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 531 "h225.cnf"
+#line 536 "h225.cnf"
   tp_handle = NULL;
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -5151,15 +5151,6 @@ dissect_h225_FastStartToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-
-static int
-dissect_h225_EncodedFastStartToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h225_FastStartToken);
-
-  return offset;
-}
-
-
 static const per_sequence_t CapacityReportingCapability_sequence[] = {
   { &hf_h225_canReportCallCapacity, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h225_BOOLEAN },
   { NULL, 0, 0, NULL }
@@ -5579,7 +5570,7 @@ static const per_choice_t GatekeeperRejectReason_choice[] = {
 
 static int
 dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 422 "h225.cnf"
+#line 427 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -5881,7 +5872,7 @@ static const per_choice_t RegistrationRejectReason_choice[] = {
 
 static int
 dissect_h225_RegistrationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 477 "h225.cnf"
+#line 482 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -5944,7 +5935,7 @@ static const per_choice_t UnregRequestReason_choice[] = {
 
 static int
 dissect_h225_UnregRequestReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 429 "h225.cnf"
+#line 434 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -6029,7 +6020,7 @@ static const per_choice_t UnregRejectReason_choice[] = {
 
 static int
 dissect_h225_UnregRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 436 "h225.cnf"
+#line 441 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -6089,7 +6080,7 @@ dissect_h225_CallModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 static int
 dissect_h225_DestinationInfo_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 253 "h225.cnf"
+#line 258 "h225.cnf"
 
   h225_pi->is_destinationInfo = TRUE;
 
@@ -6297,7 +6288,7 @@ static const per_choice_t AdmissionRejectReason_choice[] = {
 
 static int
 dissect_h225_AdmissionRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 463 "h225.cnf"
+#line 468 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -6429,7 +6420,7 @@ static const per_choice_t BandRejectReason_choice[] = {
 
 static int
 dissect_h225_BandRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 443 "h225.cnf"
+#line 448 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -6481,7 +6472,7 @@ static const per_choice_t DisengageReason_choice[] = {
 
 static int
 dissect_h225_DisengageReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 450 "h225.cnf"
+#line 455 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -6568,7 +6559,7 @@ static const per_choice_t DisengageRejectReason_choice[] = {
 
 static int
 dissect_h225_DisengageRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 456 "h225.cnf"
+#line 461 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -6714,7 +6705,7 @@ static const per_choice_t LocationRejectReason_choice[] = {
 
 static int
 dissect_h225_LocationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 470 "h225.cnf"
+#line 475 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -7085,7 +7076,7 @@ static const per_choice_t InfoRequestNakReason_choice[] = {
 
 static int
 dissect_h225_InfoRequestNakReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 484 "h225.cnf"
+#line 489 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -7296,7 +7287,7 @@ static const per_choice_t RasMessage_choice[] = {
 
 int
 dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 241 "h225.cnf"
+#line 246 "h225.cnf"
   	guint32 rasmessage_value;
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index ee792a3580..b58af3cbf9 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -571,7 +571,7 @@ static const per_sequence_t ENCRYPTED_sequence[] = {
 
 int
 dissect_h235_ENCRYPTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 49 "h235.cnf"
+#line 56 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -601,7 +601,7 @@ static const per_sequence_t SIGNED_sequence[] = {
 
 int
 dissect_h235_SIGNED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 46 "h235.cnf"
+#line 53 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -764,7 +764,7 @@ static const per_sequence_t ClearToken_sequence[] = {
 
 int
 dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 56 "h235.cnf"
+#line 63 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -783,7 +783,7 @@ static const per_sequence_t HASHED_sequence[] = {
 
 int
 dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 52 "h235.cnf"
+#line 59 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -795,15 +795,6 @@ dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
 
 
 static int
-dissect_h235_EncodedGeneralToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_ClearToken);
-
-  return offset;
-}
-
-
-
-static int
 dissect_h235_PwdCertToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_h235_ClearToken(tvb, offset, actx, tree, hf_index);
 
@@ -811,15 +802,6 @@ dissect_h235_PwdCertToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 }
 
 
-
-static int
-dissect_h235_EncodedPwdCertToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_PwdCertToken);
-
-  return offset;
-}
-
-
 static const per_sequence_t T_cryptoEncryptedToken_sequence[] = {
   { &hf_h235_tokenOID       , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h235_OBJECT_IDENTIFIER },
   { &hf_h235_encryptedToken , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h235_ENCRYPTED },
@@ -884,7 +866,7 @@ static const per_choice_t CryptoToken_choice[] = {
 
 int
 dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 60 "h235.cnf"
+#line 67 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
 
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -913,15 +895,6 @@ dissect_h235_KeySignedMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
-
-static int
-dissect_h235_EncodedKeySignedMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_KeySignedMaterial);
-
-  return offset;
-}
-
-
 static const per_sequence_t ReturnSig_sequence[] = {
   { &hf_h235_generalId      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h235_Identifier },
   { &hf_h235_responseRandom , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_h235_RandomVal },
@@ -939,15 +912,6 @@ dissect_h235_ReturnSig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 }
 
 
-
-static int
-dissect_h235_EncodedReturnSig(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_ReturnSig);
-
-  return offset;
-}
-
-
 static const per_sequence_t KeySyncMaterial_sequence[] = {
   { &hf_h235_generalID      , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h235_Identifier },
   { &hf_h235_keyMaterial    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h235_KeyMaterial },
@@ -965,15 +929,6 @@ dissect_h235_KeySyncMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 
 static int
-dissect_h235_EncodedKeySyncMaterial(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_h235_KeySyncMaterial);
-
-  return offset;
-}
-
-
-
-static int
 dissect_h235_INTEGER_0_24(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                               0U, 24U, NULL, FALSE);
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index 62bef9c5df..5e4b9f6346 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -493,7 +493,6 @@ static int hf_rrlp_codePhaseRMSError = -1;        /* INTEGER_0_63 */
 static int hf_rrlp_adr = -1;                      /* INTEGER_0_33554431 */
 static int hf_rrlp_privateExtensionList = -1;     /* PrivateExtensionList */
 static int hf_rrlp_pcs_Extensions = -1;           /* PCS_Extensions */
-static int hf_rrlp_slr_Arg_PCS_Extensions = -1;   /* SLR_Arg_PCS_Extensions */
 static int hf_rrlp_PrivateExtensionList_item = -1;  /* PrivateExtension */
 static int hf_rrlp_extId = -1;                    /* OBJECT_IDENTIFIER */
 static int hf_rrlp_extType = -1;                  /* T_extType */
@@ -665,7 +664,6 @@ static gint ett_rrlp_SeqOfGANSS_SgnElement = -1;
 static gint ett_rrlp_GANSS_SgnElement = -1;
 static gint ett_rrlp_Rel7_AssistanceData_Extension = -1;
 static gint ett_rrlp_ExtensionContainer = -1;
-static gint ett_rrlp_SLR_ArgExtensionContainer = -1;
 static gint ett_rrlp_PrivateExtensionList = -1;
 static gint ett_rrlp_PrivateExtension = -1;
 static gint ett_rrlp_PCS_Extensions = -1;
@@ -868,7 +866,7 @@ dissect_rrlp_TimeSlotScheme(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 static int
 dissect_rrlp_Ext_GeographicalInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 35 "rrlp.cnf"
+#line 39 "rrlp.cnf"
 
 tvbuff_t *parameter_tvb = NULL;
 
@@ -4572,7 +4570,7 @@ static const per_sequence_t PDU_sequence[] = {
 
 static int
 dissect_rrlp_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 26 "rrlp.cnf"
+#line 30 "rrlp.cnf"
 	
 	proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE);
 
@@ -4599,21 +4597,6 @@ dissect_rrlp_SLR_Arg_PCS_Extensions(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
   return offset;
 }
 
-
-static const per_sequence_t SLR_ArgExtensionContainer_sequence[] = {
-  { &hf_rrlp_privateExtensionList, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_rrlp_PrivateExtensionList },
-  { &hf_rrlp_slr_Arg_PCS_Extensions, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_rrlp_SLR_Arg_PCS_Extensions },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_rrlp_SLR_ArgExtensionContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_rrlp_SLR_ArgExtensionContainer, SLR_ArgExtensionContainer_sequence);
-
-  return offset;
-}
-
 /*--- PDUs ---*/
 
 static void dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
@@ -6324,10 +6307,6 @@ void proto_register_rrlp(void) {
       { "pcs-Extensions", "rrlp.pcs_Extensions",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.PCS_Extensions", HFILL }},
-    { &hf_rrlp_slr_Arg_PCS_Extensions,
-      { "slr-Arg-PCS-Extensions", "rrlp.slr_Arg_PCS_Extensions",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "rrlp.SLR_Arg_PCS_Extensions", HFILL }},
     { &hf_rrlp_PrivateExtensionList_item,
       { "Item", "rrlp.PrivateExtensionList_item",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -6527,7 +6506,6 @@ void proto_register_rrlp(void) {
     &ett_rrlp_GANSS_SgnElement,
     &ett_rrlp_Rel7_AssistanceData_Extension,
     &ett_rrlp_ExtensionContainer,
-    &ett_rrlp_SLR_ArgExtensionContainer,
     &ett_rrlp_PrivateExtensionList,
     &ett_rrlp_PrivateExtension,
     &ett_rrlp_PCS_Extensions,
diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index c00aad334e..464c5b336d 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -161,11 +161,11 @@ static int hf_ulp_sessionId = -1;                 /* INTEGER_0_65535 */
 static int hf_ulp_setId = -1;                     /* SETId */
 static int hf_ulp_msisdn = -1;                    /* OCTET_STRING_SIZE_8 */
 static int hf_ulp_mdn = -1;                       /* OCTET_STRING_SIZE_8 */
-static int hf_ulp_min_01 = -1;                    /* BIT_STRING_SIZE_34 */
+static int hf_ulp_minsi = -1;                     /* BIT_STRING_SIZE_34 */
 static int hf_ulp_imsi = -1;                      /* OCTET_STRING_SIZE_8 */
 static int hf_ulp_nai = -1;                       /* IA5String_SIZE_1_1000 */
 static int hf_ulp_iPAddress = -1;                 /* IPAddress */
-static int hf_ulp_sessionID_01 = -1;              /* OCTET_STRING_SIZE_4 */
+static int hf_ulp_sessionSlpID = -1;              /* OCTET_STRING_SIZE_4 */
 static int hf_ulp_slpId = -1;                     /* SLPAddress */
 static int hf_ulp_ipv4Address = -1;               /* OCTET_STRING_SIZE_4 */
 static int hf_ulp_ipv6Address = -1;               /* OCTET_STRING_SIZE_16 */
@@ -207,9 +207,9 @@ static int hf_ulp_refUC = -1;                     /* INTEGER_0_268435455 */
 static int hf_ulp_frequencyInfo = -1;             /* FrequencyInfo */
 static int hf_ulp_primaryScramblingCode = -1;     /* INTEGER_0_511 */
 static int hf_ulp_measuredResultsList = -1;       /* MeasuredResultsList */
-static int hf_ulp_modeSpecificInfo = -1;          /* T_modeSpecificInfo */
-static int hf_ulp_fdd = -1;                       /* FrequencyInfoFDD */
-static int hf_ulp_tdd = -1;                       /* FrequencyInfoTDD */
+static int hf_ulp_modeSpecificFrequencyInfo = -1;  /* FrequencySpecificInfo */
+static int hf_ulp_fdd_fr = -1;                    /* FrequencyInfoFDD */
+static int hf_ulp_tdd_fr = -1;                    /* FrequencyInfoTDD */
 static int hf_ulp_uarfcn_UL = -1;                 /* UARFCN */
 static int hf_ulp_uarfcn_DL = -1;                 /* UARFCN */
 static int hf_ulp_uarfcn_Nt = -1;                 /* UARFCN */
@@ -222,13 +222,13 @@ static int hf_ulp_utra_CarrierRSSI = -1;          /* UTRA_CarrierRSSI */
 static int hf_ulp_cellMeasuredResultsList = -1;   /* CellMeasuredResultsList */
 static int hf_ulp_CellMeasuredResultsList_item = -1;  /* CellMeasuredResults */
 static int hf_ulp_cellIdentity = -1;              /* INTEGER_0_268435455 */
-static int hf_ulp_modeSpecificInfo_01 = -1;       /* T_modeSpecificInfo_01 */
-static int hf_ulp_fdd_01 = -1;                    /* T_fdd */
+static int hf_ulp_modeSpecificInfo = -1;          /* T_modeSpecificInfo */
+static int hf_ulp_fdd = -1;                       /* T_fdd */
 static int hf_ulp_primaryCPICH_Info = -1;         /* PrimaryCPICH_Info */
 static int hf_ulp_cpich_Ec_N0 = -1;               /* CPICH_Ec_N0 */
 static int hf_ulp_cpich_RSCP = -1;                /* CPICH_RSCP */
 static int hf_ulp_pathloss = -1;                  /* Pathloss */
-static int hf_ulp_tdd_01 = -1;                    /* T_tdd */
+static int hf_ulp_tdd = -1;                       /* T_tdd */
 static int hf_ulp_cellParametersID = -1;          /* CellParametersID */
 static int hf_ulp_proposedTGSN = -1;              /* TGSN */
 static int hf_ulp_primaryCCPCH_RSCP = -1;         /* PrimaryCCPCH_RSCP */
@@ -296,7 +296,7 @@ static gint ett_ulp_CdmaCellInformation = -1;
 static gint ett_ulp_GsmCellInformation = -1;
 static gint ett_ulp_WcdmaCellInformation = -1;
 static gint ett_ulp_FrequencyInfo = -1;
-static gint ett_ulp_T_modeSpecificInfo = -1;
+static gint ett_ulp_FrequencySpecificInfo = -1;
 static gint ett_ulp_FrequencyInfoFDD = -1;
 static gint ett_ulp_FrequencyInfoTDD = -1;
 static gint ett_ulp_NMR = -1;
@@ -305,7 +305,7 @@ static gint ett_ulp_MeasuredResultsList = -1;
 static gint ett_ulp_MeasuredResults = -1;
 static gint ett_ulp_CellMeasuredResultsList = -1;
 static gint ett_ulp_CellMeasuredResults = -1;
-static gint ett_ulp_T_modeSpecificInfo_01 = -1;
+static gint ett_ulp_T_modeSpecificInfo = -1;
 static gint ett_ulp_T_fdd = -1;
 static gint ett_ulp_T_tdd = -1;
 static gint ett_ulp_TimeslotISCP_List = -1;
@@ -459,7 +459,7 @@ static const value_string ulp_SETId_vals[] = {
 static const per_choice_t SETId_choice[] = {
   {   0, &hf_ulp_msisdn          , ASN1_EXTENSION_ROOT    , dissect_ulp_OCTET_STRING_SIZE_8 },
   {   1, &hf_ulp_mdn             , ASN1_EXTENSION_ROOT    , dissect_ulp_OCTET_STRING_SIZE_8 },
-  {   2, &hf_ulp_min_01          , ASN1_EXTENSION_ROOT    , dissect_ulp_BIT_STRING_SIZE_34 },
+  {   2, &hf_ulp_minsi           , ASN1_EXTENSION_ROOT    , dissect_ulp_BIT_STRING_SIZE_34 },
   {   3, &hf_ulp_imsi            , ASN1_EXTENSION_ROOT    , dissect_ulp_OCTET_STRING_SIZE_8 },
   {   4, &hf_ulp_nai             , ASN1_EXTENSION_ROOT    , dissect_ulp_IA5String_SIZE_1_1000 },
   {   5, &hf_ulp_iPAddress       , ASN1_EXTENSION_ROOT    , dissect_ulp_IPAddress },
@@ -525,7 +525,7 @@ dissect_ulp_SLPAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 
 static const per_sequence_t SlpSessionID_sequence[] = {
-  { &hf_ulp_sessionID_01    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_OCTET_STRING_SIZE_4 },
+  { &hf_ulp_sessionSlpID    , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_OCTET_STRING_SIZE_4 },
   { &hf_ulp_slpId           , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_SLPAddress },
   { NULL, 0, 0, NULL }
 };
@@ -974,22 +974,22 @@ dissect_ulp_FrequencyInfoTDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
-static const value_string ulp_T_modeSpecificInfo_vals[] = {
+static const value_string ulp_FrequencySpecificInfo_vals[] = {
   {   0, "fdd" },
   {   1, "tdd" },
   { 0, NULL }
 };
 
-static const per_choice_t T_modeSpecificInfo_choice[] = {
-  {   0, &hf_ulp_fdd             , ASN1_EXTENSION_ROOT    , dissect_ulp_FrequencyInfoFDD },
-  {   1, &hf_ulp_tdd             , ASN1_EXTENSION_ROOT    , dissect_ulp_FrequencyInfoTDD },
+static const per_choice_t FrequencySpecificInfo_choice[] = {
+  {   0, &hf_ulp_fdd_fr          , ASN1_EXTENSION_ROOT    , dissect_ulp_FrequencyInfoFDD },
+  {   1, &hf_ulp_tdd_fr          , ASN1_EXTENSION_ROOT    , dissect_ulp_FrequencyInfoTDD },
   { 0, NULL, 0, NULL }
 };
 
 static int
-dissect_ulp_T_modeSpecificInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_ulp_FrequencySpecificInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
-                                 ett_ulp_T_modeSpecificInfo, T_modeSpecificInfo_choice,
+                                 ett_ulp_FrequencySpecificInfo, FrequencySpecificInfo_choice,
                                  NULL);
 
   return offset;
@@ -997,7 +997,7 @@ dissect_ulp_T_modeSpecificInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 
 static const per_sequence_t FrequencyInfo_sequence[] = {
-  { &hf_ulp_modeSpecificInfo, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo },
+  { &hf_ulp_modeSpecificFrequencyInfo, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_ulp_FrequencySpecificInfo },
   { NULL, 0, 0, NULL }
 };
 
@@ -1163,22 +1163,22 @@ dissect_ulp_T_tdd(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto
 }
 
 
-static const value_string ulp_T_modeSpecificInfo_01_vals[] = {
+static const value_string ulp_T_modeSpecificInfo_vals[] = {
   {   0, "fdd" },
   {   1, "tdd" },
   { 0, NULL }
 };
 
-static const per_choice_t T_modeSpecificInfo_01_choice[] = {
-  {   0, &hf_ulp_fdd_01          , ASN1_NO_EXTENSIONS     , dissect_ulp_T_fdd },
-  {   1, &hf_ulp_tdd_01          , ASN1_NO_EXTENSIONS     , dissect_ulp_T_tdd },
+static const per_choice_t T_modeSpecificInfo_choice[] = {
+  {   0, &hf_ulp_fdd             , ASN1_NO_EXTENSIONS     , dissect_ulp_T_fdd },
+  {   1, &hf_ulp_tdd             , ASN1_NO_EXTENSIONS     , dissect_ulp_T_tdd },
   { 0, NULL, 0, NULL }
 };
 
 static int
-dissect_ulp_T_modeSpecificInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_ulp_T_modeSpecificInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
-                                 ett_ulp_T_modeSpecificInfo_01, T_modeSpecificInfo_01_choice,
+                                 ett_ulp_T_modeSpecificInfo, T_modeSpecificInfo_choice,
                                  NULL);
 
   return offset;
@@ -1187,7 +1187,7 @@ dissect_ulp_T_modeSpecificInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static const per_sequence_t CellMeasuredResults_sequence[] = {
   { &hf_ulp_cellIdentity    , ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_ulp_INTEGER_0_268435455 },
-  { &hf_ulp_modeSpecificInfo_01, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo_01 },
+  { &hf_ulp_modeSpecificInfo, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_ulp_T_modeSpecificInfo },
   { NULL, 0, 0, NULL }
 };
 
@@ -1840,7 +1840,7 @@ dissect_ulp_OCTET_STRING_SIZE_1_8192(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 static int
 dissect_ulp_T_rrlpPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 36 "ulp.cnf"
+#line 50 "ulp.cnf"
  tvbuff_t *rrlp_tvb;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -2084,7 +2084,7 @@ static const per_choice_t UlpMessage_choice[] = {
 
 static int
 dissect_ulp_UlpMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 24 "ulp.cnf"
+#line 38 "ulp.cnf"
 
 guint32 UlpMessage;
 
@@ -2113,7 +2113,7 @@ static const per_sequence_t ULP_PDU_sequence[] = {
 
 static int
 dissect_ulp_ULP_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 15 "ulp.cnf"
+#line 29 "ulp.cnf"
 	proto_tree_add_item(tree, proto_ulp, tvb, 0, -1, FALSE);
 
 	if (check_col(actx->pinfo->cinfo, COL_PROTOCOL)) 
@@ -2509,7 +2509,7 @@ void proto_register_ulp(void) {
       { "mdn", "ulp.mdn",
         FT_BYTES, BASE_HEX, NULL, 0,
         "ulp.OCTET_STRING_SIZE_8", HFILL }},
-    { &hf_ulp_min_01,
+    { &hf_ulp_minsi,
       { "min", "ulp.min",
         FT_BYTES, BASE_HEX, NULL, 0,
         "ulp.BIT_STRING_SIZE_34", HFILL }},
@@ -2525,7 +2525,7 @@ void proto_register_ulp(void) {
       { "iPAddress", "ulp.iPAddress",
         FT_UINT32, BASE_DEC, VALS(ulp_IPAddress_vals), 0,
         "ulp.IPAddress", HFILL }},
-    { &hf_ulp_sessionID_01,
+    { &hf_ulp_sessionSlpID,
       { "sessionID", "ulp.sessionID",
         FT_BYTES, BASE_HEX, NULL, 0,
         "ulp.OCTET_STRING_SIZE_4", HFILL }},
@@ -2693,15 +2693,15 @@ void proto_register_ulp(void) {
       { "measuredResultsList", "ulp.measuredResultsList",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ulp.MeasuredResultsList", HFILL }},
-    { &hf_ulp_modeSpecificInfo,
+    { &hf_ulp_modeSpecificFrequencyInfo,
       { "modeSpecificInfo", "ulp.modeSpecificInfo",
-        FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_vals), 0,
-        "ulp.T_modeSpecificInfo", HFILL }},
-    { &hf_ulp_fdd,
+        FT_UINT32, BASE_DEC, VALS(ulp_FrequencySpecificInfo_vals), 0,
+        "ulp.FrequencySpecificInfo", HFILL }},
+    { &hf_ulp_fdd_fr,
       { "fdd", "ulp.fdd",
         FT_NONE, BASE_NONE, NULL, 0,
         "ulp.FrequencyInfoFDD", HFILL }},
-    { &hf_ulp_tdd,
+    { &hf_ulp_tdd_fr,
       { "tdd", "ulp.tdd",
         FT_NONE, BASE_NONE, NULL, 0,
         "ulp.FrequencyInfoTDD", HFILL }},
@@ -2753,11 +2753,11 @@ void proto_register_ulp(void) {
       { "cellIdentity", "ulp.cellIdentity",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ulp.INTEGER_0_268435455", HFILL }},
-    { &hf_ulp_modeSpecificInfo_01,
+    { &hf_ulp_modeSpecificInfo,
       { "modeSpecificInfo", "ulp.modeSpecificInfo",
-        FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_01_vals), 0,
-        "ulp.T_modeSpecificInfo_01", HFILL }},
-    { &hf_ulp_fdd_01,
+        FT_UINT32, BASE_DEC, VALS(ulp_T_modeSpecificInfo_vals), 0,
+        "ulp.T_modeSpecificInfo", HFILL }},
+    { &hf_ulp_fdd,
       { "fdd", "ulp.fdd",
         FT_NONE, BASE_NONE, NULL, 0,
         "ulp.T_fdd", HFILL }},
@@ -2777,7 +2777,7 @@ void proto_register_ulp(void) {
       { "pathloss", "ulp.pathloss",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ulp.Pathloss", HFILL }},
-    { &hf_ulp_tdd_01,
+    { &hf_ulp_tdd,
       { "tdd", "ulp.tdd",
         FT_NONE, BASE_NONE, NULL, 0,
         "ulp.T_tdd", HFILL }},
@@ -2910,7 +2910,7 @@ void proto_register_ulp(void) {
     &ett_ulp_GsmCellInformation,
     &ett_ulp_WcdmaCellInformation,
     &ett_ulp_FrequencyInfo,
-    &ett_ulp_T_modeSpecificInfo,
+    &ett_ulp_FrequencySpecificInfo,
     &ett_ulp_FrequencyInfoFDD,
     &ett_ulp_FrequencyInfoTDD,
     &ett_ulp_NMR,
@@ -2919,7 +2919,7 @@ void proto_register_ulp(void) {
     &ett_ulp_MeasuredResults,
     &ett_ulp_CellMeasuredResultsList,
     &ett_ulp_CellMeasuredResults,
-    &ett_ulp_T_modeSpecificInfo_01,
+    &ett_ulp_T_modeSpecificInfo,
     &ett_ulp_T_fdd,
     &ett_ulp_T_tdd,
     &ett_ulp_TimeslotISCP_List,