X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=681b250e20135ee334c0822a500eae0ea50f2973;hp=a85b8a92bb227a4c836f6ac1ff35e35268482689;hb=7b793150f96a6fe6033ac1390a663b1b62be2df6;hpb=38646182c4edae5df911f78aa75324550dac0596 diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index a85b8a9..681b250 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 @@ -21,6 +22,7 @@ * action = 0x1: device add message * payload: * 4-byte len, id + * 1-byte type * 4-byte len, name * 4-byte len, description * 4-byte len, icon_file @@ -33,13 +35,46 @@ * 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 * payload: * 4-byte len, id + * + * action = 0x3: boot + * payload: + * 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 + * */ +void pb_protocol_dump_device(const struct device *dev, const char *text, + FILE *stream) +{ + struct boot_option *opt; + + fprintf(stream, "%snew dev:\n", text); + fprintf(stream, "%s\tid: %s\n", text, dev->id); + fprintf(stream, "%s\tname: %s\n", text, dev->name); + fprintf(stream, "%s\tdesc: %s\n", text, dev->description); + fprintf(stream, "%s\ticon: %s\n", text, dev->icon_file); + fprintf(stream, "%s\tboot options:\n", text); + list_for_each_entry(&dev->boot_options, opt, list) { + fprintf(stream, "%s\t\tid: %s\n", text, opt->id); + fprintf(stream, "%s\t\tname: %s\n", text, opt->name); + fprintf(stream, "%s\t\tdesc: %s\n", text, opt->description); + 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); + } +} + int pb_protocol_device_cmp(const struct device *a, const struct device *b) { return !strcmp(a->id, b->id); @@ -131,63 +166,120 @@ 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) + + sizeof(dev->type) + 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_serialise_device(const struct device *dev, char *buf, int buf_len) +int pb_protocol_boot_len(const struct boot_command *boot) { - struct boot_option *opt; - uint32_t n; - char *pos; + 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_boot_status_len(const struct boot_status *status) +{ + 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); + *(enum device_type *)pos = dev->type; + pos += sizeof(enum device_type); 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; + + return 0; +} + +int pb_protocol_serialise_boot_option(const struct boot_option *opt, + char *buf, int buf_len) +{ + char *pos = buf; + + 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; + + return 0; +} + +int pb_protocol_serialise_boot_command(const struct boot_command *boot, + char *buf, int buf_len) +{ + char *pos = buf; + + 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); + (void)buf_len; - list_for_each_entry(&dev->boot_options, opt, list) - n++; + return 0; +} - *(uint32_t *)pos = __cpu_to_be32(n); +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); - /* 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, 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; } @@ -283,69 +375,164 @@ 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 (len < sizeof(enum device_type)) + goto out; + dev->type = *(enum device_type *)(pos); + pos += sizeof(enum device_type); + len -= sizeof(enum device_type); 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; + + if (read_string(opt, &pos, &len, &opt->description)) + goto out; + + 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; +} + +int pb_protocol_deserialise_boot_command(struct boot_command *cmd, + 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(cmd, &pos, &len, &cmd->option_id)) + goto out; + + if (read_string(cmd, &pos, &len, &cmd->boot_image_file)) + goto out; + + if (read_string(cmd, &pos, &len, &cmd->initrd_file)) + goto out; + + if (read_string(cmd, &pos, &len, &cmd->dtb_file)) + goto out; + + if (read_string(cmd, &pos, &len, &cmd->boot_args)) + 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; } - return dev; + 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; + + rc = 0; -out_err: - talloc_free(dev); - return NULL; +out: + return rc; }