X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=6247dd0471b6b5fa6f8247adb68f872297eb6c52;hp=a124f8bee8d9ffd03eb008ca4bae26e801a53699;hb=ec82dfa6207090d285c4617e1d0a7a2284e390c3;hpb=16ab363fe5bc4393b5dd7b9c12bbd6e5b55a22fe

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index a124f8b..6247dd0 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -112,6 +112,24 @@ static void device_remove(struct discover_client *client, const char *id)
 	talloc_free(device);
 }
 
+void discover_client_enumerate(struct discover_client *client)
+{
+	struct boot_option *opt;
+	struct device *device;
+	int i;
+
+	for (i = 0; i < client->n_devices; i++) {
+		device = client->devices[i];
+		if (client->ops.device_add)
+			client->ops.device_add(device, client->ops.cb_arg);
+
+		list_for_each_entry(&device->boot_options, opt, list)
+			if (client->ops.boot_option_add)
+				client->ops.boot_option_add(device, opt,
+						client->ops.cb_arg);
+	}
+}
+
 static void update_status(struct discover_client *client,
 		struct boot_status *status)
 {
@@ -163,7 +181,7 @@ static int discover_client_process(void *arg)
 		rc = pb_protocol_deserialise_device(dev, message);
 		if (rc) {
 			pb_log("%s: no device?\n", __func__);
-			return 0;
+			goto out;
 		}
 
 		device_add(client, dev);
@@ -174,7 +192,7 @@ static int discover_client_process(void *arg)
 		rc = pb_protocol_deserialise_boot_option(opt, message);
 		if (rc) {
 			pb_log("%s: no boot_option?\n", __func__);
-			return 0;
+			goto out;
 		}
 
 		boot_option_add(client, opt);
@@ -183,7 +201,7 @@ static int discover_client_process(void *arg)
 		dev_id = pb_protocol_deserialise_string(ctx, message);
 		if (!dev_id) {
 			pb_log("%s: no device id?\n", __func__);
-			return 0;
+			goto out;
 		}
 		device_remove(client, dev_id);
 		break;
@@ -193,7 +211,7 @@ static int discover_client_process(void *arg)
 		rc = pb_protocol_deserialise_boot_status(status, message);
 		if (rc) {
 			pb_log("%s: invalid status message?\n", __func__);
-			return 0;
+			goto out;
 		}
 		update_status(client, status);
 		break;
@@ -203,7 +221,7 @@ static int discover_client_process(void *arg)
 		rc = pb_protocol_deserialise_system_info(sysinfo, message);
 		if (rc) {
 			pb_log("%s: invalid sysinfo message?\n", __func__);
-			return 0;
+			goto out;
 		}
 		update_sysinfo(client, sysinfo);
 		break;
@@ -213,7 +231,7 @@ static int discover_client_process(void *arg)
 		rc = pb_protocol_deserialise_config(config, message);
 		if (rc) {
 			pb_log("%s: invalid config message?\n", __func__);
-			return 0;
+			goto out;
 		}
 		update_config(client, config);
 		break;
@@ -221,6 +239,7 @@ static int discover_client_process(void *arg)
 		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}
 
+out:
 	talloc_free(ctx);
 
 	return 0;
@@ -293,6 +312,7 @@ static void create_boot_command(struct boot_command *command,
 	command->initrd_file = data->initrd;
 	command->dtb_file = data->dtb;
 	command->boot_args = data->args;
+	command->tty = ttyname(STDIN_FILENO);
 }
 
 int discover_client_boot(struct discover_client *client,
@@ -365,3 +385,21 @@ int discover_client_send_config(struct discover_client *client,
 
 	return pb_protocol_write_message(client->fd, message);
 }
+
+int discover_client_send_url(struct discover_client *client,
+		char *url)
+{
+	struct pb_protocol_message *message;
+	int len;
+
+	len = pb_protocol_url_len(url);
+
+	message = pb_protocol_create_message(client,
+				PB_PROTOCOL_ACTION_ADD_URL, len);
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_url(url, message->payload, len);
+
+	return pb_protocol_write_message(client->fd, message);
+}