osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Guy Harris 2021-02-10 14:20:13 -08:00
parent a8e2197d99
commit 9e2e260fa8
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-infiniband.c
View File

@ -6412,7 +6412,7 @@ void proto_register_infiniband(void)
}, },
{ &hf_infiniband_dma_length, { { &hf_infiniband_dma_length, {
"DMA Length", "infiniband.reth.dmalen", "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) */ /* Atomic Extended Transport Header (AtomicETH) */

34
epan/dissectors/packet-iscsi.c
View File

@ -2693,7 +2693,7 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_TotalAHSLength, { &hf_iscsi_TotalAHSLength,
{ "TotalAHSLength", "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 } "Total additional header segment length (4 byte words)", HFILL }
}, },
{ &hf_iscsi_InitiatorTaskTag, { &hf_iscsi_InitiatorTaskTag,
@ -2703,37 +2703,37 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_ExpectedDataTransferLength, { &hf_iscsi_ExpectedDataTransferLength,
{ "ExpectedDataTransferLength", "iscsi.scsicommand.expecteddatatransferlength", { "ExpectedDataTransferLength", "iscsi.scsicommand.expecteddatatransferlength",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Expected length of data transfer", HFILL } "Expected length of data transfer", HFILL }
}, },
{ &hf_iscsi_CmdSN, { &hf_iscsi_CmdSN,
{ "CmdSN", "iscsi.cmdsn", { "CmdSN", "iscsi.cmdsn",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Sequence number for this command", HFILL } "Sequence number for this command", HFILL }
}, },
{ &hf_iscsi_ExpStatSN, { &hf_iscsi_ExpStatSN,
{ "ExpStatSN", "iscsi.expstatsn", { "ExpStatSN", "iscsi.expstatsn",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Next expected status sequence number", HFILL } "Next expected status sequence number", HFILL }
}, },
{ &hf_iscsi_SCSIResponse_ResidualCount, { &hf_iscsi_SCSIResponse_ResidualCount,
{ "ResidualCount", "iscsi.scsiresponse.residualcount", { "ResidualCount", "iscsi.scsiresponse.residualcount",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Residual count", HFILL } "Residual count", HFILL }
}, },
{ &hf_iscsi_StatSN, { &hf_iscsi_StatSN,
{ "StatSN", "iscsi.statsn", { "StatSN", "iscsi.statsn",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Status sequence number", HFILL } "Status sequence number", HFILL }
}, },
{ &hf_iscsi_ExpCmdSN, { &hf_iscsi_ExpCmdSN,
{ "ExpCmdSN", "iscsi.expcmdsn", { "ExpCmdSN", "iscsi.expcmdsn",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Next expected command sequence number", HFILL } "Next expected command sequence number", HFILL }
}, },
{ &hf_iscsi_MaxCmdSN, { &hf_iscsi_MaxCmdSN,
{ "MaxCmdSN", "iscsi.maxcmdsn", { "MaxCmdSN", "iscsi.maxcmdsn",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Maximum acceptable command sequence number", HFILL } "Maximum acceptable command sequence number", HFILL }
}, },
{ &hf_iscsi_SCSIResponse_o, { &hf_iscsi_SCSIResponse_o,
@ -2768,12 +2768,12 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_SCSIResponse_BidiReadResidualCount, { &hf_iscsi_SCSIResponse_BidiReadResidualCount,
{ "BidiReadResidualCount", "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 } "Bi-directional read residual count", HFILL }
}, },
{ &hf_iscsi_SenseLength, { &hf_iscsi_SenseLength,
{ "SenseLength", "iscsi.scsiresponse.senselength", { "SenseLength", "iscsi.scsiresponse.senselength",
FT_UINT16, BASE_HEX, NULL, 0, FT_UINT16, BASE_DEC_HEX, NULL, 0,
"Sense data length", HFILL } "Sense data length", HFILL }
}, },
{ &hf_iscsi_SCSIData_F, { &hf_iscsi_SCSIData_F,
@ -2808,17 +2808,17 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_BufferOffset, { &hf_iscsi_BufferOffset,
{ "BufferOffset", "iscsi.bufferOffset", { "BufferOffset", "iscsi.bufferOffset",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Buffer offset", HFILL } "Buffer offset", HFILL }
}, },
{ &hf_iscsi_SCSIData_ResidualCount, { &hf_iscsi_SCSIData_ResidualCount,
{ "ResidualCount", "iscsi.scsidata.readresidualcount", { "ResidualCount", "iscsi.scsidata.readresidualcount",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Residual count", HFILL } "Residual count", HFILL }
}, },
{ &hf_iscsi_DataSN, { &hf_iscsi_DataSN,
{ "DataSN", "iscsi.datasn", { "DataSN", "iscsi.datasn",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Data sequence number", HFILL } "Data sequence number", HFILL }
}, },
{ &hf_iscsi_VersionMax, { &hf_iscsi_VersionMax,
@ -2961,7 +2961,7 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_R2TSN, { &hf_iscsi_R2TSN,
{ "R2TSN", "iscsi.r2tsn", { "R2TSN", "iscsi.r2tsn",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"R2T PDU Number", HFILL } "R2T PDU Number", HFILL }
}, },
{ &hf_iscsi_TaskManagementFunction_Response, { &hf_iscsi_TaskManagementFunction_Response,
@ -2976,7 +2976,7 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_RefCmdSN, { &hf_iscsi_RefCmdSN,
{ "RefCmdSN", "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 } "Command sequence number for command to be aborted", HFILL }
}, },
{ &hf_iscsi_TaskManagementFunction_Function, { &hf_iscsi_TaskManagementFunction_Function,
@ -3006,7 +3006,7 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_DesiredDataLength, { &hf_iscsi_DesiredDataLength,
{ "DesiredDataLength", "iscsi.desireddatalength", { "DesiredDataLength", "iscsi.desireddatalength",
FT_UINT32, BASE_HEX, NULL, 0, FT_UINT32, BASE_DEC_HEX, NULL, 0,
"Desired data length (bytes)", HFILL } "Desired data length (bytes)", HFILL }
}, },
{ &hf_iscsi_AsyncEvent, { &hf_iscsi_AsyncEvent,
@ -3051,7 +3051,7 @@ proto_register_iscsi(void)
}, },
{ &hf_iscsi_RunLength, { &hf_iscsi_RunLength,
{ "RunLength", "iscsi.snack.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 } "Number of additional missing status PDUs in this run", HFILL }
}, },
}; };

20
epan/dissectors/packet-nvme.c
View File

@ -1008,7 +1008,7 @@ proto_register_nvme(void)
}, },
{ &hf_nvme_cmd_nlb, { &hf_nvme_cmd_nlb,
{ "Absolute Number of Logical Blocks", "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, { &hf_nvme_cmd_rsvd2,
{ "Reserved", "nvme.cmd.rsvd2", { "Reserved", "nvme.cmd.rsvd2",
@ -1099,7 +1099,7 @@ proto_register_nvme(void)
/* Identify NS response */ /* Identify NS response */
{ &hf_nvme_identify_ns_nsze, { &hf_nvme_identify_ns_nsze,
{ "Namespace Size (NSZE)", "nvme.cmd.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, { &hf_nvme_identify_ns_ncap,
{ "Namespace Capacity (NCAP)", "nvme.cmd.identify.ns.ncap", { "Namespace Capacity (NCAP)", "nvme.cmd.identify.ns.ncap",
@ -1115,11 +1115,11 @@ proto_register_nvme(void)
}, },
{ &hf_nvme_identify_ns_nlbaf, { &hf_nvme_identify_ns_nlbaf,
{ "Number of LBA Formats (NLBAF)", "nvme.cmd.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, { &hf_nvme_identify_ns_flbas,
{ "Formatted LBA Size (FLBAS)", "nvme.cmd.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, { &hf_nvme_identify_ns_mc,
{ "Metadata Capabilities (MC)", "nvme.cmd.identify.ns.mc", { "Metadata Capabilities (MC)", "nvme.cmd.identify.ns.mc",
@ -1201,19 +1201,19 @@ proto_register_nvme(void)
}, },
{ &hf_nvme_identify_ctrl_sqes, { &hf_nvme_identify_ctrl_sqes,
{ "Submission Queue Entry Size (SQES)", "nvme.cmd.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, { &hf_nvme_identify_ctrl_cqes,
{ "Completion Queue Entry Size (CQES)", "nvme.cmd.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, { &hf_nvme_identify_ctrl_maxcmd,
{ "Maximum Outstanding Commands (MAXCMD)", "nvme.cmd.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, { &hf_nvme_identify_ctrl_nn,
{ "Number of Namespaces (NN)", "nvme.cmd.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, { &hf_nvme_identify_ctrl_oncs,
{ "Optional NVM Command Support (ONCS)", "nvme.cmd.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, { &hf_nvme_identify_ctrl_ioccsz,
{ "I/O Queue Command Capsule Supported Size (IOCCSZ)", "nvme.cmd.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, { &hf_nvme_identify_ctrl_iorcsz,
{ "I/O Queue Response Capsule Supported Size (IORCSZ)", "nvme.cmd.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 */ /* Identify nslist response */