discover: Make boot_priorities more flexible

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

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 091fab722f102e9d9c186e8bec6900146737bcce..3c472febdb14c88a7a0ef82112230c2d67d2fbc3 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -228,7 +228,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
        for (i = 0; i < sysinfo->n_interfaces; i++) {
                struct interface_info *if_info = sysinfo->interfaces[i];
                len +=  4 + if_info->hwaddr_size +
-                       4 + optional_strlen(if_info->name);
+                       4 + optional_strlen(if_info->name) +
+                       sizeof(if_info->link);
        }
 
        for (i = 0; i < sysinfo->n_blockdevs; i++) {
@@ -278,7 +279,7 @@ int pb_protocol_config_len(const struct config *config)
                len += 4 + optional_strlen(config->network.dns_servers[i]);
 
        len += 4;
-       len += config->n_boot_priorities * 4;
+       len += config->n_boot_priorities * 8;
 
        return len;
 }
@@ -384,6 +385,9 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
                pos += if_info->hwaddr_size;
 
                pos += pb_protocol_serialise_string(pos, if_info->name);
+
+               *(bool *)pos = if_info->link;
+               pos += sizeof(bool);
        }
 
        *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
@@ -460,7 +464,11 @@ int pb_protocol_serialise_config(const struct config *config,
        *(uint32_t *)pos = __cpu_to_be32(config->n_boot_priorities);
        pos += 4;
        for (i = 0; i < config->n_boot_priorities; i++) {
-               *(uint32_t *)pos = __cpu_to_be32(config->boot_priorities[i].type);
+               *(uint32_t *)pos =
+                       __cpu_to_be32(config->boot_priorities[i].type);
+               pos += 4;
+               *(uint32_t *)pos =
+                       __cpu_to_be32(config->boot_priorities[i].priority);
                pos += 4;
        }
 
@@ -765,6 +773,9 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
                if (read_string(if_info, &pos, &len, &if_info->name))
                        goto out;
 
+               if_info->link = *(bool *)pos;
+               pos += sizeof(if_info->link);
+
                sysinfo->interfaces[i] = if_info;
        }