X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=1d1a84b8901a3069c6a957382b992b395dc7b7f4;hp=4daeb5a3bc35510a757ccf76f9e13bb3f8c12aab;hb=c25601a71b0951225691aa2edc389826f7f3836c;hpb=58821e4d5e593e4a828a1d79215e9480e9a6ca4f

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 4daeb5a..1d1a84b 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"
 
@@ -36,26 +38,47 @@
  * 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, boot_args
+ *
  */
 
-/* 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;
+
+	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)
+{
+	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.
@@ -195,6 +218,7 @@ int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_le
 	}
 
 	assert(pos <= buf + buf_len);
+	(void)buf_len;
 
 	return 0;
 }
@@ -221,7 +245,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,
@@ -229,8 +257,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);
 
@@ -257,8 +288,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));
@@ -268,6 +302,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;
 		}
 
@@ -306,6 +342,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++) {