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

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

Browse Source 
I'm reverting to previous revision, because I've realized these
``if (rsp != NULL)'' became redundant.
I'm sorry about that.
This commit is contained in:
Zdenek Styblik 2012-10-22 06:09:49 +00:00
parent f8f6d51fd2
commit a974ab2c69
1 changed files with 73 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
ipmitool/lib/ipmi_sol.c
View File

@ -208,6 +208,7 @@ 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
*/ */
@ -218,11 +219,6 @@ 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) {
@ -231,14 +227,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",
@ -246,23 +242,21 @@ 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) {
@ -271,14 +265,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",
@ -286,6 +280,9 @@ 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));
} }
/* /*
@ -298,12 +295,6 @@ 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:
@ -313,14 +304,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",
@ -328,6 +319,9 @@ 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));
} }
/* /*
@ -340,12 +334,6 @@ 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:
@ -354,14 +342,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",
@ -369,6 +357,9 @@ 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));
} }
/* /*
@ -381,12 +372,6 @@ 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:
@ -395,14 +380,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",
@ -410,6 +395,9 @@ 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));
} }
/* /*
@ -417,17 +405,11 @@ 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:
@ -435,14 +417,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",
@ -450,6 +432,9 @@ 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));
} }
/* /*
@ -462,12 +447,6 @@ 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:
@ -475,14 +454,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",
@ -490,6 +469,9 @@ 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));
} }
/* /*
@ -502,12 +484,6 @@ 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:
@ -515,14 +491,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:
@ -531,6 +507,9 @@ 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));
} }
/* /*
@ -543,12 +522,6 @@ 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:
@ -556,23 +529,19 @@ 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", lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - defaulting to %d", val2str(data[1], sol_parameter_vals), intf->session->port);
val2str(data[1], sol_parameter_vals), intf->session->port); params->payload_port = intf->session->port;
params->payload_port = intf->session->port; } else {
} else { lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - can't determine which payload port to use on NULL session" );
lprintf(LOG_ERR, return -1;
"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",
@ -580,6 +549,9 @@ 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;