X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=bcc7230a0060c062600ed69c66aadfde2cdf2f25;hp=31637c611c19993a390bd6e1fe86ff917a96ba58;hb=c11bcba9a99e858e618f4d872a5be7d52dcaaa5a;hpb=ceefe00bf8c1498dfc2118d2b3666f67f91bb956 diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 31637c6..bcc7230 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -33,6 +34,7 @@ * 4-byte len, icon_file * 4-byte len, boot_image_file * 4-byte len, initrd_file + * 4-byte len, dtb_file * 4-byte len, boot_args * * action = 0x2: device remove message @@ -44,6 +46,7 @@ * 4-byte len, boot option id * 4-byte len, boot_image_file * 4-byte len, initrd_file + * 4-byte len, dtb_file * 4-byte len, boot_args * */ @@ -66,6 +69,7 @@ void pb_protocol_dump_device(const struct device *dev, const char *text, fprintf(stream, "%s\t\ticon: %s\n", text, opt->icon_file); fprintf(stream, "%s\t\tboot: %s\n", text, opt->boot_image_file); 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); } } @@ -161,26 +165,25 @@ static int optional_strlen(const char *str) int pb_protocol_device_len(const struct device *dev) { - struct boot_option *opt; - int len; - - len = 4 + optional_strlen(dev->id) + + return 4 + optional_strlen(dev->id) + 4 + optional_strlen(dev->name) + 4 + optional_strlen(dev->description) + - 4 + optional_strlen(dev->icon_file) + - 4; + 4 + optional_strlen(dev->icon_file); +} - list_for_each_entry(&dev->boot_options, opt, list) { - len += 4 + optional_strlen(opt->id) + - 4 + optional_strlen(opt->name) + - 4 + optional_strlen(opt->description) + - 4 + optional_strlen(opt->icon_file) + - 4 + optional_strlen(opt->boot_image_file) + - 4 + optional_strlen(opt->initrd_file) + - 4 + optional_strlen(opt->boot_args); - } +int pb_protocol_boot_option_len(const struct boot_option *opt) +{ - return len; + return 4 + optional_strlen(opt->device_id) + + 4 + optional_strlen(opt->id) + + 4 + optional_strlen(opt->name) + + 4 + optional_strlen(opt->description) + + 4 + optional_strlen(opt->icon_file) + + 4 + optional_strlen(opt->boot_image_file) + + 4 + optional_strlen(opt->initrd_file) + + 4 + optional_strlen(opt->dtb_file) + + 4 + optional_strlen(opt->boot_args) + + sizeof(opt->is_default); } int pb_protocol_boot_len(const struct boot_command *boot) @@ -188,42 +191,51 @@ int pb_protocol_boot_len(const struct boot_command *boot) return 4 + optional_strlen(boot->option_id) + 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); } -int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len) +int pb_protocol_boot_status_len(const struct boot_status *status) { - struct boot_option *opt; - uint32_t n; - char *pos; + return 4 + + 4 + optional_strlen(status->message) + + 4 + optional_strlen(status->detail) + + 4; +} - pos = buf; +int pb_protocol_serialise_device(const struct device *dev, + char *buf, int buf_len) +{ + char *pos = buf; - /* construct payload into buffer */ pos += pb_protocol_serialise_string(pos, dev->id); pos += pb_protocol_serialise_string(pos, dev->name); pos += pb_protocol_serialise_string(pos, dev->description); pos += pb_protocol_serialise_string(pos, dev->icon_file); - /* write option count */ - n = 0; + assert(pos <= buf + buf_len); + (void)buf_len; - list_for_each_entry(&dev->boot_options, opt, list) - n++; + return 0; +} - *(uint32_t *)pos = __cpu_to_be32(n); - pos += sizeof(uint32_t); +int pb_protocol_serialise_boot_option(const struct boot_option *opt, + char *buf, int buf_len) +{ + char *pos = buf; - /* write each option */ - list_for_each_entry(&dev->boot_options, opt, list) { - pos += pb_protocol_serialise_string(pos, opt->id); - pos += pb_protocol_serialise_string(pos, opt->name); - pos += pb_protocol_serialise_string(pos, opt->description); - pos += pb_protocol_serialise_string(pos, opt->icon_file); - pos += pb_protocol_serialise_string(pos, opt->boot_image_file); - pos += pb_protocol_serialise_string(pos, opt->initrd_file); - pos += pb_protocol_serialise_string(pos, opt->boot_args); - } + pos += pb_protocol_serialise_string(pos, opt->device_id); + pos += pb_protocol_serialise_string(pos, opt->id); + pos += pb_protocol_serialise_string(pos, opt->name); + pos += pb_protocol_serialise_string(pos, opt->description); + pos += pb_protocol_serialise_string(pos, opt->icon_file); + pos += pb_protocol_serialise_string(pos, opt->boot_image_file); + 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); + + *(bool *)pos = opt->is_default; + pos += sizeof(bool); assert(pos <= buf + buf_len); (void)buf_len; @@ -239,6 +251,7 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot, pos += pb_protocol_serialise_string(pos, boot->option_id); pos += pb_protocol_serialise_string(pos, boot->boot_image_file); 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); assert(pos <= buf + buf_len); @@ -247,6 +260,26 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot, return 0; } +int pb_protocol_serialise_boot_status(const struct boot_status *status, + char *buf, int buf_len) +{ + char *pos = buf; + + *(uint32_t *)pos = __cpu_to_be32(status->type); + 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); + + 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; @@ -338,100 +371,158 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd) } -struct device *pb_protocol_deserialise_device(void *ctx, +int pb_protocol_deserialise_device(struct device *dev, const struct pb_protocol_message *message) { - struct device *dev; - const char *pos; - int i, n_options; unsigned int len; + const char *pos; + int rc = -1; len = message->payload_len; pos = message->payload; - dev = talloc(ctx, struct device); - if (read_string(dev, &pos, &len, &dev->id)) - goto out_err; + goto out; if (read_string(dev, &pos, &len, &dev->name)) - goto out_err; + goto out; if (read_string(dev, &pos, &len, &dev->description)) - goto out_err; + goto out; if (read_string(dev, &pos, &len, &dev->icon_file)) - goto out_err; + goto out; - n_options = __be32_to_cpu(*(uint32_t *)pos); - pos += sizeof(uint32_t); + rc = 0; - dev->n_options = n_options; - - list_init(&dev->boot_options); - - for (i = 0; i < n_options; i++) { - struct boot_option *opt; - - opt = talloc(dev, struct boot_option); - - if (read_string(opt, &pos, &len, &opt->id)) - goto out_err; - if (read_string(opt, &pos, &len, &opt->name)) - goto out_err; - if (read_string(opt, &pos, &len, - &opt->description)) - goto out_err; - if (read_string(opt, &pos, &len, - &opt->icon_file)) - goto out_err; - if (read_string(opt, &pos, &len, - &opt->boot_image_file)) - goto out_err; - if (read_string(opt, &pos, &len, - &opt->initrd_file)) - goto out_err; - if (read_string(opt, &pos, &len, - &opt->boot_args)) - goto out_err; - - list_add(&dev->boot_options, &opt->list); - } +out: + return rc; +} + +int pb_protocol_deserialise_boot_option(struct boot_option *opt, + const struct pb_protocol_message *message) +{ + unsigned int len; + const char *pos; + int rc = -1; + + len = message->payload_len; + pos = message->payload; + + if (read_string(opt, &pos, &len, &opt->device_id)) + goto out; + + if (read_string(opt, &pos, &len, &opt->id)) + goto out; + + if (read_string(opt, &pos, &len, &opt->name)) + goto out; - return dev; + if (read_string(opt, &pos, &len, &opt->description)) + goto out; -out_err: - talloc_free(dev); - return NULL; + if (read_string(opt, &pos, &len, &opt->icon_file)) + goto out; + + if (read_string(opt, &pos, &len, &opt->boot_image_file)) + goto out; + + if (read_string(opt, &pos, &len, &opt->initrd_file)) + goto out; + + if (read_string(opt, &pos, &len, &opt->dtb_file)) + goto out; + + if (read_string(opt, &pos, &len, &opt->boot_args)) + goto out; + + if (len < sizeof(bool)) + goto out; + opt->is_default = *(bool *)(pos); + + rc = 0; + +out: + return rc; } -struct boot_command *pb_protocol_deserialise_boot_command(void *ctx, +int pb_protocol_deserialise_boot_command(struct boot_command *cmd, const struct pb_protocol_message *message) { - struct boot_command *cmd; - const char *pos; unsigned int len; + const char *pos; + int rc = -1; len = message->payload_len; pos = message->payload; - cmd = talloc(ctx, struct boot_command); - if (read_string(cmd, &pos, &len, &cmd->option_id)) - goto out_err; + goto out; if (read_string(cmd, &pos, &len, &cmd->boot_image_file)) - goto out_err; + goto out; if (read_string(cmd, &pos, &len, &cmd->initrd_file)) - goto out_err; + goto out; + + if (read_string(cmd, &pos, &len, &cmd->dtb_file)) + goto out; if (read_string(cmd, &pos, &len, &cmd->boot_args)) - goto out_err; + goto out; + + rc = 0; + +out: + return rc; +} + +int pb_protocol_deserialise_boot_status(struct boot_status *status, + const struct pb_protocol_message *message) +{ + unsigned int len; + const char *pos; + int rc = -1; + + len = message->payload_len; + pos = message->payload; + + /* first up, the type enum... */ + if (len < sizeof(uint32_t)) + goto out; + + status->type = __be32_to_cpu(*(uint32_t *)(pos)); + + switch (status->type) { + case BOOT_STATUS_ERROR: + case BOOT_STATUS_INFO: + break; + default: + goto out; + } + + pos += sizeof(uint32_t); + len -= sizeof(uint32_t); + + /* message and detail strings */ + 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; - return cmd; + rc = 0; -out_err: - talloc_free(cmd); - return NULL; +out: + return rc; }