diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-05-09 14:28:57 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-05-09 21:29:29 +0000 |
commit | b8040a44ce2560f2d93007e066af4db8d4ef14f5 (patch) | |
tree | cbb69f74bceeb9d0ae5444a89026d954eda7484b | |
parent | c25b4f2f3fbec3e305638a90c93a90cdce931178 (diff) |
Fix various field names and types.
Make some names used for multiple fields more stylistically consistent.
If a bitfield has more than one bit, it's not Boolean - the extra bits
mean it has more values than "true" or "false".
If a bitfield has only one bit, and indicates that something is
true/false, or enabled/disabled, or present/absent, or on/off, or
something else obviously Boolean, it's Boolean.
Change-Id: I89d5e214eb5c4e7f72eb59a78757f0f49fec3dbf
Reviewed-on: https://code.wireshark.org/review/21579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r-- | epan/dissectors/packet-ixveriwave.c | 108 |
1 files changed, 30 insertions, 78 deletions
diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index a3d74c24ef..1817e4e470 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -3299,7 +3299,7 @@ void proto_register_ixveriwave(void) #endif { &hf_radiotap_rfinfo_contextpA_bit13, { "QAM modulation", "ixveriwave.contextpA.bits13", - FT_BOOLEAN, 16, NULL, 0xe000, NULL, HFILL } }, + FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL } }, { &hf_radiotap_rfinfo_contextpb, { "CONTEXT_B", "ixveriwave.contextpb", @@ -3331,7 +3331,7 @@ void proto_register_ixveriwave(void) FT_BOOLEAN, 16, NULL, 0x0020, "Automatic Gain Control-[5] agc_high_pwr_terminator", HFILL } }, { &hf_radiotap_rfinfo_contextpB_bit13, { "QAM modulation", "ixveriwave.contextpB.bits13", - FT_BOOLEAN, 16, NULL, 0xe000, NULL, HFILL } }, + FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL } }, { &hf_radiotap_rfinfo_contextpC_bit0, { "SNR_NOISE_valid", "ixveriwave.contextpC.bit0", @@ -3353,7 +3353,7 @@ void proto_register_ixveriwave(void) FT_BOOLEAN, 16, NULL, 0x0020, "Automatic Gain Control-[5] agc_high_pwr_terminator", HFILL } }, { &hf_radiotap_rfinfo_contextpC_bit13, { "QAM modulation", "ixveriwave.contextpC.bits13", - FT_BOOLEAN, 16, NULL, 0xe000, NULL, HFILL } }, + FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL } }, { &hf_radiotap_rfinfo_contextpD_bit0, { "SNR_NOISE_valid", "ixveriwave.contextpD.bit0", @@ -3375,7 +3375,7 @@ void proto_register_ixveriwave(void) FT_BOOLEAN, 16, NULL, 0x0020, "Automatic Gain Control-[5] agc_high_pwr_terminator", HFILL } }, { &hf_radiotap_rfinfo_contextpD_bit13, { "QAM modulation", "ixveriwave.contextpD.bits13", - FT_BOOLEAN, 16, NULL, 0xe000, NULL, HFILL } }, + FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL } }, { &hf_radiotap_rfinfo_frameformatA, { "Frame format", "ixveriwave.rfinfo.frameformatA", @@ -3632,7 +3632,7 @@ framing signal deasserted. this is caused by software setting the drain all reg { "Sent CTS to self before data", "ixveriwave.info.bit9", FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_2_bit10, - { "MPDU of an A-MPDU", "ixveriwave.info.bit10", + { "MPDU of A-MPDU", "ixveriwave.info.bit10", FT_BOOLEAN, 16, NULL, INFO_MPDU_OF_A_MPDU, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_2_bit11, { "First MPDU of A-MPDU", "ixveriwave.info.bit11", @@ -3665,7 +3665,7 @@ framing signal deasserted. this is caused by software setting the drain all reg { "Short frame error. Frame is shorter than length.", "ixveriwave.errors.bit2", FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_2_bit4, - { "FCS_Error", "ixveriwave.errors.bit4", + { "FCS Error", "ixveriwave.errors.bit4", FT_BOOLEAN, 16, NULL, 0x0010, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_2_bit5, { "L2 de-aggregation error", "ixveriwave.errors.bit5", @@ -3680,10 +3680,10 @@ framing signal deasserted. this is caused by software setting the drain all reg { "Bad flow payload checksum", "ixveriwave.errors.bit8", FT_BOOLEAN, 16, NULL, 0x0100, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_2_bit10, - { "Bad IP checksum error", "ixveriwave.errors.bit10", + { "IP checksum error", "ixveriwave.errors.bit10", FT_BOOLEAN, 16, NULL, 0x0400, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_2_bit11, - { "L4(TCP/ICMP/IGMP/UDP) checksum error", "ixveriwave.errors.bit11", + { "L4 (TCP/ICMP/IGMP/UDP) checksum error", "ixveriwave.errors.bit11", FT_BOOLEAN, 16, NULL, 0x0800, NULL, HFILL } }, { &hf_radiotap_vw_errors_tx_bit01, @@ -4040,49 +4040,49 @@ framing signal deasserted. this is caused by software setting the drain all reg /* rx info decodes for fpga ver VW510021 */ { &hf_radiotap_vw_info_rx_bit0, { "Crypto WEP Encoded", "ixveriwave.info.bit0", - FT_UINT24, BASE_DEC, NULL, 0x000001, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000001, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit1, { "Crypto TKIP Encoded", "ixveriwave.info.bit1", FT_UINT24, BASE_DEC, VALS(crypto_TKIP_type), 0x000006, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit3, { "Crypto RX TKIP TSC SEQSKIP", "ixveriwave.info.bit3", - FT_UINT24, BASE_DEC, NULL, 0x000008, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000008, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit4, { "Crypto RX CCMP PN SEQSKIP", "ixveriwave.info.bit4", - FT_UINT24, BASE_DEC, NULL, 0x000010, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000010, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit5, { "TKIP not full MSDU", "ixveriwave.info.bit5", - FT_UINT24, BASE_DEC, NULL, 0x000020, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000020, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit6, { "MPDU Length field is greater than MPDU octets", "ixveriwave.info.bit6", - FT_UINT24, BASE_DEC, NULL, 0x000040, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000040, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit7, { "RX TKIP / CCMP TSC SEQERR", "ixveriwave.info.bit7", - FT_UINT24, BASE_DEC, NULL, 0x000080, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000080, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit8, { "ACK withheld from frame", "ixveriwave.info.bit8", - FT_UINT24, BASE_DEC, NULL, 0x000100, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000100, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit9, { "Client BSSID matched", "ixveriwave.info.bit9", - FT_UINT24, BASE_DEC, NULL, 0x000200, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000200, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit10, - { "MPDU of an A-MPDU", "ixveriwave.info.bit10", - FT_UINT24, BASE_DEC, NULL, 0x000400, NULL, HFILL } }, + { "MPDU of A-MPDU", "ixveriwave.info.bit10", + FT_BOOLEAN, 24, NULL, 0x000400, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit11, { "First MPDU of A-MPDU", "ixveriwave.info.bit11", - FT_UINT24, BASE_DEC, NULL, 0x000800, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x000800, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit12, { "Last MPDU of A-MPDU", "ixveriwave.info.bit12", - FT_UINT24, BASE_DEC, NULL, 0x001000, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x001000, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit13, { "MSDU of A-MSDU", "ixveriwave.info.bit13", - FT_UINT24, BASE_DEC, NULL, 0x002000, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x002000, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit14, { "First MSDU of A-MSDU", "ixveriwave.info.bit14", - FT_UINT24, BASE_DEC, NULL, 0x004000, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x004000, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit15, { "Last MSDU of A-MSDU", "ixveriwave.info.bit15", - FT_UINT24, BASE_DEC, NULL, 0x008000, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x008000, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit16, { "Layer 1 Info[0]", "ixveriwave.info.bit16", FT_UINT24, BASE_DEC, NULL, 0x010000, NULL, HFILL } }, @@ -4091,10 +4091,10 @@ framing signal deasserted. this is caused by software setting the drain all reg FT_UINT24, BASE_DEC, NULL, 0x020000, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit18, { "VHT frame received with the use of the VHT_SIG_B.LENGTH", "ixveriwave.info.bit18", - FT_UINT24, BASE_DEC, NULL, 0x040000, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x040000, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit19, { "VHT frame received without the use of VHT_SIG_B.LENGTH", "ixveriwave.info.bit19", - FT_UINT24, BASE_DEC, NULL, 0x080000, NULL, HFILL } }, + FT_BOOLEAN, 24, NULL, 0x080000, NULL, HFILL } }, { &hf_radiotap_vw_info_rx_bit20, { "Factory Internal", "ixveriwave.info.bit20", FT_UINT24, BASE_DEC, NULL, 0xf00000, NULL, HFILL } }, @@ -4104,13 +4104,12 @@ framing signal deasserted. this is caused by software setting the drain all reg FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, /* tx info decodes for VW510021 and previous versions */ - /* { &hf_radiotap_vw_info_tx_bit0, { "Crypto WEP Encoded", "ixveriwave.info.bit0", FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL } }, { &hf_radiotap_vw_info_tx_bit1, { "Crypto TKIP Encoded", "ixveriwave.info.bit1", - FT_BOOLEAN, 16, NULL, 0x0006, NULL, HFILL } }, + FT_UINT16, BASE_DEC, VALS(crypto_TKIP_type), 0x0006, NULL, HFILL } }, { &hf_radiotap_vw_info_tx_bit3, { "Crypto C bit Error", "ixveriwave.info.bit3", FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL } }, @@ -4150,53 +4149,6 @@ framing signal deasserted. this is caused by software setting the drain all reg { &hf_radiotap_vw_info_tx_bit15, { "Last MSDU of A-MSDU", "ixveriwave.info.bit15", FT_BOOLEAN, 16, NULL, INFO_LAST_MSDU_OF_A_MSDU, NULL, HFILL } }, - */ - /* tx info decodes for VW510021 and previous versions */ - { &hf_radiotap_vw_info_tx_bit0, - { "Crypto WEP Encoded", "ixveriwave.info.bit0", - FT_UINT16, BASE_DEC, NULL, 0x0001, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit1, - { "Crypto TKIP Encoded", "ixveriwave.info.bit1", - FT_UINT16, BASE_DEC, VALS(crypto_TKIP_type), 0x0006, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit3, - { "Crypto C bit Error", "ixveriwave.info.bit3", - FT_UINT16, BASE_DEC, NULL, 0x0008, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit4, - { "Crypto TKIP not full MSDU", "ixveriwave.info.bit4", - FT_UINT16, BASE_DEC, NULL, 0x0010, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit5, - { "Crypto Software Error", "ixveriwave.info.bit5", - FT_UINT16, BASE_DEC, NULL, 0x0020, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit6, - { "Crypto Short Fault", "ixveriwave.info.bit6", - FT_UINT16, BASE_DEC, NULL, 0x0040, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit7, - { "Crypto Payload Length Fault", "ixveriwave.info.bit7", - FT_UINT16, BASE_DEC, NULL, 0x0080, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit8, - { "Sent RTS before Data", "ixveriwave.info.bit8", - FT_UINT16, BASE_DEC, NULL, 0x0100, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit9, - { "Sent CTS to Self before Data", "ixveriwave.info.bit9", - FT_UINT16, BASE_DEC, NULL, 0x0200, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit10, - { "MPDU of A-MPDU", "ixveriwave.info.bit10", - FT_UINT16, BASE_DEC, NULL, INFO_MPDU_OF_A_MPDU, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit11, - { "First MPDU of A-MPDU", "ixveriwave.info.bit11", - FT_UINT16, BASE_DEC, NULL, INFO_FIRST_MPDU_OF_A_MPDU, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit12, - { "Last MPDU of A-MPDU", "ixveriwave.info.bit12", - FT_UINT16, BASE_DEC, NULL, INFO_LAST_MPDU_OF_A_MPDU, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit13, - { "MSDU of A-MSDU", "ixveriwave.info.bit13", - FT_UINT16, BASE_DEC, NULL, INFO_MSDU_OF_A_MSDU, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit14, - { "First MSDU of A-MSDU", "ixveriwave.info.bit14", - FT_UINT16, BASE_DEC, NULL, INFO_FIRST_MSDU_OF_A_MSDU, NULL, HFILL } }, - { &hf_radiotap_vw_info_tx_bit15, - { "Last MSDU of A-MSDU", "ixveriwave.info.bit15", - FT_UINT16, BASE_DEC, NULL, INFO_LAST_MSDU_OF_A_MSDU, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit0, { "SIG Field CRC/Parity Error", "ixveriwave.errors.bit0", @@ -4220,7 +4172,7 @@ framing signal deasserted. this is caused by software setting the drain all reg { "Duplicate MPDU", "ixveriwave.errors.bit6", FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit7, - { "Bad Flow Magic Number", "ixveriwave.errors.bit7", + { "Bad flow magic number", "ixveriwave.errors.bit7", FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit8, { "Bad flow payload checksum", "ixveriwave.errors.bit8", @@ -4229,10 +4181,10 @@ framing signal deasserted. this is caused by software setting the drain all reg { "Illegal VHT_SIG Value", "ixveriwave.errors.bit9", FT_BOOLEAN, 32, NULL, 0x00000200, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit10, - { "Bad IP checksum error", "ixveriwave.errors.bit10", + { "IP checksum error", "ixveriwave.errors.bit10", FT_BOOLEAN, 32, NULL, 0x00000400, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit11, - { "TCP/ICMP/IGMP/UDP Checksum Error", "ixveriwave.errors.bit11", + { "L4 (TCP/ICMP/IGMP/UDP) checksum error", "ixveriwave.errors.bit11", FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit12, { "Layer 1 Unsupported Feature", "ixveriwave.errors.bit12", @@ -4269,7 +4221,7 @@ framing signal deasserted. this is caused by software setting the drain all reg FT_BOOLEAN, 32, NULL, 0x00800000, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit24, { "Factory Debug", "ixveriwave.errors.bit24", - FT_BOOLEAN, 32, NULL, 0x7F000000, NULL, HFILL } }, + FT_UINT32, BASE_HEX, NULL, 0x7F000000, NULL, HFILL } }, { &hf_radiotap_vw_errors_rx_bit31, { "Internal Error", "ixveriwave.errors.bit31", FT_BOOLEAN, 32, NULL, 0x80000000, NULL, HFILL } }, |