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

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 4398248..42506e2 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -239,6 +239,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 +260,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;
@@ -280,12 +284,18 @@ int pb_protocol_config_len(const struct config *config)
 		len += 4 + optional_strlen(config->network.dns_servers[i]);
 
 	len += 4;
-	len += config->n_boot_priorities * 8;
-
-	len += 4 + optional_strlen(config->boot_device);
+	for (i = 0; i < config->n_autoboot_opts; i++) {
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+			len += 4 + 4;
+		else
+			len += 4 + 4 +
+				optional_strlen(config->autoboot_opts[i].uuid);
+	}
 
 	len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */
 
+	len += 4; /* allow_writes */
+
 	len += 4 + optional_strlen(config->lang);
 
 	return len;
@@ -414,6 +424,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;
 
@@ -442,6 +458,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;
@@ -477,24 +495,30 @@ int pb_protocol_serialise_config(const struct config *config,
 				config->network.dns_servers[i]);
 	}
 
-	*(uint32_t *)pos = __cpu_to_be32(config->n_boot_priorities);
+	*(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts);
 	pos += 4;
-	for (i = 0; i < config->n_boot_priorities; i++) {
-		*(uint32_t *)pos =
-			__cpu_to_be32(config->boot_priorities[i].type);
-		pos += 4;
+	for (i = 0; i < config->n_autoboot_opts; i++) {
 		*(uint32_t *)pos =
-			__cpu_to_be32(config->boot_priorities[i].priority);
+			__cpu_to_be32(config->autoboot_opts[i].boot_type);
 		pos += 4;
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) {
+			*(uint32_t *)pos =
+				__cpu_to_be32(config->autoboot_opts[i].type);
+			pos += 4;
+		} else {
+			pos += pb_protocol_serialise_string(pos,
+						config->autoboot_opts[i].uuid);
+		}
 	}
 
-	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;
 
+	*(uint32_t *)pos = config->allow_writes;
+	pos += 4;
+
 	pos += pb_protocol_serialise_string(pos, config->lang);
 
 	assert(pos <= buf + buf_len);
@@ -838,8 +862,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;
 }
@@ -872,6 +906,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;
@@ -925,30 +962,36 @@ int pb_protocol_deserialise_config(struct config *config,
 		config->network.dns_servers[i] = str;
 	}
 
-	if (read_u32(&pos, &len, &config->n_boot_priorities))
+	if (read_u32(&pos, &len, &config->n_autoboot_opts))
 		goto out;
-	config->boot_priorities = talloc_array(config, struct boot_priority,
-			config->n_boot_priorities);
+	config->autoboot_opts = talloc_array(config, struct autoboot_option,
+			config->n_autoboot_opts);
 
-	for (i = 0; i < config->n_boot_priorities; i++) {
-		if (read_u32(&pos, &len, &tmp))
-			goto out;
-		config->boot_priorities[i].priority = (int)tmp;
+	for (i = 0; i < config->n_autoboot_opts; i++) {
 		if (read_u32(&pos, &len, &tmp))
 			goto out;
-		config->boot_priorities[i].type = tmp;
+		config->autoboot_opts[i].boot_type = (int)tmp;
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) {
+			if (read_u32(&pos, &len, &tmp))
+				goto out;
+			config->autoboot_opts[i].type = tmp;
+		} else {
+			if (read_string(config, &pos, &len, &str))
+				goto out;
+			config->autoboot_opts[i].uuid = str;
+		}
 	}
 
-	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_u32(&pos, &len, &tmp))
+		goto out;
+	config->allow_writes = !!tmp;
+
 	if (read_string(config, &pos, &len, &str))
 		goto out;