ui/common: Only close valid file descriptor

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 69ea35d2eed735382abe2bf22acc64444311159c..42506e218fad289e51c934f6ad5d5643b5004918 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -239,6 +239,9 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
                        4 + optional_strlen(bd_info->mountpoint);
        }
 
+       /* BMC MAC */
+       len += HWADDR_SIZE;
+
        return len;
 }
 
@@ -257,6 +260,7 @@ static int pb_protocol_interface_config_len(struct interface_config *conf)
        if (conf->method == CONFIG_METHOD_STATIC) {
                len += 4 + optional_strlen(conf->static_config.address);
                len += 4 + optional_strlen(conf->static_config.gateway);
+               len += 4 + optional_strlen(conf->static_config.url);
        }
 
        return len;
@@ -290,6 +294,8 @@ int pb_protocol_config_len(const struct config *config)
 
        len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */
 
+       len += 4; /* allow_writes */
+
        len += 4 + optional_strlen(config->lang);
 
        return len;
@@ -418,6 +424,12 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
                pos += pb_protocol_serialise_string(pos, bd_info->mountpoint);
        }
 
+       if (sysinfo->bmc_mac)
+               memcpy(pos, sysinfo->bmc_mac, HWADDR_SIZE);
+       else
+               memset(pos, 0, HWADDR_SIZE);
+       pos += HWADDR_SIZE;
+
        assert(pos <= buf + buf_len);
        (void)buf_len;
 
@@ -446,6 +458,8 @@ static int pb_protocol_serialise_config_interface(char *buf,
                                conf->static_config.address);
                pos += pb_protocol_serialise_string(pos,
                                conf->static_config.gateway);
+               pos += pb_protocol_serialise_string(pos,
+                               conf->static_config.url);
        }
 
        return pos - buf;
@@ -502,6 +516,9 @@ int pb_protocol_serialise_config(const struct config *config,
        *(uint32_t *)pos = config->ipmi_bootdev_persistent;
        pos += 4;
 
+       *(uint32_t *)pos = config->allow_writes;
+       pos += 4;
+
        pos += pb_protocol_serialise_string(pos, config->lang);
 
        assert(pos <= buf + buf_len);
@@ -845,8 +862,18 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 
                sysinfo->blockdevs[i] = bd_info;
        }
-       rc = 0;
 
+       for (i = 0; i < HWADDR_SIZE; i++) {
+               if (pos[i] != 0) {
+                       sysinfo->bmc_mac = talloc_memdup(sysinfo, pos, HWADDR_SIZE);
+                       break;
+               }
+       }
+
+       pos += HWADDR_SIZE;
+       len -= HWADDR_SIZE;
+
+       rc = 0;
 out:
        return rc;
 }
@@ -879,6 +906,9 @@ static int pb_protocol_deserialise_config_interface(const char **buf,
 
                if (read_string(iface, buf, len, &iface->static_config.gateway))
                        return -1;
+
+               if (read_string(iface, buf, len, &iface->static_config.url))
+                       return -1;
        }
 
        return 0;
@@ -958,6 +988,10 @@ int pb_protocol_deserialise_config(struct config *config,
                goto out;
        config->ipmi_bootdev_persistent = !!tmp;
 
+       if (read_u32(&pos, &len, &tmp))
+               goto out;
+       config->allow_writes = !!tmp;
+
        if (read_string(config, &pos, &len, &str))
                goto out;