X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=e99ce86292c90baf111efd84865e7b8aa48a5197;hp=7d45f512b0dcb81db6b83ba6223e6eb921dde30f;hb=d974c3c39237c8e94bb3a51d3511d18dea01043e;hpb=acc5ace6e58db2f3dceb1f7a27d0fc1fb29c4a27

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 7d45f51..e99ce86 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -225,6 +225,13 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 		4 + optional_strlen(sysinfo->identifier) +
 		4 + 4;
 
+	len +=	4;
+	for (i = 0; i < sysinfo->n_current; i++)
+		len += 4 + optional_strlen(sysinfo->platform_current[i]);
+	len +=	4;
+	for (i = 0; i < sysinfo->n_other; i++)
+		len += 4 + optional_strlen(sysinfo->platform_other[i]);
+
 	for (i = 0; i < sysinfo->n_interfaces; i++) {
 		struct interface_info *if_info = sysinfo->interfaces[i];
 		len +=	4 + if_info->hwaddr_size +
@@ -239,6 +246,9 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 			4 + optional_strlen(bd_info->mountpoint);
 	}
 
+	/* BMC MAC */
+	len += HWADDR_SIZE;
+
 	return len;
 }
 
@@ -257,6 +267,7 @@ static int pb_protocol_interface_config_len(struct interface_config *conf)
 	if (conf->method == CONFIG_METHOD_STATIC) {
 		len += 4 + optional_strlen(conf->static_config.address);
 		len += 4 + optional_strlen(conf->static_config.gateway);
+		len += 4 + optional_strlen(conf->static_config.url);
 	}
 
 	return len;
@@ -391,6 +402,16 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 	pos += pb_protocol_serialise_string(pos, sysinfo->type);
 	pos += pb_protocol_serialise_string(pos, sysinfo->identifier);
 
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_current);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_current; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->platform_current[i]);
+
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_other);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_other; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->platform_other[i]);
+
 	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_interfaces);
 	pos += sizeof(uint32_t);
 
@@ -420,6 +441,12 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 		pos += pb_protocol_serialise_string(pos, bd_info->mountpoint);
 	}
 
+	if (sysinfo->bmc_mac)
+		memcpy(pos, sysinfo->bmc_mac, HWADDR_SIZE);
+	else
+		memset(pos, 0, HWADDR_SIZE);
+	pos += HWADDR_SIZE;
+
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
 
@@ -448,6 +475,8 @@ static int pb_protocol_serialise_config_interface(char *buf,
 				conf->static_config.address);
 		pos += pb_protocol_serialise_string(pos,
 				conf->static_config.gateway);
+		pos += pb_protocol_serialise_string(pos,
+				conf->static_config.url);
 	}
 
 	return pos - buf;
@@ -786,6 +815,7 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 	unsigned int len, i;
 	const char *pos;
 	int rc = -1;
+	char *tmp;
 
 	len = message->payload_len;
 	pos = message->payload;
@@ -797,6 +827,27 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 	if (read_string(sysinfo, &pos, &len, &sysinfo->identifier))
 		goto out;
 
+	/* versions strings for openpower platforms */
+	if (read_u32(&pos, &len, &sysinfo->n_current))
+		goto out;
+	sysinfo->platform_current = talloc_array(sysinfo, char *,
+						sysinfo->n_current);
+	for (i = 0; i < sysinfo->n_current; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->platform_current[i] = talloc_strdup(sysinfo, tmp);
+	}
+
+	if (read_u32(&pos, &len, &sysinfo->n_other))
+		goto out;
+	sysinfo->platform_other = talloc_array(sysinfo, char *,
+						sysinfo->n_other);
+	for (i = 0; i < sysinfo->n_other; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->platform_other[i] = talloc_strdup(sysinfo, tmp);
+	}
+
 	/* number of interfaces */
 	if (read_u32(&pos, &len, &sysinfo->n_interfaces))
 		goto out;
@@ -850,8 +901,18 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 
 		sysinfo->blockdevs[i] = bd_info;
 	}
-	rc = 0;
 
+	for (i = 0; i < HWADDR_SIZE; i++) {
+		if (pos[i] != 0) {
+			sysinfo->bmc_mac = talloc_memdup(sysinfo, pos, HWADDR_SIZE);
+			break;
+		}
+	}
+
+	pos += HWADDR_SIZE;
+	len -= HWADDR_SIZE;
+
+	rc = 0;
 out:
 	return rc;
 }
@@ -884,6 +945,9 @@ static int pb_protocol_deserialise_config_interface(const char **buf,
 
 		if (read_string(iface, buf, len, &iface->static_config.gateway))
 			return -1;
+
+		if (read_string(iface, buf, len, &iface->static_config.url))
+			return -1;
 	}
 
 	return 0;