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

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 47d04a3..65a1e93 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -215,11 +215,11 @@ int pb_protocol_boot_len(const struct boot_command *boot)
 		4 + optional_strlen(boot->console);
 }
 
-int pb_protocol_boot_status_len(const struct boot_status *status)
+int pb_protocol_boot_status_len(const struct status *status)
 {
-	return  4 +
+	return  4 +	/* type */
 		4 + optional_strlen(status->message) +
-		4 + optional_strlen(status->detail) +
+		4 +	/* backlog */
 		4;
 }
 
@@ -305,6 +305,9 @@ int pb_protocol_config_len(const struct config *config)
 	for (i = 0; i < config->network.n_dns_servers; i++)
 		len += 4 + optional_strlen(config->network.dns_servers[i]);
 
+	len += 4 + optional_strlen(config->http_proxy);
+	len += 4 + optional_strlen(config->https_proxy);
+
 	len += 4;
 	for (i = 0; i < config->n_autoboot_opts; i++) {
 		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
@@ -398,7 +401,7 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
 	return 0;
 }
 
-int pb_protocol_serialise_boot_status(const struct boot_status *status,
+int pb_protocol_serialise_boot_status(const struct status *status,
 		char *buf, int buf_len)
 {
 	char *pos = buf;
@@ -407,10 +410,9 @@ int pb_protocol_serialise_boot_status(const struct boot_status *status,
 	pos += sizeof(uint32_t);
 
 	pos += pb_protocol_serialise_string(pos, status->message);
-	pos += pb_protocol_serialise_string(pos, status->detail);
 
-	*(uint32_t *)pos = __cpu_to_be32(status->type);
-	pos += sizeof(uint32_t);
+	*(bool *)pos = __cpu_to_be32(status->backlog);
+	pos += sizeof(bool);
 
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
@@ -550,6 +552,9 @@ int pb_protocol_serialise_config(const struct config *config,
 				config->network.dns_servers[i]);
 	}
 
+	pos += pb_protocol_serialise_string(pos, config->http_proxy);
+	pos += pb_protocol_serialise_string(pos, config->https_proxy);
+
 	*(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts);
 	pos += 4;
 	for (i = 0; i < config->n_autoboot_opts; i++) {
@@ -815,7 +820,7 @@ out:
 	return rc;
 }
 
-int pb_protocol_deserialise_boot_status(struct boot_status *status,
+int pb_protocol_deserialise_boot_status(struct status *status,
 		const struct pb_protocol_message *message)
 {
 	unsigned int len;
@@ -832,8 +837,8 @@ int pb_protocol_deserialise_boot_status(struct boot_status *status,
 	status->type = __be32_to_cpu(*(uint32_t *)(pos));
 
 	switch (status->type) {
-	case BOOT_STATUS_ERROR:
-	case BOOT_STATUS_INFO:
+	case STATUS_ERROR:
+	case STATUS_INFO:
 		break;
 	default:
 		goto out;
@@ -842,22 +847,13 @@ int pb_protocol_deserialise_boot_status(struct boot_status *status,
 	pos += sizeof(uint32_t);
 	len -= sizeof(uint32_t);
 
-	/* message and detail strings */
+	/* message string */
 	if (read_string(status, &pos, &len, &status->message))
 		goto out;
 
-	if (read_string(status, &pos, &len, &status->detail))
-		goto out;
-
-	/* and finally, progress */
-	if (len < sizeof(uint32_t))
-		goto out;
-
-	status->progress = __be32_to_cpu(*(uint32_t *)(pos));
-
-	/* clamp to 100% */
-	if (status->progress > 100)
-		status->progress = 100;
+	/* backlog */
+	status->backlog = *(bool *)pos;
+	pos += sizeof(status->backlog);
 
 	rc = 0;
 
@@ -1082,6 +1078,13 @@ int pb_protocol_deserialise_config(struct config *config,
 		config->network.dns_servers[i] = str;
 	}
 
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+	config->http_proxy = str;
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+	config->https_proxy = str;
+
 	if (read_u32(&pos, &len, &config->n_autoboot_opts))
 		goto out;
 	config->autoboot_opts = talloc_array(config, struct autoboot_option,