Merging upstream version 4.4.0.

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

1 files changed, 53 insertions, 52 deletions

diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c
index b0069347..2a1538e4 100644
--- a/epan/dissectors/packet-h323.c
+++ b/epan/dissectors/packet-h323.c
@@ -1,7 +1,7 @@
 /* Do not modify this file. Changes will be overwritten.                      */
 /* Generated automatically by the ASN.1 to Wireshark dissector compiler       */
 /* packet-h323.c                                                              */
-/* asn2wrs.py -L -p h323 -c ./h323.cnf -s ./packet-h323-template -D . -O ../.. RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */
+/* asn2wrs.py -q -L -p h323 -c ./h323.cnf -s ./packet-h323-template -D . -O ../.. RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */
 
 /* packet-h323.c
  * Routines for H.323 packet dissection
@@ -19,6 +19,7 @@
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
+#include <wsutil/array.h>
 
 #include "packet-per.h"
 #include "packet-h225.h"
@@ -32,7 +33,7 @@ void proto_register_h323(void);
 void proto_reg_handoff_h323(void);
 
 /* Generic Extensible Framework */
-gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const gchar *type) {
+gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const char *type) {
   gef_ctx_t *gefx;
 
   gefx = wmem_new0(pool, gef_ctx_t);
@@ -42,7 +43,7 @@ gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const gchar
   return gefx;
 }
 
-gboolean gef_ctx_check_signature(gef_ctx_t *gefx) {
+bool gef_ctx_check_signature(gef_ctx_t *gefx) {
   return gefx && (gefx->signature == GEF_CTX_SIGNATURE);
 }
 
@@ -63,7 +64,7 @@ gef_ctx_t* gef_ctx_get(void *ptr) {
 }
 
 void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx) {
-  const gchar *parent_key;
+  const char *parent_key;
 
   if (!gefx) return;
   parent_key = (gefx->parent) ? gefx->parent->key : NULL;
@@ -78,57 +79,57 @@ void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx) {
 }
 
 /* Initialize the protocol and registered fields */
-static int proto_h323 = -1;
-static int hf_h323_RasTunnelledSignallingMessage_PDU = -1;  /* RasTunnelledSignallingMessage */
-static int hf_h323_RobustnessData_PDU = -1;       /* RobustnessData */
-static int hf_h323_tunnelledProtocolID = -1;      /* TunnelledProtocol */
-static int hf_h323_messageContent = -1;           /* T_messageContent */
-static int hf_h323_messageContent_item = -1;      /* OCTET_STRING */
-static int hf_h323_tunnellingRequired = -1;       /* NULL */
-static int hf_h323_nonStandardData = -1;          /* NonStandardParameter */
-static int hf_h323_versionID = -1;                /* INTEGER_1_256 */
-static int hf_h323_robustnessData = -1;           /* T_robustnessData */
-static int hf_h323_rrqData = -1;                  /* Rrq_RD */
-static int hf_h323_rcfData = -1;                  /* Rcf_RD */
-static int hf_h323_setupData = -1;                /* Setup_RD */
-static int hf_h323_connectData = -1;              /* Connect_RD */
-static int hf_h323_statusData = -1;               /* Status_RD */
-static int hf_h323_statusInquiryData = -1;        /* StatusInquiry_RD */
-static int hf_h323_BackupCallSignalAddresses_item = -1;  /* BackupCallSignalAddresses_item */
-static int hf_h323_tcp = -1;                      /* TransportAddress */
-static int hf_h323_alternateTransport = -1;       /* AlternateTransportAddresses */
-static int hf_h323_backupCallSignalAddresses = -1;  /* BackupCallSignalAddresses */
-static int hf_h323_hasSharedRepository = -1;      /* NULL */
-static int hf_h323_irrFrequency = -1;             /* INTEGER_1_65535 */
-static int hf_h323_endpointGuid = -1;             /* GloballyUniqueIdentifier */
-static int hf_h323_h245Address = -1;              /* TransportAddress */
-static int hf_h323_fastStart = -1;                /* T_fastStart */
-static int hf_h323_fastStart_item = -1;           /* OCTET_STRING */
-static int hf_h323_resetH245 = -1;                /* NULL */
-static int hf_h323_timeToLive = -1;               /* TimeToLive */
-static int hf_h323_includeFastStart = -1;         /* NULL */
+static int proto_h323;
+static int hf_h323_RasTunnelledSignallingMessage_PDU;  /* RasTunnelledSignallingMessage */
+static int hf_h323_RobustnessData_PDU;            /* RobustnessData */
+static int hf_h323_tunnelledProtocolID;           /* TunnelledProtocol */
+static int hf_h323_messageContent;                /* T_messageContent */
+static int hf_h323_messageContent_item;           /* OCTET_STRING */
+static int hf_h323_tunnellingRequired;            /* NULL */
+static int hf_h323_nonStandardData;               /* NonStandardParameter */
+static int hf_h323_versionID;                     /* INTEGER_1_256 */
+static int hf_h323_robustnessData;                /* T_robustnessData */
+static int hf_h323_rrqData;                       /* Rrq_RD */
+static int hf_h323_rcfData;                       /* Rcf_RD */
+static int hf_h323_setupData;                     /* Setup_RD */
+static int hf_h323_connectData;                   /* Connect_RD */
+static int hf_h323_statusData;                    /* Status_RD */
+static int hf_h323_statusInquiryData;             /* StatusInquiry_RD */
+static int hf_h323_BackupCallSignalAddresses_item;  /* BackupCallSignalAddresses_item */
+static int hf_h323_tcp;                           /* TransportAddress */
+static int hf_h323_alternateTransport;            /* AlternateTransportAddresses */
+static int hf_h323_backupCallSignalAddresses;     /* BackupCallSignalAddresses */
+static int hf_h323_hasSharedRepository;           /* NULL */
+static int hf_h323_irrFrequency;                  /* INTEGER_1_65535 */
+static int hf_h323_endpointGuid;                  /* GloballyUniqueIdentifier */
+static int hf_h323_h245Address;                   /* TransportAddress */
+static int hf_h323_fastStart;                     /* T_fastStart */
+static int hf_h323_fastStart_item;                /* OCTET_STRING */
+static int hf_h323_resetH245;                     /* NULL */
+static int hf_h323_timeToLive;                    /* TimeToLive */
+static int hf_h323_includeFastStart;              /* NULL */
 
 /* Initialize the subtree pointers */
-static gint ett_h323_RasTunnelledSignallingMessage = -1;
-static gint ett_h323_T_messageContent = -1;
-static gint ett_h323_RobustnessData = -1;
-static gint ett_h323_T_robustnessData = -1;
-static gint ett_h323_BackupCallSignalAddresses = -1;
-static gint ett_h323_BackupCallSignalAddresses_item = -1;
-static gint ett_h323_Rrq_RD = -1;
-static gint ett_h323_Rcf_RD = -1;
-static gint ett_h323_Setup_RD = -1;
-static gint ett_h323_Connect_RD = -1;
-static gint ett_h323_Status_RD = -1;
-static gint ett_h323_T_fastStart = -1;
-static gint ett_h323_StatusInquiry_RD = -1;
+static int ett_h323_RasTunnelledSignallingMessage;
+static int ett_h323_T_messageContent;
+static int ett_h323_RobustnessData;
+static int ett_h323_T_robustnessData;
+static int ett_h323_BackupCallSignalAddresses;
+static int ett_h323_BackupCallSignalAddresses_item;
+static int ett_h323_Rrq_RD;
+static int ett_h323_Rcf_RD;
+static int ett_h323_Setup_RD;
+static int ett_h323_Connect_RD;
+static int ett_h323_Status_RD;
+static int ett_h323_T_fastStart;
+static int ett_h323_StatusInquiry_RD;
 
 
 
 static int
 dissect_h323_OCTET_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
-                                       NO_BOUND, NO_BOUND, FALSE, NULL);
+                                       NO_BOUND, NO_BOUND, false, NULL);
 
   return offset;
 }
@@ -177,7 +178,7 @@ dissect_h323_RasTunnelledSignallingMessage(tvbuff_t *tvb _U_, int offset _U_, as
 static int
 dissect_h323_INTEGER_1_256(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                                            1U, 256U, NULL, FALSE);
+                                                            1U, 256U, NULL, false);
 
   return offset;
 }
@@ -237,7 +238,7 @@ dissect_h323_Rrq_RD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
 static int
 dissect_h323_INTEGER_1_65535(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                                            1U, 65535U, NULL, FALSE);
+                                                            1U, 65535U, NULL, false);
 
   return offset;
 }
@@ -393,7 +394,7 @@ dissect_h323_RobustnessData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 static int dissect_RasTunnelledSignallingMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
-  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, true, pinfo);
   offset = dissect_h323_RasTunnelledSignallingMessage(tvb, offset, &asn1_ctx, tree, hf_h323_RasTunnelledSignallingMessage_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -401,7 +402,7 @@ static int dissect_RasTunnelledSignallingMessage_PDU(tvbuff_t *tvb _U_, packet_i
 static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
-  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, true, pinfo);
   offset = dissect_h323_RobustnessData(tvb, offset, &asn1_ctx, tree, hf_h323_RobustnessData_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -528,7 +529,7 @@ void proto_register_h323(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_h323_RasTunnelledSignallingMessage,
     &ett_h323_T_messageContent,
     &ett_h323_RobustnessData,