From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770

1 files changed, 153 insertions, 153 deletions

diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index e8bc2bfe97..884d2a73ca 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -9221,7 +9221,7 @@ void proto_register_inap(void) {
         "inap.ApplyChargingArg", HFILL }},
     { &hf_inap_ApplyChargingReportArg_PDU,
       { "ApplyChargingReportArg", "inap.ApplyChargingReportArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ApplyChargingReportArg", HFILL }},
     { &hf_inap_AssistRequestInstructionsArg_PDU,
       { "AssistRequestInstructionsArg", "inap.AssistRequestInstructionsArg",
@@ -9325,7 +9325,7 @@ void proto_register_inap(void) {
         "inap.FacilitySelectedAndAvailableArg", HFILL }},
     { &hf_inap_FurnishChargingInformationArg_PDU,
       { "FurnishChargingInformationArg", "inap.FurnishChargingInformationArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.FurnishChargingInformationArg", HFILL }},
     { &hf_inap_HoldCallInNetworkArg_PDU,
       { "HoldCallInNetworkArg", "inap.HoldCallInNetworkArg",
@@ -9589,23 +9589,23 @@ void proto_register_inap(void) {
         "inap.IA5String_SIZE_1_512", HFILL }},
     { &hf_inap_conferenceTreatmentIndicator,
       { "conferenceTreatmentIndicator", "inap.conferenceTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_callCompletionTreatmentIndicator,
       { "callCompletionTreatmentIndicator", "inap.callCompletionTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_holdTreatmentIndicator,
       { "holdTreatmentIndicator", "inap.holdTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_ectTreatmentIndicator,
       { "ectTreatmentIndicator", "inap.ectTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_calledAddressValue,
       { "calledAddressValue", "inap.calledAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_gapOnService,
       { "gapOnService", "inap.gapOnService",
@@ -9629,11 +9629,11 @@ void proto_register_inap(void) {
         "inap.T_callingAddressAndService", HFILL }},
     { &hf_inap_callingAddressValue,
       { "callingAddressValue", "inap.callingAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_locationNumber,
       { "locationNumber", "inap.locationNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.LocationNumber", HFILL }},
     { &hf_inap_eventTypeBCSM,
       { "eventTypeBCSM", "inap.eventTypeBCSM",
@@ -9653,63 +9653,63 @@ void proto_register_inap(void) {
         "inap.DpSpecificCriteria", HFILL }},
     { &hf_inap_bearerCap,
       { "bearerCap", "inap.bearerCap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.T_bearerCap", HFILL }},
     { &hf_inap_tmr,
       { "tmr", "inap.tmr",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_broadbandBearerCap,
       { "broadbandBearerCap", "inap.broadbandBearerCap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_minBroadbandBearerCapabilityLength_maxBroadbandBearerCapabilityLength", HFILL }},
     { &hf_inap_aALParameters,
       { "aALParameters", "inap.aALParameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AALParameters", HFILL }},
     { &hf_inap_additionalATMCellRate,
       { "additionalATMCellRate", "inap.additionalATMCellRate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AdditionalATMCellRate", HFILL }},
     { &hf_inap_aESACalledParty,
       { "aESACalledParty", "inap.aESACalledParty",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AESACalledParty", HFILL }},
     { &hf_inap_aESACallingParty,
       { "aESACallingParty", "inap.aESACallingParty",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AESACallingParty", HFILL }},
     { &hf_inap_alternativeATMTrafficDescriptor,
       { "alternativeATMTrafficDescriptor", "inap.alternativeATMTrafficDescriptor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AlternativeATMTrafficDescriptor", HFILL }},
     { &hf_inap_aTMCellRate,
       { "aTMCellRate", "inap.aTMCellRate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ATMCellRate", HFILL }},
     { &hf_inap_cDVTDescriptor,
       { "cDVTDescriptor", "inap.cDVTDescriptor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CDVTDescriptor", HFILL }},
     { &hf_inap_cumulativeTransitDelay,
       { "cumulativeTransitDelay", "inap.cumulativeTransitDelay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CumulativeTransitDelay", HFILL }},
     { &hf_inap_endToEndTransitDelay,
       { "endToEndTransitDelay", "inap.endToEndTransitDelay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.EndToEndTransitDelay", HFILL }},
     { &hf_inap_minAcceptableATMTrafficDescriptor,
       { "minAcceptableATMTrafficDescriptor", "inap.minAcceptableATMTrafficDescriptor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.MinAcceptableATMTrafficDescriptor", HFILL }},
     { &hf_inap_eventTypeCharging,
       { "eventTypeCharging", "inap.eventTypeCharging",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.EventTypeCharging", HFILL }},
     { &hf_inap_componentInfo,
       { "componentInfo", "inap.componentInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_118", HFILL }},
     { &hf_inap_relayedComponent,
       { "relayedComponent", "inap.relayedComponent",
@@ -9721,7 +9721,7 @@ void proto_register_inap(void) {
         "inap.BasicGapCriteria", HFILL }},
     { &hf_inap_scfID,
       { "scfID", "inap.scfID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ScfID", HFILL }},
     { &hf_inap_counterID,
       { "counterID", "inap.counterID",
@@ -9745,7 +9745,7 @@ void proto_register_inap(void) {
         "inap.GapTreatment", HFILL }},
     { &hf_inap_DestinationRoutingAddress_item,
       { "CalledPartyNumber", "inap.CalledPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_serviceAddressInformation,
       { "serviceAddressInformation", "inap.serviceAddressInformation",
@@ -9757,11 +9757,11 @@ void proto_register_inap(void) {
         "inap.BearerCapability", HFILL }},
     { &hf_inap_calledPartyNumber,
       { "calledPartyNumber", "inap.calledPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_callingPartyNumber,
       { "callingPartyNumber", "inap.callingPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingPartyNumber", HFILL }},
     { &hf_inap_callingPartysCategory,
       { "callingPartysCategory", "inap.callingPartysCategory",
@@ -9769,15 +9769,15 @@ void proto_register_inap(void) {
         "inap.CallingPartysCategory", HFILL }},
     { &hf_inap_iPSSPCapabilities,
       { "iPSSPCapabilities", "inap.iPSSPCapabilities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.IPSSPCapabilities", HFILL }},
     { &hf_inap_iPAvailable,
       { "iPAvailable", "inap.iPAvailable",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.IPAvailable", HFILL }},
     { &hf_inap_iSDNAccessRelatedInformation,
       { "iSDNAccessRelatedInformation", "inap.iSDNAccessRelatedInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ISDNAccessRelatedInformation", HFILL }},
     { &hf_inap_cGEncountered,
       { "cGEncountered", "inap.cGEncountered",
@@ -9785,7 +9785,7 @@ void proto_register_inap(void) {
         "inap.CGEncountered", HFILL }},
     { &hf_inap_serviceProfileIdentifier,
       { "serviceProfileIdentifier", "inap.serviceProfileIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ServiceProfileIdentifier", HFILL }},
     { &hf_inap_terminalType,
       { "terminalType", "inap.terminalType",
@@ -9797,15 +9797,15 @@ void proto_register_inap(void) {
         "inap.Extensions", HFILL }},
     { &hf_inap_chargeNumber,
       { "chargeNumber", "inap.chargeNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ChargeNumber", HFILL }},
     { &hf_inap_servingAreaID,
       { "servingAreaID", "inap.servingAreaID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ServingAreaID", HFILL }},
     { &hf_inap_serviceInteractionIndicators,
       { "serviceInteractionIndicators", "inap.serviceInteractionIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ServiceInteractionIndicators", HFILL }},
     { &hf_inap_iNServiceCompatibilityIndication,
       { "iNServiceCompatibilityIndication", "inap.iNServiceCompatibilityIndication",
@@ -9821,11 +9821,11 @@ void proto_register_inap(void) {
         "inap.USIServiceIndicator", HFILL }},
     { &hf_inap_uSIInformation,
       { "uSIInformation", "inap.uSIInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.USIInformation", HFILL }},
     { &hf_inap_forwardGVNS,
       { "forwardGVNS", "inap.forwardGVNS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ForwardGVNS", HFILL }},
     { &hf_inap_createdCallSegmentAssociation,
       { "createdCallSegmentAssociation", "inap.createdCallSegmentAssociation",
@@ -9873,7 +9873,7 @@ void proto_register_inap(void) {
         "inap.T_collectedInfoSpecificInfo", HFILL }},
     { &hf_inap_calledPartynumber,
       { "calledPartynumber", "inap.calledPartynumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_analysedInfoSpecificInfo,
       { "analysedInfoSpecificInfo", "inap.analysedInfoSpecificInfo",
@@ -9885,7 +9885,7 @@ void proto_register_inap(void) {
         "inap.T_routeSelectFailureSpecificInfo", HFILL }},
     { &hf_inap_failureCause,
       { "failureCause", "inap.failureCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oCalledPartyBusySpecificInfo,
       { "oCalledPartyBusySpecificInfo", "inap.oCalledPartyBusySpecificInfo",
@@ -9893,7 +9893,7 @@ void proto_register_inap(void) {
         "inap.T_oCalledPartyBusySpecificInfo", HFILL }},
     { &hf_inap_busyCause,
       { "busyCause", "inap.busyCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oNoAnswerSpecificInfo,
       { "oNoAnswerSpecificInfo", "inap.oNoAnswerSpecificInfo",
@@ -9901,7 +9901,7 @@ void proto_register_inap(void) {
         "inap.T_oNoAnswerSpecificInfo", HFILL }},
     { &hf_inap_cause,
       { "cause", "inap.cause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oAnswerSpecificInfo,
       { "oAnswerSpecificInfo", "inap.oAnswerSpecificInfo",
@@ -9909,7 +9909,7 @@ void proto_register_inap(void) {
         "inap.T_oAnswerSpecificInfo", HFILL }},
     { &hf_inap_backwardGVNS,
       { "backwardGVNS", "inap.backwardGVNS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.BackwardGVNS", HFILL }},
     { &hf_inap_oMidCallSpecificInfo,
       { "oMidCallSpecificInfo", "inap.oMidCallSpecificInfo",
@@ -9929,7 +9929,7 @@ void proto_register_inap(void) {
         "inap.T_oDisconnectSpecificInfo", HFILL }},
     { &hf_inap_releaseCause,
       { "releaseCause", "inap.releaseCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_tBusySpecificInfo,
       { "tBusySpecificInfo", "inap.tBusySpecificInfo",
@@ -9993,7 +9993,7 @@ void proto_register_inap(void) {
         "inap.T_oAbandon", HFILL }},
     { &hf_inap_abandonCause,
       { "abandonCause", "inap.abandonCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_tAbandon,
       { "tAbandon", "inap.tAbandon",
@@ -10005,7 +10005,7 @@ void proto_register_inap(void) {
         "inap.T_authorizeRouteFailure", HFILL }},
     { &hf_inap_authoriseRouteFailureCause,
       { "authoriseRouteFailureCause", "inap.authoriseRouteFailureCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_terminationAttemptAuthorized,
       { "terminationAttemptAuthorized", "inap.terminationAttemptAuthorized",
@@ -10017,7 +10017,7 @@ void proto_register_inap(void) {
         "inap.T_originationAttemptDenied", HFILL }},
     { &hf_inap_originationDeniedCause,
       { "originationDeniedCause", "inap.originationDeniedCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_terminationAttemptDenied,
       { "terminationAttemptDenied", "inap.terminationAttemptDenied",
@@ -10025,7 +10025,7 @@ void proto_register_inap(void) {
         "inap.T_terminationAttemptDenied", HFILL }},
     { &hf_inap_terminationDeniedCause,
       { "terminationDeniedCause", "inap.terminationDeniedCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oModifyRequestSpecificInfo,
       { "oModifyRequestSpecificInfo", "inap.oModifyRequestSpecificInfo",
@@ -10057,15 +10057,15 @@ void proto_register_inap(void) {
         "inap.INTEGER", HFILL }},
     { &hf_inap_huntGroup,
       { "huntGroup", "inap.huntGroup",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING", HFILL }},
     { &hf_inap_routeIndex,
       { "routeIndex", "inap.routeIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING", HFILL }},
     { &hf_inap_sFBillingChargingCharacteristics,
       { "sFBillingChargingCharacteristics", "inap.sFBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.SFBillingChargingCharacteristics", HFILL }},
     { &hf_inap_informationToSend,
       { "informationToSend", "inap.informationToSend",
@@ -10085,11 +10085,11 @@ void proto_register_inap(void) {
         "inap.Integer4", HFILL }},
     { &hf_inap_dialledNumber,
       { "dialledNumber", "inap.dialledNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_callingLineID,
       { "callingLineID", "inap.callingLineID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_addressAndService,
       { "addressAndService", "inap.addressAndService",
@@ -10101,19 +10101,19 @@ void proto_register_inap(void) {
         "inap.Duration", HFILL }},
     { &hf_inap_stopTime,
       { "stopTime", "inap.stopTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DateAndTime", HFILL }},
     { &hf_inap_callDiversionTreatmentIndicator,
       { "callDiversionTreatmentIndicator", "inap.callDiversionTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_callOfferingTreatmentIndicator,
       { "callOfferingTreatmentIndicator", "inap.callOfferingTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_callWaitingTreatmentIndicator,
       { "callWaitingTreatmentIndicator", "inap.callWaitingTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_compoundCapCriteria,
       { "compoundCapCriteria", "inap.compoundCapCriteria",
@@ -10133,7 +10133,7 @@ void proto_register_inap(void) {
         "inap.T_both", HFILL }},
     { &hf_inap_GenericNumbers_item,
       { "GenericNumber", "inap.GenericNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericNumber", HFILL }},
     { &hf_inap_actionOnProfile,
       { "actionOnProfile", "inap.actionOnProfile",
@@ -10169,11 +10169,11 @@ void proto_register_inap(void) {
         "inap.AlternativeIdentities", HFILL }},
     { &hf_inap_sendingSideID,
       { "sendingSideID", "inap.sendingSideID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.LegType", HFILL }},
     { &hf_inap_receivingSideID,
       { "receivingSideID", "inap.receivingSideID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.LegType", HFILL }},
     { &hf_inap_MidCallControlInfo_item,
       { "MidCallControlInfo item", "inap.MidCallControlInfo_item",
@@ -10189,15 +10189,15 @@ void proto_register_inap(void) {
         "inap.T_midCallReportType", HFILL }},
     { &hf_inap_iNServiceControlCode,
       { "iNServiceControlCode", "inap.iNServiceControlCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_iNServiceControlCodeLow,
       { "iNServiceControlCodeLow", "inap.iNServiceControlCodeLow",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_iNServiceControlCodeHigh,
       { "iNServiceControlCodeHigh", "inap.iNServiceControlCodeHigh",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_messageType,
       { "messageType", "inap.messageType",
@@ -10217,7 +10217,7 @@ void proto_register_inap(void) {
         "inap.Interval", HFILL }},
     { &hf_inap_access,
       { "access", "inap.access",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_group,
       { "group", "inap.group",
@@ -10245,7 +10245,7 @@ void proto_register_inap(void) {
         "inap.INTEGER_0_255", HFILL }},
     { &hf_inap_callStopTimeValue,
       { "callStopTimeValue", "inap.callStopTimeValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DateAndTime", HFILL }},
     { &hf_inap_callConnectedElapsedTimeValue,
       { "callConnectedElapsedTimeValue", "inap.callConnectedElapsedTimeValue",
@@ -10253,7 +10253,7 @@ void proto_register_inap(void) {
         "inap.Integer4", HFILL }},
     { &hf_inap_releaseCauseValue,
       { "releaseCauseValue", "inap.releaseCauseValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_uSImonitorMode,
       { "uSImonitorMode", "inap.uSImonitorMode",
@@ -10265,7 +10265,7 @@ void proto_register_inap(void) {
         "inap.RequestedUTSI", HFILL }},
     { &hf_inap_lineID,
       { "lineID", "inap.lineID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_facilityGroupID,
       { "facilityGroupID", "inap.facilityGroupID",
@@ -10281,11 +10281,11 @@ void proto_register_inap(void) {
         "inap.RouteCountersAndValue", HFILL }},
     { &hf_inap_route,
       { "route", "inap.route",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Route", HFILL }},
     { &hf_inap_RouteList_item,
       { "Route", "inap.Route",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Route", HFILL }},
     { &hf_inap_miscCallInfo,
       { "miscCallInfo", "inap.miscCallInfo",
@@ -10317,31 +10317,31 @@ void proto_register_inap(void) {
         "inap.ConnectedNumberTreatmentInd", HFILL }},
     { &hf_inap_suppressCallDiversionNotification,
       { "suppressCallDiversionNotification", "inap.suppressCallDiversionNotification",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_suppressCallTransferNotification,
       { "suppressCallTransferNotification", "inap.suppressCallTransferNotification",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_allowCdINNoPresentationInd,
       { "allowCdINNoPresentationInd", "inap.allowCdINNoPresentationInd",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_userDialogueDurationInd,
       { "userDialogueDurationInd", "inap.userDialogueDurationInd",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_overrideLineRestrictions,
       { "overrideLineRestrictions", "inap.overrideLineRestrictions",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_suppressVPNAPP,
       { "suppressVPNAPP", "inap.suppressVPNAPP",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_calledINNumberOverriding,
       { "calledINNumberOverriding", "inap.calledINNumberOverriding",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_redirectServiceTreatmentInd,
       { "redirectServiceTreatmentInd", "inap.redirectServiceTreatmentInd",
@@ -10349,7 +10349,7 @@ void proto_register_inap(void) {
         "inap.T_redirectServiceTreatmentInd", HFILL }},
     { &hf_inap_redirectReason,
       { "redirectReason", "inap.redirectReason",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RedirectReason", HFILL }},
     { &hf_inap_nonCUGCall,
       { "nonCUGCall", "inap.nonCUGCall",
@@ -10409,7 +10409,7 @@ void proto_register_inap(void) {
         "inap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_inap_local,
       { "local", "inap.local",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_minUSIServiceIndicatorLength_maxUSIServiceIndicatorLength", HFILL }},
     { &hf_inap_filteredCallTreatment,
       { "filteredCallTreatment", "inap.filteredCallTreatment",
@@ -10429,7 +10429,7 @@ void proto_register_inap(void) {
         "inap.FilteringCriteria", HFILL }},
     { &hf_inap_startTime,
       { "startTime", "inap.startTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DateAndTime", HFILL }},
     { &hf_inap_dpSpecificCommonParameters,
       { "dpSpecificCommonParameters", "inap.dpSpecificCommonParameters",
@@ -10437,15 +10437,15 @@ void proto_register_inap(void) {
         "inap.DpSpecificCommonParameters", HFILL }},
     { &hf_inap_dialledDigits,
       { "dialledDigits", "inap.dialledDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_callingPartyBusinessGroupID,
       { "callingPartyBusinessGroupID", "inap.callingPartyBusinessGroupID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingPartyBusinessGroupID", HFILL }},
     { &hf_inap_callingPartySubaddress,
       { "callingPartySubaddress", "inap.callingPartySubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingPartySubaddress", HFILL }},
     { &hf_inap_callingFacilityGroup,
       { "callingFacilityGroup", "inap.callingFacilityGroup",
@@ -10457,19 +10457,19 @@ void proto_register_inap(void) {
         "inap.FacilityGroupMember", HFILL }},
     { &hf_inap_originalCalledPartyID,
       { "originalCalledPartyID", "inap.originalCalledPartyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OriginalCalledPartyID", HFILL }},
     { &hf_inap_prefix,
       { "prefix", "inap.prefix",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_redirectingPartyID,
       { "redirectingPartyID", "inap.redirectingPartyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RedirectingPartyID", HFILL }},
     { &hf_inap_redirectionInformation,
       { "redirectionInformation", "inap.redirectionInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RedirectionInformation", HFILL }},
     { &hf_inap_routeList,
       { "routeList", "inap.routeList",
@@ -10477,19 +10477,19 @@ void proto_register_inap(void) {
         "inap.RouteList", HFILL }},
     { &hf_inap_travellingClassMark,
       { "travellingClassMark", "inap.travellingClassMark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.TravellingClassMark", HFILL }},
     { &hf_inap_featureCode,
       { "featureCode", "inap.featureCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.FeatureCode", HFILL }},
     { &hf_inap_accessCode,
       { "accessCode", "inap.accessCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AccessCode", HFILL }},
     { &hf_inap_carrier,
       { "carrier", "inap.carrier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Carrier", HFILL }},
     { &hf_inap_componentType,
       { "componentType", "inap.componentType",
@@ -10509,7 +10509,7 @@ void proto_register_inap(void) {
         "inap.DestinationRoutingAddress", HFILL }},
     { &hf_inap_alertingPattern,
       { "alertingPattern", "inap.alertingPattern",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AlertingPattern", HFILL }},
     { &hf_inap_iNServiceCompatibilityResponse,
       { "iNServiceCompatibilityResponse", "inap.iNServiceCompatibilityResponse",
@@ -10517,7 +10517,7 @@ void proto_register_inap(void) {
         "inap.INServiceCompatibilityResponse", HFILL }},
     { &hf_inap_correlationID,
       { "correlationID", "inap.correlationID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CorrelationID", HFILL }},
     { &hf_inap_callSegmentID,
       { "callSegmentID", "inap.callSegmentID",
@@ -10529,7 +10529,7 @@ void proto_register_inap(void) {
         "inap.LegID", HFILL }},
     { &hf_inap_aChBillingChargingCharacteristics,
       { "aChBillingChargingCharacteristics", "inap.aChBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AChBillingChargingCharacteristics", HFILL }},
     { &hf_inap_partyToCharge,
       { "partyToCharge", "inap.partyToCharge",
@@ -10537,11 +10537,11 @@ void proto_register_inap(void) {
         "inap.LegID", HFILL }},
     { &hf_inap_releaseIndication,
       { "releaseIndication", "inap.releaseIndication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_destinationNumberRoutingAddress,
       { "destinationNumberRoutingAddress", "inap.destinationNumberRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_displayInformation,
       { "displayInformation", "inap.displayInformation",
@@ -10549,7 +10549,7 @@ void proto_register_inap(void) {
         "inap.DisplayInformation", HFILL }},
     { &hf_inap_destinationIndex,
       { "destinationIndex", "inap.destinationIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DestinationIndex", HFILL }},
     { &hf_inap_gapIndicators,
       { "gapIndicators", "inap.gapIndicators",
@@ -10557,7 +10557,7 @@ void proto_register_inap(void) {
         "inap.GapIndicators", HFILL }},
     { &hf_inap_registratorIdentifier,
       { "registratorIdentifier", "inap.registratorIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RegistratorIdentifier", HFILL }},
     { &hf_inap_gapCriteria,
       { "gapCriteria", "inap.gapCriteria",
@@ -10577,7 +10577,7 @@ void proto_register_inap(void) {
         "inap.RequestedInformationList", HFILL }},
     { &hf_inap_lastEventIndicator,
       { "lastEventIndicator", "inap.lastEventIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_requestedInformationTypeList,
       { "requestedInformationTypeList", "inap.requestedInformationTypeList",
@@ -10605,7 +10605,7 @@ void proto_register_inap(void) {
         "inap.ResourceID", HFILL }},
     { &hf_inap_numberingPlan,
       { "numberingPlan", "inap.numberingPlan",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.NumberingPlan", HFILL }},
     { &hf_inap_cutAndPaste,
       { "cutAndPaste", "inap.cutAndPaste",
@@ -10617,7 +10617,7 @@ void proto_register_inap(void) {
         "inap.ForwardingCondition", HFILL }},
     { &hf_inap_forwardCallIndicators,
       { "forwardCallIndicators", "inap.forwardCallIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ForwardCallIndicators", HFILL }},
     { &hf_inap_genericNumbers,
       { "genericNumbers", "inap.genericNumbers",
@@ -10625,27 +10625,27 @@ void proto_register_inap(void) {
         "inap.GenericNumbers", HFILL }},
     { &hf_inap_sDSSinformation,
       { "sDSSinformation", "inap.sDSSinformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.SDSSinformation", HFILL }},
     { &hf_inap_calledDirectoryNumber,
       { "calledDirectoryNumber", "inap.calledDirectoryNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledDirectoryNumber", HFILL }},
     { &hf_inap_calledPartySubaddress,
       { "calledPartySubaddress", "inap.calledPartySubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartySubaddress", HFILL }},
     { &hf_inap_connectionIdentifier,
       { "connectionIdentifier", "inap.connectionIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ConnectionIdentifier", HFILL }},
     { &hf_inap_genericIdentifier,
       { "genericIdentifier", "inap.genericIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericIdentifier", HFILL }},
     { &hf_inap_qOSParameter,
       { "qOSParameter", "inap.qOSParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.QoSParameter", HFILL }},
     { &hf_inap_bISDNParameters,
       { "bISDNParameters", "inap.bISDNParameters",
@@ -10653,7 +10653,7 @@ void proto_register_inap(void) {
         "inap.BISDNParameters", HFILL }},
     { &hf_inap_cug_Interlock,
       { "cug-Interlock", "inap.cug_Interlock",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CUG_Interlock", HFILL }},
     { &hf_inap_cug_OutgoingAccess,
       { "cug-OutgoingAccess", "inap.cug_OutgoingAccess",
@@ -10665,7 +10665,7 @@ void proto_register_inap(void) {
         "inap.T_resourceAddress", HFILL }},
     { &hf_inap_ipRoutingAddress,
       { "ipRoutingAddress", "inap.ipRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.IPRoutingAddress", HFILL }},
     { &hf_inap_ipAddressAndLegID,
       { "ipAddressAndLegID", "inap.ipAddressAndLegID",
@@ -10689,7 +10689,7 @@ void proto_register_inap(void) {
         "inap.CallSegmentID", HFILL }},
     { &hf_inap_genericName,
       { "genericName", "inap.genericName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericName", HFILL }},
     { &hf_inap_ipRelationInformation,
       { "ipRelationInformation", "inap.ipRelationInformation",
@@ -10733,7 +10733,7 @@ void proto_register_inap(void) {
         "inap.T_cSFailure", HFILL }},
     { &hf_inap_reason,
       { "reason", "inap.reason",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Reason", HFILL }},
     { &hf_inap_bCSMFailure,
       { "bCSMFailure", "inap.bCSMFailure",
@@ -10741,7 +10741,7 @@ void proto_register_inap(void) {
         "inap.T_bCSMFailure", HFILL }},
     { &hf_inap_assistingSSPIPRoutingAddress,
       { "assistingSSPIPRoutingAddress", "inap.assistingSSPIPRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AssistingSSPIPRoutingAddress", HFILL }},
     { &hf_inap_partyToConnect,
       { "partyToConnect", "inap.partyToConnect",
@@ -10749,11 +10749,11 @@ void proto_register_inap(void) {
         "inap.T_partyToConnect", HFILL }},
     { &hf_inap_eventSpecificInformationCharging,
       { "eventSpecificInformationCharging", "inap.eventSpecificInformationCharging",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.EventSpecificInformationCharging", HFILL }},
     { &hf_inap_bcsmEventCorrelationID,
       { "bcsmEventCorrelationID", "inap.bcsmEventCorrelationID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CorrelationID", HFILL }},
     { &hf_inap_eventSpecificInformationBCSM,
       { "eventSpecificInformationBCSM", "inap.eventSpecificInformationBCSM",
@@ -10761,11 +10761,11 @@ void proto_register_inap(void) {
         "inap.EventSpecificInformationBCSM", HFILL }},
     { &hf_inap_calledPartyBusinessGroupID,
       { "calledPartyBusinessGroupID", "inap.calledPartyBusinessGroupID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyBusinessGroupID", HFILL }},
     { &hf_inap_holdcause,
       { "holdcause", "inap.holdcause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.HoldCause", HFILL }},
     { &hf_inap_empty,
       { "empty", "inap.empty",
@@ -10773,39 +10773,39 @@ void proto_register_inap(void) {
         "inap.NULL", HFILL }},
     { &hf_inap_highLayerCompatibility,
       { "highLayerCompatibility", "inap.highLayerCompatibility",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.HighLayerCompatibility", HFILL }},
     { &hf_inap_additionalCallingPartyNumber,
       { "additionalCallingPartyNumber", "inap.additionalCallingPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AdditionalCallingPartyNumber", HFILL }},
     { &hf_inap_cCSS,
       { "cCSS", "inap.cCSS",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.CCSS", HFILL }},
     { &hf_inap_vPNIndicator,
       { "vPNIndicator", "inap.vPNIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.VPNIndicator", HFILL }},
     { &hf_inap_cNInfo,
       { "cNInfo", "inap.cNInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CNInfo", HFILL }},
     { &hf_inap_callReference,
       { "callReference", "inap.callReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallReference", HFILL }},
     { &hf_inap_routeingNumber,
       { "routeingNumber", "inap.routeingNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RouteingNumber", HFILL }},
     { &hf_inap_callingGeodeticLocation,
       { "callingGeodeticLocation", "inap.callingGeodeticLocation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingGeodeticLocation", HFILL }},
     { &hf_inap_globalCallReference,
       { "globalCallReference", "inap.globalCallReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GlobalCallReference", HFILL }},
     { &hf_inap_cug_Index,
       { "cug-Index", "inap.cug_Index",
@@ -10817,7 +10817,7 @@ void proto_register_inap(void) {
         "inap.CallSegmentID", HFILL }},
     { &hf_inap_incomingSignallingBufferCopy,
       { "incomingSignallingBufferCopy", "inap.incomingSignallingBufferCopy",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_actionIndicator,
       { "actionIndicator", "inap.actionIndicator",
@@ -10921,7 +10921,7 @@ void proto_register_inap(void) {
         "inap.ApplicationTimer", HFILL }},
     { &hf_inap_initialCallSegment,
       { "initialCallSegment", "inap.initialCallSegment",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_callSegmentToRelease,
       { "callSegmentToRelease", "inap.callSegmentToRelease",
@@ -10933,7 +10933,7 @@ void proto_register_inap(void) {
         "inap.INTEGER_1_numOfCSs", HFILL }},
     { &hf_inap_forcedRelease,
       { "forcedRelease", "inap.forcedRelease",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_allCallSegments,
       { "allCallSegments", "inap.allCallSegments",
@@ -10993,11 +10993,11 @@ void proto_register_inap(void) {
         "inap.FacilityGroupMember", HFILL }},
     { &hf_inap_sCIBillingChargingCharacteristics,
       { "sCIBillingChargingCharacteristics", "inap.sCIBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.SCIBillingChargingCharacteristics", HFILL }},
     { &hf_inap_nocharge,
       { "nocharge", "inap.nocharge",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_callProcessingOperation,
       { "callProcessingOperation", "inap.callProcessingOperation",
@@ -11041,15 +11041,15 @@ void proto_register_inap(void) {
         "inap.INTEGER_1_127", HFILL }},
     { &hf_inap_endOfReplyDigit,
       { "endOfReplyDigit", "inap.endOfReplyDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_cancelDigit,
       { "cancelDigit", "inap.cancelDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_startDigit,
       { "startDigit", "inap.startDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_firstDigitTimeOut,
       { "firstDigitTimeOut", "inap.firstDigitTimeOut",
@@ -11065,19 +11065,19 @@ void proto_register_inap(void) {
         "inap.ErrorTreatment", HFILL }},
     { &hf_inap_interruptableAnnInd,
       { "interruptableAnnInd", "inap.interruptableAnnInd",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_voiceInformation,
       { "voiceInformation", "inap.voiceInformation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_voiceBack,
       { "voiceBack", "inap.voiceBack",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_detectModem,
       { "detectModem", "inap.detectModem",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_collectedDigits,
       { "collectedDigits", "inap.collectedDigits",
@@ -11085,7 +11085,7 @@ void proto_register_inap(void) {
         "inap.CollectedDigits", HFILL }},
     { &hf_inap_iA5Information,
       { "iA5Information", "inap.iA5Information",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_messageID,
       { "messageID", "inap.messageID",
@@ -11125,23 +11125,23 @@ void proto_register_inap(void) {
         "inap.T_controlDigits", HFILL }},
     { &hf_inap_endOfRecordingDigit,
       { "endOfRecordingDigit", "inap.endOfRecordingDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_replayDigit,
       { "replayDigit", "inap.replayDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_restartRecordingDigit,
       { "restartRecordingDigit", "inap.restartRecordingDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_restartAllowed,
       { "restartAllowed", "inap.restartAllowed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_replayAllowed,
       { "replayAllowed", "inap.replayAllowed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_inbandInfo,
       { "inbandInfo", "inap.inbandInfo",
@@ -11165,7 +11165,7 @@ void proto_register_inap(void) {
         "inap.IA5String_SIZE_b3__minMessageContentLength_b3__maxMessageContentLength", HFILL }},
     { &hf_inap_attributes,
       { "attributes", "inap.attributes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_b3__minAttributesLength_b3__maxAttributesLength", HFILL }},
     { &hf_inap_elementaryMessageIDs,
       { "elementaryMessageIDs", "inap.elementaryMessageIDs",
@@ -11189,7 +11189,7 @@ void proto_register_inap(void) {
         "inap.VariablePart", HFILL }},
     { &hf_inap_iPAddressValue,
       { "iPAddressValue", "inap.iPAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_gapOnResource,
       { "gapOnResource", "inap.gapOnResource",
@@ -11213,27 +11213,27 @@ void proto_register_inap(void) {
         "inap.Integer4", HFILL }},
     { &hf_inap_number,
       { "number", "inap.number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_time,
       { "time", "inap.time",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_inap_date,
       { "date", "inap.date",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_inap_price,
       { "price", "inap.price",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_inap_disconnectFromIPForbidden,
       { "disconnectFromIPForbidden", "inap.disconnectFromIPForbidden",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_requestAnnouncementComplete,
       { "requestAnnouncementComplete", "inap.requestAnnouncementComplete",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_connectedParty,
       { "connectedParty", "inap.connectedParty",
@@ -11245,7 +11245,7 @@ void proto_register_inap(void) {
         "inap.CollectedInfo", HFILL }},
     { &hf_inap_digitsResponse,
       { "digitsResponse", "inap.digitsResponse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_iA5Response,
       { "iA5Response", "inap.iA5Response",
@@ -11253,15 +11253,15 @@ void proto_register_inap(void) {
         "inap.IA5String", HFILL }},
     { &hf_inap_modemdetected,
       { "modemdetected", "inap.modemdetected",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_subscriberID,
       { "subscriberID", "inap.subscriberID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericNumber", HFILL }},
     { &hf_inap_mailBoxID,
       { "mailBoxID", "inap.mailBoxID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.MailBoxID", HFILL }},
     { &hf_inap_informationToRecord,
       { "informationToRecord", "inap.informationToRecord",