X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=dbbda406fe5a022c518c656c4b44e11b692010da;hp=64bd16175723536423f2e1a73b3324b9fc4a1d05;hb=9f191cc3c194ed51534c22e2dae15b2c08c8abc2;hpb=a055f6714fd06aa3b633b1bc44a8dbf42a0eedb0 diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 64bd161..dbbda40 100644 --- 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) @@ -215,11 +218,11 @@ int pb_protocol_boot_len(const struct boot_command *boot) 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 +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; @@ -401,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; @@ -410,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; @@ -466,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); @@ -609,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; @@ -777,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; @@ -821,7 +880,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; @@ -838,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; @@ -848,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; @@ -959,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; } @@ -1154,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; +}