From 9e2e260fa8f0c7ca4685542c92053ac7ecf3f4a0 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 10 Feb 2021 14:20:13 -0800 Subject: [PATCH] Infiniband, iSCSI, NVMA: use BASE_DEC_HEX for counts/lengths/etc.. Show values that are sequence numbers, counts, lengths, and the like in decimal, with the hex value after it in parentheses for the benefit of those who count to 16 rather than 10. --- epan/dissectors/packet-infiniband.c | 2 +- epan/dissectors/packet-iscsi.c | 34 ++++++++++++++--------------- epan/dissectors/packet-nvme.c | 20 ++++++++--------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index ad58ed6235..75e1eece82 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -6412,7 +6412,7 @@ void proto_register_infiniband(void) }, { &hf_infiniband_dma_length, { "DMA Length", "infiniband.reth.dmalen", - FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} + FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, /* Atomic Extended Transport Header (AtomicETH) */ diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 456f378043..9a375c55e7 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -2693,7 +2693,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_TotalAHSLength, { "TotalAHSLength", "iscsi.totalahslength", - FT_UINT8, BASE_HEX, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, "Total additional header segment length (4 byte words)", HFILL } }, { &hf_iscsi_InitiatorTaskTag, @@ -2703,37 +2703,37 @@ proto_register_iscsi(void) }, { &hf_iscsi_ExpectedDataTransferLength, { "ExpectedDataTransferLength", "iscsi.scsicommand.expecteddatatransferlength", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Expected length of data transfer", HFILL } }, { &hf_iscsi_CmdSN, { "CmdSN", "iscsi.cmdsn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Sequence number for this command", HFILL } }, { &hf_iscsi_ExpStatSN, { "ExpStatSN", "iscsi.expstatsn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Next expected status sequence number", HFILL } }, { &hf_iscsi_SCSIResponse_ResidualCount, { "ResidualCount", "iscsi.scsiresponse.residualcount", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Residual count", HFILL } }, { &hf_iscsi_StatSN, { "StatSN", "iscsi.statsn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Status sequence number", HFILL } }, { &hf_iscsi_ExpCmdSN, { "ExpCmdSN", "iscsi.expcmdsn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Next expected command sequence number", HFILL } }, { &hf_iscsi_MaxCmdSN, { "MaxCmdSN", "iscsi.maxcmdsn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Maximum acceptable command sequence number", HFILL } }, { &hf_iscsi_SCSIResponse_o, @@ -2768,12 +2768,12 @@ proto_register_iscsi(void) }, { &hf_iscsi_SCSIResponse_BidiReadResidualCount, { "BidiReadResidualCount", "iscsi.scsiresponse.bidireadresidualcount", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Bi-directional read residual count", HFILL } }, { &hf_iscsi_SenseLength, { "SenseLength", "iscsi.scsiresponse.senselength", - FT_UINT16, BASE_HEX, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, "Sense data length", HFILL } }, { &hf_iscsi_SCSIData_F, @@ -2808,17 +2808,17 @@ proto_register_iscsi(void) }, { &hf_iscsi_BufferOffset, { "BufferOffset", "iscsi.bufferOffset", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Buffer offset", HFILL } }, { &hf_iscsi_SCSIData_ResidualCount, { "ResidualCount", "iscsi.scsidata.readresidualcount", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Residual count", HFILL } }, { &hf_iscsi_DataSN, { "DataSN", "iscsi.datasn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Data sequence number", HFILL } }, { &hf_iscsi_VersionMax, @@ -2961,7 +2961,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_R2TSN, { "R2TSN", "iscsi.r2tsn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "R2T PDU Number", HFILL } }, { &hf_iscsi_TaskManagementFunction_Response, @@ -2976,7 +2976,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_RefCmdSN, { "RefCmdSN", "iscsi.refcmdsn", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Command sequence number for command to be aborted", HFILL } }, { &hf_iscsi_TaskManagementFunction_Function, @@ -3006,7 +3006,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_DesiredDataLength, { "DesiredDataLength", "iscsi.desireddatalength", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Desired data length (bytes)", HFILL } }, { &hf_iscsi_AsyncEvent, @@ -3051,7 +3051,7 @@ proto_register_iscsi(void) }, { &hf_iscsi_RunLength, { "RunLength", "iscsi.snack.runlength", - FT_UINT32, BASE_HEX, NULL, 0, + FT_UINT32, BASE_DEC_HEX, NULL, 0, "Number of additional missing status PDUs in this run", HFILL } }, }; diff --git a/epan/dissectors/packet-nvme.c b/epan/dissectors/packet-nvme.c index 1afeabf8a1..1116ec7cfe 100644 --- a/epan/dissectors/packet-nvme.c +++ b/epan/dissectors/packet-nvme.c @@ -1008,7 +1008,7 @@ proto_register_nvme(void) }, { &hf_nvme_cmd_nlb, { "Absolute Number of Logical Blocks", "nvme.cmd.nlb", - FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL} + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL} }, { &hf_nvme_cmd_rsvd2, { "Reserved", "nvme.cmd.rsvd2", @@ -1099,7 +1099,7 @@ proto_register_nvme(void) /* Identify NS response */ { &hf_nvme_identify_ns_nsze, { "Namespace Size (NSZE)", "nvme.cmd.identify.ns.nsze", - FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT64, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ns_ncap, { "Namespace Capacity (NCAP)", "nvme.cmd.identify.ns.ncap", @@ -1115,11 +1115,11 @@ proto_register_nvme(void) }, { &hf_nvme_identify_ns_nlbaf, { "Number of LBA Formats (NLBAF)", "nvme.cmd.identify.ns.nlbaf", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ns_flbas, { "Formatted LBA Size (FLBAS)", "nvme.cmd.identify.ns.flbas", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ns_mc, { "Metadata Capabilities (MC)", "nvme.cmd.identify.ns.mc", @@ -1201,19 +1201,19 @@ proto_register_nvme(void) }, { &hf_nvme_identify_ctrl_sqes, { "Submission Queue Entry Size (SQES)", "nvme.cmd.identify.ctrl.sqes", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ctrl_cqes, { "Completion Queue Entry Size (CQES)", "nvme.cmd.identify.ctrl.cqes", - FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ctrl_maxcmd, { "Maximum Outstanding Commands (MAXCMD)", "nvme.cmd.identify.ctrl.maxcmd", - FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ctrl_nn, { "Number of Namespaces (NN)", "nvme.cmd.identify.ctrl.nn", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ctrl_oncs, { "Optional NVM Command Support (ONCS)", "nvme.cmd.identify.ctrl.oncs", @@ -1229,11 +1229,11 @@ proto_register_nvme(void) }, { &hf_nvme_identify_ctrl_ioccsz, { "I/O Queue Command Capsule Supported Size (IOCCSZ)", "nvme.cmd.identify.ctrl.ioccsz", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, { &hf_nvme_identify_ctrl_iorcsz, { "I/O Queue Response Capsule Supported Size (IORCSZ)", "nvme.cmd.identify.ctrl.iorcsz", - FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} + FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL} }, /* Identify nslist response */