Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 18 deletions

diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf
index 29b7bd1e..342a8940 100644
--- a/epan/dissectors/asn1/ranap/ranap.cnf
+++ b/epan/dissectors/asn1/ranap/ranap.cnf
@@ -190,13 +190,13 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   const char    *digit_str;
   sccp_msg_info_t *sccp_info;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
-                                       3, 8, FALSE, &imsi_tvb);
+                                       3, 8, false, &imsi_tvb);
 
   if(!imsi_tvb)
     return offset;
   /* Hide the octet string default printout */
   proto_item_set_hidden(actx->created_item);
-  digit_str = dissect_e212_imsi(imsi_tvb, actx->pinfo, tree,  0, tvb_reported_length(imsi_tvb), FALSE);
+  digit_str = dissect_e212_imsi(imsi_tvb, actx->pinfo, tree,  0, tvb_reported_length(imsi_tvb), false);
 
   sccp_info = (sccp_msg_info_t *)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_ranap, actx->pinfo->curr_layer_num);
 
@@ -221,7 +221,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
 #.FN_BODY RRC-Container VAL_PTR = &rrc_message_tvb
   tvbuff_t *rrc_message_tvb=NULL;
-  guint8 container_choice=0;
+  uint8_t container_choice=0;
 
 %(DEFAULT_BODY)s
 
@@ -243,7 +243,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
          */
 
         /* Assume a TargetRNC-ToSourceRNC-Container.  Peek the RRC octetstream to guess the choice*/
-        container_choice = tvb_get_guint8(rrc_message_tvb, 0) >> 5;
+        container_choice = tvb_get_uint8(rrc_message_tvb, 0) >> 5;
         if (container_choice < 7) {
           /* Normal case (0-6): dissect as TargetRNC-ToSourceRNC-Container */
           call_dissector(rrc_t_to_srnc_handle,rrc_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
@@ -293,11 +293,11 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   private_data->number_type = E212_NONE;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
-                                    3, 3, FALSE, &parameter_tvb);
+                                    3, 3, false, &parameter_tvb);
 
   if (!parameter_tvb)
     return offset;
-  dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, number_type, FALSE);
+  dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, number_type, false);
 #.END
 
 #.FN_BODY CGI
@@ -352,9 +352,9 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   tvbuff_t *parameter_tvb = NULL;
   proto_item *item;
   proto_tree *subtree, *nsap_tree;
-  guint8 *padded_nsap_bytes;
+  uint8_t *padded_nsap_bytes;
   tvbuff_t *nsap_tvb;
-  gint tvb_len;
+  int tvb_len;
 
 %(DEFAULT_BODY)s
   if (!parameter_tvb)
@@ -377,7 +377,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
     if (tvb_len == 7){
       /* Unpadded IPv4 NSAP */
       /* Creating a new TVB with padding */
-      padded_nsap_bytes = (guint8*) wmem_alloc0(actx->pinfo->pool, 20);
+      padded_nsap_bytes = (uint8_t*) wmem_alloc0(actx->pinfo->pool, 20);
       tvb_memcpy(parameter_tvb, padded_nsap_bytes, 0, tvb_len);
       nsap_tvb = tvb_new_child_real_data(tvb, padded_nsap_bytes, 20, 20);
       add_new_data_source(actx->pinfo, nsap_tvb, "Padded NSAP Data");
@@ -451,7 +451,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   /* N.B. value_tvb is 4 bytes of OCTET STRING */
   if (tvb_get_ntohs(value_tvb, 2) == 0) {
     /* Will show first 2 bytes as an integer, as very likely to be a UDP port number */
-    guint16 port_number = tvb_get_ntohs(value_tvb, 0);
+    uint16_t port_number = tvb_get_ntohs(value_tvb, 0);
     private_data_set_binding_id_port(actx, port_number);
     proto_item_append_text(actx->created_item, " (%%u)", port_number);
   }
@@ -465,8 +465,8 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
 #.FN_BODY RAB-SetupOrModifyItemFirst
   address ipv4_addr;
-  guint32 transportLayerAddress_ipv4;
-  guint16 binding_id;
+  uint32_t transportLayerAddress_ipv4;
+  uint16_t binding_id;
 
   private_data_set_transportLayerAddress_ipv4(actx, 0);
   private_data_set_binding_id_port(actx, 0);
@@ -478,12 +478,12 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   }
   set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
   /* Set RTP dissector for the UDP stream of this RAB */
-  rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, FALSE, 0);
+  rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, false, 0);
 
 #.FN_BODY RAB-SetupOrModifiedItem
   address ipv4_addr;
-  guint32 transportLayerAddress_ipv4;
-  guint16 binding_id;
+  uint32_t transportLayerAddress_ipv4;
+  uint16_t binding_id;
 
   private_data_set_transportLayerAddress_ipv4(actx, 0);
   private_data_set_binding_id_port(actx, 0);
@@ -495,7 +495,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   }
   set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
   /* Set RTP dissector for the UDP stream of this RAB */
-  rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, FALSE, 0);
+  rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, false, 0);
 
 # Contains the BSSGP RIM PDU as defined in TS 48.018 [36].
 #.FN_BODY RIMInformation VAL_PTR=&value_tvb
@@ -1198,8 +1198,6 @@ id-Correlation-ID                               ProtocolIE-ID
 id-IRAT-Measurement-Configuration               ProtocolIE-ID
 id-MDT-Configuration                            ProtocolIE-ID
 id-Priority-Class-Indicator                     ProtocolIE-ID
-# Ws Extension
-id-Not-Used-246                                 ProtocolIE-ID
 id-RNSAPRelocationParameters                    ProtocolIE-ID
 id-RABParametersList                            ProtocolIE-ID
 id-Management-Based-MDT-Allowed                 ProtocolIE-ID