Use 'consoles' instead of 'tty' to refer to interfaces

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

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 7887fb00cbd19f7bc43216a68ce47a562d3916c8..0d83bde0d11fca8f7b4902755cfa13e458a6277f 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, initrd_file
  *    4-byte len, dtb_file
  *    4-byte len, boot_args

+ *    4-byte len, args_sig_file

  *
  * action = 0x2: device remove message
  *  payload:
  *
  * 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, initrd_file
  *   4-byte len, dtb_file
  *   4-byte len, boot_args

+ *   4-byte len, args_sig_file

  *
  */
 
  *
  */
 


@@ -72,6 +74,7 @@ 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\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);

        }
 }
 
        }
 }
 


@@ -197,6 +200,7 @@ 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) +
                4 + optional_strlen(opt->initrd_file) +
                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);
 }
 


@@ -207,7 +211,8 @@ int pb_protocol_boot_len(const struct boot_command *boot)
                4 + optional_strlen(boot->initrd_file) +
                4 + optional_strlen(boot->dtb_file) +
                4 + optional_strlen(boot->boot_args) +
                4 + optional_strlen(boot->initrd_file) +
                4 + optional_strlen(boot->dtb_file) +
                4 + optional_strlen(boot->boot_args) +

-               4 + optional_strlen(boot->tty);
+               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 boot_status *status)


@@ -278,6 +283,8 @@ static int pb_protocol_interface_config_len(struct interface_config *conf)
                len += 4 + optional_strlen(conf->static_config.url);
        }
 
                len += 4 + optional_strlen(conf->static_config.url);
        }
 

+       len += 4 /* conf->override */;
+

        return len;
 }
 
        return len;
 }
 


@@ -311,11 +318,11 @@ int pb_protocol_config_len(const struct config *config)
 
        len += 4; /* allow_writes */
 
 
        len += 4; /* allow_writes */
 

-       len += 4; /* n_tty */
-       for (i = 0; i < config->n_tty; i++)
-               len += 4 + optional_strlen(config->tty_list[i]);
+       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_tty);
+       len += 4 + optional_strlen(config->boot_console);

 
        len += 4 + optional_strlen(config->lang);
 
 
        len += 4 + optional_strlen(config->lang);
 


@@ -360,6 +367,7 @@ 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->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);
 
        *(bool *)pos = opt->is_default;
        pos += sizeof(bool);


@@ -380,7 +388,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->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->tty);
+       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;
 
        assert(pos <= buf + buf_len);
        (void)buf_len;


@@ -504,6 +513,9 @@ static int pb_protocol_serialise_config_interface(char *buf,
                                conf->static_config.url);
        }
 
                                conf->static_config.url);
        }
 

+       *(uint32_t *)pos = conf->override;
+       pos += 4;
+

        return pos - buf;
 }
 
        return pos - buf;
 }
 


@@ -561,12 +573,12 @@ int pb_protocol_serialise_config(const struct config *config,
        *(uint32_t *)pos = config->allow_writes;
        pos += 4;
 
        *(uint32_t *)pos = config->allow_writes;
        pos += 4;
 

-       *(uint32_t *)pos = __cpu_to_be32(config->n_tty);
+       *(uint32_t *)pos = __cpu_to_be32(config->n_consoles);

        pos += 4;
        pos += 4;

-       for (i = 0; i < config->n_tty; i++)
-               pos += pb_protocol_serialise_string(pos, config->tty_list[i]);
+       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_tty);
+       pos += pb_protocol_serialise_string(pos, config->boot_console);

 
        pos += pb_protocol_serialise_string(pos, config->lang);
 
 
        pos += pb_protocol_serialise_string(pos, config->lang);
 


@@ -750,6 +762,9 @@ 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->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);
        if (len < sizeof(bool))
                goto out;
        opt->is_default = *(bool *)(pos);


@@ -785,7 +800,10 @@ 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->boot_args))
                goto out;
 

-       if (read_string(cmd, &pos, &len, &cmd->tty))
+       if (read_string(cmd, &pos, &len, &cmd->args_sig_file))
+               goto out;
+
+       if (read_string(cmd, &pos, &len, &cmd->console))

                goto out;
 
        rc = 0;
                goto out;
 
        rc = 0;


@@ -1006,6 +1024,10 @@ static int pb_protocol_deserialise_config_interface(const char **buf,
                        return -1;
        }
 
                        return -1;
        }
 

+       if (read_u32(buf, len, &tmp))
+               return -1;
+       iface->override = !!tmp;
+

        return 0;
 }
 
        return 0;
 }
 


@@ -1087,20 +1109,20 @@ int pb_protocol_deserialise_config(struct config *config,
                goto out;
        config->allow_writes = !!tmp;
 
                goto out;
        config->allow_writes = !!tmp;
 

-       if (read_u32(&pos, &len, &config->n_tty))
+       if (read_u32(&pos, &len, &config->n_consoles))

                goto out;
 
                goto out;
 

-       config->tty_list = talloc_array(config, char *, config->n_tty);
-       for (i = 0; i < config->n_tty; i++) {
-               if (read_string(config->tty_list, &pos, &len, &str))
+       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;
                        goto out;

-               config->tty_list[i] = str;
+               config->consoles[i] = str;

        }
 
        if (read_string(config, &pos, &len, &str))
                goto out;
 
        }
 
        if (read_string(config, &pos, &len, &str))
                goto out;
 

-       config->boot_tty = str;
+       config->boot_console = str;

 
        if (read_string(config, &pos, &len, &str))
                goto out;
 
        if (read_string(config, &pos, &len, &str))
                goto out;