X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=18edf57e24ca341e88a21fa2e06891685c297c0a;hp=706aec9786169af697c0488f535a2730c95269db;hb=0d3caaf8e9a75e9b6ebc9427c75ed2914c60439d;hpb=662129afba2d344d692a9dbfd430c91eff4f281d diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 706aec9..18edf57 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -212,14 +212,14 @@ int pb_protocol_boot_len(const struct boot_command *boot) 4 + optional_strlen(boot->dtb_file) + 4 + optional_strlen(boot->boot_args) + 4 + optional_strlen(boot->args_sig_file) + - 4 + optional_strlen(boot->tty); + 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; } @@ -249,7 +249,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++) { @@ -305,6 +306,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) @@ -318,11 +322,12 @@ int pb_protocol_config_len(const struct config *config) 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; /* manual_console */ len += 4 + optional_strlen(config->lang); @@ -389,7 +394,7 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot, 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->tty); + pos += pb_protocol_serialise_string(pos, boot->console); assert(pos <= buf + buf_len); (void)buf_len; @@ -397,7 +402,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; @@ -406,10 +411,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; @@ -462,6 +466,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); @@ -549,6 +555,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++) { @@ -573,12 +582,14 @@ 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_tty); + *(uint32_t *)pos = __cpu_to_be32(config->n_consoles); 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); + *(uint32_t *)pos = config->manual_console; + pos += 4; pos += pb_protocol_serialise_string(pos, config->lang); @@ -803,7 +814,7 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd, if (read_string(cmd, &pos, &len, &cmd->args_sig_file)) goto out; - if (read_string(cmd, &pos, &len, &cmd->tty)) + if (read_string(cmd, &pos, &len, &cmd->console)) goto out; rc = 0; @@ -812,7 +823,7 @@ 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; @@ -829,8 +840,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; @@ -839,22 +850,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; @@ -950,6 +952,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; } @@ -1079,6 +1084,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, @@ -1109,20 +1121,24 @@ int pb_protocol_deserialise_config(struct config *config, goto out; config->allow_writes = !!tmp; - if (read_u32(&pos, &len, &config->n_tty)) + if (read_u32(&pos, &len, &config->n_consoles)) 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; - config->tty_list[i] = str; + config->consoles[i] = str; } if (read_string(config, &pos, &len, &str)) goto out; - config->boot_tty = str; + 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;