X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=6f278c89ac00e24185b8d8071152b3825076b413;hp=0252b9aaa18bf12c3c2d46efa920f0171a013218;hb=192291bf0e5ae7ad714c863926ed0b8981102e9c;hpb=5a1cb18519a0140ad49c460d99be2fb399efb802

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 0252b9a..6f278c8 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -1,11 +1,13 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <string.h>
 #include <stdint.h>
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
 #include <list/list.h>
+#include <log/log.h>
 
 #include "pb-protocol.h"
 
@@ -38,24 +40,15 @@
  *   4-byte len, id
  */
 
-/* Deep copy a boot_option.
-*/
-struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt)
+int pb_protocol_device_cmp(const struct device *a, const struct device *b)
 {
-	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 !strcmp(a->id, b->id);
+}
 
-	return new;
+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.
@@ -85,7 +78,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, unsigned int *len, char **str)
+static int read_string(void *ctx, const char **pos, unsigned int *len,
+	char **str)
 {
 	uint32_t str_len, read_len;
 
@@ -113,9 +107,10 @@ static int read_string(void *ctx, char **pos, unsigned 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;
+	const char *buf;
+	char *str;
 	unsigned int len;
 
 	len = message->payload_len;
@@ -134,7 +129,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;
@@ -158,7 +153,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;
@@ -219,7 +214,11 @@ int pb_protocol_write_message(int fd, struct pb_protocol_message *message)
 
 	talloc_free(message);
 
-	return total_len ? -1 : 0;
+	if (!total_len)
+		return 0;
+
+	pb_log("%s: failed: %s\n", __func__, strerror(errno));
+	return -1;
 }
 
 struct pb_protocol_message *pb_protocol_create_message(void *ctx,
@@ -227,8 +226,11 @@ struct pb_protocol_message *pb_protocol_create_message(void *ctx,
 {
 	struct pb_protocol_message *message;
 
-	if (payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE)
+	if (payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE) {
+		pb_log("%s: payload too big %u/%u\n", __func__, payload_len,
+			PB_PROTOCOL_MAX_PAYLOAD_SIZE);
 		return NULL;
+	}
 
 	message = talloc_size(ctx, sizeof(*message) + payload_len);
 
@@ -255,8 +257,11 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd)
 	m.payload_len = __be32_to_cpu(m.payload_len);
 	m.action = __be32_to_cpu(m.action);
 
-	if (m.payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE)
+	if (m.payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE) {
+		pb_log("%s: payload too big %u/%u\n", __func__, m.payload_len,
+			PB_PROTOCOL_MAX_PAYLOAD_SIZE);
 		return NULL;
+	}
 
 	message = talloc_size(ctx, sizeof(m) + m.payload_len);
 	memcpy(message, &m, sizeof(m));
@@ -266,6 +271,8 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd)
 
 		if (rc <= 0) {
 			talloc_free(message);
+			pb_log("%s: failed (%u): %s\n", __func__, len,
+				strerror(errno));
 			return NULL;
 		}
 
@@ -277,10 +284,10 @@ 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;
+	const char *pos;
 	int i, n_options;
 	unsigned int len;