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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 68 insertions, 68 deletions

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 6913979598..a316b7f2cb 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -7074,11 +7074,11 @@ void proto_register_s1ap(void) {
   static hf_register_info hf[] = {
     { &hf_s1ap_transportLayerAddressIPv4,
       { "transportLayerAddress(IPv4)", "s1ap.transportLayerAddressIPv4",
-        FT_IPv4, BASE_DEC, NULL, 0,
+        FT_IPv4, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_transportLayerAddressIPv6,
       { "transportLayerAddress(IPv6)", "s1ap.transportLayerAddressIPv6",
-        FT_IPv4, BASE_HEX, NULL, 0,
+        FT_IPv4, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 
@@ -7098,7 +7098,7 @@ void proto_register_s1ap(void) {
         "s1ap.Cause", HFILL }},
     { &hf_s1ap_Cdma2000PDU_PDU,
       { "Cdma2000PDU", "s1ap.Cdma2000PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000PDU", HFILL }},
     { &hf_s1ap_Cdma2000RATType_PDU,
       { "Cdma2000RATType", "s1ap.Cdma2000RATType",
@@ -7106,7 +7106,7 @@ void proto_register_s1ap(void) {
         "s1ap.Cdma2000RATType", HFILL }},
     { &hf_s1ap_Cdma2000SectorID_PDU,
       { "Cdma2000SectorID", "s1ap.Cdma2000SectorID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000SectorID", HFILL }},
     { &hf_s1ap_Cdma2000HOStatus_PDU,
       { "Cdma2000HOStatus", "s1ap.Cdma2000HOStatus",
@@ -7122,7 +7122,7 @@ void proto_register_s1ap(void) {
         "s1ap.Cdma2000OneXSRVCCInfo", HFILL }},
     { &hf_s1ap_Cdma2000OneXRAND_PDU,
       { "Cdma2000OneXRAND", "s1ap.Cdma2000OneXRAND",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXRAND", HFILL }},
     { &hf_s1ap_CNDomain_PDU,
       { "CNDomain", "s1ap.CNDomain",
@@ -7134,7 +7134,7 @@ void proto_register_s1ap(void) {
         "s1ap.CSFallbackIndicator", HFILL }},
     { &hf_s1ap_CSG_Id_PDU,
       { "CSG-Id", "s1ap.CSG_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CSG_Id", HFILL }},
     { &hf_s1ap_CSG_IdList_PDU,
       { "CSG-IdList", "s1ap.CSG_IdList",
@@ -7146,7 +7146,7 @@ void proto_register_s1ap(void) {
         "s1ap.CriticalityDiagnostics", HFILL }},
     { &hf_s1ap_DataCodingScheme_PDU,
       { "DataCodingScheme", "s1ap.DataCodingScheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.DataCodingScheme", HFILL }},
     { &hf_s1ap_Direct_Forwarding_Path_Availability_PDU,
       { "Direct-Forwarding-Path-Availability", "s1ap.Direct_Forwarding_Path_Availability",
@@ -7198,7 +7198,7 @@ void proto_register_s1ap(void) {
         "s1ap.HandoverType", HFILL }},
     { &hf_s1ap_MessageIdentifier_PDU,
       { "MessageIdentifier", "s1ap.MessageIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MessageIdentifier", HFILL }},
     { &hf_s1ap_MMEname_PDU,
       { "MMEname", "s1ap.MMEname",
@@ -7210,23 +7210,23 @@ void proto_register_s1ap(void) {
         "s1ap.MME_UE_S1AP_ID", HFILL }},
     { &hf_s1ap_MSClassmark2_PDU,
       { "MSClassmark2", "s1ap.MSClassmark2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MSClassmark2", HFILL }},
     { &hf_s1ap_MSClassmark3_PDU,
       { "MSClassmark3", "s1ap.MSClassmark3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MSClassmark3", HFILL }},
     { &hf_s1ap_NAS_PDU_PDU,
       { "NAS-PDU", "s1ap.NAS_PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NAS_PDU", HFILL }},
     { &hf_s1ap_NASSecurityParametersfromE_UTRAN_PDU,
       { "NASSecurityParametersfromE-UTRAN", "s1ap.NASSecurityParametersfromE_UTRAN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NASSecurityParametersfromE_UTRAN", HFILL }},
     { &hf_s1ap_NASSecurityParameterstoE_UTRAN_PDU,
       { "NASSecurityParameterstoE-UTRAN", "s1ap.NASSecurityParameterstoE_UTRAN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NASSecurityParameterstoE_UTRAN", HFILL }},
     { &hf_s1ap_NumberofBroadcastRequest_PDU,
       { "NumberofBroadcastRequest", "s1ap.NumberofBroadcastRequest",
@@ -7258,7 +7258,7 @@ void proto_register_s1ap(void) {
         "s1ap.RRC_Establishment_Cause", HFILL }},
     { &hf_s1ap_SecurityKey_PDU,
       { "SecurityKey", "s1ap.SecurityKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.SecurityKey", HFILL }},
     { &hf_s1ap_SecurityContext_PDU,
       { "SecurityContext", "s1ap.SecurityContext",
@@ -7266,7 +7266,7 @@ void proto_register_s1ap(void) {
         "s1ap.SecurityContext", HFILL }},
     { &hf_s1ap_SerialNumber_PDU,
       { "SerialNumber", "s1ap.SerialNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.SerialNumber", HFILL }},
     { &hf_s1ap_SONConfigurationTransfer_PDU,
       { "SONConfigurationTransfer", "s1ap.SONConfigurationTransfer",
@@ -7274,7 +7274,7 @@ void proto_register_s1ap(void) {
         "s1ap.SONConfigurationTransfer", HFILL }},
     { &hf_s1ap_Source_ToTarget_TransparentContainer_PDU,
       { "Source-ToTarget-TransparentContainer", "s1ap.Source_ToTarget_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Source_ToTarget_TransparentContainer", HFILL }},
     { &hf_s1ap_SRVCCOperationPossible_PDU,
       { "SRVCCOperationPossible", "s1ap.SRVCCOperationPossible",
@@ -7314,7 +7314,7 @@ void proto_register_s1ap(void) {
         "s1ap.TargetID", HFILL }},
     { &hf_s1ap_Target_ToSource_TransparentContainer_PDU,
       { "Target-ToSource-TransparentContainer", "s1ap.Target_ToSource_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Target_ToSource_TransparentContainer", HFILL }},
     { &hf_s1ap_TimeToWait_PDU,
       { "TimeToWait", "s1ap.TimeToWait",
@@ -7322,7 +7322,7 @@ void proto_register_s1ap(void) {
         "s1ap.TimeToWait", HFILL }},
     { &hf_s1ap_TransportLayerAddress_PDU,
       { "TransportLayerAddress", "s1ap.TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_TraceActivation_PDU,
       { "TraceActivation", "s1ap.TraceActivation",
@@ -7342,7 +7342,7 @@ void proto_register_s1ap(void) {
         "s1ap.UE_associatedLogicalS1_ConnectionItem", HFILL }},
     { &hf_s1ap_UEIdentityIndexValue_PDU,
       { "UEIdentityIndexValue", "s1ap.UEIdentityIndexValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.UEIdentityIndexValue", HFILL }},
     { &hf_s1ap_UEPagingID_PDU,
       { "UEPagingID", "s1ap.UEPagingID",
@@ -7350,7 +7350,7 @@ void proto_register_s1ap(void) {
         "s1ap.UEPagingID", HFILL }},
     { &hf_s1ap_UERadioCapability_PDU,
       { "UERadioCapability", "s1ap.UERadioCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.UERadioCapability", HFILL }},
     { &hf_s1ap_UESecurityCapabilities_PDU,
       { "UESecurityCapabilities", "s1ap.UESecurityCapabilities",
@@ -7362,15 +7362,15 @@ void proto_register_s1ap(void) {
         "s1ap.WarningAreaList", HFILL }},
     { &hf_s1ap_WarningType_PDU,
       { "WarningType", "s1ap.WarningType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.WarningType", HFILL }},
     { &hf_s1ap_WarningSecurityInfo_PDU,
       { "WarningSecurityInfo", "s1ap.WarningSecurityInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.WarningSecurityInfo", HFILL }},
     { &hf_s1ap_WarningMessageContents_PDU,
       { "WarningMessageContents", "s1ap.WarningMessageContents",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.WarningMessageContents", HFILL }},
     { &hf_s1ap_HandoverRequired_PDU,
       { "HandoverRequired", "s1ap.HandoverRequired",
@@ -7850,11 +7850,11 @@ void proto_register_s1ap(void) {
         "s1ap.COUNTvalue", HFILL }},
     { &hf_s1ap_receiveStatusofULPDCPSDUs,
       { "receiveStatusofULPDCPSDUs", "s1ap.receiveStatusofULPDCPSDUs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.ReceiveStatusofULPDCPSDUs", HFILL }},
     { &hf_s1ap_BPLMNs_item,
       { "PLMNidentity", "s1ap.PLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_cellID_Broadcast,
       { "cellID-Broadcast", "s1ap.cellID_Broadcast",
@@ -7898,15 +7898,15 @@ void proto_register_s1ap(void) {
         "s1ap.EUTRAN_CGI", HFILL }},
     { &hf_s1ap_cdma2000OneXMEID,
       { "cdma2000OneXMEID", "s1ap.cdma2000OneXMEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXMEID", HFILL }},
     { &hf_s1ap_cdma2000OneXMSI,
       { "cdma2000OneXMSI", "s1ap.cdma2000OneXMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXMSI", HFILL }},
     { &hf_s1ap_cdma2000OneXPilot,
       { "cdma2000OneXPilot", "s1ap.cdma2000OneXPilot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXPilot", HFILL }},
     { &hf_s1ap_cell_Size,
       { "cell-Size", "s1ap.cell_Size",
@@ -7914,19 +7914,19 @@ void proto_register_s1ap(void) {
         "s1ap.Cell_Size", HFILL }},
     { &hf_s1ap_pLMNidentity,
       { "pLMNidentity", "s1ap.pLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_lAC,
       { "lAC", "s1ap.lAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.LAC", HFILL }},
     { &hf_s1ap_cI,
       { "cI", "s1ap.cI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CI", HFILL }},
     { &hf_s1ap_rAC,
       { "rAC", "s1ap.rAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.RAC", HFILL }},
     { &hf_s1ap_CSG_IdList_item,
       { "CSG-IdList-Item", "s1ap.CSG_IdList_Item",
@@ -7934,7 +7934,7 @@ void proto_register_s1ap(void) {
         "s1ap.CSG_IdList_Item", HFILL }},
     { &hf_s1ap_cSG_Id,
       { "cSG-Id", "s1ap.cSG_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CSG_Id", HFILL }},
     { &hf_s1ap_pDCP_SN,
       { "pDCP-SN", "s1ap.pDCP_SN",
@@ -7982,7 +7982,7 @@ void proto_register_s1ap(void) {
         "s1ap.EUTRAN_CGI", HFILL }},
     { &hf_s1ap_EmergencyAreaIDList_item,
       { "EmergencyAreaID", "s1ap.EmergencyAreaID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.EmergencyAreaID", HFILL }},
     { &hf_s1ap_EmergencyAreaID_Broadcast_item,
       { "EmergencyAreaID-Broadcast-Item", "s1ap.EmergencyAreaID_Broadcast_Item",
@@ -7990,7 +7990,7 @@ void proto_register_s1ap(void) {
         "s1ap.EmergencyAreaID_Broadcast_Item", HFILL }},
     { &hf_s1ap_emergencyAreaID,
       { "emergencyAreaID", "s1ap.emergencyAreaID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.EmergencyAreaID", HFILL }},
     { &hf_s1ap_completedCellinEAI,
       { "completedCellinEAI", "s1ap.completedCellinEAI",
@@ -8002,11 +8002,11 @@ void proto_register_s1ap(void) {
         "s1ap.CompletedCellinEAI_Item", HFILL }},
     { &hf_s1ap_macroENB_ID,
       { "macroENB-ID", "s1ap.macroENB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_s1ap_homeENB_ID,
       { "homeENB-ID", "s1ap.homeENB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_s1ap_lAI,
       { "lAI", "s1ap.lAI",
@@ -8022,11 +8022,11 @@ void proto_register_s1ap(void) {
         "s1ap.Bearers_SubjectToStatusTransferList", HFILL }},
     { &hf_s1ap_ENBX2TLAs_item,
       { "TransportLayerAddress", "s1ap.TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_EPLMNs_item,
       { "PLMNidentity", "s1ap.PLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_dL_Forwarding,
       { "dL-Forwarding", "s1ap.dL_Forwarding",
@@ -8054,7 +8054,7 @@ void proto_register_s1ap(void) {
         "s1ap.GBR_QosInformation", HFILL }},
     { &hf_s1ap_cell_ID,
       { "cell-ID", "s1ap.cell_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CellIdentity", HFILL }},
     { &hf_s1ap_ForbiddenTAs_item,
       { "ForbiddenTAs-Item", "s1ap.ForbiddenTAs_Item",
@@ -8062,7 +8062,7 @@ void proto_register_s1ap(void) {
         "s1ap.ForbiddenTAs_Item", HFILL }},
     { &hf_s1ap_pLMN_Identity,
       { "pLMN-Identity", "s1ap.pLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_forbiddenTACs,
       { "forbiddenTACs", "s1ap.forbiddenTACs",
@@ -8070,7 +8070,7 @@ void proto_register_s1ap(void) {
         "s1ap.ForbiddenTACs", HFILL }},
     { &hf_s1ap_ForbiddenTACs_item,
       { "TAC", "s1ap.TAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TAC", HFILL }},
     { &hf_s1ap_ForbiddenLAs_item,
       { "ForbiddenLAs-Item", "s1ap.ForbiddenLAs_Item",
@@ -8082,7 +8082,7 @@ void proto_register_s1ap(void) {
         "s1ap.ForbiddenLACs", HFILL }},
     { &hf_s1ap_ForbiddenLACs_item,
       { "LAC", "s1ap.LAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.LAC", HFILL }},
     { &hf_s1ap_e_RAB_MaximumBitrateDL,
       { "e-RAB-MaximumBitrateDL", "s1ap.e_RAB_MaximumBitrateDL",
@@ -8102,15 +8102,15 @@ void proto_register_s1ap(void) {
         "s1ap.BitRate", HFILL }},
     { &hf_s1ap_mME_Group_ID,
       { "mME-Group-ID", "s1ap.mME_Group_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Group_ID", HFILL }},
     { &hf_s1ap_mME_Code,
       { "mME-Code", "s1ap.mME_Code",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_servingPLMN,
       { "servingPLMN", "s1ap.servingPLMN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_equivalentPLMNs,
       { "equivalentPLMNs", "s1ap.equivalentPLMNs",
@@ -8134,7 +8134,7 @@ void proto_register_s1ap(void) {
         "s1ap.LastVisitedEUTRANCellInformation", HFILL }},
     { &hf_s1ap_uTRAN_Cell,
       { "uTRAN-Cell", "s1ap.uTRAN_Cell",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.LastVisitedUTRANCellInformation", HFILL }},
     { &hf_s1ap_gERAN_Cell,
       { "gERAN-Cell", "s1ap.gERAN_Cell",
@@ -8170,7 +8170,7 @@ void proto_register_s1ap(void) {
         "s1ap.ReportArea", HFILL }},
     { &hf_s1ap_rIMInformation,
       { "rIMInformation", "s1ap.rIMInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.RIMInformation", HFILL }},
     { &hf_s1ap_rIMRoutingAddress,
       { "rIMRoutingAddress", "s1ap.rIMRoutingAddress",
@@ -8186,7 +8186,7 @@ void proto_register_s1ap(void) {
         "s1ap.INTEGER_0_7", HFILL }},
     { &hf_s1ap_nextHopParameter,
       { "nextHopParameter", "s1ap.nextHopParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.SecurityKey", HFILL }},
     { &hf_s1ap_sONInformationRequest,
       { "sONInformationRequest", "s1ap.sONInformationRequest",
@@ -8238,15 +8238,15 @@ void proto_register_s1ap(void) {
         "s1ap.ServedMMECs", HFILL }},
     { &hf_s1ap_ServedGroupIDs_item,
       { "MME-Group-ID", "s1ap.MME_Group_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Group_ID", HFILL }},
     { &hf_s1ap_ServedMMECs_item,
       { "MME-Code", "s1ap.MME_Code",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_ServedPLMNs_item,
       { "PLMNidentity", "s1ap.PLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_SupportedTAs_item,
       { "SupportedTAs-Item", "s1ap.SupportedTAs_Item",
@@ -8254,7 +8254,7 @@ void proto_register_s1ap(void) {
         "s1ap.SupportedTAs_Item", HFILL }},
     { &hf_s1ap_tAC,
       { "tAC", "s1ap.tAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TAC", HFILL }},
     { &hf_s1ap_broadcastPLMNs,
       { "broadcastPLMNs", "s1ap.broadcastPLMNs",
@@ -8262,11 +8262,11 @@ void proto_register_s1ap(void) {
         "s1ap.BPLMNs", HFILL }},
     { &hf_s1ap_mMEC,
       { "mMEC", "s1ap.mMEC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_m_TMSI,
       { "m-TMSI", "s1ap.m_TMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.M_TMSI", HFILL }},
     { &hf_s1ap_TAIListforWarning_item,
       { "TAI", "s1ap.TAI",
@@ -8306,11 +8306,11 @@ void proto_register_s1ap(void) {
         "s1ap.ExtendedRNC_ID", HFILL }},
     { &hf_s1ap_e_UTRAN_Trace_ID,
       { "e-UTRAN-Trace-ID", "s1ap.e_UTRAN_Trace_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.E_UTRAN_Trace_ID", HFILL }},
     { &hf_s1ap_interfacesToTrace,
       { "interfacesToTrace", "s1ap.interfacesToTrace",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.InterfacesToTrace", HFILL }},
     { &hf_s1ap_traceDepth,
       { "traceDepth", "s1ap.traceDepth",
@@ -8318,7 +8318,7 @@ void proto_register_s1ap(void) {
         "s1ap.TraceDepth", HFILL }},
     { &hf_s1ap_traceCollectionEntityIPAddress,
       { "traceCollectionEntityIPAddress", "s1ap.traceCollectionEntityIPAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_uEaggregateMaximumBitRateDL,
       { "uEaggregateMaximumBitRateDL", "s1ap.uEaggregateMaximumBitRateDL",
@@ -8346,15 +8346,15 @@ void proto_register_s1ap(void) {
         "s1ap.S_TMSI", HFILL }},
     { &hf_s1ap_iMSI,
       { "iMSI", "s1ap.iMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.IMSI", HFILL }},
     { &hf_s1ap_encryptionAlgorithms,
       { "encryptionAlgorithms", "s1ap.encryptionAlgorithms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.EncryptionAlgorithms", HFILL }},
     { &hf_s1ap_integrityProtectionAlgorithms,
       { "integrityProtectionAlgorithms", "s1ap.integrityProtectionAlgorithms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.IntegrityProtectionAlgorithms", HFILL }},
     { &hf_s1ap_cellIDList,
       { "cellIDList", "s1ap.cellIDList",
@@ -8378,27 +8378,27 @@ void proto_register_s1ap(void) {
         "s1ap.ProtocolIE_Container", HFILL }},
     { &hf_s1ap_dL_transportLayerAddress,
       { "dL-transportLayerAddress", "s1ap.dL_transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_dL_gTP_TEID,
       { "dL-gTP-TEID", "s1ap.dL_gTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.GTP_TEID", HFILL }},
     { &hf_s1ap_uL_TransportLayerAddress,
       { "uL-TransportLayerAddress", "s1ap.uL_TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_uL_GTP_TEID,
       { "uL-GTP-TEID", "s1ap.uL_GTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.GTP_TEID", HFILL }},
     { &hf_s1ap_transportLayerAddress,
       { "transportLayerAddress", "s1ap.transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_gTP_TEID,
       { "gTP-TEID", "s1ap.gTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.GTP_TEID", HFILL }},
     { &hf_s1ap_e_RABlevelQosParameters,
       { "e-RABlevelQosParameters", "s1ap.e_RABlevelQosParameters",
@@ -8414,7 +8414,7 @@ void proto_register_s1ap(void) {
         "s1ap.E_RABLevelQoSParameters", HFILL }},
     { &hf_s1ap_nAS_PDU,
       { "nAS-PDU", "s1ap.nAS_PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NAS_PDU", HFILL }},
     { &hf_s1ap_E_RABSetupListBearerSURes_item,
       { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",