protocol: expose discovery reinit over client/server protocol

[petitboot] / ui / common / discover-client.c

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 90cd3b419101c051e35f5da1539eb975673c22ee..fbf70bae9cbbe56897e18dfd9c119d64637b3a1f 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -115,7 +115,6 @@ static void update_status(struct discover_client *client,
 {
        if (client->ops.update_status)
                client->ops.update_status(status, client->ops.cb_arg);
-       talloc_free(status);
 }
 
 static void update_sysinfo(struct discover_client *client,
@@ -123,7 +122,13 @@ static void update_sysinfo(struct discover_client *client,
 {
        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)
@@ -133,18 +138,24 @@ static int discover_client_process(void *arg)
        struct system_info *sysinfo;
        struct boot_status *status;
        struct boot_option *opt;
+       struct config *config;
        struct device *dev;
        char *dev_id;
+       void *ctx;
        int rc;
 
-       message = pb_protocol_read_message(client, client->fd);
+       /* We use a temporary context for processing one message; persistent
+        * data is re-parented to the client in the callbacks. */
+       ctx = talloc_new(client);
+
+       message = pb_protocol_read_message(ctx, client->fd);
 
        if (!message)
                return -1;
 
        switch (message->action) {
        case PB_PROTOCOL_ACTION_DEVICE_ADD:
-               dev = talloc_zero(client, struct device);
+               dev = talloc_zero(ctx, struct device);
                list_init(&dev->boot_options);
 
                rc = pb_protocol_deserialise_device(dev, message);
@@ -156,7 +167,7 @@ static int discover_client_process(void *arg)
                device_add(client, dev);
                break;
        case PB_PROTOCOL_ACTION_BOOT_OPTION_ADD:
-               opt = talloc_zero(client, struct boot_option);
+               opt = talloc_zero(ctx, struct boot_option);
 
                rc = pb_protocol_deserialise_boot_option(opt, message);
                if (rc) {
@@ -167,7 +178,7 @@ static int discover_client_process(void *arg)
                boot_option_add(client, opt);
                break;
        case PB_PROTOCOL_ACTION_DEVICE_REMOVE:
-               dev_id = pb_protocol_deserialise_string(client, message);
+               dev_id = pb_protocol_deserialise_string(ctx, message);
                if (!dev_id) {
                        pb_log("%s: no device id?\n", __func__);
                        return 0;
@@ -175,7 +186,7 @@ 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);
+               status = talloc_zero(ctx, struct boot_status);
 
                rc = pb_protocol_deserialise_boot_status(status, message);
                if (rc) {
@@ -185,7 +196,7 @@ 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);
+               sysinfo = talloc_zero(ctx, struct system_info);
 
                rc = pb_protocol_deserialise_system_info(sysinfo, message);
                if (rc) {
@@ -194,10 +205,21 @@ static int discover_client_process(void *arg)
                }
                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);
        }
 
+       talloc_free(ctx);
 
        return 0;
 }
@@ -264,8 +286,7 @@ 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;
@@ -311,3 +332,34 @@ 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);
+}