X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=41707da09ab0d7345c8d0a0a2d2f9d1b48f43517;hb=becf2b28d8b0aa561ac7e42db519071f8065d37f;hp=ed61fe149b1bbac074dae847cb7d359a3417d3cd;hpb=98b04aa42a4f1dc8e585f00d75c3b28d9e9aa2a9;p=petitboot

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index ed61fe1..41707da 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -75,6 +75,8 @@ void pb_protocol_dump_device(const struct device *dev, const char *text,
 		fprintf(stream, "%s\t\tdtb:  %s\n", text, opt->dtb_file);
 		fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args);
 		fprintf(stream, "%s\t\tasig: %s\n", text, opt->args_sig_file);
+		fprintf(stream, "%s\t\ttype: %s\n", text,
+			opt->type == DISCOVER_BOOT_OPTION ? "boot" : "plugin");
 	}
 }
 
@@ -201,7 +203,8 @@ int pb_protocol_boot_option_len(const struct boot_option *opt)
 		4 + optional_strlen(opt->dtb_file) +
 		4 + optional_strlen(opt->boot_args) +
 		4 + optional_strlen(opt->args_sig_file) +
-		sizeof(opt->is_default);
+		sizeof(opt->is_default) +
+		sizeof(opt->type);
 }
 
 int pb_protocol_boot_len(const struct boot_command *boot)
@@ -250,7 +253,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 		len +=	4 + if_info->hwaddr_size +
 			4 + optional_strlen(if_info->name) +
 			sizeof(if_info->link) +
-			4 + optional_strlen(if_info->address);
+			4 + optional_strlen(if_info->address) +
+			4 + optional_strlen(if_info->address_v6);
 	}
 
 	for (i = 0; i < sysinfo->n_blockdevs; i++) {
@@ -360,6 +364,21 @@ int pb_protocol_plugin_option_len(const struct plugin_option *opt)
 	return len;
 }
 
+int pb_protocol_temp_autoboot_len(const struct autoboot_option *opt)
+{
+	unsigned int len = 0;
+
+	/* boot_type */
+	len += 4;
+
+	if (opt->boot_type == BOOT_DEVICE_TYPE)
+		len += 4;
+	else
+		len += optional_strlen(opt->uuid);
+
+	return len;
+}
+
 int pb_protocol_serialise_device(const struct device *dev,
 		char *buf, int buf_len)
 {
@@ -397,6 +416,9 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt,
 	*(bool *)pos = opt->is_default;
 	pos += sizeof(bool);
 
+	*(uint32_t *)pos = __cpu_to_be32(opt->type);
+	pos += 4;
+
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
 
@@ -488,6 +510,7 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 		pos += sizeof(bool);
 
 		pos += pb_protocol_serialise_string(pos, if_info->address);
+		pos += pb_protocol_serialise_string(pos, if_info->address_v6);
 	}
 
 	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
@@ -657,6 +680,26 @@ int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
 	return 0;
 }
 
+int pb_protocol_serialise_temp_autoboot(const struct autoboot_option *opt,
+		char *buf, int buf_len)
+{
+	char *pos = buf;
+
+	*(uint32_t *)pos = __cpu_to_be32(opt->boot_type);
+	pos += 4;
+
+	if (opt->boot_type == BOOT_DEVICE_TYPE) {
+		*(uint32_t *)pos = __cpu_to_be32(opt->type);
+		pos += 4;
+	} else {
+		pos += pb_protocol_serialise_string(pos, opt->uuid);
+	}
+
+	(void)buf_len;
+
+	return 0;
+}
+
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message)
 {
 	int total_len, rc;
@@ -825,6 +868,11 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt,
 	if (len < sizeof(bool))
 		goto out;
 	opt->is_default = *(bool *)(pos);
+	pos += sizeof(bool);
+	len -= sizeof(bool);
+
+	if (read_u32(&pos, &len, &opt->type))
+		return -1;
 
 	rc = 0;
 
@@ -1000,6 +1048,8 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 
 		if (read_string(if_info, &pos, &len, &if_info->address))
 			goto out;
+		if (read_string(if_info, &pos, &len, &if_info->address_v6))
+			goto out;
 
 		sysinfo->interfaces[i] = if_info;
 	}
@@ -1254,3 +1304,38 @@ int pb_protocol_deserialise_plugin_option(struct plugin_option *opt,
 out:
 	return rc;
 }
+
+int pb_protocol_deserialise_temp_autoboot(struct autoboot_option *opt,
+		const struct pb_protocol_message *message)
+{
+	unsigned int len, tmp;
+	const char *pos;
+	int rc = -1;
+	char *str;
+
+	len = message->payload_len;
+	pos = message->payload;
+
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+
+	opt->boot_type = tmp;
+	if (opt->boot_type == BOOT_DEVICE_TYPE) {
+		if (read_u32(&pos, &len, &tmp))
+			goto out;
+		opt->type = tmp;
+
+	} else if (opt->boot_type == BOOT_DEVICE_UUID) {
+		if (read_string(opt, &pos, &len, &str))
+			goto out;
+		opt->uuid = str;
+
+	} else {
+		return -1;
+	}
+
+	rc = 0;
+
+out:
+	return rc;
+}