X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=ed61fe149b1bbac074dae847cb7d359a3417d3cd;hb=98b04aa42a4f1dc8e585f00d75c3b28d9e9aa2a9;hp=65a1e93408d834d0449d458d0806e3ef50be66f6;hpb=75c97cfd449b2bac8e61af1017a83bdf43f5e8fe;p=petitboot

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 65a1e93..ed61fe1 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -249,7 +249,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 		struct interface_info *if_info = sysinfo->interfaces[i];
 		len +=	4 + if_info->hwaddr_size +
 			4 + optional_strlen(if_info->name) +
-			sizeof(if_info->link);
+			sizeof(if_info->link) +
+			4 + optional_strlen(if_info->address);
 	}
 
 	for (i = 0; i < sysinfo->n_blockdevs; i++) {
@@ -339,6 +340,26 @@ int pb_protocol_url_len(const char *url)
 	return 4 + optional_strlen(url);
 }
 
+
+int pb_protocol_plugin_option_len(const struct plugin_option *opt)
+{
+	unsigned int i, len = 0;
+
+	len += 4 + optional_strlen(opt->id);
+	len += 4 + optional_strlen(opt->name);
+	len += 4 + optional_strlen(opt->vendor);
+	len += 4 + optional_strlen(opt->vendor_id);
+	len += 4 + optional_strlen(opt->version);
+	len += 4 + optional_strlen(opt->date);
+	len += 4 + optional_strlen(opt->plugin_file);
+
+	len += 4; /* n_executables */
+	for (i = 0; i < opt->n_executables; i++)
+		len += 4 + optional_strlen(opt->executables[i]);
+
+	return len;
+}
+
 int pb_protocol_serialise_device(const struct device *dev,
 		char *buf, int buf_len)
 {
@@ -465,6 +486,8 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 
 		*(bool *)pos = if_info->link;
 		pos += sizeof(bool);
+
+		pos += pb_protocol_serialise_string(pos, if_info->address);
 	}
 
 	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
@@ -608,6 +631,32 @@ int pb_protocol_serialise_url(const char *url, char *buf, int buf_len)
 	return 0;
 }
 
+int pb_protocol_serialise_plugin_option(const struct plugin_option *opt,
+		char *buf, int buf_len)
+{
+	char *pos = buf;
+	unsigned int i;
+
+	pos += pb_protocol_serialise_string(pos, opt->id);
+	pos += pb_protocol_serialise_string(pos, opt->name);
+	pos += pb_protocol_serialise_string(pos, opt->vendor);
+	pos += pb_protocol_serialise_string(pos, opt->vendor_id);
+	pos += pb_protocol_serialise_string(pos, opt->version);
+	pos += pb_protocol_serialise_string(pos, opt->date);
+	pos += pb_protocol_serialise_string(pos, opt->plugin_file);
+
+	*(uint32_t *)pos = __cpu_to_be32(opt->n_executables);
+	pos += 4;
+
+	for (i = 0; i < opt->n_executables; i++)
+		pos += pb_protocol_serialise_string(pos, opt->executables[i]);
+
+	assert(pos <= buf + buf_len);
+	(void)buf_len;
+
+	return 0;
+}
+
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message)
 {
 	int total_len, rc;
@@ -949,6 +998,9 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 		if_info->link = *(bool *)pos;
 		pos += sizeof(if_info->link);
 
+		if (read_string(if_info, &pos, &len, &if_info->address))
+			goto out;
+
 		sysinfo->interfaces[i] = if_info;
 	}
 
@@ -1144,3 +1196,61 @@ int pb_protocol_deserialise_config(struct config *config,
 out:
 	return rc;
 }
+
+int pb_protocol_deserialise_plugin_option(struct plugin_option *opt,
+		const struct pb_protocol_message *message)
+{
+	unsigned int len, i, tmp;
+	const char *pos;
+	int rc = -1;
+	char *str;
+
+	len = message->payload_len;
+	pos = message->payload;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->id = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->name = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->vendor = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->vendor_id = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->version = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->date = str;
+
+	if (read_string(opt, &pos, &len, &str))
+		goto out;
+	opt->plugin_file = str;
+
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	opt->n_executables = tmp;
+
+	opt->executables = talloc_zero_array(opt, char *, opt->n_executables);
+	if (!opt->executables)
+		goto out;
+
+	for (i = 0; i < opt->n_executables; i++) {
+		if (read_string(opt, &pos, &len, &str))
+			goto out;
+		opt->executables[i] = talloc_strdup(opt, str);
+	}
+
+	rc = 0;
+out:
+	return rc;
+}