Merging upstream version 4.4.0.

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

3 files changed, 99 insertions, 101 deletions

diff --git a/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf b/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf
index 793a4509..05a39b97 100644
--- a/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf
+++ b/epan/dissectors/asn1/atn-ulcs/atn-ulcs.cnf
@@ -34,7 +34,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
         1U,
         127U,
         &ulcs_context_value,
-        TRUE);
+        true);
 
 #.END
 
@@ -55,14 +55,14 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
         hf_index,
         NO_BOUND,
         NO_BOUND,
-        FALSE,
+        false,
         NULL,
         0,
         &tvb_usr,
         NULL);
 
     if (tvb_usr) {
-      /* call appropiate dissector for bitstring data */
+      /* call appropriate dissector for bitstring data */
       switch(ulcs_context_value){
           case  1: /* ACSE PDU*/
               atn_ulcs_tree = proto_tree_add_subtree(
@@ -168,7 +168,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
 #.FN_BODY AE-qualifier-form2
     packet_info * pinfo = actx->pinfo;
     atn_conversation_t *atn_cv = NULL;
-    guint32 ae_qualifier = 0;
+    uint32_t ae_qualifier = 0;
 
     /* dissect  ae-qualifier */
     offset = dissect_per_integer(
@@ -208,7 +208,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
     packet_info * pinfo = actx->pinfo;
     aarq_data_t *aarq_data = NULL;
     atn_conversation_t *atn_cv = NULL;
-    guint32 aircraft_24_bit_address = 0;
+    uint32_t aircraft_24_bit_address = 0;
 
     /* AARQ/DT: dstref present, srcref is always zero */
     if((pinfo->clnp_dstref) && (!pinfo->clnp_srcref)){
@@ -273,7 +273,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
 
         /* alloc aarq data */
         aarq_data = wmem_new(wmem_file_scope(), aarq_data_t);
-        aarq_data-> aarq_pending = FALSE;
+        aarq_data-> aarq_pending = false;
 
         /* insert aarq data */
         wmem_tree_insert32(aarq_data_tree ,aircraft_24_bit_address,(void*)aarq_data);
@@ -282,13 +282,13 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
     /* check for pending AARQ/AARE sequences */
     /* if "aarq_data-> aarq_pending" is set this means that there is already one  */
     /* AARQ/AARE sequence pending (is unwise to overwrite AARE/AARQ) */
-    if (aarq_data-> aarq_pending == FALSE ) {
+    if (aarq_data-> aarq_pending == false ) {
 
       /* init aarq data */
       memset(aarq_data,0,sizeof(aarq_data_t));
 
       aarq_data->cv = atn_cv;
-      aarq_data-> aarq_pending = TRUE;
+      aarq_data-> aarq_pending = true;
     }
 
 #.END
@@ -296,7 +296,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
 
 #.FN_BODY AARE-apdu
   packet_info * pinfo = actx->pinfo;
-  guint32 aircraft_24_bit_address = 0 ;
+  uint32_t aircraft_24_bit_address = 0 ;
   atn_conversation_t *atn_cv = NULL;
   aarq_data_t *aarq_data = NULL;
 
@@ -374,7 +374,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
 
   /* clear aarq data */
   memset(aarq_data,0,sizeof(aarq_data_t));
-  aarq_data-> aarq_pending  =  FALSE;
+  aarq_data-> aarq_pending  =  false;
 
   %(DEFAULT_BODY)s
 
@@ -385,13 +385,13 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
 #.FN_BODY Associate-result
  /* extension present: last param set to true. asn2wrs didn't take notice of that */
  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                                            0U, 2U, NULL, TRUE);
+                                                            0U, 2U, NULL, true);
 #.END
 
 #.FN_BODY Release-request-reason
  /* extension present: last param set to true. asn2wrs didn't take notice of that */
  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                                            0U, 30U, NULL, TRUE);
+                                                            0U, 30U, NULL, true);
 #.END
 
 #.FN_BODY Release-response-reason
@@ -406,7 +406,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
     0U,
     30U,
     NULL,
-    TRUE);
+    true);
 
 #.END
 
@@ -436,7 +436,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
    */
   offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
                                       ett_atn_ulcs_RDNSequence, RDNSequence_sequence_of,
-                                      1, 1, FALSE);
+                                      1, 1, false);
 
 #.END
 
@@ -447,7 +447,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
    */
   offset = dissect_per_constrained_set_of(tvb, offset, actx, tree, hf_index,
                                              ett_atn_ulcs_RelativeDistinguishedName, RelativeDistinguishedName_set_of,
-                                             1, 1, FALSE);
+                                             1, 1, false);
 
 #.END
 
@@ -461,9 +461,9 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
       hf_index,
       -1,
       -1,
-      FALSE,
+      false,
       &actx->external.data_value_descriptor);
-  actx->external.data_value_descr_present = TRUE;
+  actx->external.data_value_descr_present = true;
 
 #.END
 
@@ -493,7 +493,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
     tree, hf_index,
     NO_BOUND,
     NO_BOUND,
-    FALSE,
+    false,
     NULL,
     0,
     &tvb_usr,
diff --git a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c
index 18e32836..33b22531 100644
--- a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c
+++ b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c
@@ -4,28 +4,26 @@
  *
  * Routines for ATN upper layer
  * protocol packet disassembly
-
+ *
  * ATN upper layers are embedded within OSI Layer 4 (COTP).
  *
  * ATN upper layers contain:
  * Session Layer (NUL protocol option)
  * Presentation Layer (NUL protocol option)
  * ATN upper Layer/Application (ACSE PDU or PDV-list PDU)
-
+ *
  * ATN applications protocols (i.e. CM or CPDLC) are contained within
  * ACSE user-information or PDV presentation data.
-
+ *
  * details see:
- * http://en.wikipedia.org/wiki/CPDLC
- * http://members.optusnet.com.au/~cjr/introduction.htm
-
+ * https://en.wikipedia.org/wiki/CPDLC
+ * https://members.optusnet.com.au/~cjr/introduction.htm
+ *
  * standards:
- * http://legacy.icao.int/anb/panels/acp/repository.cfm
-
- * note:
- * We are dealing with ATN/ULCS aka ICAO Doc 9705 Ed2 here
+ * We are dealing with ATN/ULCS aka ICAO Doc 9705 Second Edition here
  * (don't think there is an ULCS equivalent for "FANS-1/A ").
-
+ * https://www.icao.int/safety/acp/repository/_%20Doc9705_ed2_1999.pdf
+ *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -38,10 +36,10 @@
 why not using existing ses, pres and acse dissectors ?
     ATN upper layers are derived from OSI standards for session,
     presentation and application but the encoding differs
-    (it's PER instead of BER encoding to save bandwith).
+    (it's PER instead of BER encoding to save bandwidth).
     Session and presentation use the "null" encoding option,
     meaning that they are only present at connection establishment
-    and ommitted otherwise.
+    and omitted otherwise.
     Instead of adapting existing dissectors it seemed simpler and cleaner
     to implement everything the new atn-ulcs dissector.
 
@@ -104,6 +102,7 @@ which ATN standard is supported ?
 #include <epan/packet.h>
 #include <epan/address.h>
 #include <epan/conversation.h>
+#include <wsutil/array.h>
 #include <epan/osi-utils.h>
 #include "packet-ber.h"
 #include "packet-per.h"
@@ -118,18 +117,18 @@ void proto_reg_handoff_atn_ulcs(void);
 static heur_dissector_list_t atn_ulcs_heur_subdissector_list;
 
 /* presentation subdissectors i.e. CM, CPDLC */
-static dissector_handle_t atn_cm_handle = NULL;
-static dissector_handle_t atn_cpdlc_handle = NULL;
+static dissector_handle_t atn_cm_handle;
+static dissector_handle_t atn_cpdlc_handle;
 
-static int proto_atn_ulcs          = -1;
-static guint32 ulcs_context_value = 0;
+static int proto_atn_ulcs;
+static uint32_t ulcs_context_value;
 static const char *object_identifier_id;
 
-static wmem_tree_t *aarq_data_tree = NULL;
-static wmem_tree_t *atn_conversation_tree = NULL;
+static wmem_tree_t *aarq_data_tree;
+static wmem_tree_t *atn_conversation_tree;
 
 
-static proto_tree *root_tree = NULL;
+static proto_tree *root_tree;
 
 /* forward declarations for functions generated from asn1 */
 static int dissect_atn_ulcs_T_externalt_encoding_single_asn1_type(
@@ -160,15 +159,15 @@ static int dissect_ACSE_apdu_PDU(
     proto_tree *tree _U_,
     void *data _U_);
 
-guint32 dissect_per_object_descriptor_t(
+uint32_t dissect_per_object_descriptor_t(
     tvbuff_t *tvb,
-    guint32 offset,
+    uint32_t offset,
     asn1_ctx_t *actx,
     proto_tree *tree,
     int hf_index,
     tvbuff_t **value_tvb);
 
-static gint dissect_atn_ulcs(
+static int dissect_atn_ulcs(
     tvbuff_t *tvb,
     packet_info *pinfo,
     proto_tree  *tree,
@@ -177,8 +176,8 @@ static gint dissect_atn_ulcs(
 #include "packet-atn-ulcs-hf.c"
 
 #include "packet-atn-ulcs-ett.c"
-static gint ett_atn_ulcs = -1;
-static gint ett_atn_acse = -1;
+static int ett_atn_ulcs;
+static int ett_atn_acse;
 
 #include "packet-atn-ulcs-fn.c"
 
@@ -223,30 +222,30 @@ static const per_choice_t External_encoding_choice[] =
 #define SES_PARAM_B2_MASK     0x02
 #define SES_PARAM_B1_MASK     0x01
 
-static int hf_atn_ses_type = -1;
-static int hf_atn_ses_param_ind = -1;
-static int hf_atn_ses_param_b1 = -1;
-static int hf_atn_ses_param_b2 = -1;
+static int hf_atn_ses_type;
+static int hf_atn_ses_param_ind;
+static int hf_atn_ses_param_b1;
+static int hf_atn_ses_param_b2;
 
-static gint ett_atn_ses = -1;
+static int ett_atn_ses;
 
 #define ATN_SES_PROTO "ICAO Doc9705 ULCS Session (ISO 8326/8327-1:1994)"
 
-const value_string atn_ses_param_ind[] =
+static const value_string atn_ses_param_ind[] =
 {
     {0, "No Parameter Indication "},
     {1, "Parameter Indication "},
     {0, NULL }
 };
 
-const value_string srf_b2[] =
+static const value_string srf_b2[] =
 {
     {0, "Transport Connection is kept"},
     {1, "Transport Connection is released" },
     {0, NULL }
 };
 
-const value_string srf_b1[] =
+static const value_string srf_b1[] =
 {
     {0, "Transport Connection is transient"},
     {1, "Transport Connection is persistent"},
@@ -260,7 +259,7 @@ const value_string srf_b1[] =
 #define SES_ATN_SRF       0xe0
 #define SES_ATN_SRFC      0xa0
 
-const value_string atn_ses_type[] =
+static const value_string atn_ses_type[] =
 {
     { 0x1d, "Short Connect (SCN) SPDU" },
     { 0x1f, "Short Connect Accept (SAC) SPDU" },
@@ -273,15 +272,15 @@ const value_string atn_ses_type[] =
 /* ATN Presentation layer */
 #define ATN_PRES_PROTO "ICAO Doc9705 ULCS Presentation (ISO 8822/8823-1:1994)"
 
-static int hf_atn_pres_err   = -1;
-static int hf_atn_pres_pdu_type = -1;
-static gint ett_atn_pres    = -1;
+static int hf_atn_pres_err;
+static int hf_atn_pres_pdu_type;
+static int ett_atn_pres;
 
 #define ATN_SES_PRES_MASK 0xf803
 #define PRES_CPR_ER_MASK    0x70
 
 /* type determined by SPDU and PPDU */
-const value_string atn_pres_vals[] =
+static const value_string atn_pres_vals[] =
 {
     { 0xe802, "Short Presentation Connect PPDU (CP) " },
     { 0xf802, "Short Presentation Connect PPDU (CP) " },
@@ -293,7 +292,7 @@ const value_string atn_pres_vals[] =
 };
 
 /* Short Presentation Connect Reject PPDU's 0yyy 00zz */
-const value_string atn_pres_err[] =
+static const value_string atn_pres_err[] =
 {
     { 0x00, "Presentation-user" },
     { 0x01, "Reason not specified (transient)"},
@@ -329,9 +328,9 @@ static int  atn_ulcs_Externalt_encoding(
 }
 
 /* re-implementing external data: packet-per.c */
-static guint32  atn_per_external_type(
+static uint32_t atn_per_external_type(
     tvbuff_t *tvb _U_,
-    guint32 offset,
+    uint32_t offset,
     asn1_ctx_t *actx,
     proto_tree *tree _U_,
     int hf_index _U_,
@@ -363,12 +362,12 @@ static guint32  atn_per_external_type(
 
 /* determine 24-bit aircraft address(ARS) */
 /* from 20-byte ATN NSAP. */
-guint32 get_aircraft_24_bit_address_from_nsap(
+uint32_t get_aircraft_24_bit_address_from_nsap(
     packet_info *pinfo)
 {
-    const guint8* addr = NULL;
-    guint32 ars =0;
-    guint32 adr_prefix =0;
+    const uint8_t* addr = NULL;
+    uint32_t ars =0;
+    uint32_t adr_prefix =0;
 
     /* check NSAP address type*/
     if( (pinfo->src.type != get_osi_address_type()) ||
@@ -386,7 +385,7 @@ guint32 get_aircraft_24_bit_address_from_nsap(
     /* from an aircraft it's downlink */
 
     /* convert addr into 32-bit integer */
-    addr = (const guint8 *)pinfo->src.data;
+    addr = (const uint8_t *)pinfo->src.data;
     adr_prefix =
         ((addr[0]<<24) |
         (addr[1]<<16) |
@@ -400,7 +399,7 @@ guint32 get_aircraft_24_bit_address_from_nsap(
     if((adr_prefix == 0x470027c1) ||
         (adr_prefix == 0x47002741)) {
       /* ICAO doc9507 Ed2 SV5 5.4.3.8.4.4 */
-      /* states that the ARS subfield containes */
+      /* states that the ARS subfield contains */
       /* the  24-bitaddress of the aircraft */
         ars = ((addr[8])<<16) |
             ((addr[9])<<8) |
@@ -412,7 +411,7 @@ guint32 get_aircraft_24_bit_address_from_nsap(
     /* from an aircraft it's downlink */
 
     /* convert addr into 32-bit integer */
-    addr = (const guint8 *)pinfo->dst.data;
+    addr = (const uint8_t *)pinfo->dst.data;
     adr_prefix = ((addr[0]<<24) |
         (addr[1]<<16) |
         (addr[2]<<8) |
@@ -425,7 +424,7 @@ guint32 get_aircraft_24_bit_address_from_nsap(
     if((adr_prefix == 0x470027c1) ||
         (adr_prefix == 0x47002741)) {
       /* ICAO doc9507 Ed2 SV5 5.4.3.8.4.4 */
-      /* states that the ARS subfield containes */
+      /* states that the ARS subfield contains */
       /* the  24-bitaddress of the aircraft */
       ars = ((addr[8])<<16) |
             ((addr[9])<<8) |
@@ -435,12 +434,12 @@ guint32 get_aircraft_24_bit_address_from_nsap(
 }
 
 /* determine whether a PDU is uplink or downlink */
-/* by checking for known aircraft  address prefices*/
+/* by checking for known aircraft address prefixes*/
 int check_heur_msg_type(packet_info *pinfo  _U_)
 {
     int t = no_msg;
-    const guint8* addr = NULL;
-    guint32 adr_prefix =0;
+    const uint8_t* addr = NULL;
+    uint32_t adr_prefix =0;
 
     /* check NSAP address type*/
     if( (pinfo->src.type != get_osi_address_type()) || (pinfo->dst.type != get_osi_address_type())) {
@@ -450,7 +449,7 @@ int check_heur_msg_type(packet_info *pinfo  _U_)
     if( (pinfo->src.len != 20) || (pinfo->dst.len != 20)) {
         return t; }
 
-    addr = (const guint8 *)pinfo->src.data;
+    addr = (const uint8_t *)pinfo->src.data;
 
     /* convert address to 32-bit integer  */
     adr_prefix = ((addr[0]<<24) | (addr[1]<<16) | (addr[2]<<8) | addr[3] );
@@ -463,7 +462,7 @@ int check_heur_msg_type(packet_info *pinfo  _U_)
         t = dm; /* source is an aircraft: it's a downlink PDU */
     }
 
-    addr = (const guint8 *)pinfo->dst.data;
+    addr = (const uint8_t *)pinfo->dst.data;
 
     /* convert address to 32-bit integer  */
     adr_prefix = ((addr[0]<<24) | (addr[1]<<16) | (addr[2]<<8) | addr[3] );
@@ -492,12 +491,12 @@ wmem_tree_t *get_atn_conversation_tree(void){
 /* at transport layer (cotp) but this isn't working yet. */
 atn_conversation_t * find_atn_conversation(
     address *address1,
-    guint16 clnp_ref1,
+    uint16_t clnp_ref1,
     address *address2 )
 {
     atn_conversation_t *cv = NULL;
-    guint32 key = 0;
-    guint32 tmp = 0;
+    uint32_t key = 0;
+    uint32_t tmp = 0;
 
     tmp = add_address_to_hash( tmp, address1);
     key = (tmp << 16) | clnp_ref1 ;
@@ -517,13 +516,13 @@ atn_conversation_t * find_atn_conversation(
 /* a conversation may be referenced from both endpoints */
 atn_conversation_t * create_atn_conversation(
     address *address1,
-    guint16 clnp_ref1,
+    uint16_t clnp_ref1,
     address *address2,
     atn_conversation_t *conversation)
 {
     atn_conversation_t *cv = NULL;
-    guint32 key = 0;
-    guint32 tmp = 0;
+    uint32_t key = 0;
+    uint32_t tmp = 0;
 
     tmp = add_address_to_hash( tmp, address1);
     key = (tmp << 16) | clnp_ref1 ;
@@ -560,15 +559,15 @@ dissect_atn_ulcs(
     int offset = 0;
     proto_item *ti = NULL;
     proto_tree *atn_ulcs_tree = NULL;
-    guint8 value_pres = 0;
-    guint8 value_ses = 0;
-    guint16 value_ses_pres = 0;
+    uint8_t value_pres = 0;
+    uint8_t value_ses = 0;
+    uint16_t value_ses_pres = 0;
 
     root_tree = tree;
 
     /* data pointer */
     /* decode as PDV-list */
-    if ( (int)(intptr_t)  data == FALSE )
+    if ( (int)(intptr_t)  data == false )
     {
         ti = proto_tree_add_item(
             tree,
@@ -592,7 +591,7 @@ dissect_atn_ulcs(
     }
 
     /* decode as SPDU, PPDU and ACSE PDU */
-    if ( (int)(intptr_t)  data == TRUE )
+    if ( (int)(intptr_t)  data == true )
     {
         /* get session and presentation PDU's */
         value_ses_pres = tvb_get_ntohs(tvb, offset);
@@ -603,7 +602,7 @@ dissect_atn_ulcs(
             ett_atn_ses, NULL, ATN_SES_PROTO );
 
         /* get SPDU (1 octet) */
-        value_ses = tvb_get_guint8(tvb, offset);
+        value_ses = tvb_get_uint8(tvb, offset);
 
         /* SPDU type/identifier  */
         proto_tree_add_item(atn_ulcs_tree,
@@ -654,7 +653,7 @@ dissect_atn_ulcs(
             tree, tvb, offset, 0,
             ett_atn_pres, NULL, ATN_PRES_PROTO );
 
-        value_pres = tvb_get_guint8(tvb, offset);
+        value_pres = tvb_get_uint8(tvb, offset);
 
         /* need session context to identify PPDU type */
         /* note: */
@@ -701,7 +700,7 @@ dissect_atn_ulcs(
     return offset;
 }
 
-static gboolean dissect_atn_ulcs_heur(
+static bool dissect_atn_ulcs_heur(
     tvbuff_t *tvb,
     packet_info *pinfo,
     proto_tree *tree,
@@ -710,7 +709,7 @@ static gboolean dissect_atn_ulcs_heur(
     /* do we have enough data*/
     /* at least session + presentation data or pdv-list */
     if (tvb_captured_length(tvb) < 2){
-        return FALSE; }
+        return false; }
 
     /* check for session/presentation/ACSE PDU's  */
     /* SPDU and PPDU are one octet each */
@@ -742,8 +741,8 @@ static gboolean dissect_atn_ulcs_heur(
                 tvb,
                 pinfo,
                 tree,
-                (void*) TRUE);
-            return TRUE;
+                (void*) true);
+            return true;
         default:  /* no SPDU */
             break;
     }
@@ -760,13 +759,12 @@ static gboolean dissect_atn_ulcs_heur(
         /* PDV-list PDU may contain */
         /* application protocol data (CM, CPDLC) */
         /* or an ACSE PDU */
-            dissect_atn_ulcs(tvb, pinfo, tree, (void*) FALSE);
-            return TRUE;
-            break;
+            dissect_atn_ulcs(tvb, pinfo, tree, (void*) false);
+            return true;
         default:  /* no or unsupported PDU */
             break;
     }
-    return FALSE;
+    return false;
 }
 
 void proto_register_atn_ulcs (void)
@@ -827,7 +825,7 @@ void proto_register_atn_ulcs (void)
           HFILL}},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         #include "packet-atn-ulcs-ettarr.c"
         &ett_atn_ses,
         &ett_atn_pres,
@@ -855,7 +853,7 @@ void proto_register_atn_ulcs (void)
         proto_atn_ulcs);
 
     /* initiate sub dissector list */
-    atn_ulcs_heur_subdissector_list = register_heur_dissector_list("atn-ulcs", proto_atn_ulcs);
+    atn_ulcs_heur_subdissector_list = register_heur_dissector_list_with_description("atn-ulcs", "ATN-ULCS unhandled data", proto_atn_ulcs);
 
     /* init aare/aare data */
     aarq_data_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
diff --git a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h
index 872403f8..6e2134bb 100644
--- a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h
+++ b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h
@@ -33,18 +33,18 @@ enum ae_qualifier {
 };
 
 typedef struct atn_conversation_t {
-    gint ae_qualifier; /* A/G application type  */
+    int ae_qualifier; /* A/G application type  */
 } atn_conversation_t;
 
 atn_conversation_t * create_atn_conversation(
     address*,
-    guint16,
+    uint16_t,
     address*,
     atn_conversation_t*);
 
 atn_conversation_t * find_atn_conversation(
     address*,
-    guint16,
+    uint16_t,
     address*);
 
 /* struct for conversation data reconstruction used in AARQ and AARE */
@@ -53,16 +53,16 @@ atn_conversation_t * find_atn_conversation(
 /* if AARQ/AARQ is contained within CR/CC only src_ref is present in CR */
 /* while CC provides src_ref and dstref */
 typedef struct aarq_data_t {
-    gboolean aarq_pending; /* flag tells whether AARQ/sequence is pending (true)  */
+    bool aarq_pending; /* flag tells whether AARQ/sequence is pending (true)  */
                            /* required not to mix up different AARQ/AARE sequences */
-                           /* during simoultanous establishment of transport connections */
+                           /* during simultaneous establishment of transport connections */
                            /* i.e. GND facility initialises cpcstart and cmcontact at the same time */
     atn_conversation_t* cv; /* pointer to AARQ conversation */
 } aarq_data_t;
 
 wmem_tree_t *get_atn_conversation_tree(void);
 
-guint32 get_aircraft_24_bit_address_from_nsap(packet_info *);
+uint32_t get_aircraft_24_bit_address_from_nsap(packet_info *);
 int check_heur_msg_type(packet_info *);
 
 #endif