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

reordered init to allow IPMB address discovery before call to

Browse Source 
IPMICTL_SET_MY_ADDRESS_CMD
This commit is contained in:
Francois Isabelle 2009-04-21 13:01:29 +00:00
parent 92a2b12fe1
commit b5fb1221c1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipmitool/src/plugins/open/open.c
View File

@ -102,16 +102,7 @@ ipmi_openipmi_open(struct ipmi_intf * intf)
return -1; return -1;
} }
if (intf->my_addr != 0) {
unsigned int a = intf->my_addr;
if (ioctl(intf->fd, IPMICTL_SET_MY_ADDRESS_CMD, &a) < 0) {
lperror(LOG_ERR, "Could not set IPMB address");
return -1;
}
lprintf(LOG_DEBUG, "Set IPMB address to 0x%x",
intf->my_addr);
}
intf->opened = 1; intf->opened = 1;
/* Check if PICMG extension is available to use the function GetDeviceLocator /* Check if PICMG extension is available to use the function GetDeviceLocator
@ -179,6 +170,15 @@ ipmi_openipmi_open(struct ipmi_intf * intf)
} }
} }
if (intf->my_addr != 0) {
unsigned int a = intf->my_addr;
if (ioctl(intf->fd, IPMICTL_SET_MY_ADDRESS_CMD, &a) < 0) {
lperror(LOG_ERR, "Could not set IPMB address");
return -1;
}
lprintf(LOG_DEBUG, "Set IPMB address to 0x%x",
intf->my_addr);
}
return intf->fd; return intf->fd;
} }
@ -233,7 +233,7 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
ipmb_addr.slave_addr = intf->target_addr; ipmb_addr.slave_addr = intf->target_addr;
ipmb_addr.lun = req->msg.lun; ipmb_addr.lun = req->msg.lun;
lprintf(LOG_DEBUG, "Sending request to " lprintf(LOG_DEBUG, "Sending request to "
"IPMB target @ 0x%x", intf->target_addr); "IPMB target @ 0x%x (from 0x%x)", intf->target_addr,intf->my_addr);
#ifdef ENABLE_INTF_OPEN_DUAL_BRIDGE #ifdef ENABLE_INTF_OPEN_DUAL_BRIDGE
if(intf->transit_addr != 0 && if(intf->transit_addr != 0 &&
intf->transit_addr != intf->my_addr) { intf->transit_addr != intf->my_addr) {