X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=439824871ebf1e380561cc76129da2d3f81d3f98;hp=3c472febdb14c88a7a0ef82112230c2d67d2fbc3;hb=d3e95283e69d3099fe9f36e56be1f645f565c843;hpb=aa530148044a7c6d7ec7b6a32672cc69d53979b2

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 3c472fe..4398248 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -267,7 +267,8 @@ int pb_protocol_config_len(const struct config *config)
 	unsigned int i, len;
 
 	len =	4 /* config->autoboot_enabled */ +
-		4 /* config->autoboot_timeout_sec */;
+		4 /* config->autoboot_timeout_sec */ +
+		4 /* config->safe_mode */;
 
 	len += 4;
 	for (i = 0; i < config->network.n_interfaces; i++)
@@ -281,9 +282,21 @@ int pb_protocol_config_len(const struct config *config)
 	len += 4;
 	len += config->n_boot_priorities * 8;
 
+	len += 4 + optional_strlen(config->boot_device);
+
+	len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */
+
+	len += 4 + optional_strlen(config->lang);
+
 	return len;
 }
 
+int pb_protocol_url_len(const char *url)
+{
+	/* url + length field */
+	return 4 + optional_strlen(url);
+}
+
 int pb_protocol_serialise_device(const struct device *dev,
 		char *buf, int buf_len)
 {
@@ -446,6 +459,9 @@ int pb_protocol_serialise_config(const struct config *config,
 	*(uint32_t *)pos = __cpu_to_be32(config->autoboot_timeout_sec);
 	pos += 4;
 
+	*(uint32_t *)pos = config->safe_mode;
+	pos += 4;
+
 	*(uint32_t *)pos = __cpu_to_be32(config->network.n_interfaces);
 	pos += 4;
 	for (i = 0; i < config->network.n_interfaces; i++) {
@@ -472,12 +488,33 @@ int pb_protocol_serialise_config(const struct config *config,
 		pos += 4;
 	}
 
+	pos += pb_protocol_serialise_string(pos, config->boot_device);
+
+	*(uint32_t *)pos = __cpu_to_be32(config->ipmi_bootdev);
+	pos += 4;
+	*(uint32_t *)pos = config->ipmi_bootdev_persistent;
+	pos += 4;
+
+	pos += pb_protocol_serialise_string(pos, config->lang);
+
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
 
 	return 0;
 }
 
+int pb_protocol_serialise_url(const char *url, char *buf, int buf_len)
+{
+	char *pos = buf;
+
+	pos += pb_protocol_serialise_string(pos, url);
+
+	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;
@@ -846,6 +883,7 @@ int pb_protocol_deserialise_config(struct config *config,
 	unsigned int len, i, tmp;
 	const char *pos;
 	int rc = -1;
+	char *str;
 
 	len = message->payload_len;
 	pos = message->payload;
@@ -857,6 +895,10 @@ int pb_protocol_deserialise_config(struct config *config,
 	if (read_u32(&pos, &len, &config->autoboot_timeout_sec))
 		goto out;
 
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	config->safe_mode = !!tmp;
+
 	if (read_u32(&pos, &len, &config->network.n_interfaces))
 		goto out;
 
@@ -878,10 +920,9 @@ int pb_protocol_deserialise_config(struct config *config,
 			config->network.n_dns_servers);
 
 	for (i = 0; i < config->network.n_dns_servers; i++) {
-		char *tmp;
-		if (read_string(config->network.dns_servers, &pos, &len, &tmp))
+		if (read_string(config->network.dns_servers, &pos, &len, &str))
 			goto out;
-		config->network.dns_servers[i] = tmp;
+		config->network.dns_servers[i] = str;
 	}
 
 	if (read_u32(&pos, &len, &config->n_boot_priorities))
@@ -890,11 +931,29 @@ int pb_protocol_deserialise_config(struct config *config,
 			config->n_boot_priorities);
 
 	for (i = 0; i < config->n_boot_priorities; i++) {
+		if (read_u32(&pos, &len, &tmp))
+			goto out;
+		config->boot_priorities[i].priority = (int)tmp;
 		if (read_u32(&pos, &len, &tmp))
 			goto out;
 		config->boot_priorities[i].type = tmp;
 	}
 
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+	config->boot_device = str;
+
+	if (read_u32(&pos, &len, &config->ipmi_bootdev))
+		goto out;
+	if (read_u32(&pos, &len, &tmp))
+		goto out;
+	config->ipmi_bootdev_persistent = !!tmp;
+
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+
+	config->lang = str;
+
 	rc = 0;
 
 out: