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

ID: 3522731 - 'lib/ipmi_sol.c' - ipmi_get_sol_info() returns always 0

Browse Source 
Commit fixes ipmi_get_sol_info()'s return value, so (-1) is returned on error,
eg. response is NULL. It doesn't matter whether it is first or last response, we
bail out immediately.
Commit also fixes missing argument to one lprintf() and
indentation(spaces->tabs).

This bug is connected with ``ID: 1835038 - 'lib/ipmi_sol.c' -
ipmi_get_sol_info() returns always 0''.

Reported by: Duncan Idaho
This commit is contained in:
Zdenek Styblik 2012-10-21 11:46:17 +00:00
parent 8d828f6c72
commit f8f6d51fd2
1 changed files with 101 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
ipmitool/lib/ipmi_sol.c
View File

@ -208,7 +208,6 @@ ipmi_get_sol_info(
req.msg.data_len = 4; req.msg.data_len = 4;
req.msg.data = data; req.msg.data = data;
/* /*
* set in progress * set in progress
*/ */
@ -219,6 +218,11 @@ ipmi_get_sol_info(
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
@ -227,14 +231,14 @@ ipmi_get_sol_info(
params->set_in_progress = rsp->data[1]; params->set_in_progress = rsp->data[1];
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -242,21 +246,23 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
* SOL enable * SOL enable
*/ */
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
data[0] = channel; /* channel number */ data[0] = channel; /* channel number */
data[1] = SOL_PARAMETER_SOL_ENABLE; /* parameter selector */ data[1] = SOL_PARAMETER_SOL_ENABLE; /* parameter selector */
data[2] = 0x00; /* set selector */ data[2] = 0x00; /* set selector */
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
@ -265,14 +271,14 @@ ipmi_get_sol_info(
params->enabled = rsp->data[1]; params->enabled = rsp->data[1];
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -280,9 +286,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
@ -295,6 +298,12 @@ ipmi_get_sol_info(
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
case 0x00: case 0x00:
@ -304,14 +313,14 @@ ipmi_get_sol_info(
params->privilege_level = rsp->data[1] & 0x0F; params->privilege_level = rsp->data[1] & 0x0F;
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -319,9 +328,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
@ -334,6 +340,12 @@ ipmi_get_sol_info(
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
case 0x00: case 0x00:
@ -342,14 +354,14 @@ ipmi_get_sol_info(
params->character_send_threshold = rsp->data[2]; params->character_send_threshold = rsp->data[2];
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -357,9 +369,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
@ -372,6 +381,12 @@ ipmi_get_sol_info(
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
case 0x00: case 0x00:
@ -380,14 +395,14 @@ ipmi_get_sol_info(
params->retry_interval = rsp->data[2]; params->retry_interval = rsp->data[2];
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -395,9 +410,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
@ -405,11 +417,17 @@ ipmi_get_sol_info(
*/ */
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
data[0] = channel; /* channel number */ data[0] = channel; /* channel number */
data[1] = SOL_PARAMETER_SOL_NON_VOLATILE_BIT_RATE; /* parameter selector */ data[1] = SOL_PARAMETER_SOL_NON_VOLATILE_BIT_RATE; /* parameter selector */
data[2] = 0x00; /* set selector */ data[2] = 0x00; /* set selector */
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
case 0x00: case 0x00:
@ -417,14 +435,14 @@ ipmi_get_sol_info(
params->non_volatile_bit_rate = rsp->data[1] & 0x0F; params->non_volatile_bit_rate = rsp->data[1] & 0x0F;
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -432,9 +450,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
@ -447,6 +462,12 @@ ipmi_get_sol_info(
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
case 0x00: case 0x00:
@ -454,14 +475,14 @@ ipmi_get_sol_info(
params->volatile_bit_rate = rsp->data[1] & 0x0F; params->volatile_bit_rate = rsp->data[1] & 0x0F;
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -469,9 +490,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
@ -484,6 +502,12 @@ ipmi_get_sol_info(
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
case 0x00: case 0x00:
@ -491,14 +515,14 @@ ipmi_get_sol_info(
params->payload_channel = rsp->data[1]; params->payload_channel = rsp->data[1];
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - defaulting to 0x%02x", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - defaulting to 0x%02x",
val2str(data[1], sol_parameter_vals), channel); val2str(data[1], sol_parameter_vals), channel);
params->payload_channel = channel; params->payload_channel = channel;
break; break;
default: default:
@ -507,9 +531,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
/* /*
@ -522,6 +543,12 @@ ipmi_get_sol_info(
data[3] = 0x00; /* block selector */ data[3] = 0x00; /* block selector */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
return (-1);
}
if (NULL != rsp) { if (NULL != rsp) {
switch (rsp->ccode) { switch (rsp->ccode) {
case 0x00: case 0x00:
@ -529,19 +556,23 @@ ipmi_get_sol_info(
params->payload_port = (rsp->data[1]) | (rsp->data[2] << 8); params->payload_port = (rsp->data[1]) | (rsp->data[2] << 8);
} else { } else {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received " lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
"for SOL parameter '%s'", "for SOL parameter '%s'",
rsp->data_len, rsp->data_len,
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
} }
break; break;
case 0x80: case 0x80:
if( intf->session != NULL ){ if( intf->session != NULL ) {
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - defaulting to %d", val2str(data[1], sol_parameter_vals), intf->session->port); lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - defaulting to %d",
params->payload_port = intf->session->port; val2str(data[1], sol_parameter_vals), intf->session->port);
} else { params->payload_port = intf->session->port;
lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - can't determine which payload port to use on NULL session" ); } else {
return -1; lprintf(LOG_ERR,
} "Info: SOL parameter '%s' not supported - can't determine which "
"payload port to use on NULL session",
val2str(data[1], sol_parameter_vals));
return -1;
}
break; break;
default: default:
lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
@ -549,9 +580,6 @@ ipmi_get_sol_info(
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else {
lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
val2str(data[1], sol_parameter_vals));
} }
return 0; return 0;