Add protocol object compare routines

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index ffa2c1b9b87f80b1b4077e6e2bf7135d7b2b5d69..69c9bfea63e5017051e9a66509c9aa9fc36c02bc 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <string.h>
 #include <stdint.h>
 #include <asm/byteorder.h>
@@ -37,6 +38,36 @@
  *   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;
+}
+
+int pb_protocol_device_cmp(const struct device *a, const struct device *b)
+{
+       return !strcmp(a->id, b->id);
+}
+
+int pb_protocol_boot_option_cmp(const struct boot_option *a,
+       const struct boot_option *b)
+{
+       return !strcmp(a->id, b->id);
+}
 
 /* Write a string into the buffer, starting at pos.
  *
@@ -65,7 +96,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;
 
@@ -93,10 +125,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;
@@ -114,7 +147,7 @@ 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)
 {
        struct boot_option *opt;
        int len;
@@ -138,7 +171,7 @@ 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;
@@ -172,6 +205,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;
 }
 
@@ -201,7 +236,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;
 
@@ -221,7 +256,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 */
 
@@ -254,11 +290,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, n_options, len;
+       const char *pos;
+       int i, n_options;
+       unsigned int len;
 
        len = message->payload_len;
        pos = message->payload;