ui/ncurses: Add plugin menu and nc-plugin screen

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

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 9091709cd095b145cd3572d345a16070ac4ad996..dbbda406fe5a022c518c656c4b44e11b692010da 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -37,6 +37,7 @@
  *    4-byte len, initrd_file
  *    4-byte len, dtb_file
  *    4-byte len, boot_args
+ *    4-byte len, args_sig_file
  *
  * action = 0x2: device remove message
  *  payload:
@@ -49,6 +50,7 @@
  *   4-byte len, initrd_file
  *   4-byte len, dtb_file
  *   4-byte len, boot_args
+ *   4-byte len, args_sig_file
  *
  */
 
@@ -72,6 +74,9 @@ void pb_protocol_dump_device(const struct device *dev, const char *text,
                fprintf(stream, "%s\t\tinit: %s\n", text, opt->initrd_file);
                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");
        }
 }
 
@@ -197,7 +202,9 @@ int pb_protocol_boot_option_len(const struct boot_option *opt)
                4 + optional_strlen(opt->initrd_file) +
                4 + optional_strlen(opt->dtb_file) +
                4 + optional_strlen(opt->boot_args) +
-               sizeof(opt->is_default);
+               4 + optional_strlen(opt->args_sig_file) +
+               sizeof(opt->is_default) +
+               sizeof(opt->type);
 }
 
 int pb_protocol_boot_len(const struct boot_command *boot)
@@ -206,14 +213,16 @@ int pb_protocol_boot_len(const struct boot_command *boot)
                4 + optional_strlen(boot->boot_image_file) +
                4 + optional_strlen(boot->initrd_file) +
                4 + optional_strlen(boot->dtb_file) +
-               4 + optional_strlen(boot->boot_args);
+               4 + optional_strlen(boot->boot_args) +
+               4 + optional_strlen(boot->args_sig_file) +
+               4 + optional_strlen(boot->console);
 }
 
-int pb_protocol_boot_status_len(const struct boot_status *status)
+int pb_protocol_boot_status_len(const struct status *status)
 {
-       return  4 +
+       return  4 +     /* type */
                4 + optional_strlen(status->message) +
-               4 + optional_strlen(status->detail) +
+               4 +     /* backlog */
                4;
 }
 
@@ -243,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++) {
@@ -277,6 +287,8 @@ static int pb_protocol_interface_config_len(struct interface_config *conf)
                len += 4 + optional_strlen(conf->static_config.url);
        }
 
+       len += 4 /* conf->override */;
+
        return len;
 }
 
@@ -297,6 +309,9 @@ int pb_protocol_config_len(const struct config *config)
        for (i = 0; i < config->network.n_dns_servers; i++)
                len += 4 + optional_strlen(config->network.dns_servers[i]);
 
+       len += 4 + optional_strlen(config->http_proxy);
+       len += 4 + optional_strlen(config->https_proxy);
+
        len += 4;
        for (i = 0; i < config->n_autoboot_opts; i++) {
                if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
@@ -310,6 +325,13 @@ int pb_protocol_config_len(const struct config *config)
 
        len += 4; /* allow_writes */
 
+       len += 4; /* n_consoles */
+       for (i = 0; i < config->n_consoles; i++)
+               len += 4 + optional_strlen(config->consoles[i]);
+
+       len += 4 + optional_strlen(config->boot_console);
+       len += 4; /* manual_console */
+
        len += 4 + optional_strlen(config->lang);
 
        return len;
@@ -321,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)
 {
@@ -353,10 +395,14 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt,
        pos += pb_protocol_serialise_string(pos, opt->initrd_file);
        pos += pb_protocol_serialise_string(pos, opt->dtb_file);
        pos += pb_protocol_serialise_string(pos, opt->boot_args);
+       pos += pb_protocol_serialise_string(pos, opt->args_sig_file);
 
        *(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;
 
@@ -373,6 +419,8 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
        pos += pb_protocol_serialise_string(pos, boot->initrd_file);
        pos += pb_protocol_serialise_string(pos, boot->dtb_file);
        pos += pb_protocol_serialise_string(pos, boot->boot_args);
+       pos += pb_protocol_serialise_string(pos, boot->args_sig_file);
+       pos += pb_protocol_serialise_string(pos, boot->console);
 
        assert(pos <= buf + buf_len);
        (void)buf_len;
@@ -380,7 +428,7 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
        return 0;
 }
 
-int pb_protocol_serialise_boot_status(const struct boot_status *status,
+int pb_protocol_serialise_boot_status(const struct status *status,
                char *buf, int buf_len)
 {
        char *pos = buf;
@@ -389,10 +437,9 @@ int pb_protocol_serialise_boot_status(const struct boot_status *status,
        pos += sizeof(uint32_t);
 
        pos += pb_protocol_serialise_string(pos, status->message);
-       pos += pb_protocol_serialise_string(pos, status->detail);
 
-       *(uint32_t *)pos = __cpu_to_be32(status->type);
-       pos += sizeof(uint32_t);
+       *(bool *)pos = __cpu_to_be32(status->backlog);
+       pos += sizeof(bool);
 
        assert(pos <= buf + buf_len);
        (void)buf_len;
@@ -445,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);
@@ -496,6 +545,9 @@ static int pb_protocol_serialise_config_interface(char *buf,
                                conf->static_config.url);
        }
 
+       *(uint32_t *)pos = conf->override;
+       pos += 4;
+
        return pos - buf;
 }
 
@@ -529,6 +581,9 @@ int pb_protocol_serialise_config(const struct config *config,
                                config->network.dns_servers[i]);
        }
 
+       pos += pb_protocol_serialise_string(pos, config->http_proxy);
+       pos += pb_protocol_serialise_string(pos, config->https_proxy);
+
        *(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts);
        pos += 4;
        for (i = 0; i < config->n_autoboot_opts; i++) {
@@ -553,6 +608,15 @@ int pb_protocol_serialise_config(const struct config *config,
        *(uint32_t *)pos = config->allow_writes;
        pos += 4;
 
+       *(uint32_t *)pos = __cpu_to_be32(config->n_consoles);
+       pos += 4;
+       for (i = 0; i < config->n_consoles; i++)
+               pos += pb_protocol_serialise_string(pos, config->consoles[i]);
+
+       pos += pb_protocol_serialise_string(pos, config->boot_console);
+       *(uint32_t *)pos = config->manual_console;
+       pos += 4;
+
        pos += pb_protocol_serialise_string(pos, config->lang);
 
        assert(pos <= buf + buf_len);
@@ -573,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;
@@ -735,9 +825,17 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt,
        if (read_string(opt, &pos, &len, &opt->boot_args))
                goto out;
 
+       if (read_string(opt, &pos, &len, &opt->args_sig_file))
+               goto out;
+
        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;
 
@@ -770,13 +868,19 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd,
        if (read_string(cmd, &pos, &len, &cmd->boot_args))
                goto out;
 
+       if (read_string(cmd, &pos, &len, &cmd->args_sig_file))
+               goto out;
+
+       if (read_string(cmd, &pos, &len, &cmd->console))
+               goto out;
+
        rc = 0;
 
 out:
        return rc;
 }
 
-int pb_protocol_deserialise_boot_status(struct boot_status *status,
+int pb_protocol_deserialise_boot_status(struct status *status,
                const struct pb_protocol_message *message)
 {
        unsigned int len;
@@ -793,8 +897,8 @@ int pb_protocol_deserialise_boot_status(struct boot_status *status,
        status->type = __be32_to_cpu(*(uint32_t *)(pos));
 
        switch (status->type) {
-       case BOOT_STATUS_ERROR:
-       case BOOT_STATUS_INFO:
+       case STATUS_ERROR:
+       case STATUS_INFO:
                break;
        default:
                goto out;
@@ -803,22 +907,13 @@ int pb_protocol_deserialise_boot_status(struct boot_status *status,
        pos += sizeof(uint32_t);
        len -= sizeof(uint32_t);
 
-       /* message and detail strings */
+       /* message string */
        if (read_string(status, &pos, &len, &status->message))
                goto out;
 
-       if (read_string(status, &pos, &len, &status->detail))
-               goto out;
-
-       /* and finally, progress */
-       if (len < sizeof(uint32_t))
-               goto out;
-
-       status->progress = __be32_to_cpu(*(uint32_t *)(pos));
-
-       /* clamp to 100% */
-       if (status->progress > 100)
-               status->progress = 100;
+       /* backlog */
+       status->backlog = *(bool *)pos;
+       pos += sizeof(status->backlog);
 
        rc = 0;
 
@@ -914,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;
        }
 
@@ -988,6 +1086,10 @@ static int pb_protocol_deserialise_config_interface(const char **buf,
                        return -1;
        }
 
+       if (read_u32(buf, len, &tmp))
+               return -1;
+       iface->override = !!tmp;
+
        return 0;
 }
 
@@ -1039,6 +1141,13 @@ int pb_protocol_deserialise_config(struct config *config,
                config->network.dns_servers[i] = str;
        }
 
+       if (read_string(config, &pos, &len, &str))
+               goto out;
+       config->http_proxy = str;
+       if (read_string(config, &pos, &len, &str))
+               goto out;
+       config->https_proxy = str;
+
        if (read_u32(&pos, &len, &config->n_autoboot_opts))
                goto out;
        config->autoboot_opts = talloc_array(config, struct autoboot_option,
@@ -1069,6 +1178,25 @@ int pb_protocol_deserialise_config(struct config *config,
                goto out;
        config->allow_writes = !!tmp;
 
+       if (read_u32(&pos, &len, &config->n_consoles))
+               goto out;
+
+       config->consoles = talloc_array(config, char *, config->n_consoles);
+       for (i = 0; i < config->n_consoles; i++) {
+               if (read_string(config->consoles, &pos, &len, &str))
+                       goto out;
+               config->consoles[i] = str;
+       }
+
+       if (read_string(config, &pos, &len, &str))
+               goto out;
+
+       config->boot_console = str;
+
+       if (read_u32(&pos, &len, &tmp))
+               goto out;
+       config->manual_console = !!tmp;
+
        if (read_string(config, &pos, &len, &str))
                goto out;
 
@@ -1079,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;
+}