X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=de210bd785bd940af1a27eac7784dc6c87133529;hb=7832d10c59cfe7f06e19bc6f0b6acaac1a552618;hp=107d0314d2de24f563e6c87bbe0d66ec4f733330;hpb=658d9e98eec02f92e3cf263a1bb27beb3d395b2f;p=petitboot

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 107d031..de210bd 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -118,12 +118,29 @@ static void update_status(struct discover_client *client,
 	talloc_free(status);
 }
 
+static void update_sysinfo(struct discover_client *client,
+		struct system_info *sysinfo)
+{
+	if (client->ops.update_sysinfo)
+		client->ops.update_sysinfo(sysinfo, client->ops.cb_arg);
+	talloc_free(sysinfo);
+}
+
+static void update_config(struct discover_client *client,
+		struct config *config)
+{
+	if (client->ops.update_config)
+		client->ops.update_config(config, client->ops.cb_arg);
+}
+
 static int discover_client_process(void *arg)
 {
 	struct discover_client *client = arg;
 	struct pb_protocol_message *message;
+	struct system_info *sysinfo;
 	struct boot_status *status;
 	struct boot_option *opt;
+	struct config *config;
 	struct device *dev;
 	char *dev_id;
 	int rc;
@@ -175,6 +192,26 @@ static int discover_client_process(void *arg)
 		}
 		update_status(client, status);
 		break;
+	case PB_PROTOCOL_ACTION_SYSTEM_INFO:
+		sysinfo = talloc_zero(client, struct system_info);
+
+		rc = pb_protocol_deserialise_system_info(sysinfo, message);
+		if (rc) {
+			pb_log("%s: invalid sysinfo message?\n", __func__);
+			return 0;
+		}
+		update_sysinfo(client, sysinfo);
+		break;
+	case PB_PROTOCOL_ACTION_CONFIG:
+		config = talloc_zero(ctx, struct config);
+
+		rc = pb_protocol_deserialise_config(config, message);
+		if (rc) {
+			pb_log("%s: invalid config message?\n", __func__);
+			return 0;
+		}
+		update_config(client, config);
+		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}
@@ -245,10 +282,10 @@ static void create_boot_command(struct boot_command *command,
 		const struct boot_option *boot_option,
 		const struct pb_boot_data *data)
 {
-
-	command->option_id = boot_option->id;
+	command->option_id = boot_option ? boot_option->id : NULL;
 	command->boot_image_file = data->image;
 	command->initrd_file = data->initrd;
+	command->dtb_file = data->dtb;
 	command->boot_args = data->args;
 }
 
@@ -278,3 +315,16 @@ int discover_client_boot(struct discover_client *client,
 
 	return rc;
 }
+
+int discover_client_cancel_default(struct discover_client *client)
+{
+	struct pb_protocol_message *message;
+
+	message = pb_protocol_create_message(client,
+			PB_PROTOCOL_ACTION_CANCEL_DEFAULT, 0);
+
+	if (!message)
+		return -1;
+
+	return pb_protocol_write_message(client->fd, message);
+}