X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=9589bb20d16c0e8ac57f390138aafca4ccd0b2be;hp=0f8dc58441701c32312e040c29417d0bf4a0be9f;hb=59caf989e5e20f4a1238f23e512a586d5ba67de1;hpb=1eaa67c4bd124bd9e786c64c95f4fb1f3570482b diff --git a/discover/device-handler.c b/discover/device-handler.c index 0f8dc58..9589bb2 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -11,9 +11,11 @@ #include #include #include +#include #include "device-handler.h" #include "discover-server.h" +#include "event.h" #include "parser.h" #include "udev.h" #include "paths.h" @@ -31,11 +33,6 @@ struct device_handler { struct list contexts; }; -struct mount_map { - char *device_path; - char *mount_point; -}; - /** * device_handler_add - Add a device to the handler device array. */ @@ -62,7 +59,7 @@ static void device_handler_remove(struct device_handler *handler, if (handler->devices[i] == device) break; - if (i < handler->n_devices) { + if (i == handler->n_devices) { assert(0 && "unknown device"); return; } @@ -90,7 +87,7 @@ static struct device *device_handler_find(struct device_handler *handler, && streq(handler->devices[i]->id, id)) return handler->devices[i]; - assert(0 && "unknown device"); + pb_log("%s: unknown device: %s\n", __func__, id); return NULL; } @@ -118,78 +115,6 @@ const struct device *device_handler_get_device( return handler->devices[index]; } -static int mkdir_recursive(const char *dir) -{ - struct stat statbuf; - char *str, *sep; - int mode = 0755; - - if (!*dir) - return 0; - - if (!stat(dir, &statbuf)) { - if (!S_ISDIR(statbuf.st_mode)) { - pb_log("%s: %s exists, but isn't a directory\n", - __func__, dir); - return -1; - } - return 0; - } - - str = talloc_strdup(NULL, dir); - sep = strchr(*str == '/' ? str + 1 : str, '/'); - - while (1) { - - /* terminate the path at sep */ - if (sep) - *sep = '\0'; - - if (mkdir(str, mode) && errno != EEXIST) { - pb_log("mkdir(%s): %s\n", str, strerror(errno)); - return -1; - } - - if (!sep) - break; - - /* reset dir to the full path */ - strcpy(str, dir); - sep = strchr(sep + 1, '/'); - } - - talloc_free(str); - - return 0; -} - -static int rmdir_recursive(const char *base, const char *dir) -{ - char *cur, *pos; - - /* sanity check: make sure that dir is within base */ - if (strncmp(base, dir, strlen(base))) - return -1; - - cur = talloc_strdup(NULL, dir); - - while (strcmp(base, dir)) { - - rmdir(dir); - - /* null-terminate at the last slash */ - pos = strrchr(dir, '/'); - if (!pos) - break; - - *pos = '\0'; - } - - talloc_free(cur); - - return 0; -} - static void setup_device_links(struct discover_context *ctx) { struct link { @@ -212,7 +137,7 @@ static void setup_device_links(struct discover_context *ctx) char *enc, *dir, *path; const char *value; - value = udev_event_param(ctx->event, link->env); + value = event_get_param(ctx->event, link->env); if (!value || !*value) continue; @@ -220,7 +145,7 @@ static void setup_device_links(struct discover_context *ctx) dir = join_paths(ctx, mount_base(), link->dir); path = join_paths(ctx, dir, value); - if (!mkdir_recursive(dir)) { + if (!pb_mkdir_recursive(dir)) { unlink(path); if (symlink(ctx->mount_path, path)) { pb_log("symlink(%s,%s): %s\n", @@ -253,47 +178,42 @@ static void remove_device_links(struct discover_context *ctx) static int mount_device(struct discover_context *ctx) { const char *mountpoint; - int status; - pid_t pid; + const char *argv[6]; if (!ctx->mount_path) { mountpoint = mountpoint_for_device(ctx->device_path); ctx->mount_path = talloc_strdup(ctx, mountpoint); } - if (mkdir_recursive(ctx->mount_path)) + if (pb_mkdir_recursive(ctx->mount_path)) pb_log("couldn't create mount directory %s: %s\n", ctx->mount_path, strerror(errno)); - pid = fork(); - if (pid == -1) { - pb_log("%s: fork failed: %s\n", __func__, strerror(errno)); - goto out_rmdir; - } + argv[0] = MOUNT_BIN; + argv[1] = ctx->device_path; + argv[2] = ctx->mount_path; + argv[3] = "-o"; + argv[4] = "ro"; + argv[5] = NULL; - if (pid == 0) { - execl(MOUNT_BIN, MOUNT_BIN, ctx->device_path, ctx->mount_path, - "-o", "ro", NULL); - exit(EXIT_FAILURE); - } + if (pb_run_cmd(argv, 1, 0)) { - if (waitpid(pid, &status, 0) == -1) { - pb_log("%s: waitpid failed: %s\n", __func__, - strerror(errno)); - goto out_rmdir; - } + /* Retry mount without ro option. */ + + argv[0] = MOUNT_BIN; + argv[1] = ctx->device_path; + argv[2] = ctx->mount_path; + argv[3] = NULL; - if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { - pb_log("%s: mount failed (%d): %s\n", __func__, - WEXITSTATUS(status), ctx->event->device); - goto out_rmdir; + if (pb_run_cmd(argv, 1, 0)) + goto out_rmdir; } setup_device_links(ctx); return 0; out_rmdir: - rmdir_recursive(mount_base(), ctx->mount_path); + pb_rmdir_recursive(mount_base(), ctx->mount_path); return -1; } @@ -324,7 +244,7 @@ static int umount_device(struct discover_context *ctx) if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) return -1; - rmdir_recursive(mount_base(), ctx->mount_path); + pb_rmdir_recursive(mount_base(), ctx->mount_path); return 0; } @@ -352,8 +272,8 @@ static int destroy_context(void *arg) return 0; } -static int handle_add_event(struct device_handler *handler, - struct udev_event *event) +static int handle_add_udev_event(struct device_handler *handler, + struct event *event) { struct discover_context *ctx; const char *devname; @@ -368,12 +288,8 @@ static int handle_add_event(struct device_handler *handler, ctx->id = talloc_strdup(ctx, event->device); - devname = udev_event_param(ctx->event, "DEVNAME"); - if (!devname) { - pb_log("no devname for %s?\n", event->device); - return 0; - } - + devname = event_get_param(ctx->event, "DEVNAME"); + assert(devname); ctx->device_path = talloc_strdup(ctx, devname); rc = mount_device(ctx); @@ -401,8 +317,8 @@ static int handle_add_event(struct device_handler *handler, return 0; } -static int handle_remove_event(struct device_handler *handler, - struct udev_event *event) +static int handle_remove_udev_event(struct device_handler *handler, + struct event *event) { struct discover_context *ctx; @@ -420,22 +336,77 @@ static int handle_remove_event(struct device_handler *handler, return 0; } -int device_handler_event(struct device_handler *handler, - struct udev_event *event) +static int handle_add_user_event(struct device_handler *handler, + struct event *event) { - int rc; + struct device *device; + + assert(event->device); + + device = talloc_zero(handler, struct device); + + if (!device) + goto fail; - switch (event->action) { - case UDEV_ACTION_ADD: - rc = handle_add_event(handler, event); - break; + device->id = talloc_strdup(device, event->device); + list_init(&device->boot_options); - case UDEV_ACTION_REMOVE: - rc = handle_remove_event(handler, event); - break; + parse_user_event(device, event); + + discover_server_notify_add(handler->server, device); + + /* add device to handler device array */ + device_handler_add(handler, device); + + return 0; + +fail: + talloc_free(device); + return 0; +} + +static int handle_remove_user_event(struct device_handler *handler, + struct event *event) +{ + struct device *device = device_handler_find(handler, event->device); + + if (!device) + return 0; + + discover_server_notify_remove(handler->server, device); + + /* remove device from handler device array */ + device_handler_remove(handler, device); + + talloc_free(device); + return 0; +} + +typedef int (*event_handler)(struct device_handler *, struct event *); + +static event_handler handlers[EVENT_TYPE_MAX][EVENT_ACTION_MAX] = { + [EVENT_TYPE_UDEV] = { + [EVENT_ACTION_ADD] = handle_add_udev_event, + [EVENT_ACTION_REMOVE] = handle_remove_udev_event, + }, + [EVENT_TYPE_USER] = { + [EVENT_ACTION_ADD] = handle_add_user_event, + [EVENT_ACTION_REMOVE] = handle_remove_user_event, + } +}; + +int device_handler_event(struct device_handler *handler, + struct event *event) +{ + if (event->type >= EVENT_TYPE_MAX || + event->action >= EVENT_ACTION_MAX || + !handlers[event->type][event->action]) { + pb_log("%s unknown type/action: %d/%d\n", __func__, + event->type, event->action); + return 0; } - return rc; + return handlers[event->type][event->action](handler, event); } struct device_handler *device_handler_init(struct discover_server *server) @@ -450,7 +421,7 @@ struct device_handler *device_handler_init(struct discover_server *server) list_init(&handler->contexts); /* set up our mount point base */ - mkdir_recursive(mount_base()); + pb_mkdir_recursive(mount_base()); parser_init();