Squelch an MSVC++ complaint.
[obnox/wireshark/wip.git] / packet-isup.c
index 63615fd512f7e5e2e0abf0e89d89643c7e326425..79b1dcd6f9d86b4c964b933c1d453be8b9488098 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for ISUP dissection
  * Copyright 2001, Martina Obermeier <martina.obermeier@icn.siemens.de>
  *
- * $Id: packet-isup.c,v 1.3 2001/05/30 08:49:23 guy Exp $
+ * $Id: packet-isup.c,v 1.5 2001/08/28 08:28:14 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1298,7 +1298,10 @@ void dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_t
   proto_tree_add_uint(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Called Party Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -1342,7 +1345,10 @@ void dissect_isup_subsequent_number_parameter(tvbuff_t *parameter_tvb, proto_tre
   proto_tree_add_boolean(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, 0, 1, indicators1);
   offset = 1;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Subsequent Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -1402,7 +1408,7 @@ dissect_isup_information_indicators_parameter(tvbuff_t *parameter_tvb, proto_tre
   proto_tree_add_boolean(parameter_tree, hf_isup_solicited_indicator, parameter_tvb, 0, INFO_IND_LENGTH,  information_indicators);
   
 
-  proto_item_set_text(parameter_item, "Information  indicators: 0x%x", information_indicators);
+  proto_item_set_text(parameter_item, "Information indicators: 0x%x", information_indicators);
 }
 /* ------------------------------------------------------------------
   Dissector Parameter Continuity Indicators 
@@ -1415,7 +1421,7 @@ dissect_isup_continuity_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
   continuity_indicators = tvb_get_guint8(parameter_tvb, 0);
   proto_tree_add_boolean(parameter_tree, hf_isup_continuity_indicator, parameter_tvb, 0, CONTINUITY_IND_LENGTH,  continuity_indicators);
 
-  proto_item_set_text(parameter_item, "Continuity  indicators: 0x%x", continuity_indicators);
+  proto_item_set_text(parameter_item, "Continuity indicators: 0x%x", continuity_indicators);
 }
 /* ------------------------------------------------------------------ 
  Dissector Parameter Backward Call Indicators 
@@ -1524,7 +1530,10 @@ dissect_isup_circuit_state_ind_parameter(tvbuff_t *parameter_tvb, proto_tree *pa
 
   length = tvb_length_remaining(parameter_tvb, offset);
   while(length > 0){
-    circuit_state_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+    circuit_state_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                            offset,
+                                            tvb_length_remaining(parameter_tvb, offset),
+                                            "Circuit# CIC+%u state", i);
     circuit_state_tree = proto_item_add_subtree(circuit_state_item, ett_isup_circuit_state_ind);
     circuit_state = tvb_get_guint8(parameter_tvb, offset);
     if ((circuit_state & DC_8BIT_MASK) == 0){ 
@@ -1539,7 +1548,7 @@ dissect_isup_circuit_state_ind_parameter(tvbuff_t *parameter_tvb, proto_tree *pa
     } 
     offset++;
     length = tvb_length_remaining(parameter_tvb, offset);
- }
 }
   proto_item_set_text(parameter_item, "Circuit state indicator (national use)");
 }
 /* ------------------------------------------------------------------
@@ -1631,7 +1640,10 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Calling Party Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -1680,7 +1692,10 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, proto_tre
   proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Original Called Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -1729,7 +1744,10 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
   proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Redirecting Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -1777,7 +1795,10 @@ void dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tr
   proto_tree_add_uint(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Redirection Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -1917,7 +1938,10 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Connected Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -1964,7 +1988,10 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_
   proto_tree_add_uint(parameter_tree, hf_isup_network_identification_plan, parameter_tvb, 0, 1, indicators);
   offset = 1;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Network identification");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -2304,7 +2331,10 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Location number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -2408,7 +2438,10 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator_enhanced, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Call transfer number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -2546,7 +2579,10 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
   proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
   offset = 2;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Called IN Number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -2691,7 +2727,10 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, proto_tree *param
   proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator_enhanced, parameter_tvb, 2, 1, indicators2);
   offset = 3;
 
-  address_digits_item = proto_tree_add_notext(parameter_tree, parameter_tvb, offset, tvb_length_remaining(parameter_tvb, offset));
+  address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb,
+                                           offset,
+                                           tvb_length_remaining(parameter_tvb, offset),
+                                           "Generic number");
   address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits);
 
   length = tvb_length_remaining(parameter_tvb, offset);
@@ -2754,7 +2793,11 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, proto_tree *i
     if (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS){
       parameter_length = tvb_get_guint8(optional_parameters_tvb, offset + PARAMETER_TYPE_LENGTH);
       
-      parameter_item = proto_tree_add_notext(isup_tree, optional_parameters_tvb , offset, parameter_length  + PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_IND_LENGTH);
+      parameter_item = proto_tree_add_text(isup_tree, optional_parameters_tvb,
+                                          offset,
+                                          parameter_length  + PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_IND_LENGTH,
+                                          "Parameter: type %u",
+                                          parameter_type);
       parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
       proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH, parameter_type, "Optional Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
       offset += PARAMETER_TYPE_LENGTH;
@@ -3039,7 +3082,9 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre
   
   /* Do stuff for first mandatory fixed parameter: Nature of Connection Indicators */
   parameter_type = PARAM_TYPE_NATURE_OF_CONN_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, NATURE_OF_CONNECTION_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      NATURE_OF_CONNECTION_IND_LENGTH,
+                                      "Nature of Connection Indicators");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3049,7 +3094,9 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre
 
   /* Do stuff for 2nd mandatory fixed parameter: Forward Call Indicators */
   parameter_type =  PARAM_TYPE_FORW_CALL_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset,  FORWARD_CALL_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      FORWARD_CALL_IND_LENGTH,
+                                      "Forward Call Indicators");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset); 
@@ -3059,7 +3106,9 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre
 
   /* Do stuff for 3nd mandatory fixed parameter: Calling party's category */
   parameter_type = PARAM_TYPE_CALLING_PRTY_CATEG;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset,  CALLING_PRTYS_CATEGORY_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      CALLING_PRTYS_CATEGORY_LENGTH,
+                                      "Calling Party's category");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset); 
@@ -3069,7 +3118,9 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre
 
   /* Do stuff for 4th mandatory fixed parameter: Transmission medium requirement */
   parameter_type = PARAM_TYPE_TRANSM_MEDIUM_REQU;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH,
+                                      "Transmission medium requirement");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));                     
   actual_length = tvb_length_remaining(message_tvb, offset); 
@@ -3083,7 +3134,10 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Called Party Number");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3111,7 +3165,10 @@ gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto_tree *
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Subsequent Number");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3137,7 +3194,9 @@ dissect_isup_information_request_message(tvbuff_t *message_tvb, proto_tree *isup
  
   /* Do stuff for first mandatory fixed parameter: Information request indicators*/ 
   parameter_type = PARAM_TYPE_INFO_REQ_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, INFO_REQUEST_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      INFO_REQUEST_IND_LENGTH,
+                                      "Information request indicators");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3159,7 +3218,9 @@ dissect_isup_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
  
   /* Do stuff for first mandatory fixed parameter: Information  indicators*/ 
   parameter_type = PARAM_TYPE_INFO_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, INFO_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      INFO_IND_LENGTH,
+                                      "Information indicators");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3181,7 +3242,9 @@ dissect_isup_continuity_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
  
   /* Do stuff for first mandatory fixed parameter: Continuity indicators*/ 
   parameter_type = PARAM_TYPE_CONTINUITY_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, CONTINUITY_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      CONTINUITY_IND_LENGTH,
+                                      "Continuity indicators");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3203,7 +3266,9 @@ dissect_isup_address_complete_message(tvbuff_t *message_tvb, proto_tree *isup_tr
  
   /* Do stuff for first mandatory fixed parameter: backward call indicators*/ 
   parameter_type = PARAM_TYPE_BACKW_CALL_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, BACKWARD_CALL_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      BACKWARD_CALL_IND_LENGTH,
+                                      "Backward Call Indicators");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3225,7 +3290,9 @@ dissect_isup_connect_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
  
   /* Do stuff for first mandatory fixed parameter: backward call indicators*/ 
   parameter_type = PARAM_TYPE_BACKW_CALL_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, BACKWARD_CALL_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      BACKWARD_CALL_IND_LENGTH,
+                                      "Backward Call Indicators");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3251,7 +3318,10 @@ dissect_isup_release_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Cause indicators, see Q.850");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3276,7 +3346,9 @@ dissect_isup_suspend_resume_message(tvbuff_t *message_tvb, proto_tree *isup_tree
  
   /* Do stuff for first mandatory fixed parameter: backward call indicators*/ 
   parameter_type = PARAM_TYPE_SUSP_RESUME_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, SUSPEND_RESUME_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      SUSPEND_RESUME_IND_LENGTH,
+                                      "Suspend/Resume indicator");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3302,7 +3374,10 @@ dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Range and status");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3327,7 +3402,9 @@ dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree *
 
    /* Do stuff for first mandatory fixed parameter: circuit group supervision message type*/ 
   parameter_type = PARAM_TYPE_CIRC_GRP_SV_MSG_TYPE;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, CIRC_GRP_SV_MSG_TYPE_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      CIRC_GRP_SV_MSG_TYPE_LENGTH,
+                                      "Circuit group supervision message type");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3341,7 +3418,10 @@ dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree *
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Facility indicator");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3367,7 +3447,9 @@ dissect_isup_facility_request_accepted_message(tvbuff_t *message_tvb, proto_tree
  
   /* Do stuff for first mandatory fixed parameter: facility indicators*/ 
   parameter_type = PARAM_TYPE_FACILITY_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, FACILITY_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      FACILITY_IND_LENGTH,
+                                      "Facility indicator");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3389,7 +3471,9 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre
  
   /* Do stuff for first mandatory fixed parameter: facility indicators*/ 
   parameter_type = PARAM_TYPE_FACILITY_IND;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, FACILITY_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      FACILITY_IND_LENGTH,
+                                      "Facility indicator");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3403,7 +3487,10 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Cause indicators, see Q.850");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3432,7 +3519,10 @@ dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb,
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Range and status");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3461,7 +3551,10 @@ dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_t
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Range and status");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3477,7 +3570,10 @@ dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_t
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Circuit state indicator (national use)");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3502,7 +3598,9 @@ dissect_isup_call_progress_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
  
   /* Do stuff for first mandatory fixed parameter: Event information*/ 
   parameter_type = PARAM_TYPE_EVENT_INFO;
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb, offset, EVENT_INFO_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset,
+                                      EVENT_INFO_LENGTH,
+                                      "Event information");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));              
   actual_length = tvb_length_remaining(message_tvb, offset);
@@ -3528,7 +3626,10 @@ dissect_isup_user_to_user_information_message(tvbuff_t *message_tvb, proto_tree
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "User-to-user information, see Q.931");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3557,7 +3658,10 @@ dissect_isup_confusion_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
   parameter_pointer = tvb_get_guint8(message_tvb, offset);
   parameter_length = tvb_get_guint8(message_tvb, offset + parameter_pointer);
 
-  parameter_item = proto_tree_add_notext(isup_tree, message_tvb , offset +  parameter_pointer, parameter_length + PARAMETER_LENGTH_IND_LENGTH);
+  parameter_item = proto_tree_add_text(isup_tree, message_tvb,
+                                      offset +  parameter_pointer,
+                                      parameter_length + PARAMETER_LENGTH_IND_LENGTH,
+                                      "Cause indicators, see Q.850");
   parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
   proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"unknown"));      
   proto_tree_add_uint_format(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset, PARAMETER_POINTER_LENGTH, parameter_pointer, "Pointer to Parameter: %u", parameter_pointer);  
@@ -3838,432 +3942,432 @@ proto_register_isup(void)
                { &hf_isup_cic,
                        { "CIC",           "isup.cic",
                        FT_UINT16, BASE_HEX, NULL, 0xFF0F,          
-                         "" }}, 
+                         "", HFILL }}, 
 
                { &hf_isup_message_type,
                        { "Message Type",  "isup.message_type",
                        FT_UINT8, BASE_DEC, NULL, 0x0,          
-                       "" }},
+                       "", HFILL }},
                        
                { &hf_isup_parameter_type,
                        { "Parameter Type",  "isup.parameter_type",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
                        
                { &hf_isup_parameter_length,
                        { "Parameter Length",  "isup.parameter_length",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
                        
                { &hf_isup_mandatory_variable_parameter_pointer,
                        { "Pointer to Parameter",  "isup.mandatory_variable_parameter_pointer",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_pointer_to_start_of_optional_part,
                        { "Pointer to optional parameter part",  "isup.optional_parameter_part_pointer",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_satellite_indicator,
                        { "Satellite Indicator",  "isup.satellite_indicator",
                        FT_UINT8, BASE_HEX, VALS(isup_satellite_ind_value), BA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_continuity_check_indicator,
                        { "Continuity Check Indicator",  "isup.continuity_check_indicator",
                        FT_UINT8, BASE_HEX, VALS(isup_continuity_check_ind_value), DC_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_echo_control_device_indicator,
                        { "Echo Control Device Indicator",  "isup.echo_control_device_indicator",
                        FT_BOOLEAN, 8, TFS(&isup_echo_control_device_ind_value),E_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_natnl_inatnl_call_indicator,
                        { "National/international call indicator",  "isup.forw_call_natnl_inatnl_call_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_natnl_inatnl_call_ind_value),A_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_end_to_end_method_indicator,
                        { "End-to-end method indicator",  "isup.forw_call_end_to_end_method_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_end_to_end_method_ind_value), CB_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_interworking_indicator,
                        { "Interworking indicator",  "isup.forw_call_interworking_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_interworking_ind_value), D_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_end_to_end_info_indicator,
                        { "End-to-end information indicator",  "isup.forw_call_end_to_end_information_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_end_to_end_info_ind_value), E_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_isdn_user_part_indicator,
                        { "ISDN user part indicator",  "isup.forw_call_isdn_user_part_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_ISDN_user_part_ind_value), F_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_preferences_indicator,
                        { "ISDN user part preference indicator",  "isup.forw_call_preferences_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_preferences_ind_value), HG_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_isdn_access_indicator,
                        { "ISDN access indicator",  "isup.forw_call_isdn_access_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_ISDN_originating_access_ind_value), I_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_forw_call_sccp_method_indicator,
                        { "SCCP method indicator",  "isup.forw_call_sccp_method_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_SCCP_method_ind_value), KJ_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                                        
                { &hf_isup_calling_partys_category,
                        { "Calling Party's category",  "isup.calling_partys_category",
                        FT_UINT8, BASE_HEX, VALS(isup_calling_partys_category_value), 0x0,
-                       "" }},
+                       "", HFILL }},
                
                { &hf_isup_transmission_medium_requirement,
                        { "Transmission medium requirement",  "isup.transmission_medium_requirement",
                        FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_value), 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_odd_even_indicator,
                        { "Odd/even indicator",  "isup.isdn_odd_even_indicator",
                        FT_BOOLEAN, 8, TFS(&isup_odd_even_ind_value), ISUP_ODD_EVEN_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_called_party_nature_of_address_indicator,
                        { "Nature of address indicator",  "isup.called_party_nature_of_address_indicator",
                        FT_UINT8, BASE_DEC, VALS(isup_called_party_nature_of_address_ind_value), ISUP_NATURE_OF_ADDRESS_IND_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_calling_party_nature_of_address_indicator,
                        { "Nature of address indicator",  "isup.calling_party_nature_of_address_indicator",
                        FT_UINT8, BASE_DEC, VALS(isup_calling_party_nature_of_address_ind_value), ISUP_NATURE_OF_ADDRESS_IND_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_inn_indicator,
                        { "INN indicator",  "isup.inn_indicator",
                        FT_BOOLEAN, 8, TFS(&isup_INN_ind_value), ISUP_INN_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_ni_indicator,
                        { "NI indicator",  "isup.ni_indicator",
                        FT_BOOLEAN, 8, TFS(&isup_NI_ind_value), ISUP_NI_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_numbering_plan_indicator,
                        { "Numbering plan indicator",  "isup.numbering_plan_indicator",
                        FT_UINT8, BASE_DEC, VALS(isup_numbering_plan_ind_value), ISUP_NUMBERING_PLAN_IND_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_address_presentation_restricted_indicator,
                        { "Address presentation restricted indicator",  "isup.address_presentation_restricted_indicator",
                        FT_UINT8, BASE_DEC, VALS(isup_address_presentation_restricted_ind_value), ISUP_ADDRESS_PRESENTATION_RESTR_IND_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_screening_indicator,
                        { "Screening indicator",  "isup.screening_indicator",
                        FT_UINT8, BASE_DEC, VALS(isup_screening_ind_value), ISUP_SCREENING_IND_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_screening_indicator_enhanced,
                        { "Screening indicator",  "isup.screening_indicator_enhanced",
                        FT_UINT8, BASE_DEC, VALS(isup_screening_ind_enhanced_value), ISUP_SCREENING_IND_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_called_party_odd_address_signal_digit,
                        { "Address signal digit",  "isup.called_party_odd_address_signal_digit",
                        FT_UINT8, BASE_DEC, VALS(isup_called_party_address_digit_value), ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_calling_party_odd_address_signal_digit,
                        { "Address signal digit",  "isup.calling_party_odd_address_signal_digit",
                        FT_UINT8, BASE_DEC, VALS(isup_calling_party_address_digit_value), ISUP_ODD_ADDRESS_SIGNAL_DIGIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_called_party_even_address_signal_digit,
                        { "Address signal digit",  "isup.called_party_even_address_signal_digit",
                        FT_UINT8, BASE_DEC, VALS(isup_called_party_address_digit_value), ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_calling_party_even_address_signal_digit,
                        { "Address signal digit",  "isup.calling_party_even_address_signal_digit",
                        FT_UINT8, BASE_DEC, VALS(isup_calling_party_address_digit_value), ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_calling_party_address_request_indicator,
                        { "Calling party address request indicator",  "isup.calling_party_address_request_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_calling_party_address_request_ind_value), A_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_info_req_holding_indicator,
                        { "Holding indicator",  "isup.info_req_holding_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_holding_ind_value), B_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_calling_partys_category_request_indicator,
                        { "Calling party's category request indicator",  "isup.calling_partys_category_request_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_calling_partys_category_request_ind_value), D_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_charge_information_request_indicator,
                        { "Charge information request indicator",  "isup.charge_information_request_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_charge_information_request_ind_value), E_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_malicious_call_identification_request_indicator,
                        { "Malicious call identification request indicator (ISUP'88)",  "isup.malicious_call_ident_request_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_malicious_call_identification_request_ind_value), H_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_calling_party_address_response_indicator,
                        { "Calling party address response indicator",  "isup.calling_party_address_response_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_calling_party_address_response_ind_value), BA_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_hold_provided_indicator,
                        { "Hold provided indicator",  "isup.hold_provided_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_hold_provided_ind_value), C_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_calling_partys_category_response_indicator,
                        { "Calling party's category response indicator",  "isup.calling_partys_category_response_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_calling_partys_category_response_ind_value), F_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_charge_information_response_indicator,
                        { "Charge information response indicator",  "isup.charge_information_response_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_charge_information_response_ind_value), G_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_solicited_indicator,
                        { "Solicited indicator",  "isup.solicided_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_solicited_information_ind_value), H_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_continuity_indicator,
                        { "Continuity indicator",  "isup.continuity_indicator",
                        FT_BOOLEAN, 8, TFS(&isup_continuity_ind_value), A_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_charge_ind,
                        { "Charge indicator",  "isup.charge_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_charge_ind_value), BA_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_called_partys_status_ind,
                        { "Called party's status indicator",  "isup.called_partys_status_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_called_partys_status_ind_value), DC_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_called_partys_category_ind,
                        { "Called party's category indicator",  "isup.called_partys_category_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_called_partys_category_ind_value), FE_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_end_to_end_method_ind,
                        { "End-to-end method indicator",  "isup.backw_call_end_to_end_method_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_end_to_end_method_ind_value), HG_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_interworking_ind,
                        { "Interworking indicator",  "isup.backw_call_interworking_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_interworking_ind_value), I_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_end_to_end_info_ind,
                        { "End-to-end information indicator",  "isup.backw_call_end_to_end_information_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_end_to_end_info_ind_value), J_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_isdn_user_part_ind,
                        { "ISDN user part indicator",  "isup.backw_call_isdn_user_part_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_ISDN_user_part_ind_value), K_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_holding_ind,
                        { "Holding indicator",  "isup.backw_call_holding_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_holding_ind_value), L_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_backw_call_isdn_access_ind,
                        { "ISDN access indicator",  "isup.backw_call_isdn_access_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_ISDN_terminating_access_ind_value), M_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_echo_control_device_ind,
                        { "Echo Control Device Indicator",  "isup.backw_call_echo_control_device_indicator",
                        FT_BOOLEAN, 16, TFS(&isup_echo_control_device_ind_value), N_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_backw_call_sccp_method_ind,
                        { "SCCP method indicator",  "isup.backw_call_sccp_method_indicator",
                        FT_UINT16, BASE_HEX, VALS(isup_SCCP_method_ind_value), PO_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                                        
                { &hf_isup_suspend_resume_indicator,
                        { "Suspend/Resume indicator",  "isup.suspend_resume_indicator",
                        FT_BOOLEAN, 8, TFS(&isup_suspend_resume_ind_value), A_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                        
                { &hf_isup_transmission_medium_requirement,
                        { "Transmission medium requirement",  "isup.transmission_medium_requirement",
                        FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_value), 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_range_indicator,
                        { "Range indicator",  "isup.range_indicator",
                          FT_UINT8, BASE_DEC, NULL , 0x0,
-                         "" }},
+                         "", HFILL }},
 
                { &hf_isup_cgs_message_type,
                        { "Circuit group supervision message type",  "isup.cgs_message_type",
                        FT_UINT8, BASE_DEC, VALS(isup_cgs_message_type_value), BA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_mtc_blocking_state1,
                        { "Maintenance blocking state",  "isup.mtc_blocking_state",
                        FT_UINT8, BASE_DEC, VALS(isup_mtc_blocking_state_DC00_value), BA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_mtc_blocking_state2,
                        { "Maintenance blocking state",  "isup.mtc_blocking_state",
                        FT_UINT8, BASE_DEC, VALS(isup_mtc_blocking_state_DCnot00_value), BA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
        
                { &hf_isup_call_proc_state,
                        { "Call processing state",  "isup.call_processing_state",
                        FT_UINT8, BASE_DEC, VALS(isup_call_processing_state_value), DC_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
        
                { &hf_isup_hw_blocking_state,
                        { "HW blocking state",  "isup.hw_blocking_state",
                        FT_UINT8, BASE_DEC, VALS(isup_HW_blocking_state_value), FE_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                                        
                { &hf_isup_event_ind,
                        { "Event indicator",  "isup.event_ind",
                          FT_UINT8, 8, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_event_presentation_restricted_ind,
                        { "Event presentation restricted indicator",  "isup.event_presentatiation_restr_ind",
                        FT_BOOLEAN, 8, TFS(&isup_event_presentation_restricted_ind_value), H_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_cug_call_ind,
                        { "Closed user group call indicator",  "isup.clg_call_ind",
                        FT_UINT8, BASE_DEC, VALS(isup_CUG_call_ind_value), BA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_simple_segmentation_ind,
                        { "Simple segmentation indicator",  "isup.simple_segmentation_ind",
                        FT_BOOLEAN, 8, TFS(&isup_simple_segmentation_ind_value), C_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_connected_line_identity_request_ind,
                        { "Connected line identity request indicator",  "isup.connected_line_identity_request_ind",
                        FT_BOOLEAN, 8, TFS(&isup_connected_line_identity_request_ind_value), H_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_redirecting_ind,
                        { "Redirection indicator",  "isup.redirecting_ind",
                        FT_UINT16, BASE_DEC, VALS(isup_redirecting_ind_value), CBA_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_original_redirection_reason,
                        { "Original redirection reason",  "isup.original_redirection_reason",
                        FT_UINT16, BASE_DEC, VALS(isup_original_redirection_reason_value), HGFE_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_redirection_counter,
                        { "Redirection counter",  "isup.redirection_counter",
                        FT_UINT16, BASE_DEC, NULL, KJI_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_redirection_reason,
                        { "Redirection reason",  "isup.redirection_reason",
                        FT_UINT16, BASE_DEC, VALS(isup_redirection_reason_value), PONM_16BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_type_of_network_identification,
                        { "Type of network identification",  "isup.type_of_network_identification",
                        FT_UINT8, BASE_DEC, VALS(isup_type_of_network_identification_value), GFE_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_network_identification_plan,
                        { "Network identification plan",  "isup.network_identification_plan",
                        FT_UINT8, BASE_DEC, VALS(isup_network_identification_plan_value), DCBA_8BIT_MASK,
-                       "" }},                                  
+                       "", HFILL }},                                   
 
                { &hf_isup_map_type,
                        { "Map Type",  "isup.map_type",
                        FT_UINT8, BASE_DEC, VALS(isup_map_type_value), FEDCBA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
        
                { &hf_isup_automatic_congestion_level,
                        { "Automatic congestion level",  "isup.automatic_congestion_level",
                        FT_UINT8, BASE_DEC, VALS(isup_auto_congestion_level_value), 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_inband_information_ind,
                        { "In-band information indicator",  "isup.inband_information_ind",
                        FT_BOOLEAN, 8, TFS(&isup_inband_information_ind_value), A_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_call_diversion_may_occur_ind,
                        { "Call diversion may occur indicator",  "isup.call_diversion_may_occur_ind",
                        FT_BOOLEAN, 8, TFS(&isup_call_diversion_may_occur_ind_value), B_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_mlpp_user_ind,
                        { "MLPP user indicator",  "isup.mlpp_user",
                        FT_BOOLEAN, 8, TFS(&isup_MLPP_user_ind_value), D_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                        
                { &hf_isup_access_delivery_ind,
                        { "Access delivery indicator",  "isup.access_delivery_ind",
                        FT_BOOLEAN, 8, TFS(&isup_access_delivery_ind_value), A_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                
                { &hf_isup_transmission_medium_requirement_prime,
                        { "Transmission medium requirement prime",  "isup.transmission_medium_requirement_prime",
                        FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_prime_value), 0x0,
-                       "" }},
+                       "", HFILL }},
                
                { &hf_isup_loop_prevention_response_ind,
                        { "Response indicator",  "isup.loop_prevention_response_ind",
                        FT_UINT8, BASE_DEC, VALS(isup_loop_prevention_response_ind_value), CB_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                        
                { &hf_isup_temporary_alternative_routing_ind,
                        { "Temporary alternative routing indicator",  "isup.temporary_alternative_routing_ind",
                        FT_BOOLEAN, 8, TFS(&isup_temporary_alternative_routing_ind_value), A_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                                
                { &hf_isup_extension_ind,
                        { "Extension indicator",  "isup.extension_ind",
                        FT_BOOLEAN, 8, TFS(&isup_extension_ind_value), H_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_isup_call_to_be_diverted_ind,
                        { "Call to be diverted indicator",  "isup.call_to_be_diverted_ind",
                        FT_UINT8, BASE_DEC, VALS(isup_call_to_be_diverted_ind_value), BA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
                        
                { &hf_isup_call_to_be_offered_ind,
                        { "Call to be offered indicator",  "isup.call_to_be_offered_ind",
                        FT_UINT8, BASE_DEC, VALS(isup_call_to_be_offered_ind_value), BA_8BIT_MASK,
-                       "" }},          
+                       "", HFILL }},           
                        
                { &hf_isup_conference_acceptance_ind,
                        { "Conference acceptance indicator",  "isup.conference_acceptance_ind",
                        FT_UINT8, BASE_DEC, VALS(isup_conference_acceptance_ind_value), BA_8BIT_MASK,
-                       "" }},
+                       "", HFILL }},
        };
 
 /* Setup protocol subtree array */