X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=c3f3f383f59fa0bf51f4d72ecf45482259a148db;hb=209b10507b8f95f9f549ecb81158034038334c36;hp=42aa9de9a950a3877a7b3dad8c96b96d47305373;hpb=bd06734362bb727b09b943688d9b69aa0a84590d;p=petitboot

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 42aa9de..c3f3f38 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -110,10 +110,19 @@ static void device_remove(struct discover_client *client, const char *id)
 	talloc_free(device);
 }
 
+static void update_status(struct discover_client *client,
+		struct boot_status *status)
+{
+	if (client->ops.update_status)
+		client->ops.update_status(status, client->ops.cb_arg);
+	talloc_free(status);
+}
+
 static int discover_client_process(void *arg)
 {
 	struct discover_client *client = arg;
 	struct pb_protocol_message *message;
+	struct boot_status *status;
 	struct boot_option *opt;
 	struct device *dev;
 	char *dev_id;
@@ -156,6 +165,16 @@ static int discover_client_process(void *arg)
 		}
 		device_remove(client, dev_id);
 		break;
+	case PB_PROTOCOL_ACTION_STATUS:
+		status = talloc_zero(client, struct boot_status);
+
+		rc = pb_protocol_deserialise_boot_status(status, message);
+		if (rc) {
+			pb_log("%s: invalid status message?\n", __func__);
+			return 0;
+		}
+		update_status(client, status);
+		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}
@@ -196,8 +215,8 @@ struct discover_client* discover_client_init(struct waitset *waitset,
 		goto out_err;
 	}
 
-	waiter_register(waitset, client->fd, WAIT_IN, discover_client_process,
-			client);
+	waiter_register_io(waitset, client->fd, WAIT_IN,
+			discover_client_process, client);
 
 	return client;
 
@@ -230,6 +249,7 @@ static void create_boot_command(struct boot_command *command,
 	command->option_id = boot_option->id;
 	command->boot_image_file = data->image;
 	command->initrd_file = data->initrd;
+	command->dtb_file = data->dtb;
 	command->boot_args = data->args;
 }
 
@@ -259,3 +279,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);
+}