discover: Deprecate 'conf' user event

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 69defa34e341b22a9441b4b233f39d7b532eaa94..b201de8c669e84230efd6e13cc9254ecc68fbd96 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -58,6 +58,10 @@ static const char *event_action_name(enum event_action action)
                return "url";
        case EVENT_ACTION_DHCP:
                return "dhcp";
+       case EVENT_ACTION_BOOT:
+               return "boot";
+       case EVENT_ACTION_SYNC:
+               return "sync";
        default:
                break;
        }
@@ -378,28 +382,6 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
        return 0;
 }
 
-static int user_event_conf(struct user_event *uev, struct event *event)
-{
-       struct device_handler *handler = uev->handler;
-       struct discover_device *dev;
-       struct pb_url *url;
-       const char *val;
-
-       val = event_get_param(event, "url");
-       if (!val)
-               return 0;
-
-       url = pb_url_parse(event, val);
-       if (!url)
-               return 0;
-
-       dev = discover_device_create(handler, event->device);
-
-       device_handler_conf(handler, dev, url);
-
-       return 0;
-}
-
 static int user_event_add(struct user_event *uev, struct event *event)
 {
        struct device_handler *handler = uev->handler;
@@ -439,7 +421,37 @@ static int user_event_url(struct user_event *uev, struct event *event)
 
        url = event_get_param(event, "url");
        if (url)
-               device_handler_process_url(handler, url);
+               device_handler_process_url(handler, url, NULL, NULL);
+
+       return 0;
+}
+
+static int user_event_boot(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       struct boot_command *cmd = talloc(handler, struct boot_command);
+
+       cmd->option_id = talloc_strdup(cmd, event_get_param(event, "id"));
+       cmd->boot_image_file = talloc_strdup(cmd, event_get_param(event, "image"));
+       cmd->initrd_file = talloc_strdup(cmd, event_get_param(event, "initrd"));
+       cmd->dtb_file = talloc_strdup(cmd, event_get_param(event, "dtb"));
+       cmd->boot_args = talloc_strdup(cmd, event_get_param(event, "args"));
+
+       device_handler_boot(handler, cmd);
+
+       talloc_free(cmd);
+
+       return 0;
+}
+
+static int user_event_sync(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+
+       if (strncasecmp(event->device, "all", strlen("all")) != 0)
+               device_sync_snapshots(handler, event->device);
+       else
+               device_sync_snapshots(handler, NULL);
 
        return 0;
 }
@@ -469,29 +481,34 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
                break;
        case EVENT_ACTION_URL:
                result = user_event_url(uev, event);
-               break;
-       case EVENT_ACTION_CONF:
-               result = user_event_conf(uev, event);
-               break;
+               goto out;
        case EVENT_ACTION_DHCP:
                result = user_event_dhcp(uev, event);
+               goto out;
+       case EVENT_ACTION_BOOT:
+               result = user_event_boot(uev, event);
+               break;
+       case EVENT_ACTION_SYNC:
+               result = user_event_sync(uev, event);
                break;
        default:
                break;
        }
 
+       /* user_event_url() and user_event_dhcp() will steal the event context,
+        * but all others still need to free */
        talloc_free(event);
-
+out:
        return;
 }
 
 static int user_event_process(void *arg)
 {
        struct user_event *uev = arg;
-       char buf[PBOOT_USER_EVENT_SIZE];
+       char buf[PBOOT_USER_EVENT_SIZE + 1];
        int len;
 
-       len = recvfrom(uev->socket, buf, sizeof(buf), 0, NULL, NULL);
+       len = recvfrom(uev->socket, buf, PBOOT_USER_EVENT_SIZE, 0, NULL, NULL);
 
        if (len < 0) {
                pb_log("%s: socket read failed: %s", __func__, strerror(errno));
@@ -503,6 +520,8 @@ static int user_event_process(void *arg)
                return 0;
        }
 
+       buf[len] = '\0';
+
        pb_debug("%s: %u bytes\n", __func__, len);
 
        user_event_handle_message(uev, buf, len);