discover/status: Use full URL in parse status message

[petitboot] / discover / ipmi.c

diff --git a/discover/ipmi.c b/discover/ipmi.c
index 710a47d1c6e8108a8c0d923a8b3df82bfa885dee..2aaf114c20c5bb248141d01b0c786ff26dcd402e 100644 (file)
--- a/discover/ipmi.c
+++ b/discover/ipmi.c
@@ -4,6 +4,7 @@
 #include <poll.h>
 #include <string.h>
 #include <unistd.h>
+#include <arpa/inet.h>
 
 #include <sys/ioctl.h>
 #include <sys/time.h>
@@ -107,11 +108,21 @@ int ipmi_transaction(struct ipmi *ipmi, uint8_t netfn, uint8_t cmd,
 {
        struct timeval start, now, delta;
        struct pollfd pollfds[1];
+       struct flock lock;
        int expired_ms, rc;
 
+       memset(&lock, 0, sizeof(lock));
+       lock.l_type = F_WRLCK;
+       lock.l_whence = SEEK_SET;
+       rc = fcntl(ipmi->fd, F_SETLKW, &lock);
+       if (rc == -1) {
+               pb_log("IPMI: error locking IPMI device: %m\n");
+               return rc;
+       }
+
        rc = ipmi_send(ipmi, netfn, cmd, req_buf, req_len);
        if (rc)
-               return rc;
+               goto out;
 
        pollfds[0].fd = ipmi->fd;
        pollfds[0].events = POLLIN;
@@ -132,11 +143,13 @@ int ipmi_transaction(struct ipmi *ipmi, uint8_t netfn, uint8_t cmd,
                if (rc == 0) {
                        pb_log("IPMI: timeout waiting for response "
                                        "(netfn %d, cmd %d)\n", netfn, cmd);
+                       rc = -1;
                        break;
                }
 
                if (!(pollfds[0].revents & POLLIN)) {
                        pb_log("IPMI: unexpected fd status from poll?\n");
+                       rc = -1;
                        break;
                }
 
@@ -156,17 +169,24 @@ int ipmi_transaction(struct ipmi *ipmi, uint8_t netfn, uint8_t cmd,
                                expired_ms = (delta.tv_sec * 1000) +
                                                (delta.tv_usec / 1000);
 
-                               if (expired_ms >= timeout_ms)
+                               if (expired_ms >= timeout_ms) {
+                                       rc = -1;
                                        break;
+                               }
                        }
                } else {
                        pb_debug("IPMI: netfn(%x->%x), cmd(%x->%x)\n",
                                        netfn, resp_netfn, cmd, resp_cmd);
-                       return 0;
+                       rc = 0;
+                       goto out;
                }
        }
 
-       return -1;
+out:
+       lock.l_type = F_UNLCK;
+       if (fcntl(ipmi->fd, F_SETLKW, &lock) == -1)
+               pb_log("IPMI: error unlocking IPMI device: %m\n");
+       return rc ? -1 : 0;
 }
 
 static int ipmi_destroy(void *p)
@@ -201,3 +221,102 @@ bool ipmi_present(void)
        return !access(ipmi_devnode, R_OK | W_OK);
 }
 
+/* Reads and applies an IPMI interface config override, which closely follows
+ * the format of an interface config struct as described in lib/types */
+int parse_ipmi_interface_override(struct config *config, uint8_t *buf,
+                               uint16_t len)
+{
+       struct interface_config *ifconf;
+       char *ipstr, *gatewaystr;
+       uint8_t hwsize, ipsize;
+       int addr_type, i = 0;
+       socklen_t addr_len;
+
+       /* Get 1-byte hardware address size and ip address size */
+       memcpy(&hwsize, &buf[i], sizeof(hwsize));
+       i += sizeof(hwsize);
+       memcpy(&ipsize, &buf[i], sizeof(ipsize));
+       i += sizeof(ipsize);
+
+       if (!hwsize || !ipsize) {
+               pb_log("%s: Empty response\n", __func__);
+               return -1;
+       }
+
+       /* At the moment only support 6-byte MAC addresses */
+       if (hwsize != sizeof(ifconf->hwaddr)) {
+               pb_log("Unsupported HW address size in network override: %u\n",
+                      hwsize);
+               return -1;
+       }
+
+       /* Sanity check the IP address size */
+       if (ipsize == 4) {
+               addr_type = AF_INET;
+               addr_len = INET_ADDRSTRLEN;
+       } else if (ipsize == 16) {
+               addr_type = AF_INET6;
+               addr_len = INET6_ADDRSTRLEN;
+       } else {
+               pb_log("Unsupported IP address size: %u\n", ipsize);
+               return -1;
+       }
+
+       /* Everything past here is the interface config */
+       ifconf = talloc_zero(config, struct interface_config);
+       if (!ifconf) {
+               pb_log("Failed to allocate network override\n");
+               return -1;
+       }
+
+       /* Hardware Address */
+       memcpy(ifconf->hwaddr, &buf[i], hwsize);
+       i += hwsize;
+
+       /* Check 1-byte ignore and method flags */
+       ifconf->ignore = !!buf[i++];
+       ifconf->method = !!buf[i++];
+
+       if (ifconf->method == CONFIG_METHOD_STATIC) {
+               if (ipsize + ipsize  + 1 > len - i) {
+                       pb_log("Expected data greater than buffer size\n");
+                       talloc_free(ifconf);
+                       return -1;
+               }
+
+               /* IP address */
+               ipstr = talloc_array(ifconf, char, addr_len);
+               if (!inet_ntop(addr_type, &buf[i], ipstr, addr_len)) {
+                       pb_log("Failed to convert ipaddr: %m\n");
+                       talloc_free(ifconf);
+                       return -1;
+               }
+               i += ipsize;
+
+               /* IP address subnet */
+               ifconf->static_config.address = talloc_asprintf(ifconf,
+                                               "%s/%u", ipstr, buf[i]);
+               i++;
+
+               /* Gateway address */
+               gatewaystr = talloc_array(ifconf, char, addr_len);
+               if (!inet_ntop(addr_type, &buf[i], gatewaystr, addr_len)) {
+                       pb_log("Failed to convert gateway: %m\n");
+                       talloc_free(ifconf);
+                       return -1;
+               }
+               ifconf->static_config.gateway = gatewaystr;
+               i += ipsize;
+       }
+
+       ifconf->override = true;
+       pb_log("Applying IPMI network interface override\n");
+
+       /* Replace any existing interface config */
+       talloc_free(config->network.interfaces);
+       config->network.n_interfaces = 1;
+       config->network.interfaces = talloc(config, struct interface_config *);
+       config->network.interfaces[0] = ifconf;
+
+       return 0;
+}