protocol: Separate device add from boot-option add messages

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 6a27f15780a5a4ae290e2ddf6d1b95f789dadb02..ab27b51b2eaf764d98a37b7df3185dd49d46a20b 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -23,6 +23,7 @@
 
 struct device_handler {
        struct discover_server *server;
+       int dry_run;
 
        struct device **devices;
        unsigned int n_devices;
@@ -274,6 +275,7 @@ static int handle_add_udev_event(struct device_handler *handler,
                struct event *event)
 {
        struct discover_context *ctx;
+       struct boot_option *opt;
        const char *devname;
        int rc;
 
@@ -310,7 +312,10 @@ static int handle_add_udev_event(struct device_handler *handler,
        /* add device to handler device array */
        device_handler_add(handler, ctx->device);
 
-       discover_server_notify_add(handler->server, ctx->device);
+       discover_server_notify_device_add(handler->server, ctx->device);
+
+       list_for_each_entry(&ctx->device->boot_options, opt, list)
+               discover_server_notify_boot_option_add(handler->server, opt);
 
        return 0;
 }
@@ -324,7 +329,7 @@ static int handle_remove_udev_event(struct device_handler *handler,
        if (!ctx)
                return 0;
 
-       discover_server_notify_remove(handler->server, ctx->device);
+       discover_server_notify_device_remove(handler->server, ctx->device);
 
        /* remove device from handler device array */
        device_handler_remove(handler, ctx->device);
@@ -337,6 +342,7 @@ static int handle_remove_udev_event(struct device_handler *handler,
 static int handle_add_user_event(struct device_handler *handler,
                struct event *event)
 {
+       struct boot_option *opt;
        struct device *device;
 
        assert(event->device);
@@ -351,7 +357,10 @@ static int handle_add_user_event(struct device_handler *handler,
 
        parse_user_event(device, event);
 
-       discover_server_notify_add(handler->server, device);
+       discover_server_notify_device_add(handler->server, device);
+
+       list_for_each_entry(&device->boot_options, opt, list)
+               discover_server_notify_boot_option_add(handler->server, opt);
 
        /* add device to handler device array */
        device_handler_add(handler, device);
@@ -371,7 +380,7 @@ static int handle_remove_user_event(struct device_handler *handler,
        if (!device)
                return 0;
 
-       discover_server_notify_remove(handler->server, device);
+       discover_server_notify_device_remove(handler->server, device);
 
        /* remove device from handler device array */
        device_handler_remove(handler, device);
@@ -407,7 +416,8 @@ int device_handler_event(struct device_handler *handler,
        return handlers[event->type][event->action](handler, event);
 }
 
-struct device_handler *device_handler_init(struct discover_server *server)
+struct device_handler *device_handler_init(struct discover_server *server,
+               int dry_run)
 {
        struct device_handler *handler;
 
@@ -415,6 +425,7 @@ struct device_handler *device_handler_init(struct discover_server *server)
        handler->devices = NULL;
        handler->n_devices = 0;
        handler->server = server;
+       handler->dry_run = dry_run;
 
        list_init(&handler->contexts);
 
@@ -455,5 +466,5 @@ void device_handler_boot(struct device_handler *handler,
 
        opt = find_boot_option_by_id(handler, cmd->option_id);
 
-       boot(handler, opt, cmd, 0);
+       boot(handler, opt, cmd, handler->dry_run);
 }