travis: Enable ppc64le Travis builds

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

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 65a1e93408d834d0449d458d0806e3ef50be66f6..dbbda406fe5a022c518c656c4b44e11b692010da 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -75,6 +75,8 @@ void pb_protocol_dump_device(const struct device *dev, const char *text,
                fprintf(stream, "%s\t\tdtb:  %s\n", text, opt->dtb_file);
                fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args);
                fprintf(stream, "%s\t\tasig: %s\n", text, opt->args_sig_file);
+               fprintf(stream, "%s\t\ttype: %s\n", text,
+                       opt->type == DISCOVER_BOOT_OPTION ? "boot" : "plugin");
        }
 }
 
@@ -201,7 +203,8 @@ int pb_protocol_boot_option_len(const struct boot_option *opt)
                4 + optional_strlen(opt->dtb_file) +
                4 + optional_strlen(opt->boot_args) +
                4 + optional_strlen(opt->args_sig_file) +
-               sizeof(opt->is_default);
+               sizeof(opt->is_default) +
+               sizeof(opt->type);
 }
 
 int pb_protocol_boot_len(const struct boot_command *boot)
@@ -249,7 +252,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
                struct interface_info *if_info = sysinfo->interfaces[i];
                len +=  4 + if_info->hwaddr_size +
                        4 + optional_strlen(if_info->name) +
-                       sizeof(if_info->link);
+                       sizeof(if_info->link) +
+                       4 + optional_strlen(if_info->address);
        }
 
        for (i = 0; i < sysinfo->n_blockdevs; i++) {
@@ -339,6 +343,26 @@ int pb_protocol_url_len(const char *url)
        return 4 + optional_strlen(url);
 }
 
+
+int pb_protocol_plugin_option_len(const struct plugin_option *opt)
+{
+       unsigned int i, len = 0;
+
+       len += 4 + optional_strlen(opt->id);
+       len += 4 + optional_strlen(opt->name);
+       len += 4 + optional_strlen(opt->vendor);
+       len += 4 + optional_strlen(opt->vendor_id);
+       len += 4 + optional_strlen(opt->version);
+       len += 4 + optional_strlen(opt->date);
+       len += 4 + optional_strlen(opt->plugin_file);
+
+       len += 4; /* n_executables */
+       for (i = 0; i < opt->n_executables; i++)
+               len += 4 + optional_strlen(opt->executables[i]);
+
+       return len;
+}
+
 int pb_protocol_serialise_device(const struct device *dev,
                char *buf, int buf_len)
 {
@@ -376,6 +400,9 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt,
        *(bool *)pos = opt->is_default;
        pos += sizeof(bool);
 
+       *(uint32_t *)pos = __cpu_to_be32(opt->type);
+       pos += 4;
+
        assert(pos <= buf + buf_len);
        (void)buf_len;
 
@@ -465,6 +492,8 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 
                *(bool *)pos = if_info->link;
                pos += sizeof(bool);
+
+               pos += pb_protocol_serialise_string(pos, if_info->address);
        }
 
        *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
@@ -608,6 +637,32 @@ int pb_protocol_serialise_url(const char *url, char *buf, int buf_len)
        return 0;
 }
 
+int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
+               char *buf, int buf_len)
+{
+       char *pos = buf;
+       unsigned int i;
+
+       pos += pb_protocol_serialise_string(pos, opt->id);
+       pos += pb_protocol_serialise_string(pos, opt->name);
+       pos += pb_protocol_serialise_string(pos, opt->vendor);
+       pos += pb_protocol_serialise_string(pos, opt->vendor_id);
+       pos += pb_protocol_serialise_string(pos, opt->version);
+       pos += pb_protocol_serialise_string(pos, opt->date);
+       pos += pb_protocol_serialise_string(pos, opt->plugin_file);
+
+       *(uint32_t *)pos = __cpu_to_be32(opt->n_executables);
+       pos += 4;
+
+       for (i = 0; i < opt->n_executables; i++)
+               pos += pb_protocol_serialise_string(pos, opt->executables[i]);
+
+       assert(pos <= buf + buf_len);
+       (void)buf_len;
+
+       return 0;
+}
+
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message)
 {
        int total_len, rc;
@@ -776,6 +831,11 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt,
        if (len < sizeof(bool))
                goto out;
        opt->is_default = *(bool *)(pos);
+       pos += sizeof(bool);
+       len -= sizeof(bool);
+
+       if (read_u32(&pos, &len, &opt->type))
+               return -1;
 
        rc = 0;
 
@@ -949,6 +1009,9 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
                if_info->link = *(bool *)pos;
                pos += sizeof(if_info->link);
 
+               if (read_string(if_info, &pos, &len, &if_info->address))
+                       goto out;
+
                sysinfo->interfaces[i] = if_info;
        }
 
@@ -1144,3 +1207,61 @@ int pb_protocol_deserialise_config(struct config *config,
 out:
        return rc;
 }
+
+int pb_protocol_deserialise_plugin_option(struct plugin_option *opt,
+               const struct pb_protocol_message *message)
+{
+       unsigned int len, i, tmp;
+       const char *pos;
+       int rc = -1;
+       char *str;
+
+       len = message->payload_len;
+       pos = message->payload;
+
+       if (read_string(opt, &pos, &len, &str))
+               goto out;
+       opt->id = str;
+
+       if (read_string(opt, &pos, &len, &str))
+               goto out;
+       opt->name = str;
+
+       if (read_string(opt, &pos, &len, &str))
+               goto out;
+       opt->vendor = str;
+
+       if (read_string(opt, &pos, &len, &str))
+               goto out;
+       opt->vendor_id = str;
+
+       if (read_string(opt, &pos, &len, &str))
+               goto out;
+       opt->version = str;
+
+       if (read_string(opt, &pos, &len, &str))
+               goto out;
+       opt->date = str;
+
+       if (read_string(opt, &pos, &len, &str))
+               goto out;
+       opt->plugin_file = str;
+
+       if (read_u32(&pos, &len, &tmp))
+               goto out;
+       opt->n_executables = tmp;
+
+       opt->executables = talloc_zero_array(opt, char *, opt->n_executables);
+       if (!opt->executables)
+               goto out;
+
+       for (i = 0; i < opt->n_executables; i++) {
+               if (read_string(opt, &pos, &len, &str))
+                       goto out;
+               opt->executables[i] = talloc_strdup(opt, str);
+       }
+
+       rc = 0;
+out:
+       return rc;
+}