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;
}
mac_addr_arr + 2, mac_addr_arr + 3, mac_addr_arr + 4,
mac_addr_arr + 5);
- mac_addr = talloc_asprintf(ctx, "01-%02X-%02X-%02X-%02X-%02X-%02X",
+ mac_addr = talloc_asprintf(ctx, "01-%02x-%02x-%02x-%02x-%02x-%02x",
mac_addr_arr[0], mac_addr_arr[1], mac_addr_arr[2],
mac_addr_arr[3], mac_addr_arr[4], mac_addr_arr[5]);
/* strip filename from the bootfile path, leaving only a
* directory */
p = strrchr(basedir, '/');
- if (p)
- *p = '\0';
+ if (!p)
+ p = basedir;
+ *p = '\0';
if (strlen(basedir))
url_str = talloc_asprintf_append(url_str, "%s/",
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)
{
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;
}
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));
return 0;
}
+ buf[len] = '\0';
+
pb_debug("%s: %u bytes\n", __func__, len);
user_event_handle_message(uev, buf, len);
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;
talloc_free(uev);
return NULL;
}
-
-void user_event_destroy(struct user_event *uev)
-{
- talloc_free(uev);
-}