X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=8ad4611b3a913d7387fdb1946ff1e2efaa4e963b;hp=b48d541050613af3b865c60fe4f684e0a2145852;hb=5b3dd56d982629349e612b9e984e65dec09b438f;hpb=a0d9a2ebdf8265d40d51f47aa55c627c0e6decd3 diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c index b48d541..8ad4611 100644 --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -60,6 +60,7 @@ static void device_add(struct discover_client *client, struct device *device) client->devices[client->n_devices - 1] = device; talloc_steal(client, device); + list_init(&device->boot_options); if (client->ops.device_add) client->ops.device_add(device, client->ops.cb_arg); @@ -77,6 +78,7 @@ static void boot_option_add(struct discover_client *client, assert(dev); talloc_steal(dev, opt); + list_add(&dev->boot_options, &opt->list); if (client->ops.boot_option_add) client->ops.boot_option_add(dev, opt, client->ops.cb_arg); @@ -110,8 +112,41 @@ 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; + 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) + struct status *status) { if (client->ops.update_status) client->ops.update_status(status, client->ops.cb_arg); @@ -135,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; @@ -161,7 +197,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); @@ -172,7 +208,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); @@ -181,17 +217,17 @@ 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; 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) { pb_log("%s: invalid status message?\n", __func__); - return 0; + goto out; } update_status(client, status); break; @@ -201,7 +237,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; @@ -211,14 +247,29 @@ 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; + 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); } +out: talloc_free(ctx); return 0; @@ -291,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, @@ -332,3 +385,70 @@ int discover_client_cancel_default(struct discover_client *client) return pb_protocol_write_message(client->fd, message); } + +int discover_client_send_reinit(struct discover_client *client) +{ + struct pb_protocol_message *message; + + message = pb_protocol_create_message(client, + PB_PROTOCOL_ACTION_REINIT, 0); + + if (!message) + return -1; + + return pb_protocol_write_message(client->fd, message); +} + +int discover_client_send_config(struct discover_client *client, + struct config *config) +{ + struct pb_protocol_message *message; + int len; + + len = pb_protocol_config_len(config); + + message = pb_protocol_create_message(client, + PB_PROTOCOL_ACTION_CONFIG, len); + if (!message) + return -1; + + pb_protocol_serialise_config(config, message->payload, len); + + 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); +} + +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); +}