X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=65a1e93408d834d0449d458d0806e3ef50be66f6;hp=e99ce86292c90baf111efd84865e7b8aa48a5197;hb=75c97cfd449b2bac8e61af1017a83bdf43f5e8fe;hpb=d974c3c39237c8e94bb3a51d3511d18dea01043e diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index e99ce86..65a1e93 100644 --- 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,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\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->args_sig_file) + sizeof(opt->is_default); } @@ -206,14 +210,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; } @@ -226,12 +232,19 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo) 4 + 4; len += 4; - for (i = 0; i < sysinfo->n_current; i++) - len += 4 + optional_strlen(sysinfo->platform_current[i]); + for (i = 0; i < sysinfo->n_primary; i++) + len += 4 + optional_strlen(sysinfo->platform_primary[i]); len += 4; for (i = 0; i < sysinfo->n_other; i++) len += 4 + optional_strlen(sysinfo->platform_other[i]); + len += 4; + for (i = 0; i < sysinfo->n_bmc_current; i++) + len += 4 + optional_strlen(sysinfo->bmc_current[i]); + len += 4; + for (i = 0; i < sysinfo->n_bmc_golden; i++) + len += 4 + optional_strlen(sysinfo->bmc_golden[i]); + for (i = 0; i < sysinfo->n_interfaces; i++) { struct interface_info *if_info = sysinfo->interfaces[i]; len += 4 + if_info->hwaddr_size + @@ -270,6 +283,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; } @@ -290,6 +305,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) @@ -303,6 +321,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; @@ -346,6 +371,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->args_sig_file); *(bool *)pos = opt->is_default; pos += sizeof(bool); @@ -366,6 +392,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; @@ -373,7 +401,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; @@ -382,10 +410,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; @@ -402,16 +429,26 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo, pos += pb_protocol_serialise_string(pos, sysinfo->type); pos += pb_protocol_serialise_string(pos, sysinfo->identifier); - *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_current); + *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_primary); pos += sizeof(uint32_t); - for (i = 0; i < sysinfo->n_current; i++) - pos += pb_protocol_serialise_string(pos, sysinfo->platform_current[i]); + for (i = 0; i < sysinfo->n_primary; i++) + pos += pb_protocol_serialise_string(pos, sysinfo->platform_primary[i]); *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_other); pos += sizeof(uint32_t); for (i = 0; i < sysinfo->n_other; i++) pos += pb_protocol_serialise_string(pos, sysinfo->platform_other[i]); + *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_bmc_current); + pos += sizeof(uint32_t); + for (i = 0; i < sysinfo->n_bmc_current; i++) + pos += pb_protocol_serialise_string(pos, sysinfo->bmc_current[i]); + + *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_bmc_golden); + pos += sizeof(uint32_t); + for (i = 0; i < sysinfo->n_bmc_golden; i++) + pos += pb_protocol_serialise_string(pos, sysinfo->bmc_golden[i]); + *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_interfaces); pos += sizeof(uint32_t); @@ -479,6 +516,9 @@ static int pb_protocol_serialise_config_interface(char *buf, conf->static_config.url); } + *(uint32_t *)pos = conf->override; + pos += 4; + return pos - buf; } @@ -512,6 +552,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++) { @@ -536,6 +579,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); @@ -718,6 +770,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->args_sig_file)) + goto out; + if (len < sizeof(bool)) goto out; opt->is_default = *(bool *)(pos); @@ -753,13 +808,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; @@ -776,8 +837,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; @@ -786,22 +847,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; @@ -827,15 +879,15 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo, if (read_string(sysinfo, &pos, &len, &sysinfo->identifier)) goto out; - /* versions strings for openpower platforms */ - if (read_u32(&pos, &len, &sysinfo->n_current)) + /* Platform version strings for openpower platforms */ + if (read_u32(&pos, &len, &sysinfo->n_primary)) goto out; - sysinfo->platform_current = talloc_array(sysinfo, char *, - sysinfo->n_current); - for (i = 0; i < sysinfo->n_current; i++) { + sysinfo->platform_primary = talloc_array(sysinfo, char *, + sysinfo->n_primary); + for (i = 0; i < sysinfo->n_primary; i++) { if (read_string(sysinfo, &pos, &len, &tmp)) goto out; - sysinfo->platform_current[i] = talloc_strdup(sysinfo, tmp); + sysinfo->platform_primary[i] = talloc_strdup(sysinfo, tmp); } if (read_u32(&pos, &len, &sysinfo->n_other)) @@ -848,6 +900,27 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo, sysinfo->platform_other[i] = talloc_strdup(sysinfo, tmp); } + /* BMC version strings for openpower platforms */ + if (read_u32(&pos, &len, &sysinfo->n_bmc_current)) + goto out; + sysinfo->bmc_current = talloc_array(sysinfo, char *, + sysinfo->n_bmc_current); + for (i = 0; i < sysinfo->n_bmc_current; i++) { + if (read_string(sysinfo, &pos, &len, &tmp)) + goto out; + sysinfo->bmc_current[i] = talloc_strdup(sysinfo, tmp); + } + + if (read_u32(&pos, &len, &sysinfo->n_bmc_golden)) + goto out; + sysinfo->bmc_golden = talloc_array(sysinfo, char *, + sysinfo->n_bmc_golden); + for (i = 0; i < sysinfo->n_bmc_golden; i++) { + if (read_string(sysinfo, &pos, &len, &tmp)) + goto out; + sysinfo->bmc_golden[i] = talloc_strdup(sysinfo, tmp); + } + /* number of interfaces */ if (read_u32(&pos, &len, &sysinfo->n_interfaces)) goto out; @@ -950,6 +1023,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; } @@ -1001,6 +1078,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, @@ -1031,6 +1115,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;