deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-12 11:37:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unfinished: Attempt to fix endianness for interfaces

Browse Source 
This is a work in progress. This branch will be
force-pushed a lot. Don't use it.
This is just for saving the work as I move between
workstations.

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2018-07-30 15:42:23 +03:00
parent a4c1040420
commit 6bed638c24
No known key found for this signature in database
GPG Key ID: E893587B5B74178D
4 changed files with 121 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/ipmitool/ipmi_intf.h
View File

@ -241,6 +241,15 @@ struct ipmi_intf {
void (*set_max_response_data_size)(struct ipmi_intf * intf, uint16_t size); void (*set_max_response_data_size)(struct ipmi_intf * intf, uint16_t size);
}; };
/* Interface method wrappers to perform any host-specific actions */
struct ipmi_rs *ipmi_sendrecv(struct ipmi_intf * intf, struct ipmi_rq * req);
struct ipmi_rs *ipmi_recv_sol(struct ipmi_intf * intf);
struct ipmi_rs *ipmi_send_sol(struct ipmi_intf * intf, struct ipmi_v2_payload * payload);
int ipmi_keepalive(struct ipmi_intf * intf);
int ipmi_set_my_addr(struct ipmi_intf * intf, uint8_t addr);
void ipmi_set_max_request_data_size(struct ipmi_intf * intf, uint16_t size);
void ipmi_set_max_response_data_size(struct ipmi_intf * intf, uint16_t size);
struct ipmi_intf * ipmi_intf_load(char * name); struct ipmi_intf * ipmi_intf_load(char * name);
void ipmi_intf_print(struct ipmi_intf_support * intflist); void ipmi_intf_print(struct ipmi_intf_support * intflist);

6
src/ipmitool.c
View File

@ -132,6 +132,12 @@ main(int argc, char ** argv)
{ {
int rc; int rc;
#ifdef WORDS_BIGENDIAN
printf("BIG ENDIAN\n");
#else
printf("LITTLE ENDIAN\n");
#endif
rc = ipmi_main(argc, argv, ipmitool_cmd_list, NULL); rc = ipmi_main(argc, argv, ipmitool_cmd_list, NULL);
if (rc < 0) if (rc < 0)

50
src/plugins/ipmi_intf.c
View File

@ -623,3 +623,53 @@ ipmi_intf_set_max_response_data_size(struct ipmi_intf * intf, uint16_t size)
intf->max_response_data_size = size; intf->max_response_data_size = size;
} }
} }
/*
* Interface method wrappers.
* Do any host-specific things like byteswapping here.
* Command-specific data manipulation is not done here,
* only the common headers are mangled.
*/
struct ipmi_rs *ipmi_sendrecv(struct ipmi_intf * intf, struct ipmi_rq * req)
{
struct ipmi_rs *rsp;
/* Data length must be in IPMI order (LE) */
htoipmi16(req->msg.data_len, &req->msg.data_len);
rsp = intf->sendrecv(intf, req);
if (rsp) {
rsp->data_len = ipmi16toh(&rsp->data_len);
}
return rsp;
}
struct ipmi_rs *ipmi_recv_sol(struct ipmi_intf * intf)
{
return intf->recv_sol(intf);
}
struct ipmi_rs *ipmi_send_sol(struct ipmi_intf * intf, struct ipmi_v2_payload * payload)
{
return intf->send_sol(intf, payload);
}
int ipmi_keepalive(struct ipmi_intf * intf)
{
return intf->keepalive(intf);
}
int ipmi_set_my_addr(struct ipmi_intf * intf, uint8_t addr)
{
return intf->set_my_addr(intf, addr);
}
void ipmi_set_max_request_data_size(struct ipmi_intf * intf, uint16_t size)
{
intf->set_max_request_data_size(intf, size);
}
void ipmi_set_max_response_data_size(struct ipmi_intf * intf, uint16_t size)
{
intf->set_max_response_data_size(intf, size);
}

119
src/plugins/lanplus/lanplus.c
View File

@ -909,46 +909,38 @@ void
read_open_session_response(struct ipmi_rs * rsp, int offset) read_open_session_response(struct ipmi_rs * rsp, int offset)
{ {
memset(&rsp->payload.open_session_response, 0, memset(&rsp->payload.open_session_response, 0,
sizeof(rsp->payload.open_session_response)); sizeof(rsp->payload.open_session_response));
/* Message tag */ /* Message tag */
rsp->payload.open_session_response.message_tag = rsp->data[offset]; rsp->payload.open_session_response.message_tag = rsp->data[offset];
/* RAKP response code */ /* RAKP response code */
rsp->payload.open_session_response.rakp_return_code = rsp->data[offset + 1]; rsp->payload.open_session_response.rakp_return_code = rsp->data[offset + 1];
/* Maximum privilege level */ /* Maximum privilege level */
rsp->payload.open_session_response.max_priv_level = rsp->data[offset + 2]; rsp->payload.open_session_response.max_priv_level = rsp->data[offset + 2];
/*** offset + 3 is reserved ***/ /*** offset + 3 is reserved ***/
/* Remote console session ID */ /* Remote console session ID */
memcpy(&(rsp->payload.open_session_response.console_id), rsp->payload.open_session_response.console_id
rsp->data + offset + 4, = ipmi32toh(&rsp->data[offset + 4]);
4);
#if WORDS_BIGENDIAN
rsp->payload.open_session_response.console_id =
BSWAP_32(rsp->payload.open_session_response.console_id);
#endif
/* only tag, status, privlvl, and console id are returned if error */ /* only tag, status, privlvl, and console id are returned if error */
if (rsp->payload.open_session_response.rakp_return_code != if (rsp->payload.open_session_response.rakp_return_code
IPMI_RAKP_STATUS_NO_ERRORS) != IPMI_RAKP_STATUS_NO_ERRORS)
return; {
return;
}
/* BMC session ID */ /* BMC session ID */
memcpy(&(rsp->payload.open_session_response.bmc_id), rsp->payload.open_session_response.bmc_id
rsp->data + offset + 8, = ipmi32toh(&rsp->data[offset + 8]);
4);
#if WORDS_BIGENDIAN
rsp->payload.open_session_response.bmc_id =
BSWAP_32(rsp->payload.open_session_response.bmc_id);
#endif
/* And of course, our negotiated algorithms */ /* And of course, our negotiated algorithms */
rsp->payload.open_session_response.auth_alg = rsp->data[offset + 16]; rsp->payload.open_session_response.auth_alg = rsp->data[offset + 16];
rsp->payload.open_session_response.integrity_alg = rsp->data[offset + 24]; rsp->payload.open_session_response.integrity_alg = rsp->data[offset + 24];
rsp->payload.open_session_response.crypt_alg = rsp->data[offset + 32]; rsp->payload.open_session_response.crypt_alg = rsp->data[offset + 32];
} }
@ -976,13 +968,13 @@ read_rakp2_message(
int offset, int offset,
uint8_t auth_alg) uint8_t auth_alg)
{ {
int i; int i;
/* Message tag */ /* Message tag */
rsp->payload.rakp2_message.message_tag = rsp->data[offset]; rsp->payload.rakp2_message.message_tag = rsp->data[offset];
/* RAKP response code */ /* RAKP response code */
rsp->payload.rakp2_message.rakp_return_code = rsp->data[offset + 1]; rsp->payload.rakp2_message.rakp_return_code = rsp->data[offset + 1];
/* Console session ID */ /* Console session ID */
rsp->payload.rakp2_message.console_id = ipmi32toh(&rsp->data[offset + 4]); rsp->payload.rakp2_message.console_id = ipmi32toh(&rsp->data[offset + 4]);
@ -1004,38 +996,39 @@ read_rakp2_message(
/* Nothing to do here */ /* Nothing to do here */
break; break;
case IPMI_AUTH_RAKP_HMAC_SHA1: case IPMI_AUTH_RAKP_HMAC_SHA1:
/* We need to copy 20 bytes */ /* We need to copy 20 bytes */
for (i = 0; i < IPMI_SHA_DIGEST_LENGTH; ++i) { for (i = 0; i < IPMI_SHA_DIGEST_LENGTH; ++i) {
rsp->payload.rakp2_message.key_exchange_auth_code[i] = rsp->payload.rakp2_message.key_exchange_auth_code[i]
rsp->data[offset + 40 + i]; = rsp->data[offset + 40 + i];
} }
break; break;
case IPMI_AUTH_RAKP_HMAC_MD5: case IPMI_AUTH_RAKP_HMAC_MD5:
/* We need to copy 16 bytes */ /* We need to copy 16 bytes */
for (i = 0; i < IPMI_MD5_DIGEST_LENGTH; ++i) { for (i = 0; i < IPMI_MD5_DIGEST_LENGTH; ++i) {
rsp->payload.rakp2_message.key_exchange_auth_code[i] = rsp->payload.rakp2_message.key_exchange_auth_code[i]
rsp->data[offset + 40 + i]; = rsp->data[offset + 40 + i];
} }
break; break;
#ifdef HAVE_CRYPTO_SHA256 #ifdef HAVE_CRYPTO_SHA256
case IPMI_AUTH_RAKP_HMAC_SHA256: case IPMI_AUTH_RAKP_HMAC_SHA256:
/* We need to copy 32 bytes */ /* We need to copy 32 bytes */
for (i = 0; i < IPMI_SHA256_DIGEST_LENGTH; ++i) { for (i = 0; i < IPMI_SHA256_DIGEST_LENGTH; ++i) {
rsp->payload.rakp2_message.key_exchange_auth_code[i] = rsp->payload.rakp2_message.key_exchange_auth_code[i]
rsp->data[offset + 40 + i]; = rsp->data[offset + 40 + i];
} }
break; break;
#endif /* HAVE_CRYPTO_SHA256 */ #endif /* HAVE_CRYPTO_SHA256 */
default: default:
lprintf(LOG_ERR, "read_rakp2_message: no support " lprintf(LOG_ERR,
"for authentication algorithm 0x%x", auth_alg); "read_rakp2_message: no support "
assert(0); "for authentication algorithm 0x%x", auth_alg);
break; assert(0);
} break;
}
} }