X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=54dfbf4e1f4e9469f627351268447f426d6afd9e;hp=69c9bfea63e5017051e9a66509c9aa9fc36c02bc;hb=62cf2ababe1046b88bf225db3d2ec7187c634812;hpb=08b9b747db92ce682e094ef86f48321d29fc44d6

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 69c9bfe..54dfbf4 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,26 @@
  *   4-byte len, id
  */
 
-/* Deep copy a boot_option.
-*/
-struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt)
+void pb_protocol_dump_device(const struct device *dev, const char *text,
+	FILE *stream)
 {
-	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));
-	}
+	struct boot_option *opt;
 
-	return new;
+	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\targs: %s\n", text, opt->boot_args);
+	}
 }
 
 int pb_protocol_device_cmp(const struct device *a, const struct device *b)
@@ -232,7 +236,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,
@@ -240,8 +248,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);
 
@@ -268,8 +279,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));
@@ -279,6 +293,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;
 		}
 
@@ -317,6 +333,8 @@ struct device *pb_protocol_deserialise_device(void *ctx,
 	n_options = __be32_to_cpu(*(uint32_t *)pos);
 	pos += sizeof(uint32_t);
 
+	dev->n_options = n_options;
+
 	list_init(&dev->boot_options);
 
 	for (i = 0; i < n_options; i++) {