deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed AMC point-to-point record parsing in FRU

Browse Source 
-Fixed detection of packing support in GCC
 -Added packing support detection magic on all packed structures in project
This commit is contained in:
Francois Isabelle 2009-06-09 16:00:24 +00:00
parent b23f858ee3
commit ba83ecd7d3
4 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipmitool/src/plugins/lan/asf.h
View File

@ -56,13 +56,19 @@ static const struct valstr asf_type_vals[] __attribute__((unused)) = {
}; };
/* ASF message header */ /* ASF message header */
#ifdef HAVE_PRAGMA_PACK
#pragma pack(1)
#endif
struct asf_hdr { struct asf_hdr {
uint32_t iana; uint32_t iana;
uint8_t type; uint8_t type;
uint8_t tag; uint8_t tag;
uint8_t __reserved; uint8_t __reserved;
uint8_t len; uint8_t len;
} __attribute__((packed)); } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK
#pragma pack(0)
#endif
int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);

16
ipmitool/src/plugins/lan/rmcp.h
View File

@ -64,14 +64,23 @@ static const struct valstr rmcp_class_vals[] __attribute__((unused)) = {
{ 0, NULL } { 0, NULL }
}; };
#ifdef HAVE_PRAGMA_PACK
#pragma pack(1)
#endif
/* RMCP message header */ /* RMCP message header */
struct rmcp_hdr { struct rmcp_hdr {
uint8_t ver; uint8_t ver;
uint8_t __reserved; uint8_t __reserved;
uint8_t seq; uint8_t seq;
uint8_t class; uint8_t class;
} __attribute__((packed)); } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK
#pragma pack(0)
#endif
#ifdef HAVE_PRAGMA_PACK
#pragma pack(1)
#endif
struct rmcp_pong { struct rmcp_pong {
struct rmcp_hdr rmcp; struct rmcp_hdr rmcp;
struct asf_hdr asf; struct asf_hdr asf;
@ -80,7 +89,10 @@ struct rmcp_pong {
uint8_t sup_entities; uint8_t sup_entities;
uint8_t sup_interact; uint8_t sup_interact;
uint8_t reserved[6]; uint8_t reserved[6];
} __attribute__((packed)); } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK
#pragma pack(0)
#endif
int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);

8
ipmitool/src/plugins/lanplus/asf.h
View File

@ -56,13 +56,19 @@ static const struct valstr asf_type_vals[] __attribute__((unused)) = {
}; };
/* ASF message header */ /* ASF message header */
#ifdef HAVE_PRAGMA_PACK
#pragma pack(1)
#endif
struct asf_hdr { struct asf_hdr {
uint32_t iana; uint32_t iana;
uint8_t type; uint8_t type;
uint8_t tag; uint8_t tag;
uint8_t __reserved; uint8_t __reserved;
uint8_t len; uint8_t len;
} __attribute__((packed)); } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK
#pragma pack(0)
#endif
int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);

8
ipmitool/src/plugins/lanplus/rmcp.h
View File

@ -64,12 +64,18 @@ static const struct valstr rmcp_class_vals[] __attribute__((unused)) = {
}; };
/* RMCP message header */ /* RMCP message header */
#ifdef HAVE_PRAGMA_PACK
#pragma pack(1)
#endif
struct rmcp_hdr { struct rmcp_hdr {
uint8_t ver; uint8_t ver;
uint8_t __reserved; uint8_t __reserved;
uint8_t seq; uint8_t seq;
uint8_t class; uint8_t class;
} __attribute__((packed)); } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK
#pragma pack(0)
#endif
int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len); int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);