Adding upstream version 4.4.0.upstream/4.4.0upstream

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

9 files changed, 83 insertions, 81 deletions

diff --git a/epan/dissectors/asn1/lppa/LPPA-CommonDataTypes.asn b/epan/dissectors/asn1/lppa/LPPA-CommonDataTypes.asn
index 8b7dcd09..0478b321 100644
--- a/epan/dissectors/asn1/lppa/LPPA-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V16.1.0 (2020-09)
+-- 3GPP TS 36.455 V18.1.0 (2024-06)
 --
 
 -- **************************************************************
@@ -8,10 +8,10 @@
 -- **************************************************************
 
 LPPA-CommonDataTypes {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 eps-Access (21) modules (3) lppa (6) version1 (1) lppa-CommonDataTypes (3)}
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
diff --git a/epan/dissectors/asn1/lppa/LPPA-Constants.asn b/epan/dissectors/asn1/lppa/LPPA-Constants.asn
index 92d49b7c..57ff5d5e 100644
--- a/epan/dissectors/asn1/lppa/LPPA-Constants.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V16.1.0 (2020-09)
+-- 3GPP TS 36.455 V18.1.0 (2024-06)
 --
 
 -- **************************************************************
@@ -8,10 +8,10 @@
 -- **************************************************************
 
 LPPA-Constants {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 eps-Access (21) modules (3) lppa (6) version1 (1) lppa-Constants (4) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -54,7 +54,7 @@ maxGERANMeas								INTEGER ::= 8
 maxUTRANMeas								INTEGER ::= 8
 maxCellineNB-ext							INTEGER ::= 3840
 maxMBSFN-Allocations						INTEGER ::= 8
-maxWLANchannels								INTEGER ::= 16 
+maxWLANchannels								INTEGER ::= 16
 maxnoFreqHoppingBandsMinusOne				INTEGER ::= 7
 maxNrOfPosSImessage							INTEGER ::= 32
 maxnoAssistInfoFailureListItems				INTEGER ::= 32
diff --git a/epan/dissectors/asn1/lppa/LPPA-Containers.asn b/epan/dissectors/asn1/lppa/LPPA-Containers.asn
index 11d94b56..0641ed09 100644
--- a/epan/dissectors/asn1/lppa/LPPA-Containers.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V16.1.0 (2020-09)
+-- 3GPP TS 36.455 V18.1.0 (2024-06)
 --
 
 -- **************************************************************
@@ -8,10 +8,10 @@
 -- **************************************************************
 
 LPPA-Containers {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 eps-Access (21) modules (3) lppa (6) version1 (1) lppa-Containers (5)}
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -28,7 +28,7 @@ IMPORTS
 	Criticality,
 	Presence,
 	PrivateIE-ID,
-	ProtocolIE-ID	
+	ProtocolIE-ID
 FROM LPPA-CommonDataTypes;
 
 -- **************************************************************
@@ -117,11 +117,11 @@ WITH SYNTAX {
 --
 -- **************************************************************
 
-ProtocolIE-Container { LPPA-PROTOCOL-IES : IEsSetParam} ::= 
+ProtocolIE-Container { LPPA-PROTOCOL-IES : IEsSetParam} ::=
 	SEQUENCE (SIZE (0..maxProtocolIEs)) OF
 	ProtocolIE-Field {{IEsSetParam}}
 
-ProtocolIE-Single-Container { LPPA-PROTOCOL-IES : IEsSetParam} ::= 
+ProtocolIE-Single-Container { LPPA-PROTOCOL-IES : IEsSetParam} ::=
 	ProtocolIE-Field {{IEsSetParam}}
 
 ProtocolIE-Field { LPPA-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
@@ -136,7 +136,7 @@ ProtocolIE-Field { LPPA-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
 --
 -- **************************************************************
 
-ProtocolIE-ContainerPair { LPPA-PROTOCOL-IES-PAIR : IEsSetParam} ::= 
+ProtocolIE-ContainerPair { LPPA-PROTOCOL-IES-PAIR : IEsSetParam} ::=
 	SEQUENCE (SIZE (0..maxProtocolIEs)) OF
 	ProtocolIE-FieldPair {{IEsSetParam}}
 
@@ -168,7 +168,7 @@ ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, LPPA-P
 --
 -- **************************************************************
 
-ProtocolExtensionContainer { LPPA-PROTOCOL-EXTENSION : ExtensionSetParam} ::= 
+ProtocolExtensionContainer { LPPA-PROTOCOL-EXTENSION : ExtensionSetParam} ::=
 	SEQUENCE (SIZE (1..maxProtocolExtensions)) OF
 	ProtocolExtensionField {{ExtensionSetParam}}
 
@@ -184,7 +184,7 @@ ProtocolExtensionField { LPPA-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUEN
 --
 -- **************************************************************
 
-PrivateIE-Container { LPPA-PRIVATE-IES : IEsSetParam} ::= 
+PrivateIE-Container { LPPA-PRIVATE-IES : IEsSetParam} ::=
 	SEQUENCE (SIZE (1..maxPrivateIEs)) OF
 	PrivateIE-Field {{IEsSetParam}}
 
diff --git a/epan/dissectors/asn1/lppa/LPPA-IEs.asn b/epan/dissectors/asn1/lppa/LPPA-IEs.asn
index ccc24203..ed89676f 100644
--- a/epan/dissectors/asn1/lppa/LPPA-IEs.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V16.1.0 (2020-09)
+-- 3GPP TS 36.455 V18.1.0 (2024-06)
 --
 
 -- **************************************************************
@@ -8,15 +8,15 @@
 -- **************************************************************
 
 LPPA-IEs {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 eps-Access (21) modules (3) lppa (6) version1 (1) lppa-IEs (2) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
-IMPORTS	
-	
+IMPORTS
+
 	id-MeasurementQuantities-Item,
 	id-ResultsPerSSB-Index-List,
 	id-ResultsPerSSB-Index-Item,
@@ -54,7 +54,7 @@ FROM LPPA-CommonDataTypes
 
 	ProtocolExtensionContainer{},
 	ProtocolIE-Single-Container{},
-	
+
 	LPPA-PROTOCOL-EXTENSION,
 	LPPA-PROTOCOL-IES
 FROM LPPA-Containers;
@@ -350,7 +350,7 @@ MeasurementQuantitiesValue ::= ENUMERATED {
 MeasuredResults ::= SEQUENCE (SIZE (1.. maxNoMeas)) OF MeasuredResultsValue
 
 
-MeasuredResultsValue ::= CHOICE { 
+MeasuredResultsValue ::= CHOICE {
 	valueAngleOfArrival				INTEGER (0..719),
 	valueTimingAdvanceType1			INTEGER (0..7690),
 	valueTimingAdvanceType2			INTEGER (0..7690),
@@ -411,7 +411,7 @@ NPRSSubframePartB ::=			SEQUENCE {
 	startingsubframeoffset		ENUMERATED {zero, one-Eighth, two-Eighths, three-Eighths, four-Eighths, five-Eighths, six-Eighths, seven-Eighths, ...},
 	nPRSMutingConfiguration		NPRSMutingConfiguration 		OPTIONAL,
 	...,
-	sIB1-NB-Subframe-TDD			ENUMERATED {	sf0, sf4, sf0and5, ...} 		OPTIONAL	
+	sIB1-NB-Subframe-TDD			ENUMERATED {	sf0, sf4, sf0and5, ...} 		OPTIONAL
 
 }
 
@@ -497,7 +497,7 @@ OTDOACell-Information-Item ::= CHOICE {
 	tAC							TAC,
 	eARFCN						EARFCN,
 	pRS-Bandwidth				PRS-Bandwidth,
-	pRS-ConfigurationIndex		PRS-Configuration-Index, 
+	pRS-ConfigurationIndex		PRS-Configuration-Index,
 	cPLength					CPLength,
 	numberOfDlFrames			NumberOfDlFrames,
 	numberOfAntennaPorts		NumberOfAntennaPorts,
@@ -514,7 +514,7 @@ OTDOACell-Information-Item ::= CHOICE {
 	nPRSConfiguration			NPRSConfiguration,
 	offsetNBChanneltoEARFCN		OffsetNBChanneltoEARFCN,
 	operationModeInfo			OperationModeInfo,
-	nPRS-ID						INTEGER (0..4095, ...), 
+	nPRS-ID						INTEGER (0..4095, ...),
 	dL-Bandwidth				DL-Bandwidth,
 	pRSOccasionGroup			PRSOccasionGroup,
 	pRSFreqHoppingConfig		PRSFrequencyHoppingConfiguration,
@@ -599,31 +599,31 @@ PosSIB-Segments-ExtIEs LPPA-PROTOCOL-EXTENSION ::= {
 
 
 PosSIB-Type ::= ENUMERATED {
-	posSibType1-1, 
-	posSibType1-2, 
-	posSibType1-3, 
-	posSibType1-4, 
+	posSibType1-1,
+	posSibType1-2,
+	posSibType1-3,
+	posSibType1-4,
 	posSibType1-5,
-	posSibType1-6, 
-	posSibType1-7, 
-	posSibType2-1, 
-	posSibType2-2, 
+	posSibType1-6,
+	posSibType1-7,
+	posSibType2-1,
+	posSibType2-2,
 	posSibType2-3,
-	posSibType2-4, 
-	posSibType2-5, 
-	posSibType2-6, 
-	posSibType2-7, 
+	posSibType2-4,
+	posSibType2-5,
+	posSibType2-6,
+	posSibType2-7,
 	posSibType2-8,
-	posSibType2-9, 
-	posSibType2-10, 
-	posSibType2-11, 
-	posSibType2-12, 
-	posSibType2-13, 
-	posSibType2-14, 
-	posSibType2-15, 
+	posSibType2-9,
+	posSibType2-10,
+	posSibType2-11,
+	posSibType2-12,
+	posSibType2-13,
+	posSibType2-14,
+	posSibType2-15,
 	posSibType2-16,
-	posSibType2-17, 
-	posSibType2-18, 
+	posSibType2-17,
+	posSibType2-18,
 	posSibType2-19,
 	posSibType3-1,
 	...,
@@ -819,7 +819,7 @@ SRSConfigurationForOneCell ::= SEQUENCE {
 	srs-HoppingBandwidth		ENUMERATED {hbw0, hbw1, hbw2, hbw3},
 	srs-cyclicShift				ENUMERATED {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7},
 	srs-ConfigIndex				INTEGER (0..1023),
-	maxUpPts					ENUMERATED {true}			OPTIONAL,	-- Cond ifTDD
+	maxUpPts					ENUMERATED {true}			OPTIONAL,	-- This IE shall be present if the UL-EARFCN IE refers to TDD operation. --
 	transmissionComb			INTEGER (0..1),
 	freqDomainPosition			INTEGER (0..23),
 	groupHoppingEnabled			BOOLEAN,
diff --git a/epan/dissectors/asn1/lppa/LPPA-PDU-Contents.asn b/epan/dissectors/asn1/lppa/LPPA-PDU-Contents.asn
index 81c60b68..14e2c91c 100644
--- a/epan/dissectors/asn1/lppa/LPPA-PDU-Contents.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V16.1.0 (2020-09)
+-- 3GPP TS 36.455 V18.1.0 (2024-06)
 --
 
 -- **************************************************************
@@ -8,10 +8,10 @@
 -- **************************************************************
 
 LPPA-PDU-Contents {
-itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 eps-Access (21) modules (3) lppa (6) version1 (1) lppa-PDU-Contents (1) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
@@ -22,7 +22,7 @@ BEGIN
 -- **************************************************************
 
 IMPORTS
-	
+
 	Cause,
 	CriticalityDiagnostics,
 	E-CID-MeasurementResult,
@@ -43,7 +43,7 @@ IMPORTS
 	Assistance-Information,
 	Broadcast,
 	AssistanceInformationFailureList
-	
+
 FROM LPPA-IEs
 
 	PrivateIE-Container{},
@@ -81,7 +81,7 @@ FROM LPPA-Containers
 	id-Assistance-Information,
 	id-Broadcast,
 	id-AssistanceInformationFailureList
-	
+
 FROM LPPA-Constants;
 
 -- **************************************************************
@@ -99,7 +99,7 @@ E-CIDMeasurementInitiationRequest-IEs LPPA-PROTOCOL-IES ::= {
 	{ ID id-E-SMLC-UE-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID						PRESENCE mandatory}|
 	{ ID id-ReportCharacteristics			CRITICALITY reject	TYPE ReportCharacteristics				PRESENCE mandatory}|
 	{ ID id-MeasurementPeriodicity			CRITICALITY reject	TYPE MeasurementPeriodicity				PRESENCE conditional}|
--- The IE shall be present if the Report Characteritics IE is set to “periodic” --
+-- The IE shall be present if the Report Characteritics IE is set to the value “periodic” --
 	{ ID id-MeasurementQuantities			CRITICALITY reject	TYPE MeasurementQuantities				PRESENCE mandatory}|
 	{ ID id-InterRATMeasurementQuantities	CRITICALITY ignore	TYPE InterRATMeasurementQuantities	PRESENCE optional}|
 	{ ID id-WLANMeasurementQuantities		CRITICALITY ignore	TYPE WLANMeasurementQuantities			PRESENCE optional},
@@ -192,7 +192,7 @@ E-CIDMeasurementReport-IEs LPPA-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
--- E-CID MEASUREMENT TERMINATION 
+-- E-CID MEASUREMENT TERMINATION COMMAND
 --
 -- **************************************************************
 
@@ -391,7 +391,7 @@ ErrorIndication ::= SEQUENCE {
 }
 
 ErrorIndication-IEs LPPA-PROTOCOL-IES ::= {
-	
+
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE optional}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional},
 	...
diff --git a/epan/dissectors/asn1/lppa/LPPA-PDU-Descriptions.asn b/epan/dissectors/asn1/lppa/LPPA-PDU-Descriptions.asn
index e35d1aa2..a8c1466a 100644
--- a/epan/dissectors/asn1/lppa/LPPA-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/lppa/LPPA-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.455 V16.1.0 (2020-09)
+-- 3GPP TS 36.455 V18.1.0 (2024-06)
 --
 
 -- **************************************************************
@@ -11,7 +11,7 @@ LPPA-PDU-Descriptions {
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
 eps-Access (21) modules (3) lppa (6) version1 (1) lppa-PDU-Descriptions (0) }
 
-DEFINITIONS AUTOMATIC TAGS ::= 
+DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
diff --git a/epan/dissectors/asn1/lppa/lppa.cnf b/epan/dissectors/asn1/lppa/lppa.cnf
index a0a4381c..15c20f3e 100644
--- a/epan/dissectors/asn1/lppa/lppa.cnf
+++ b/epan/dissectors/asn1/lppa/lppa.cnf
@@ -1,6 +1,6 @@
 # lppa.cnf
 # llpa conformation file
-# Copyright 2011-2020 Pascal Quantin
+# Copyright 2011-2024 Pascal Quantin
 
 #.OPT
 PER
@@ -39,7 +39,8 @@ ProtocolExtensionField/id ext_id
 
 #.FN_FTR ProtocolIE-ID
   if (tree) {
-    proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(lppa_data->protocol_ie_id, VALS(lppa_ProtocolIE_ID_vals), "unknown (%d)"));
+    proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s",
+                           val_to_str(lppa_data->protocol_ie_id, VALS(lppa_ProtocolIE_ID_vals), "unknown (%d)"));
   }
 #.END
 
@@ -49,8 +50,8 @@ ProtocolExtensionField/id ext_id
 %(DEFAULT_BODY)s
 
   col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ",
-                 val_to_str(lppa_data->procedure_code, lppa_ProcedureCode_vals,
-                            "unknown message"));
+                 val_to_str_const(lppa_data->procedure_code, lppa_ProcedureCode_vals,
+                                  "unknown message"));
 #.END
 
 #.FN_PARS ProtocolIE-Field/value  FN_VARIANT=_pdu_new  TYPE_REF_FN=dissect_ProtocolIEFieldValue
diff --git a/epan/dissectors/asn1/lppa/packet-lppa-template.c b/epan/dissectors/asn1/lppa/packet-lppa-template.c
index 56277499..111693c4 100644
--- a/epan/dissectors/asn1/lppa/packet-lppa-template.c
+++ b/epan/dissectors/asn1/lppa/packet-lppa-template.c
@@ -1,6 +1,6 @@
 /* packet-lppa.c
  * Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection
- * Copyright 2011-2019, Pascal Quantin <pascal@wireshark.org>
+ * Copyright 2011-2024, Pascal Quantin <pascal@wireshark.org>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * Ref 3GPP TS 36.455 version 16.1.0 (2020-09)
+ * Ref 3GPP TS 36.455 version 18.1.0 (2024-06)
  * http://www.3gpp.org
  */
 
@@ -17,6 +17,7 @@
 #include <epan/packet.h>
 #include <epan/proto_data.h>
 #include <epan/asn1.h>
+#include <wsutil/array.h>
 
 #include "packet-per.h"
 #include "packet-lppa.h"
@@ -29,12 +30,12 @@ void proto_register_lppa(void);
 void proto_reg_handoff_lppa(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_lppa = -1;
+static int proto_lppa;
 
 #include "packet-lppa-hf.c"
 
 /* Initialize the subtree pointers */
-static gint ett_lppa = -1;
+static int ett_lppa;
 #include "packet-lppa-ett.c"
 
 enum {
@@ -60,10 +61,10 @@ static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, pro
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 
 struct lppa_private_data {
-    guint32 procedure_code;
-    guint32 protocol_ie_id;
-    guint32 protocol_extension_id;
-    guint32 message_type;
+    uint32_t procedure_code;
+    uint32_t protocol_ie_id;
+    uint32_t protocol_extension_id;
+    uint32_t message_type;
 };
 
 static struct lppa_private_data*
@@ -91,7 +92,7 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
     lppa_ctx.ProtocolIE_ID = lppa_data->protocol_ie_id;
     lppa_ctx.ProtocolExtensionID = lppa_data->protocol_extension_id;
 
-  return (dissector_try_uint_new(lppa_ies_dissector_table, lppa_ctx.ProtocolIE_ID, tvb, pinfo, tree, FALSE, &lppa_ctx)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint_new(lppa_ies_dissector_table, lppa_ctx.ProtocolIE_ID, tvb, pinfo, tree, false, &lppa_ctx)) ? tvb_captured_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
@@ -104,26 +105,26 @@ static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_in
     lppa_ctx.ProtocolIE_ID = lppa_data->protocol_ie_id;
     lppa_ctx.ProtocolExtensionID = lppa_data->protocol_extension_id;
 
-  return (dissector_try_uint_new(lppa_extension_dissector_table, lppa_ctx.ProtocolExtensionID, tvb, pinfo, tree, FALSE, &lppa_ctx)) ? tvb_captured_length(tvb) : 0;
+  return (dissector_try_uint_new(lppa_extension_dissector_table, lppa_ctx.ProtocolExtensionID, tvb, pinfo, tree, false, &lppa_ctx)) ? tvb_captured_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
     struct lppa_private_data* lppa_data = lppa_get_private_data(pinfo);
-    return (dissector_try_uint_new(lppa_proc_imsg_dissector_table, lppa_data->procedure_code, tvb, pinfo, tree, FALSE, data)) ? tvb_captured_length(tvb) : 0;
+    return (dissector_try_uint_new(lppa_proc_imsg_dissector_table, lppa_data->procedure_code, tvb, pinfo, tree, false, data)) ? tvb_captured_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
     struct lppa_private_data* lppa_data = lppa_get_private_data(pinfo);
-    return (dissector_try_uint_new(lppa_proc_sout_dissector_table, lppa_data->procedure_code, tvb, pinfo, tree, FALSE, data)) ? tvb_captured_length(tvb) : 0;
+    return (dissector_try_uint_new(lppa_proc_sout_dissector_table, lppa_data->procedure_code, tvb, pinfo, tree, false, data)) ? tvb_captured_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
     struct lppa_private_data* lppa_data = lppa_get_private_data(pinfo);
 
-    return (dissector_try_uint_new(lppa_proc_uout_dissector_table, lppa_data->procedure_code, tvb, pinfo, tree, FALSE, data)) ? tvb_captured_length(tvb) : 0;
+    return (dissector_try_uint_new(lppa_proc_uout_dissector_table, lppa_data->procedure_code, tvb, pinfo, tree, false, data)) ? tvb_captured_length(tvb) : 0;
 }
 
 /*--- proto_register_lppa -------------------------------------------*/
@@ -136,7 +137,7 @@ void proto_register_lppa(void) {
     };
 
     /* List of subtrees */
-    static gint* ett[] = {
+    static int* ett[] = {
         &ett_lppa,
   #include "packet-lppa-ettarr.c"
     };
diff --git a/epan/dissectors/asn1/lppa/packet-lppa-template.h b/epan/dissectors/asn1/lppa/packet-lppa-template.h
index 7e85331d..dafc19c4 100644
--- a/epan/dissectors/asn1/lppa/packet-lppa-template.h
+++ b/epan/dissectors/asn1/lppa/packet-lppa-template.h
@@ -12,10 +12,10 @@
 #define PACKET_LPPA_H
 
 typedef struct _lppa_ctx_t {
-  guint32 message_type;
-  guint32 ProcedureCode;
-  guint32 ProtocolIE_ID;
-  guint32 ProtocolExtensionID;
+  uint32_t message_type;
+  uint32_t ProcedureCode;
+  uint32_t ProtocolIE_ID;
+  uint32_t ProtocolExtensionID;
 } lppa_ctx_t;