Merging upstream version 4.4.0.

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

1 files changed, 290 insertions, 289 deletions

diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c
index 5728baf2..0c368688 100644
--- a/epan/dissectors/packet-h460.c
+++ b/epan/dissectors/packet-h460.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-h460.c                                                              */
-/* asn2wrs.py -L -c ./h460.cnf -s ./packet-h460-template -D . -O ../.. NUMBER-PORTABILITY.asn CIRCUIT-STATUS-MAP.asn CALL-PRIORITY.asn QOS-MONITORING-REPORT.asn QOS-MONITORING-EXTENDED-VOIP-REPORT.asn CALL-PARTY-CATEGORY.asn MLPP.asn SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn SIGNALLING-TRAVERSAL.asn MEDIA-TRAVERSAL.asn MESSAGE-BROADCAST.asn */
+/* asn2wrs.py -q -L -c ./h460.cnf -s ./packet-h460-template -D . -O ../.. NUMBER-PORTABILITY.asn CIRCUIT-STATUS-MAP.asn CALL-PRIORITY.asn QOS-MONITORING-REPORT.asn QOS-MONITORING-EXTENDED-VOIP-REPORT.asn CALL-PARTY-CATEGORY.asn MLPP.asn SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn SIGNALLING-TRAVERSAL.asn MEDIA-TRAVERSAL.asn MESSAGE-BROADCAST.asn */
 
 /* packet-h460.c
  * Routines for H.460.x 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"
@@ -33,305 +34,305 @@ void proto_register_h460(void);
 void proto_reg_handoff_h460(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_h460 = -1;
+static int proto_h460;
 
 /* --- Module NUMBER-PORTABILITY --- --- ---                                  */
 
-static int hf_h460_2_h460_2_NumberPortabilityInfo_PDU = -1;  /* NumberPortabilityInfo */
-static int hf_h460_2_numberPortabilityRejectReason = -1;  /* NumberPortabilityRejectReason */
-static int hf_h460_2_nUMBERPORTABILITYDATA = -1;  /* T_nUMBERPORTABILITYDATA */
-static int hf_h460_2_addressTranslated = -1;      /* NULL */
-static int hf_h460_2_portedAddress = -1;          /* PortabilityAddress */
-static int hf_h460_2_routingAddress = -1;         /* PortabilityAddress */
-static int hf_h460_2_regionalParams = -1;         /* RegionalParameters */
-static int hf_h460_2_unspecified = -1;            /* NULL */
-static int hf_h460_2_qorPortedNumber = -1;        /* NULL */
-static int hf_h460_2_aliasAddress = -1;           /* AliasAddress */
-static int hf_h460_2_typeOfAddress = -1;          /* NumberPortabilityTypeOfNumber */
-static int hf_h460_2_publicTypeOfNumber = -1;     /* PublicTypeOfNumber */
-static int hf_h460_2_privateTypeOfNumber = -1;    /* PrivateTypeOfNumber */
-static int hf_h460_2_portabilityTypeOfNumber = -1;  /* PortabilityTypeOfNumber */
-static int hf_h460_2_portedNumber = -1;           /* NULL */
-static int hf_h460_2_routingNumber = -1;          /* NULL */
-static int hf_h460_2_concatenatedNumber = -1;     /* NULL */
-static int hf_h460_2_t35CountryCode = -1;         /* INTEGER_0_255 */
-static int hf_h460_2_t35Extension = -1;           /* INTEGER_0_255 */
-static int hf_h460_2_variantIdentifier = -1;      /* INTEGER_1_255 */
-static int hf_h460_2_regionalData = -1;           /* OCTET_STRING */
+static int hf_h460_2_h460_2_NumberPortabilityInfo_PDU;  /* NumberPortabilityInfo */
+static int hf_h460_2_numberPortabilityRejectReason;  /* NumberPortabilityRejectReason */
+static int hf_h460_2_nUMBERPORTABILITYDATA;       /* T_nUMBERPORTABILITYDATA */
+static int hf_h460_2_addressTranslated;           /* NULL */
+static int hf_h460_2_portedAddress;               /* PortabilityAddress */
+static int hf_h460_2_routingAddress;              /* PortabilityAddress */
+static int hf_h460_2_regionalParams;              /* RegionalParameters */
+static int hf_h460_2_unspecified;                 /* NULL */
+static int hf_h460_2_qorPortedNumber;             /* NULL */
+static int hf_h460_2_aliasAddress;                /* AliasAddress */
+static int hf_h460_2_typeOfAddress;               /* NumberPortabilityTypeOfNumber */
+static int hf_h460_2_publicTypeOfNumber;          /* PublicTypeOfNumber */
+static int hf_h460_2_privateTypeOfNumber;         /* PrivateTypeOfNumber */
+static int hf_h460_2_portabilityTypeOfNumber;     /* PortabilityTypeOfNumber */
+static int hf_h460_2_portedNumber;                /* NULL */
+static int hf_h460_2_routingNumber;               /* NULL */
+static int hf_h460_2_concatenatedNumber;          /* NULL */
+static int hf_h460_2_t35CountryCode;              /* INTEGER_0_255 */
+static int hf_h460_2_t35Extension;                /* INTEGER_0_255 */
+static int hf_h460_2_variantIdentifier;           /* INTEGER_1_255 */
+static int hf_h460_2_regionalData;                /* OCTET_STRING */
 
 /* --- Module CIRCUIT-STATUS-MAP --- --- ---                                  */
 
-static int hf_h460_3_h460_3_CircuitStatus_PDU = -1;  /* CircuitStatus */
-static int hf_h460_3_circuitStatusMap = -1;       /* SEQUENCE_OF_CircuitStatusMap */
-static int hf_h460_3_circuitStatusMap_item = -1;  /* CircuitStatusMap */
-static int hf_h460_3_statusType = -1;             /* CircuitStatusType */
-static int hf_h460_3_baseCircuitID = -1;          /* CircuitIdentifier */
-static int hf_h460_3_range = -1;                  /* INTEGER_0_4095 */
-static int hf_h460_3_status = -1;                 /* OCTET_STRING */
-static int hf_h460_3_serviceStatus = -1;          /* NULL */
-static int hf_h460_3_busyStatus = -1;             /* NULL */
+static int hf_h460_3_h460_3_CircuitStatus_PDU;    /* CircuitStatus */
+static int hf_h460_3_circuitStatusMap;            /* SEQUENCE_OF_CircuitStatusMap */
+static int hf_h460_3_circuitStatusMap_item;       /* CircuitStatusMap */
+static int hf_h460_3_statusType;                  /* CircuitStatusType */
+static int hf_h460_3_baseCircuitID;               /* CircuitIdentifier */
+static int hf_h460_3_range;                       /* INTEGER_0_4095 */
+static int hf_h460_3_status;                      /* OCTET_STRING */
+static int hf_h460_3_serviceStatus;               /* NULL */
+static int hf_h460_3_busyStatus;                  /* NULL */
 
 /* --- Module CALL-PRIORITY --- --- ---                                       */
 
-static int hf_h460_4_h460_4_CallPriorityInfo_PDU = -1;  /* CallPriorityInfo */
-static int hf_h460_4_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU = -1;  /* CountryInternationalNetworkCallOriginationIdentification */
-static int hf_h460_4_priorityValue = -1;          /* T_priorityValue */
-static int hf_h460_4_emergencyAuthorized = -1;    /* NULL */
-static int hf_h460_4_emergencyPublic = -1;        /* NULL */
-static int hf_h460_4_high = -1;                   /* NULL */
-static int hf_h460_4_normal = -1;                 /* NULL */
-static int hf_h460_4_priorityExtension = -1;      /* INTEGER_0_255 */
-static int hf_h460_4_tokens = -1;                 /* SEQUENCE_OF_ClearToken */
-static int hf_h460_4_tokens_item = -1;            /* ClearToken */
-static int hf_h460_4_cryptoTokens = -1;           /* SEQUENCE_OF_CryptoToken */
-static int hf_h460_4_cryptoTokens_item = -1;      /* CryptoToken */
-static int hf_h460_4_rejectReason = -1;           /* T_rejectReason */
-static int hf_h460_4_priorityUnavailable = -1;    /* NULL */
-static int hf_h460_4_priorityUnauthorized = -1;   /* NULL */
-static int hf_h460_4_priorityValueUnknown = -1;   /* NULL */
-static int hf_h460_4_numberingPlan = -1;          /* T_numberingPlan */
-static int hf_h460_4_x121 = -1;                   /* T_x121 */
-static int hf_h460_4_x121CountryCode = -1;        /* X121CountryCode */
-static int hf_h460_4_e164 = -1;                   /* T_e164 */
-static int hf_h460_4_e164CountryCode = -1;        /* E164CountryCode */
-static int hf_h460_4_identificationCode = -1;     /* T_identificationCode */
+static int hf_h460_4_h460_4_CallPriorityInfo_PDU;  /* CallPriorityInfo */
+static int hf_h460_4_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU;  /* CountryInternationalNetworkCallOriginationIdentification */
+static int hf_h460_4_priorityValue;               /* T_priorityValue */
+static int hf_h460_4_emergencyAuthorized;         /* NULL */
+static int hf_h460_4_emergencyPublic;             /* NULL */
+static int hf_h460_4_high;                        /* NULL */
+static int hf_h460_4_normal;                      /* NULL */
+static int hf_h460_4_priorityExtension;           /* INTEGER_0_255 */
+static int hf_h460_4_tokens;                      /* SEQUENCE_OF_ClearToken */
+static int hf_h460_4_tokens_item;                 /* ClearToken */
+static int hf_h460_4_cryptoTokens;                /* SEQUENCE_OF_CryptoToken */
+static int hf_h460_4_cryptoTokens_item;           /* CryptoToken */
+static int hf_h460_4_rejectReason;                /* T_rejectReason */
+static int hf_h460_4_priorityUnavailable;         /* NULL */
+static int hf_h460_4_priorityUnauthorized;        /* NULL */
+static int hf_h460_4_priorityValueUnknown;        /* NULL */
+static int hf_h460_4_numberingPlan;               /* T_numberingPlan */
+static int hf_h460_4_x121;                        /* T_x121 */
+static int hf_h460_4_x121CountryCode;             /* X121CountryCode */
+static int hf_h460_4_e164;                        /* T_e164 */
+static int hf_h460_4_e164CountryCode;             /* E164CountryCode */
+static int hf_h460_4_identificationCode;          /* T_identificationCode */
 
 /* --- Modules QOS-MONITORING-REPORT QOS-MONITORING-EXTENDED-VOIP-REPORT --- --- --- */
 
-static int hf_h460_9_h460_9_QosMonitoringReportData_PDU = -1;  /* QosMonitoringReportData */
-static int hf_h460_9_h460_9_ExtendedRTPMetrics_PDU = -1;  /* ExtendedRTPMetrics */
-static int hf_h460_9_extensionId = -1;            /* GenericIdentifier */
-static int hf_h460_9_extensionContent = -1;       /* OCTET_STRING */
-static int hf_h460_9_rtpAddress = -1;             /* TransportChannelInfo */
-static int hf_h460_9_rtcpAddress = -1;            /* TransportChannelInfo */
-static int hf_h460_9_sessionId = -1;              /* INTEGER_1_255 */
-static int hf_h460_9_nonStandardData = -1;        /* NonStandardParameter */
-static int hf_h460_9_mediaSenderMeasures = -1;    /* T_mediaSenderMeasures */
-static int hf_h460_9_worstEstimatedEnd2EndDelay = -1;  /* EstimatedEnd2EndDelay */
-static int hf_h460_9_meanEstimatedEnd2EndDelay = -1;  /* EstimatedEnd2EndDelay */
-static int hf_h460_9_mediaReceiverMeasures = -1;  /* T_mediaReceiverMeasures */
-static int hf_h460_9_cumulativeNumberOfPacketsLost = -1;  /* INTEGER_0_4294967295 */
-static int hf_h460_9_packetLostRate = -1;         /* INTEGER_0_65535 */
-static int hf_h460_9_worstJitter = -1;            /* CalculatedJitter */
-static int hf_h460_9_estimatedThroughput = -1;    /* BandWidth */
-static int hf_h460_9_fractionLostRate = -1;       /* INTEGER_0_65535 */
-static int hf_h460_9_meanJitter = -1;             /* CalculatedJitter */
-static int hf_h460_9_extensions = -1;             /* SEQUENCE_OF_Extension */
-static int hf_h460_9_extensions_item = -1;        /* Extension */
-static int hf_h460_9_callReferenceValue = -1;     /* CallReferenceValue */
-static int hf_h460_9_conferenceID = -1;           /* ConferenceIdentifier */
-static int hf_h460_9_callIdentifier = -1;         /* CallIdentifier */
-static int hf_h460_9_mediaChannelsQoS = -1;       /* SEQUENCE_OF_RTCPMeasures */
-static int hf_h460_9_mediaChannelsQoS_item = -1;  /* RTCPMeasures */
-static int hf_h460_9_periodic = -1;               /* PeriodicQoSMonReport */
-static int hf_h460_9_final = -1;                  /* FinalQosMonReport */
-static int hf_h460_9_interGK = -1;                /* InterGKQosMonReport */
-static int hf_h460_9_perCallInfo = -1;            /* SEQUENCE_OF_PerCallQoSReport */
-static int hf_h460_9_perCallInfo_item = -1;       /* PerCallQoSReport */
-static int hf_h460_9_mediaInfo = -1;              /* SEQUENCE_OF_RTCPMeasures */
-static int hf_h460_9_mediaInfo_item = -1;         /* RTCPMeasures */
-static int hf_h460_9_networkPacketLossRate = -1;  /* INTEGER_0_255 */
-static int hf_h460_9_jitterBufferDiscardRate = -1;  /* INTEGER_0_255 */
-static int hf_h460_9_burstMetrics = -1;           /* BurstMetrics */
-static int hf_h460_9_rtcpRoundTripDelay = -1;     /* INTEGER_0_65535 */
-static int hf_h460_9_endSystemDelay = -1;         /* INTEGER_0_65535 */
-static int hf_h460_9_signalLevel = -1;            /* INTEGER_M127_10 */
-static int hf_h460_9_noiseLevel = -1;             /* INTEGER_M127_0 */
-static int hf_h460_9_residualEchoReturnLoss = -1;  /* INTEGER_0_127 */
-static int hf_h460_9_rFactor = -1;                /* INTEGER_0_100 */
-static int hf_h460_9_extRFactor = -1;             /* INTEGER_0_100 */
-static int hf_h460_9_estimatedMOSLQ = -1;         /* INTEGER_10_50 */
-static int hf_h460_9_estimatedMOSCQ = -1;         /* INTEGER_10_50 */
-static int hf_h460_9_plcType = -1;                /* PLCtypes */
-static int hf_h460_9_jitterBufferParms = -1;      /* JitterBufferParms */
-static int hf_h460_9_gmin = -1;                   /* INTEGER_0_255 */
-static int hf_h460_9_burstLossDensity = -1;       /* INTEGER_0_255 */
-static int hf_h460_9_gapLossDensity = -1;         /* INTEGER_0_255 */
-static int hf_h460_9_burstDuration = -1;          /* INTEGER_0_65535 */
-static int hf_h460_9_gapDuration = -1;            /* INTEGER_0_65535 */
-static int hf_h460_9_unspecified = -1;            /* NULL */
-static int hf_h460_9_disabled = -1;               /* NULL */
-static int hf_h460_9_enhanced = -1;               /* NULL */
-static int hf_h460_9_standard = -1;               /* NULL */
-static int hf_h460_9_jitterBufferType = -1;       /* JitterBufferTypes */
-static int hf_h460_9_jitterBufferAdaptRate = -1;  /* INTEGER_0_15 */
-static int hf_h460_9_jitterBufferNominalSize = -1;  /* INTEGER_0_65535 */
-static int hf_h460_9_jitterBufferMaxSize = -1;    /* INTEGER_0_65535 */
-static int hf_h460_9_jitterBufferAbsoluteMax = -1;  /* INTEGER_0_65535 */
-static int hf_h460_9_unknown = -1;                /* NULL */
-static int hf_h460_9_reserved = -1;               /* NULL */
-static int hf_h460_9_nonadaptive = -1;            /* NULL */
-static int hf_h460_9_adaptive = -1;               /* NULL */
+static int hf_h460_9_h460_9_QosMonitoringReportData_PDU;  /* QosMonitoringReportData */
+static int hf_h460_9_h460_9_ExtendedRTPMetrics_PDU;  /* ExtendedRTPMetrics */
+static int hf_h460_9_extensionId;                 /* GenericIdentifier */
+static int hf_h460_9_extensionContent;            /* OCTET_STRING */
+static int hf_h460_9_rtpAddress;                  /* TransportChannelInfo */
+static int hf_h460_9_rtcpAddress;                 /* TransportChannelInfo */
+static int hf_h460_9_sessionId;                   /* INTEGER_1_255 */
+static int hf_h460_9_nonStandardData;             /* NonStandardParameter */
+static int hf_h460_9_mediaSenderMeasures;         /* T_mediaSenderMeasures */
+static int hf_h460_9_worstEstimatedEnd2EndDelay;  /* EstimatedEnd2EndDelay */
+static int hf_h460_9_meanEstimatedEnd2EndDelay;   /* EstimatedEnd2EndDelay */
+static int hf_h460_9_mediaReceiverMeasures;       /* T_mediaReceiverMeasures */
+static int hf_h460_9_cumulativeNumberOfPacketsLost;  /* INTEGER_0_4294967295 */
+static int hf_h460_9_packetLostRate;              /* INTEGER_0_65535 */
+static int hf_h460_9_worstJitter;                 /* CalculatedJitter */
+static int hf_h460_9_estimatedThroughput;         /* BandWidth */
+static int hf_h460_9_fractionLostRate;            /* INTEGER_0_65535 */
+static int hf_h460_9_meanJitter;                  /* CalculatedJitter */
+static int hf_h460_9_extensions;                  /* SEQUENCE_OF_Extension */
+static int hf_h460_9_extensions_item;             /* Extension */
+static int hf_h460_9_callReferenceValue;          /* CallReferenceValue */
+static int hf_h460_9_conferenceID;                /* ConferenceIdentifier */
+static int hf_h460_9_callIdentifier;              /* CallIdentifier */
+static int hf_h460_9_mediaChannelsQoS;            /* SEQUENCE_OF_RTCPMeasures */
+static int hf_h460_9_mediaChannelsQoS_item;       /* RTCPMeasures */
+static int hf_h460_9_periodic;                    /* PeriodicQoSMonReport */
+static int hf_h460_9_final;                       /* FinalQosMonReport */
+static int hf_h460_9_interGK;                     /* InterGKQosMonReport */
+static int hf_h460_9_perCallInfo;                 /* SEQUENCE_OF_PerCallQoSReport */
+static int hf_h460_9_perCallInfo_item;            /* PerCallQoSReport */
+static int hf_h460_9_mediaInfo;                   /* SEQUENCE_OF_RTCPMeasures */
+static int hf_h460_9_mediaInfo_item;              /* RTCPMeasures */
+static int hf_h460_9_networkPacketLossRate;       /* INTEGER_0_255 */
+static int hf_h460_9_jitterBufferDiscardRate;     /* INTEGER_0_255 */
+static int hf_h460_9_burstMetrics;                /* BurstMetrics */
+static int hf_h460_9_rtcpRoundTripDelay;          /* INTEGER_0_65535 */
+static int hf_h460_9_endSystemDelay;              /* INTEGER_0_65535 */
+static int hf_h460_9_signalLevel;                 /* INTEGER_M127_10 */
+static int hf_h460_9_noiseLevel;                  /* INTEGER_M127_0 */
+static int hf_h460_9_residualEchoReturnLoss;      /* INTEGER_0_127 */
+static int hf_h460_9_rFactor;                     /* INTEGER_0_100 */
+static int hf_h460_9_extRFactor;                  /* INTEGER_0_100 */
+static int hf_h460_9_estimatedMOSLQ;              /* INTEGER_10_50 */
+static int hf_h460_9_estimatedMOSCQ;              /* INTEGER_10_50 */
+static int hf_h460_9_plcType;                     /* PLCtypes */
+static int hf_h460_9_jitterBufferParms;           /* JitterBufferParms */
+static int hf_h460_9_gmin;                        /* INTEGER_0_255 */
+static int hf_h460_9_burstLossDensity;            /* INTEGER_0_255 */
+static int hf_h460_9_gapLossDensity;              /* INTEGER_0_255 */
+static int hf_h460_9_burstDuration;               /* INTEGER_0_65535 */
+static int hf_h460_9_gapDuration;                 /* INTEGER_0_65535 */
+static int hf_h460_9_unspecified;                 /* NULL */
+static int hf_h460_9_disabled;                    /* NULL */
+static int hf_h460_9_enhanced;                    /* NULL */
+static int hf_h460_9_standard;                    /* NULL */
+static int hf_h460_9_jitterBufferType;            /* JitterBufferTypes */
+static int hf_h460_9_jitterBufferAdaptRate;       /* INTEGER_0_15 */
+static int hf_h460_9_jitterBufferNominalSize;     /* INTEGER_0_65535 */
+static int hf_h460_9_jitterBufferMaxSize;         /* INTEGER_0_65535 */
+static int hf_h460_9_jitterBufferAbsoluteMax;     /* INTEGER_0_65535 */
+static int hf_h460_9_unknown;                     /* NULL */
+static int hf_h460_9_reserved;                    /* NULL */
+static int hf_h460_9_nonadaptive;                 /* NULL */
+static int hf_h460_9_adaptive;                    /* NULL */
 
 /* --- Module CALL-PARTY-CATEGORY --- --- ---                                 */
 
-static int hf_h460_10_h460_10_CallPartyCategoryInfo_PDU = -1;  /* CallPartyCategoryInfo */
-static int hf_h460_10_callPartyCategory = -1;     /* CallPartyCategory */
-static int hf_h460_10_originatingLineInfo = -1;   /* OriginatingLineInfo */
+static int hf_h460_10_h460_10_CallPartyCategoryInfo_PDU;  /* CallPartyCategoryInfo */
+static int hf_h460_10_callPartyCategory;          /* CallPartyCategory */
+static int hf_h460_10_originatingLineInfo;        /* OriginatingLineInfo */
 
 /* --- Module MLPP --- --- ---                                                */
 
-static int hf_h460_14_h460_14_MLPPInfo_PDU = -1;  /* MLPPInfo */
-static int hf_h460_14_precedence = -1;            /* MlppPrecedence */
-static int hf_h460_14_mlppReason = -1;            /* MlppReason */
-static int hf_h460_14_mlppNotification = -1;      /* MlppNotification */
-static int hf_h460_14_alternateParty = -1;        /* AlternateParty */
-static int hf_h460_14_releaseCall = -1;           /* ReleaseCall */
-static int hf_h460_14_preemptionPending = -1;     /* NULL */
-static int hf_h460_14_preemptionInProgress = -1;  /* NULL */
-static int hf_h460_14_preemptionEnd = -1;         /* NULL */
-static int hf_h460_14_preemptionComplete = -1;    /* NULL */
-static int hf_h460_14_altID = -1;                 /* AliasAddress */
-static int hf_h460_14_altTimer = -1;              /* INTEGER_0_255 */
-static int hf_h460_14_preemptCallID = -1;         /* CallIdentifier */
-static int hf_h460_14_releaseReason = -1;         /* MlppReason */
-static int hf_h460_14_releaseDelay = -1;          /* INTEGER_0_255 */
+static int hf_h460_14_h460_14_MLPPInfo_PDU;       /* MLPPInfo */
+static int hf_h460_14_precedence;                 /* MlppPrecedence */
+static int hf_h460_14_mlppReason;                 /* MlppReason */
+static int hf_h460_14_mlppNotification;           /* MlppNotification */
+static int hf_h460_14_alternateParty;             /* AlternateParty */
+static int hf_h460_14_releaseCall;                /* ReleaseCall */
+static int hf_h460_14_preemptionPending;          /* NULL */
+static int hf_h460_14_preemptionInProgress;       /* NULL */
+static int hf_h460_14_preemptionEnd;              /* NULL */
+static int hf_h460_14_preemptionComplete;         /* NULL */
+static int hf_h460_14_altID;                      /* AliasAddress */
+static int hf_h460_14_altTimer;                   /* INTEGER_0_255 */
+static int hf_h460_14_preemptCallID;              /* CallIdentifier */
+static int hf_h460_14_releaseReason;              /* MlppReason */
+static int hf_h460_14_releaseDelay;               /* INTEGER_0_255 */
 
 /* --- Module SIGNALLING-CHANNEL-SUSPEND-REDIRECT --- --- ---                 */
 
-static int hf_h460_15_h460_15_SignallingChannelData_PDU = -1;  /* SignallingChannelData */
-static int hf_h460_15_signallingChannelData = -1;  /* T_signallingChannelData */
-static int hf_h460_15_channelSuspendRequest = -1;  /* ChannelSuspendRequest */
-static int hf_h460_15_channelSuspendResponse = -1;  /* ChannelSuspendResponse */
-static int hf_h460_15_channelSuspendConfirm = -1;  /* ChannelSuspendConfirm */
-static int hf_h460_15_channelSuspendCancel = -1;  /* ChannelSuspendCancel */
-static int hf_h460_15_channelResumeRequest = -1;  /* ChannelResumeRequest */
-static int hf_h460_15_channelResumeResponse = -1;  /* ChannelResumeResponse */
-static int hf_h460_15_channelResumeAddress = -1;  /* SEQUENCE_OF_TransportAddress */
-static int hf_h460_15_channelResumeAddress_item = -1;  /* TransportAddress */
-static int hf_h460_15_immediateResume = -1;       /* BOOLEAN */
-static int hf_h460_15_resetH245 = -1;             /* NULL */
-static int hf_h460_15_okToSuspend = -1;           /* BOOLEAN */
-static int hf_h460_15_randomNumber = -1;          /* INTEGER_0_4294967295 */
+static int hf_h460_15_h460_15_SignallingChannelData_PDU;  /* SignallingChannelData */
+static int hf_h460_15_signallingChannelData;      /* T_signallingChannelData */
+static int hf_h460_15_channelSuspendRequest;      /* ChannelSuspendRequest */
+static int hf_h460_15_channelSuspendResponse;     /* ChannelSuspendResponse */
+static int hf_h460_15_channelSuspendConfirm;      /* ChannelSuspendConfirm */
+static int hf_h460_15_channelSuspendCancel;       /* ChannelSuspendCancel */
+static int hf_h460_15_channelResumeRequest;       /* ChannelResumeRequest */
+static int hf_h460_15_channelResumeResponse;      /* ChannelResumeResponse */
+static int hf_h460_15_channelResumeAddress;       /* SEQUENCE_OF_TransportAddress */
+static int hf_h460_15_channelResumeAddress_item;  /* TransportAddress */
+static int hf_h460_15_immediateResume;            /* BOOLEAN */
+static int hf_h460_15_resetH245;                  /* NULL */
+static int hf_h460_15_okToSuspend;                /* BOOLEAN */
+static int hf_h460_15_randomNumber;               /* INTEGER_0_4294967295 */
 
 /* --- Module SIGNALLING-TRAVERSAL --- --- ---                                */
 
-static int hf_h460_18_h460_18_IncomingCallIndication_PDU = -1;  /* IncomingCallIndication */
-static int hf_h460_18_h460_18_LRQKeepAliveData_PDU = -1;  /* LRQKeepAliveData */
-static int hf_h460_18_callSignallingAddress = -1;  /* TransportAddress */
-static int hf_h460_18_callID = -1;                /* CallIdentifier */
-static int hf_h460_18_lrqKeepAliveInterval = -1;  /* TimeToLive */
+static int hf_h460_18_h460_18_IncomingCallIndication_PDU;  /* IncomingCallIndication */
+static int hf_h460_18_h460_18_LRQKeepAliveData_PDU;  /* LRQKeepAliveData */
+static int hf_h460_18_callSignallingAddress;      /* TransportAddress */
+static int hf_h460_18_callID;                     /* CallIdentifier */
+static int hf_h460_18_lrqKeepAliveInterval;       /* TimeToLive */
 
 /* --- Module MEDIA-TRAVERSAL --- --- ---                                     */
 
-static int hf_h460_19_h460_19_TraversalParameters_PDU = -1;  /* TraversalParameters */
-static int hf_h460_19_multiplexedMediaChannel = -1;  /* TransportAddress */
-static int hf_h460_19_multiplexedMediaControlChannel = -1;  /* TransportAddress */
-static int hf_h460_19_multiplexID = -1;           /* INTEGER_0_4294967295 */
-static int hf_h460_19_keepAliveChannel = -1;      /* TransportAddress */
-static int hf_h460_19_keepAlivePayloadType = -1;  /* INTEGER_0_127 */
-static int hf_h460_19_keepAliveInterval = -1;     /* TimeToLive */
+static int hf_h460_19_h460_19_TraversalParameters_PDU;  /* TraversalParameters */
+static int hf_h460_19_multiplexedMediaChannel;    /* TransportAddress */
+static int hf_h460_19_multiplexedMediaControlChannel;  /* TransportAddress */
+static int hf_h460_19_multiplexID;                /* INTEGER_0_4294967295 */
+static int hf_h460_19_keepAliveChannel;           /* TransportAddress */
+static int hf_h460_19_keepAlivePayloadType;       /* INTEGER_0_127 */
+static int hf_h460_19_keepAliveInterval;          /* TimeToLive */
 
 /* --- Module MESSAGE-BROADCAST --- --- ---                                   */
 
-static int hf_h460_21_h460_21_CapabilityAdvertisement_PDU = -1;  /* CapabilityAdvertisement */
-static int hf_h460_21_receiveCapabilities = -1;   /* ReceiveCapabilities */
-static int hf_h460_21_transmitCapabilities = -1;  /* SEQUENCE_SIZE_1_256_OF_TransmitCapabilities */
-static int hf_h460_21_transmitCapabilities_item = -1;  /* TransmitCapabilities */
-static int hf_h460_21_capabilities = -1;          /* SEQUENCE_SIZE_1_256_OF_Capability */
-static int hf_h460_21_capabilities_item = -1;     /* Capability */
-static int hf_h460_21_maxGroups = -1;             /* INTEGER_1_65535 */
-static int hf_h460_21_groupIdentifer = -1;        /* GloballyUniqueID */
-static int hf_h460_21_capability = -1;            /* Capability */
-static int hf_h460_21_sourceAddress = -1;         /* UnicastAddress */
+static int hf_h460_21_h460_21_CapabilityAdvertisement_PDU;  /* CapabilityAdvertisement */
+static int hf_h460_21_receiveCapabilities;        /* ReceiveCapabilities */
+static int hf_h460_21_transmitCapabilities;       /* SEQUENCE_SIZE_1_256_OF_TransmitCapabilities */
+static int hf_h460_21_transmitCapabilities_item;  /* TransmitCapabilities */
+static int hf_h460_21_capabilities;               /* SEQUENCE_SIZE_1_256_OF_Capability */
+static int hf_h460_21_capabilities_item;          /* Capability */
+static int hf_h460_21_maxGroups;                  /* INTEGER_1_65535 */
+static int hf_h460_21_groupIdentifer;             /* GloballyUniqueID */
+static int hf_h460_21_capability;                 /* Capability */
+static int hf_h460_21_sourceAddress;              /* UnicastAddress */
 
 /* Initialize the subtree pointers */
 
 /* --- Module NUMBER-PORTABILITY --- --- ---                                  */
 
-static gint ett_h460_2_NumberPortabilityInfo = -1;
-static gint ett_h460_2_T_nUMBERPORTABILITYDATA = -1;
-static gint ett_h460_2_NumberPortabilityRejectReason = -1;
-static gint ett_h460_2_PortabilityAddress = -1;
-static gint ett_h460_2_NumberPortabilityTypeOfNumber = -1;
-static gint ett_h460_2_PortabilityTypeOfNumber = -1;
-static gint ett_h460_2_RegionalParameters = -1;
+static int ett_h460_2_NumberPortabilityInfo;
+static int ett_h460_2_T_nUMBERPORTABILITYDATA;
+static int ett_h460_2_NumberPortabilityRejectReason;
+static int ett_h460_2_PortabilityAddress;
+static int ett_h460_2_NumberPortabilityTypeOfNumber;
+static int ett_h460_2_PortabilityTypeOfNumber;
+static int ett_h460_2_RegionalParameters;
 
 /* --- Module CIRCUIT-STATUS-MAP --- --- ---                                  */
 
-static gint ett_h460_3_CircuitStatus = -1;
-static gint ett_h460_3_SEQUENCE_OF_CircuitStatusMap = -1;
-static gint ett_h460_3_CircuitStatusMap = -1;
-static gint ett_h460_3_CircuitStatusType = -1;
+static int ett_h460_3_CircuitStatus;
+static int ett_h460_3_SEQUENCE_OF_CircuitStatusMap;
+static int ett_h460_3_CircuitStatusMap;
+static int ett_h460_3_CircuitStatusType;
 
 /* --- Module CALL-PRIORITY --- --- ---                                       */
 
-static gint ett_h460_4_CallPriorityInfo = -1;
-static gint ett_h460_4_T_priorityValue = -1;
-static gint ett_h460_4_SEQUENCE_OF_ClearToken = -1;
-static gint ett_h460_4_SEQUENCE_OF_CryptoToken = -1;
-static gint ett_h460_4_T_rejectReason = -1;
-static gint ett_h460_4_CountryInternationalNetworkCallOriginationIdentification = -1;
-static gint ett_h460_4_T_numberingPlan = -1;
-static gint ett_h460_4_T_x121 = -1;
-static gint ett_h460_4_T_e164 = -1;
+static int ett_h460_4_CallPriorityInfo;
+static int ett_h460_4_T_priorityValue;
+static int ett_h460_4_SEQUENCE_OF_ClearToken;
+static int ett_h460_4_SEQUENCE_OF_CryptoToken;
+static int ett_h460_4_T_rejectReason;
+static int ett_h460_4_CountryInternationalNetworkCallOriginationIdentification;
+static int ett_h460_4_T_numberingPlan;
+static int ett_h460_4_T_x121;
+static int ett_h460_4_T_e164;
 
 /* --- Modules QOS-MONITORING-REPORT QOS-MONITORING-EXTENDED-VOIP-REPORT --- --- --- */
 
-static gint ett_h460_9_Extension = -1;
-static gint ett_h460_9_RTCPMeasures = -1;
-static gint ett_h460_9_T_mediaSenderMeasures = -1;
-static gint ett_h460_9_T_mediaReceiverMeasures = -1;
-static gint ett_h460_9_SEQUENCE_OF_Extension = -1;
-static gint ett_h460_9_PerCallQoSReport = -1;
-static gint ett_h460_9_SEQUENCE_OF_RTCPMeasures = -1;
-static gint ett_h460_9_QosMonitoringReportData = -1;
-static gint ett_h460_9_PeriodicQoSMonReport = -1;
-static gint ett_h460_9_SEQUENCE_OF_PerCallQoSReport = -1;
-static gint ett_h460_9_FinalQosMonReport = -1;
-static gint ett_h460_9_InterGKQosMonReport = -1;
-static gint ett_h460_9_ExtendedRTPMetrics = -1;
-static gint ett_h460_9_BurstMetrics = -1;
-static gint ett_h460_9_PLCtypes = -1;
-static gint ett_h460_9_JitterBufferParms = -1;
-static gint ett_h460_9_JitterBufferTypes = -1;
+static int ett_h460_9_Extension;
+static int ett_h460_9_RTCPMeasures;
+static int ett_h460_9_T_mediaSenderMeasures;
+static int ett_h460_9_T_mediaReceiverMeasures;
+static int ett_h460_9_SEQUENCE_OF_Extension;
+static int ett_h460_9_PerCallQoSReport;
+static int ett_h460_9_SEQUENCE_OF_RTCPMeasures;
+static int ett_h460_9_QosMonitoringReportData;
+static int ett_h460_9_PeriodicQoSMonReport;
+static int ett_h460_9_SEQUENCE_OF_PerCallQoSReport;
+static int ett_h460_9_FinalQosMonReport;
+static int ett_h460_9_InterGKQosMonReport;
+static int ett_h460_9_ExtendedRTPMetrics;
+static int ett_h460_9_BurstMetrics;
+static int ett_h460_9_PLCtypes;
+static int ett_h460_9_JitterBufferParms;
+static int ett_h460_9_JitterBufferTypes;
 
 /* --- Module CALL-PARTY-CATEGORY --- --- ---                                 */
 
-static gint ett_h460_10_CallPartyCategoryInfo = -1;
+static int ett_h460_10_CallPartyCategoryInfo;
 
 /* --- Module MLPP --- --- ---                                                */
 
-static gint ett_h460_14_MLPPInfo = -1;
-static gint ett_h460_14_MlppNotification = -1;
-static gint ett_h460_14_AlternateParty = -1;
-static gint ett_h460_14_ReleaseCall = -1;
+static int ett_h460_14_MLPPInfo;
+static int ett_h460_14_MlppNotification;
+static int ett_h460_14_AlternateParty;
+static int ett_h460_14_ReleaseCall;
 
 /* --- Module SIGNALLING-CHANNEL-SUSPEND-REDIRECT --- --- ---                 */
 
-static gint ett_h460_15_SignallingChannelData = -1;
-static gint ett_h460_15_T_signallingChannelData = -1;
-static gint ett_h460_15_ChannelSuspendRequest = -1;
-static gint ett_h460_15_SEQUENCE_OF_TransportAddress = -1;
-static gint ett_h460_15_ChannelSuspendResponse = -1;
-static gint ett_h460_15_ChannelSuspendConfirm = -1;
-static gint ett_h460_15_ChannelSuspendCancel = -1;
-static gint ett_h460_15_ChannelResumeRequest = -1;
-static gint ett_h460_15_ChannelResumeResponse = -1;
+static int ett_h460_15_SignallingChannelData;
+static int ett_h460_15_T_signallingChannelData;
+static int ett_h460_15_ChannelSuspendRequest;
+static int ett_h460_15_SEQUENCE_OF_TransportAddress;
+static int ett_h460_15_ChannelSuspendResponse;
+static int ett_h460_15_ChannelSuspendConfirm;
+static int ett_h460_15_ChannelSuspendCancel;
+static int ett_h460_15_ChannelResumeRequest;
+static int ett_h460_15_ChannelResumeResponse;
 
 /* --- Module SIGNALLING-TRAVERSAL --- --- ---                                */
 
-static gint ett_h460_18_IncomingCallIndication = -1;
-static gint ett_h460_18_LRQKeepAliveData = -1;
+static int ett_h460_18_IncomingCallIndication;
+static int ett_h460_18_LRQKeepAliveData;
 
 /* --- Module MEDIA-TRAVERSAL --- --- ---                                     */
 
-static gint ett_h460_19_TraversalParameters = -1;
+static int ett_h460_19_TraversalParameters;
 
 /* --- Module MESSAGE-BROADCAST --- --- ---                                   */
 
-static gint ett_h460_21_CapabilityAdvertisement = -1;
-static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_TransmitCapabilities = -1;
-static gint ett_h460_21_ReceiveCapabilities = -1;
-static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability = -1;
-static gint ett_h460_21_TransmitCapabilities = -1;
+static int ett_h460_21_CapabilityAdvertisement;
+static int ett_h460_21_SEQUENCE_SIZE_1_256_OF_TransmitCapabilities;
+static int ett_h460_21_ReceiveCapabilities;
+static int ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability;
+static int ett_h460_21_TransmitCapabilities;
 
 /* Main dissector handle */
 static dissector_handle_t h460_name_handle;
 
 /* Subdissectors */
-static dissector_handle_t q931_ie_handle = NULL;
-static dissector_handle_t h225_ras_handle = NULL;
+static dissector_handle_t q931_ie_handle;
+static dissector_handle_t h225_ras_handle;
 
 
 /* --- Module NUMBER-PORTABILITY --- --- ---                                  */
@@ -435,7 +436,7 @@ dissect_h460_2_PortabilityAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_h460_2_INTEGER_0_255(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,
-                                                            0U, 255U, NULL, FALSE);
+                                                            0U, 255U, NULL, false);
 
   return offset;
 }
@@ -445,7 +446,7 @@ dissect_h460_2_INTEGER_0_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 static int
 dissect_h460_2_INTEGER_1_255(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, 255U, NULL, FALSE);
+                                                            1U, 255U, NULL, false);
 
   return offset;
 }
@@ -455,7 +456,7 @@ dissect_h460_2_INTEGER_1_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 static int
 dissect_h460_2_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;
 }
@@ -521,7 +522,7 @@ dissect_h460_2_NumberPortabilityInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 static int dissect_h460_2_NumberPortabilityInfo_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_h460_2_NumberPortabilityInfo(tvb, offset, &asn1_ctx, tree, hf_h460_2_h460_2_NumberPortabilityInfo_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -566,7 +567,7 @@ dissect_h460_3_CircuitStatusType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 static int
 dissect_h460_3_INTEGER_0_4095(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,
-                                                            0U, 4095U, NULL, FALSE);
+                                                            0U, 4095U, NULL, false);
 
   return offset;
 }
@@ -576,7 +577,7 @@ dissect_h460_3_INTEGER_0_4095(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 static int
 dissect_h460_3_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;
 }
@@ -630,7 +631,7 @@ dissect_h460_3_CircuitStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 static int dissect_h460_3_CircuitStatus_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_h460_3_CircuitStatus(tvb, offset, &asn1_ctx, tree, hf_h460_3_h460_3_CircuitStatus_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -679,7 +680,7 @@ dissect_h460_4_T_priorityValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 static int
 dissect_h460_4_INTEGER_0_255(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,
-                                                            0U, 255U, NULL, FALSE);
+                                                            0U, 255U, NULL, false);
 
   return offset;
 }
@@ -757,7 +758,7 @@ dissect_h460_4_CallPriorityInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 static int
 dissect_h460_4_X121CountryCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index,
-                                                      3, 3, FALSE, "0123456789", 10,
+                                                      3, 3, false, "0123456789", 10,
                                                       NULL);
 
   return offset;
@@ -782,7 +783,7 @@ dissect_h460_4_T_x121(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 static int
 dissect_h460_4_E164CountryCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index,
-                                                      3, 3, FALSE, "0123456789", 10,
+                                                      3, 3, false, "0123456789", 10,
                                                       NULL);
 
   return offset;
@@ -793,7 +794,7 @@ dissect_h460_4_E164CountryCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 static int
 dissect_h460_4_T_identificationCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index,
-                                                      1, 4, FALSE, "0123456789", 10,
+                                                      1, 4, false, "0123456789", 10,
                                                       NULL);
 
   return offset;
@@ -855,7 +856,7 @@ dissect_h460_4_CountryInternationalNetworkCallOriginationIdentification(tvbuff_t
 static int dissect_h460_4_CallPriorityInfo_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_h460_4_CallPriorityInfo(tvb, offset, &asn1_ctx, tree, hf_h460_4_h460_4_CallPriorityInfo_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -863,7 +864,7 @@ static int dissect_h460_4_CallPriorityInfo_PDU(tvbuff_t *tvb _U_, packet_info *p
 static int dissect_h460_4_CountryInternationalNetworkCallOriginationIdentification_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_h460_4_CountryInternationalNetworkCallOriginationIdentification(tvb, offset, &asn1_ctx, tree, hf_h460_4_h460_4_CountryInternationalNetworkCallOriginationIdentification_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -877,7 +878,7 @@ static int dissect_h460_4_CountryInternationalNetworkCallOriginationIdentificati
 static int
 dissect_h460_9_EstimatedEnd2EndDelay(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,
-                                                            0U, 4294967295U, NULL, FALSE);
+                                                            0U, 4294967295U, NULL, false);
 
   return offset;
 }
@@ -887,7 +888,7 @@ dissect_h460_9_EstimatedEnd2EndDelay(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 static int
 dissect_h460_9_CalculatedJitter(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,
-                                                            0U, 4294967295U, NULL, FALSE);
+                                                            0U, 4294967295U, NULL, false);
 
   return offset;
 }
@@ -897,7 +898,7 @@ dissect_h460_9_CalculatedJitter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
 static int
 dissect_h460_9_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;
 }
@@ -922,7 +923,7 @@ dissect_h460_9_Extension(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 static int
 dissect_h460_9_INTEGER_1_255(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, 255U, NULL, FALSE);
+                                                            1U, 255U, NULL, false);
 
   return offset;
 }
@@ -947,7 +948,7 @@ dissect_h460_9_T_mediaSenderMeasures(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 static int
 dissect_h460_9_INTEGER_0_4294967295(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,
-                                                            0U, 4294967295U, NULL, FALSE);
+                                                            0U, 4294967295U, NULL, false);
 
   return offset;
 }
@@ -957,7 +958,7 @@ dissect_h460_9_INTEGER_0_4294967295(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 static int
 dissect_h460_9_INTEGER_0_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,
-                                                            0U, 65535U, NULL, FALSE);
+                                                            0U, 65535U, NULL, false);
 
   return offset;
 }
@@ -1135,7 +1136,7 @@ dissect_h460_9_QosMonitoringReportData(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 static int
 dissect_h460_9_INTEGER_0_255(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,
-                                                            0U, 255U, NULL, FALSE);
+                                                            0U, 255U, NULL, false);
 
   return offset;
 }
@@ -1163,7 +1164,7 @@ dissect_h460_9_BurstMetrics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 static int
 dissect_h460_9_INTEGER_M127_10(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,
-                                                            -127, 10U, NULL, FALSE);
+                                                            -127, 10U, NULL, false);
 
   return offset;
 }
@@ -1173,7 +1174,7 @@ dissect_h460_9_INTEGER_M127_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 static int
 dissect_h460_9_INTEGER_M127_0(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,
-                                                            -127, 0U, NULL, FALSE);
+                                                            -127, 0U, NULL, false);
 
   return offset;
 }
@@ -1183,7 +1184,7 @@ dissect_h460_9_INTEGER_M127_0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 static int
 dissect_h460_9_INTEGER_0_127(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,
-                                                            0U, 127U, NULL, FALSE);
+                                                            0U, 127U, NULL, false);
 
   return offset;
 }
@@ -1193,7 +1194,7 @@ dissect_h460_9_INTEGER_0_127(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 static int
 dissect_h460_9_INTEGER_0_100(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,
-                                                            0U, 100U, NULL, FALSE);
+                                                            0U, 100U, NULL, false);
 
   return offset;
 }
@@ -1203,7 +1204,7 @@ dissect_h460_9_INTEGER_0_100(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 static int
 dissect_h460_9_INTEGER_10_50(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,
-                                                            10U, 50U, NULL, FALSE);
+                                                            10U, 50U, NULL, false);
 
   return offset;
 }
@@ -1274,7 +1275,7 @@ dissect_h460_9_JitterBufferTypes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 static int
 dissect_h460_9_INTEGER_0_15(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,
-                                                            0U, 15U, NULL, FALSE);
+                                                            0U, 15U, NULL, false);
 
   return offset;
 }
@@ -1329,7 +1330,7 @@ dissect_h460_9_ExtendedRTPMetrics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int dissect_h460_9_QosMonitoringReportData_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_h460_9_QosMonitoringReportData(tvb, offset, &asn1_ctx, tree, hf_h460_9_h460_9_QosMonitoringReportData_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1337,7 +1338,7 @@ static int dissect_h460_9_QosMonitoringReportData_PDU(tvbuff_t *tvb _U_, packet_
 static int dissect_h460_9_ExtendedRTPMetrics_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_h460_9_ExtendedRTPMetrics(tvb, offset, &asn1_ctx, tree, hf_h460_9_h460_9_ExtendedRTPMetrics_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1351,7 +1352,7 @@ static int dissect_h460_9_ExtendedRTPMetrics_PDU(tvbuff_t *tvb _U_, packet_info
 static int
 dissect_h460_10_CallPartyCategory(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,
-                                                            0U, 255U, NULL, FALSE);
+                                                            0U, 255U, NULL, false);
 
   return offset;
 }
@@ -1361,7 +1362,7 @@ dissect_h460_10_CallPartyCategory(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_h460_10_OriginatingLineInfo(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,
-                                                            0U, 255U, NULL, FALSE);
+                                                            0U, 255U, NULL, false);
 
   return offset;
 }
@@ -1386,7 +1387,7 @@ dissect_h460_10_CallPartyCategoryInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 static int dissect_h460_10_CallPartyCategoryInfo_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_h460_10_CallPartyCategoryInfo(tvb, offset, &asn1_ctx, tree, hf_h460_10_h460_10_CallPartyCategoryInfo_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1409,7 +1410,7 @@ static const value_string h460_14_MlppPrecedence_vals[] = {
 static int
 dissect_h460_14_MlppPrecedence(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
-                                     5, NULL, TRUE, 0, NULL);
+                                     5, NULL, true, 0, NULL);
 
   return offset;
 }
@@ -1427,7 +1428,7 @@ static uint32_t h460_14_MlppReason_value_map[3+0] = {8, 9, 46};
 static int
 dissect_h460_14_MlppReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
-                                     3, NULL, TRUE, 0, h460_14_MlppReason_value_map);
+                                     3, NULL, true, 0, h460_14_MlppReason_value_map);
 
   return offset;
 }
@@ -1472,7 +1473,7 @@ dissect_h460_14_MlppNotification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 static int
 dissect_h460_14_INTEGER_0_255(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,
-                                                            0U, 255U, NULL, FALSE);
+                                                            0U, 255U, NULL, false);
 
   return offset;
 }
@@ -1531,7 +1532,7 @@ dissect_h460_14_MLPPInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 static int dissect_h460_14_MLPPInfo_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_h460_14_MLPPInfo(tvb, offset, &asn1_ctx, tree, hf_h460_14_h460_14_MLPPInfo_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1633,7 +1634,7 @@ dissect_h460_15_ChannelSuspendCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 static int
 dissect_h460_15_INTEGER_0_4294967295(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,
-                                                            0U, 4294967295U, NULL, FALSE);
+                                                            0U, 4294967295U, NULL, false);
 
   return offset;
 }
@@ -1715,7 +1716,7 @@ dissect_h460_15_SignallingChannelData(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 static int dissect_h460_15_SignallingChannelData_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_h460_15_SignallingChannelData(tvb, offset, &asn1_ctx, tree, hf_h460_15_h460_15_SignallingChannelData_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1758,7 +1759,7 @@ dissect_h460_18_LRQKeepAliveData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 static int dissect_h460_18_IncomingCallIndication_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_h460_18_IncomingCallIndication(tvb, offset, &asn1_ctx, tree, hf_h460_18_h460_18_IncomingCallIndication_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1766,7 +1767,7 @@ static int dissect_h460_18_IncomingCallIndication_PDU(tvbuff_t *tvb _U_, packet_
 static int dissect_h460_18_LRQKeepAliveData_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_h460_18_LRQKeepAliveData(tvb, offset, &asn1_ctx, tree, hf_h460_18_h460_18_LRQKeepAliveData_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1780,7 +1781,7 @@ static int dissect_h460_18_LRQKeepAliveData_PDU(tvbuff_t *tvb _U_, packet_info *
 static int
 dissect_h460_19_INTEGER_0_4294967295(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,
-                                                            0U, 4294967295U, NULL, FALSE);
+                                                            0U, 4294967295U, NULL, false);
 
   return offset;
 }
@@ -1790,7 +1791,7 @@ dissect_h460_19_INTEGER_0_4294967295(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 static int
 dissect_h460_19_INTEGER_0_127(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,
-                                                            0U, 127U, NULL, FALSE);
+                                                            0U, 127U, NULL, false);
 
   return offset;
 }
@@ -1819,7 +1820,7 @@ dissect_h460_19_TraversalParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 static int dissect_h460_19_TraversalParameters_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_h460_19_TraversalParameters(tvb, offset, &asn1_ctx, tree, hf_h460_19_h460_19_TraversalParameters_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1837,7 +1838,7 @@ static int
 dissect_h460_21_SEQUENCE_SIZE_1_256_OF_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
                                                   ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability, h460_21_SEQUENCE_SIZE_1_256_OF_Capability_sequence_of,
-                                                  1, 256, FALSE);
+                                                  1, 256, false);
 
   return offset;
 }
@@ -1847,7 +1848,7 @@ dissect_h460_21_SEQUENCE_SIZE_1_256_OF_Capability(tvbuff_t *tvb _U_, int offset
 static int
 dissect_h460_21_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;
 }
@@ -1872,7 +1873,7 @@ dissect_h460_21_ReceiveCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 static int
 dissect_h460_21_GloballyUniqueID(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,
-                                       16, 16, FALSE, NULL);
+                                       16, 16, false, NULL);
 
   return offset;
 }
@@ -1902,7 +1903,7 @@ static int
 dissect_h460_21_SEQUENCE_SIZE_1_256_OF_TransmitCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
                                                   ett_h460_21_SEQUENCE_SIZE_1_256_OF_TransmitCapabilities, h460_21_SEQUENCE_SIZE_1_256_OF_TransmitCapabilities_sequence_of,
-                                                  1, 256, FALSE);
+                                                  1, 256, false);
 
   return offset;
 }
@@ -1927,7 +1928,7 @@ dissect_h460_21_CapabilityAdvertisement(tvbuff_t *tvb _U_, int offset _U_, asn1_
 static int dissect_h460_21_CapabilityAdvertisement_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_h460_21_CapabilityAdvertisement(tvb, offset, &asn1_ctx, tree, hf_h460_21_h460_21_CapabilityAdvertisement_PDU);
   offset += 7; offset >>= 3;
   return offset;
@@ -1957,15 +1958,15 @@ dissect_ras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 }
 
 typedef struct _h460_feature_t {
-  guint32 opt;
-  const gchar *id;
-  const gchar *name;
+  uint32_t opt;
+  const char *id;
+  const char *name;
   dissector_t content_pdu;
   /*---*/
-  const gchar *key_gd;
-  const gchar *key_fd;
-  const gchar *key_gm;
-  const gchar *key_gi;
+  const char *key_gd;
+  const char *key_fd;
+  const char *key_gm;
+  const char *key_gi;
   dissector_handle_t content_hnd;
 } h460_feature_t;
 
@@ -2081,7 +2082,7 @@ static h460_feature_t h460_feature_tab[] = {
   { 0, NULL, NULL, NULL, FFILL },
 };
 
-static h460_feature_t *find_ftr(const gchar *key) {
+static h460_feature_t *find_ftr(const char *key) {
   h460_feature_t *ftr = NULL;
   h460_feature_t *f;
 
@@ -2839,7 +2840,7 @@ void proto_register_h460(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
 
 /* --- Module NUMBER-PORTABILITY --- --- ---                                  */