X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=4daeb5a3bc35510a757ccf76f9e13bb3f8c12aab;hp=2fd76c5dd10a78f5fcbab5d6fb83dbd6035b0ea0;hb=58821e4d5e593e4a828a1d79215e9480e9a6ca4f;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1 diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 2fd76c5..4daeb5a 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -1,9 +1,11 @@ +#include #include #include #include #include +#include #include "pb-protocol.h" @@ -36,6 +38,25 @@ * 4-byte len, id */ +/* Deep copy a boot_option. +*/ +struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt) +{ + struct boot_option *new = talloc(ctx, struct boot_option); + + if (new) { + new->id = talloc_strdup(new, opt->id); + new->name = talloc_strdup(new, opt->name); + new->description = talloc_strdup(new, opt->description); + new->icon_file = talloc_strdup(new, opt->icon_file); + new->boot_image_file = talloc_strdup(new, opt->boot_image_file); + new->initrd_file = talloc_strdup(new, opt->initrd_file); + new->boot_args = talloc_strdup(new, opt->boot_args); + memset(&new->list, 0, sizeof(new->list)); + } + + return new; +} /* Write a string into the buffer, starting at pos. * @@ -64,7 +85,8 @@ int pb_protocol_serialise_string(char *pos, const char *str) * @param[out] str Pointer to resuling string * @return zero on success, non-zero on failure */ -static int read_string(void *ctx, char **pos, int *len, char **str) +static int read_string(void *ctx, const char **pos, unsigned int *len, + char **str) { uint32_t str_len, read_len; @@ -92,10 +114,11 @@ static int read_string(void *ctx, char **pos, int *len, char **str) } char *pb_protocol_deserialise_string(void *ctx, - struct pb_protocol_message *message) + const struct pb_protocol_message *message) { - char *buf, *str; - int len; + const char *buf; + char *str; + unsigned int len; len = message->payload_len; buf = message->payload; @@ -113,9 +136,10 @@ static int optional_strlen(const char *str) return strlen(str); } -int pb_protocol_device_len(struct device *dev) +int pb_protocol_device_len(const struct device *dev) { - int len, i; + struct boot_option *opt; + int len; len = 4 + optional_strlen(dev->id) + 4 + optional_strlen(dev->name) + @@ -123,8 +147,7 @@ int pb_protocol_device_len(struct device *dev) 4 + optional_strlen(dev->icon_file) + 4; - for (i = 0; i < dev->n_options; i++) { - struct boot_option *opt = &dev->options[i]; + 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) + @@ -137,10 +160,11 @@ int pb_protocol_device_len(struct device *dev) return len; } -int pb_protocol_serialise_device(struct device *dev, char *buf, int buf_len) +int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len) { + struct boot_option *opt; + uint32_t n; char *pos; - int i; pos = buf; @@ -151,12 +175,16 @@ int pb_protocol_serialise_device(struct device *dev, char *buf, int buf_len) pos += pb_protocol_serialise_string(pos, dev->icon_file); /* write option count */ - *(uint32_t *)pos = __cpu_to_be32(dev->n_options); + n = 0; + + list_for_each_entry(&dev->boot_options, opt, list) + n++; + + *(uint32_t *)pos = __cpu_to_be32(n); pos += sizeof(uint32_t); /* write each option */ - for (i = 0; i < dev->n_options; i++) { - struct boot_option *opt = &dev->options[i]; + 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); @@ -166,6 +194,8 @@ int pb_protocol_serialise_device(struct device *dev, char *buf, int buf_len) pos += pb_protocol_serialise_string(pos, opt->boot_args); } + assert(pos <= buf + buf_len); + return 0; } @@ -195,7 +225,7 @@ int pb_protocol_write_message(int fd, struct pb_protocol_message *message) } struct pb_protocol_message *pb_protocol_create_message(void *ctx, - int action, int payload_len) + enum pb_protocol_action action, int payload_len) { struct pb_protocol_message *message; @@ -215,7 +245,8 @@ struct pb_protocol_message *pb_protocol_create_message(void *ctx, struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd) { struct pb_protocol_message *message, m; - int rc, len; + int rc; + unsigned int len; /* use the stack for the initial 8-byte read */ @@ -248,11 +279,12 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd) struct device *pb_protocol_deserialise_device(void *ctx, - struct pb_protocol_message *message) + const struct pb_protocol_message *message) { struct device *dev; - char *pos; - int i, len; + const char *pos; + int i, n_options; + unsigned int len; len = message->payload_len; pos = message->payload; @@ -271,12 +303,15 @@ struct device *pb_protocol_deserialise_device(void *ctx, if (read_string(dev, &pos, &len, &dev->icon_file)) goto out_err; - dev->n_options = __be32_to_cpu(*(uint32_t *)pos); - dev->options = talloc_array(dev, struct boot_option, dev->n_options); + n_options = __be32_to_cpu(*(uint32_t *)pos); pos += sizeof(uint32_t); - for (i = 0; i < dev->n_options; i++) { - struct boot_option *opt = &dev->options[i]; + 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; @@ -297,6 +332,8 @@ struct device *pb_protocol_deserialise_device(void *ctx, if (read_string(opt, &pos, &len, &opt->boot_args)) goto out_err; + + list_add(&dev->boot_options, &opt->list); } return dev;