ui/ncurses: Interpret left/right keys as up/down

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index cf7f20c599bbefdac3c004834dc75966500a7a4b..15d9c87bebc2213a1cb265b532999921f0e92925 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -54,8 +54,12 @@ static const char *event_action_name(enum event_action action)
                return "add";
        case EVENT_ACTION_REMOVE:
                return "remove";
+       case EVENT_ACTION_URL:
+               return "url";
        case EVENT_ACTION_DHCP:
                return "dhcp";
+       case EVENT_ACTION_BOOT:
+               return "boot";
        default:
                break;
        }
@@ -430,6 +434,36 @@ static int user_event_remove(struct user_event *uev, struct event *event)
        return 0;
 }
 
+static int user_event_url(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       const char *url;
+
+       url = event_get_param(event, "url");
+       if (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 void user_event_handle_message(struct user_event *uev, char *buf,
        int len)
 {
@@ -453,12 +487,18 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
        case EVENT_ACTION_REMOVE:
                result = user_event_remove(uev, event);
                break;
+       case EVENT_ACTION_URL:
+               result = user_event_url(uev, event);
+               break;
        case EVENT_ACTION_CONF:
                result = user_event_conf(uev, event);
                break;
        case EVENT_ACTION_DHCP:
                result = user_event_dhcp(uev, event);
                break;
+       case EVENT_ACTION_BOOT:
+               result = user_event_boot(uev, event);
+               break;
        default:
                break;
        }
@@ -471,10 +511,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
 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));
@@ -486,6 +526,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);
@@ -505,15 +547,15 @@ static int user_event_destructor(void *arg)
        return 0;
 }
 
-struct user_event *user_event_init(struct waitset *waitset,
-               struct device_handler *handler)
+struct user_event *user_event_init(struct device_handler *handler,
+               struct waitset *waitset)
 {
        struct sockaddr_un addr;
        struct user_event *uev;
 
        unlink(PBOOT_USER_EVENT_SOCKET);
 
-       uev = talloc(NULL, struct user_event);
+       uev = talloc(handler, struct user_event);
 
        uev->handler = handler;
 
@@ -546,8 +588,3 @@ out_err:
        talloc_free(uev);
        return NULL;
 }
-
-void user_event_destroy(struct user_event *uev)
-{
-       talloc_free(uev);
-}