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

Fix code formatting, at least a bit.

Browse Source
This commit is contained in:
Zdenek Styblik 2013-12-08 18:46:53 +00:00
parent 0cd8f46c42
commit 5949b19d44
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipmitool/lib/ipmi_dcmi.c
View File

@ -481,7 +481,7 @@ ipmi_dcmi_prnt_oobDiscover(struct ipmi_intf * intf)
intf->abort = 1; intf->abort = 1;
intf->session->sol_data.sequence_number = 1; intf->session->sol_data.sequence_number = 1;
if (ipmi_intf_socket_connect (intf) == -1) { if (ipmi_intf_socket_connect(intf) == -1) {
lprintf(LOG_ERR, "Could not open socket!"); lprintf(LOG_ERR, "Could not open socket!");
return -1; return -1;
} }

41
ipmitool/src/plugins/ipmi_intf.c
View File

@ -346,8 +346,9 @@ ipmi_intf_socket_connect(struct ipmi_intf * intf)
char service[NI_MAXSERV]; char service[NI_MAXSERV];
int rc; int rc;
if (!intf || intf->session == NULL) if (!intf || intf->session == NULL) {
return -1; return -1;
}
session = intf->session; session = intf->session;
@ -382,12 +383,14 @@ ipmi_intf_socket_connect(struct ipmi_intf * intf)
session->ai_family = AF_UNSPEC; session->ai_family = AF_UNSPEC;
for (rp = rp0; rp != NULL; rp = rp->ai_next) { for (rp = rp0; rp != NULL; rp = rp->ai_next) {
/* We are only interested in IPv4 and IPv6 */ /* We are only interested in IPv4 and IPv6 */
if ((rp->ai_family != AF_INET6) && (rp->ai_family == AF_INET)) if ((rp->ai_family != AF_INET6) && (rp->ai_family == AF_INET)) {
continue; continue;
}
intf->fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); intf->fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
if (intf->fd == -1) if (intf->fd == -1) {
continue; continue;
}
if (rp->ai_family == AF_INET) { if (rp->ai_family == AF_INET) {
if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) { if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) {
@ -396,30 +399,25 @@ ipmi_intf_socket_connect(struct ipmi_intf * intf)
session->ai_family = rp->ai_family; session->ai_family = rp->ai_family;
break; /* Success */ break; /* Success */
} }
} } else if (rp->ai_family == AF_INET6) {
else if (rp->ai_family == AF_INET6) {
struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)rp->ai_addr; struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)rp->ai_addr;
char hbuf[NI_MAXHOST]; char hbuf[NI_MAXHOST];
socklen_t len; socklen_t len;
/* The scope was specified on the command line e.g. with -H FE80::219:99FF:FEA0:BD95%eth0 */ /* The scope was specified on the command line e.g. with -H FE80::219:99FF:FEA0:BD95%eth0 */
if ( addr6->sin6_scope_id != 0) { if (addr6->sin6_scope_id != 0) {
len = sizeof(struct sockaddr_in6); len = sizeof(struct sockaddr_in6);
if ( getnameinfo((struct sockaddr *)addr6, len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0) { if (getnameinfo((struct sockaddr *)addr6, len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0) {
lprintf(LOG_DEBUG, "Trying address: %s scope=%d", lprintf(LOG_DEBUG, "Trying address: %s scope=%d",
hbuf, hbuf,
addr6->sin6_scope_id); addr6->sin6_scope_id);
} }
if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) { if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) {
memcpy(&session->addr, rp->ai_addr, rp->ai_addrlen); memcpy(&session->addr, rp->ai_addr, rp->ai_addrlen);
session->addrlen = rp->ai_addrlen; session->addrlen = rp->ai_addrlen;
session->ai_family = rp->ai_family; session->ai_family = rp->ai_family;
break; /* Success */ break; /* Success */
} }
} else { } else {
/* No scope specified, try to get this from the list of interfaces */ /* No scope specified, try to get this from the list of interfaces */
struct ifaddrs *ifaddrs = NULL; struct ifaddrs *ifaddrs = NULL;
@ -432,18 +430,20 @@ ipmi_intf_socket_connect(struct ipmi_intf * intf)
} }
for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) { for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
if (ifa->ifa_addr == NULL) if (ifa->ifa_addr == NULL) {
continue; continue;
}
if (ifa->ifa_addr->sa_family == AF_INET6) { if (ifa->ifa_addr->sa_family == AF_INET6) {
struct sockaddr_in6 *tmp6 = (struct sockaddr_in6 *)ifa->ifa_addr; struct sockaddr_in6 *tmp6 = (struct sockaddr_in6 *)ifa->ifa_addr;
/* Skip unwanted addresses */ /* Skip unwanted addresses */
if (IN6_IS_ADDR_MULTICAST(&tmp6->sin6_addr)) if (IN6_IS_ADDR_MULTICAST(&tmp6->sin6_addr)) {
continue; continue;
if (IN6_IS_ADDR_LOOPBACK(&tmp6->sin6_addr)) }
if (IN6_IS_ADDR_LOOPBACK(&tmp6->sin6_addr)) {
continue; continue;
}
len = sizeof(struct sockaddr_in6); len = sizeof(struct sockaddr_in6);
if ( getnameinfo((struct sockaddr *)tmp6, len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0) { if ( getnameinfo((struct sockaddr *)tmp6, len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0) {
lprintf(LOG_DEBUG, "Testing %s interface address: %s scope=%d", lprintf(LOG_DEBUG, "Testing %s interface address: %s scope=%d",
@ -462,8 +462,8 @@ ipmi_intf_socket_connect(struct ipmi_intf * intf)
* byte. See also this page: * byte. See also this page:
* http://www.freebsd.org/doc/en/books/developers-handbook/ipv6.html * http://www.freebsd.org/doc/en/books/developers-handbook/ipv6.html
*/ */
if ( IN6_IS_ADDR_LINKLOCAL(&tmp6->sin6_addr) if (IN6_IS_ADDR_LINKLOCAL(&tmp6->sin6_addr)
&& ( tmp6->sin6_addr.s6_addr16[1] != 0 ) ) { && (tmp6->sin6_addr.s6_addr16[1] != 0)) {
addr6->sin6_scope_id = ntohs(tmp6->sin6_addr.s6_addr16[1]); addr6->sin6_scope_id = ntohs(tmp6->sin6_addr.s6_addr16[1]);
} }
} }
@ -480,15 +480,12 @@ ipmi_intf_socket_connect(struct ipmi_intf * intf)
} }
} }
} }
freeifaddrs(ifaddrs); freeifaddrs(ifaddrs);
} }
} }
if (session->ai_family != AF_UNSPEC) {
if (session->ai_family != AF_UNSPEC)
break; break;
}
close(intf->fd); close(intf->fd);
intf->fd = -1; intf->fd = -1;
} }