From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-infiniband.h | 146 ++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 71 deletions(-) (limited to 'epan/dissectors/packet-infiniband.h') diff --git a/epan/dissectors/packet-infiniband.h b/epan/dissectors/packet-infiniband.h index cb37e1dd..08684734 100644 --- a/epan/dissectors/packet-infiniband.h +++ b/epan/dissectors/packet-infiniband.h @@ -18,12 +18,12 @@ /* infiniband-specific information for conversations */ typedef struct { - guint64 service_id; /* service id specified when the (RC) channel was set-up */ - gboolean client_to_server; /* message direction */ - guint32 src_qp; /* originator src qp as this is not present in RC packets */ + uint64_t service_id; /* service id specified when the (RC) channel was set-up */ + bool client_to_server; /* message direction */ + uint32_t src_qp; /* originator src qp as this is not present in RC packets */ /* store mad data so that it can be parsed for private data by ULP */ - guint8 mad_private_data[MAD_DATA_SIZE]; + uint8_t mad_private_data[MAD_DATA_SIZE]; } conversation_infiniband_data; /* OpCodeValues @@ -32,74 +32,78 @@ typedef struct { * Reliable Connection (RC) * [7-5] = 000 */ -#define RC_SEND_FIRST 0 /*0x00000000 */ -#define RC_SEND_MIDDLE 1 /*0x00000001 */ -#define RC_SEND_LAST 2 /*0x00000010 */ -#define RC_SEND_LAST_IMM 3 /*0x00000011 */ -#define RC_SEND_ONLY 4 /*0x00000100 */ -#define RC_SEND_ONLY_IMM 5 /*0x00000101 */ -#define RC_RDMA_WRITE_FIRST 6 /*0x00000110 */ -#define RC_RDMA_WRITE_MIDDLE 7 /*0x00000111 */ -#define RC_RDMA_WRITE_LAST 8 /*0x00001000 */ -#define RC_RDMA_WRITE_LAST_IMM 9 /*0x00001001 */ -#define RC_RDMA_WRITE_ONLY 10 /*0x00001010 */ -#define RC_RDMA_WRITE_ONLY_IMM 11 /*0x00001011 */ -#define RC_RDMA_READ_REQUEST 12 /*0x00001100 */ -#define RC_RDMA_READ_RESPONSE_FIRST 13 /*0x00001101 */ -#define RC_RDMA_READ_RESPONSE_MIDDLE 14 /*0x00001110 */ -#define RC_RDMA_READ_RESPONSE_LAST 15 /*0x00001111 */ -#define RC_RDMA_READ_RESPONSE_ONLY 16 /*0x00010000 */ -#define RC_ACKNOWLEDGE 17 /*0x00010001 */ -#define RC_ATOMIC_ACKNOWLEDGE 18 /*0x00010010 */ -#define RC_CMP_SWAP 19 /*0x00010011 */ -#define RC_FETCH_ADD 20 /*0x00010100 */ -#define RC_SEND_LAST_INVAL 22 /*0x00010110 */ -#define RC_SEND_ONLY_INVAL 23 /*0x00010111 */ +#define RC_SEND_FIRST 0 /*0b00000000 */ +#define RC_SEND_MIDDLE 1 /*0b00000001 */ +#define RC_SEND_LAST 2 /*0b00000010 */ +#define RC_SEND_LAST_IMM 3 /*0b00000011 */ +#define RC_SEND_ONLY 4 /*0b00000100 */ +#define RC_SEND_ONLY_IMM 5 /*0b00000101 */ +#define RC_RDMA_WRITE_FIRST 6 /*0b00000110 */ +#define RC_RDMA_WRITE_MIDDLE 7 /*0b00000111 */ +#define RC_RDMA_WRITE_LAST 8 /*0b00001000 */ +#define RC_RDMA_WRITE_LAST_IMM 9 /*0b00001001 */ +#define RC_RDMA_WRITE_ONLY 10 /*0b00001010 */ +#define RC_RDMA_WRITE_ONLY_IMM 11 /*0b00001011 */ +#define RC_RDMA_READ_REQUEST 12 /*0b00001100 */ +#define RC_RDMA_READ_RESPONSE_FIRST 13 /*0b00001101 */ +#define RC_RDMA_READ_RESPONSE_MIDDLE 14 /*0b00001110 */ +#define RC_RDMA_READ_RESPONSE_LAST 15 /*0b00001111 */ +#define RC_RDMA_READ_RESPONSE_ONLY 16 /*0b00010000 */ +#define RC_ACKNOWLEDGE 17 /*0b00010001 */ +#define RC_ATOMIC_ACKNOWLEDGE 18 /*0b00010010 */ +#define RC_CMP_SWAP 19 /*0b00010011 */ +#define RC_FETCH_ADD 20 /*0b00010100 */ +#define RC_SEND_LAST_INVAL 22 /*0b00010110 */ +#define RC_SEND_ONLY_INVAL 23 /*0b00010111 */ +#define RC_FLUSH 28 /*0b00011100 */ +#define RC_ATOMIC_WRITE 29 /*0b00011101 */ /* Reliable Datagram (RD) * [7-5] = 010 */ -#define RD_SEND_FIRST 64 /*0x01000000 */ -#define RD_SEND_MIDDLE 65 /*0x01000001 */ -#define RD_SEND_LAST 66 /*0x01000010 */ -#define RD_SEND_LAST_IMM 67 /*0x01000011 */ -#define RD_SEND_ONLY 68 /*0x01000100 */ -#define RD_SEND_ONLY_IMM 69 /*0x01000101 */ -#define RD_RDMA_WRITE_FIRST 70 /*0x01000110 */ -#define RD_RDMA_WRITE_MIDDLE 71 /*0x01000111 */ -#define RD_RDMA_WRITE_LAST 72 /*0x01001000 */ -#define RD_RDMA_WRITE_LAST_IMM 73 /*0x01001001 */ -#define RD_RDMA_WRITE_ONLY 74 /*0x01001010 */ -#define RD_RDMA_WRITE_ONLY_IMM 75 /*0x01001011 */ -#define RD_RDMA_READ_REQUEST 76 /*0x01001100 */ -#define RD_RDMA_READ_RESPONSE_FIRST 77 /*0x01001101 */ -#define RD_RDMA_READ_RESPONSE_MIDDLE 78 /*0x01001110 */ -#define RD_RDMA_READ_RESPONSE_LAST 79 /*0x01001111 */ -#define RD_RDMA_READ_RESPONSE_ONLY 80 /*0x01010000 */ -#define RD_ACKNOWLEDGE 81 /*0x01010001 */ -#define RD_ATOMIC_ACKNOWLEDGE 82 /*0x01010010 */ -#define RD_CMP_SWAP 83 /*0x01010011 */ -#define RD_FETCH_ADD 84 /*0x01010100 */ -#define RD_RESYNC 85 /*0x01010101 */ +#define RD_SEND_FIRST 64 /*0b01000000 */ +#define RD_SEND_MIDDLE 65 /*0b01000001 */ +#define RD_SEND_LAST 66 /*0b01000010 */ +#define RD_SEND_LAST_IMM 67 /*0b01000011 */ +#define RD_SEND_ONLY 68 /*0b01000100 */ +#define RD_SEND_ONLY_IMM 69 /*0b01000101 */ +#define RD_RDMA_WRITE_FIRST 70 /*0b01000110 */ +#define RD_RDMA_WRITE_MIDDLE 71 /*0b01000111 */ +#define RD_RDMA_WRITE_LAST 72 /*0b01001000 */ +#define RD_RDMA_WRITE_LAST_IMM 73 /*0b01001001 */ +#define RD_RDMA_WRITE_ONLY 74 /*0b01001010 */ +#define RD_RDMA_WRITE_ONLY_IMM 75 /*0b01001011 */ +#define RD_RDMA_READ_REQUEST 76 /*0b01001100 */ +#define RD_RDMA_READ_RESPONSE_FIRST 77 /*0b01001101 */ +#define RD_RDMA_READ_RESPONSE_MIDDLE 78 /*0b01001110 */ +#define RD_RDMA_READ_RESPONSE_LAST 79 /*0b01001111 */ +#define RD_RDMA_READ_RESPONSE_ONLY 80 /*0b01010000 */ +#define RD_ACKNOWLEDGE 81 /*0b01010001 */ +#define RD_ATOMIC_ACKNOWLEDGE 82 /*0b01010010 */ +#define RD_CMP_SWAP 83 /*0b01010011 */ +#define RD_FETCH_ADD 84 /*0b01010100 */ +#define RD_RESYNC 85 /*0b01010101 */ +#define RD_FLUSH 92 /*0b01011100 */ +#define RD_ATOMIC_WRITE 93 /*0b01011101 */ /* Unreliable Datagram (UD) * [7-5] = 011 */ -#define UD_SEND_ONLY 100 /*0x01100100 */ -#define UD_SEND_ONLY_IMM 101 /*0x01100101 */ +#define UD_SEND_ONLY 100 /*0b01100100 */ +#define UD_SEND_ONLY_IMM 101 /*0b01100101 */ /* Unreliable Connection (UC) * [7-5] = 001 */ -#define UC_SEND_FIRST 32 /*0x00100000 */ -#define UC_SEND_MIDDLE 33 /*0x00100001 */ -#define UC_SEND_LAST 34 /*0x00100010 */ -#define UC_SEND_LAST_IMM 35 /*0x00100011 */ -#define UC_SEND_ONLY 36 /*0x00100100 */ -#define UC_SEND_ONLY_IMM 37 /*0x00100101 */ -#define UC_RDMA_WRITE_FIRST 38 /*0x00100110 */ -#define UC_RDMA_WRITE_MIDDLE 39 /*0x00100111 */ -#define UC_RDMA_WRITE_LAST 40 /*0x00101000 */ -#define UC_RDMA_WRITE_LAST_IMM 41 /*0x00101001 */ -#define UC_RDMA_WRITE_ONLY 42 /*0x00101010 */ -#define UC_RDMA_WRITE_ONLY_IMM 43 /*0x00101011 */ +#define UC_SEND_FIRST 32 /*0b00100000 */ +#define UC_SEND_MIDDLE 33 /*0b00100001 */ +#define UC_SEND_LAST 34 /*0b00100010 */ +#define UC_SEND_LAST_IMM 35 /*0b00100011 */ +#define UC_SEND_ONLY 36 /*0b00100100 */ +#define UC_SEND_ONLY_IMM 37 /*0b00100101 */ +#define UC_RDMA_WRITE_FIRST 38 /*0b00100110 */ +#define UC_RDMA_WRITE_MIDDLE 39 /*0b00100111 */ +#define UC_RDMA_WRITE_LAST 40 /*0b00101000 */ +#define UC_RDMA_WRITE_LAST_IMM 41 /*0b00101001 */ +#define UC_RDMA_WRITE_ONLY 42 /*0b00101010 */ +#define UC_RDMA_WRITE_ONLY_IMM 43 /*0b00101011 */ /* ComMgt class Attributes */ #define ATTR_CM_REQ 0x0010 @@ -114,14 +118,14 @@ typedef struct { */ struct infinibandinfo { proto_tree* payload_tree; - guint8 opCode; /* OpCode from BTH header. */ - guint8 pad_count; /* PadCount from BTH header. */ - guint16 cm_attribute_id; /* attribute id for CM messages */ - guint32 reth_remote_key; /* Remote Key from RETH header */ - guint64 reth_remote_address;/* Remote address from RETH header */ - guint32 reth_dma_length; /* DMA Length from RETH header */ - guint32 packet_seq_num; /* Packet sequence number */ - gboolean dctConnect; /* indicator for DCT connect/disconnect */ + uint8_t opCode; /* OpCode from BTH header. */ + uint8_t pad_count; /* PadCount from BTH header. */ + uint16_t cm_attribute_id; /* attribute id for CM messages */ + uint32_t reth_remote_key; /* Remote Key from RETH header */ + uint64_t reth_remote_address;/* Remote address from RETH header */ + uint32_t reth_dma_length; /* DMA Length from RETH header */ + uint32_t packet_seq_num; /* Packet sequence number */ + bool dctConnect; /* indicator for DCT connect/disconnect */ }; #endif -- cgit v1.2.3