X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=8ad4611b3a913d7387fdb1946ff1e2efaa4e963b;hp=71ef70b81fdb3f146e498ba4a38f9c0a438494bb;hb=5b3dd56d982629349e612b9e984e65dec09b438f;hpb=45e9e7a53540e87e2129bb11fd853501131fb795

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 71ef70b..8ad4611 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -112,6 +112,21 @@ static void device_remove(struct discover_client *client, const char *id)
 	talloc_free(device);
 }
 
+static void plugin_option_add(struct discover_client *client,
+		struct plugin_option *opt)
+{
+	talloc_steal(client, opt);
+
+	if (client->ops.plugin_option_add)
+		client->ops.plugin_option_add(opt, client->ops.cb_arg);
+}
+
+static void plugins_remove(struct discover_client *client)
+{
+	if (client->ops.plugins_remove)
+		client->ops.plugins_remove(client->ops.cb_arg);
+}
+
 void discover_client_enumerate(struct discover_client *client)
 {
 	struct boot_option *opt;
@@ -131,7 +146,7 @@ void discover_client_enumerate(struct discover_client *client)
 }
 
 static void update_status(struct discover_client *client,
-		struct boot_status *status)
+		struct status *status)
 {
 	if (client->ops.update_status)
 		client->ops.update_status(status, client->ops.cb_arg);
@@ -155,9 +170,10 @@ static int discover_client_process(void *arg)
 {
 	struct discover_client *client = arg;
 	struct pb_protocol_message *message;
+	struct plugin_option *p_opt;
 	struct system_info *sysinfo;
-	struct boot_status *status;
 	struct boot_option *opt;
+	struct status *status;
 	struct config *config;
 	struct device *dev;
 	char *dev_id;
@@ -206,7 +222,7 @@ static int discover_client_process(void *arg)
 		device_remove(client, dev_id);
 		break;
 	case PB_PROTOCOL_ACTION_STATUS:
-		status = talloc_zero(ctx, struct boot_status);
+		status = talloc_zero(ctx, struct status);
 
 		rc = pb_protocol_deserialise_boot_status(status, message);
 		if (rc) {
@@ -235,6 +251,20 @@ static int discover_client_process(void *arg)
 		}
 		update_config(client, config);
 		break;
+	case PB_PROTOCOL_ACTION_PLUGIN_OPTION_ADD:
+		p_opt = talloc_zero(ctx, struct plugin_option);
+
+		rc = pb_protocol_deserialise_plugin_option(p_opt, message);
+		if (rc) {
+			pb_log("%s: no plugin_option?\n", __func__);
+			goto out;
+		}
+
+		plugin_option_add(client, p_opt);
+		break;
+	case PB_PROTOCOL_ACTION_PLUGINS_REMOVE:
+		plugins_remove(client);
+		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
 	}
@@ -312,6 +342,8 @@ 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->args_sig_file = data->args_sig_file;
+	command->console = ttyname(STDIN_FILENO);
 }
 
 int discover_client_boot(struct discover_client *client,
@@ -402,3 +434,21 @@ int discover_client_send_url(struct discover_client *client,
 
 	return pb_protocol_write_message(client->fd, message);
 }
+
+int discover_client_send_plugin_install(struct discover_client *client,
+		char *file)
+{
+	struct pb_protocol_message *message;
+	int len;
+
+	len = pb_protocol_url_len(file);
+
+	message = pb_protocol_create_message(client,
+				PB_PROTOCOL_ACTION_PLUGIN_INSTALL, len);
+	if (!message)
+		return -1;
+
+	pb_protocol_serialise_url(file, message->payload, len);
+
+	return pb_protocol_write_message(client->fd, message);
+}