#include <talloc/talloc.h>
#include <list/list.h>
#include <log/log.h>
-#include <pb-protocol/pb-protocol.h>
+#include <types/types.h>
#include <system/system.h>
#include "device-handler.h"
#include "udev.h"
#include "paths.h"
-#define MOUNT_BIN "/bin/mount"
-
-#define UMOUNT_BIN "/bin/umount"
-
struct device_handler {
struct discover_server *server;
struct list contexts;
};
-struct mount_map {
- char *device_path;
- char *mount_point;
-};
-
/**
* device_handler_add - Add a device to the handler device array.
*/
pb_log("couldn't create mount directory %s: %s\n",
ctx->mount_path, strerror(errno));
- argv[0] = MOUNT_BIN;
+ argv[0] = pb_system_apps.mount;
argv[1] = ctx->device_path;
argv[2] = ctx->mount_path;
argv[3] = "-o";
argv[4] = "ro";
argv[5] = NULL;
- if (pb_run_cmd(argv, 1))
- argv[3] = NULL; /* try without ro */
+ if (pb_run_cmd(argv, 1, 0)) {
+
+ /* Retry mount without ro option. */
+
+ argv[0] = pb_system_apps.mount;
+ argv[1] = ctx->device_path;
+ argv[2] = ctx->mount_path;
+ argv[3] = NULL;
- if (pb_run_cmd(argv, 1))
- goto out_rmdir;
+ if (pb_run_cmd(argv, 1, 0))
+ goto out_rmdir;
+ }
setup_device_links(ctx);
return 0;
}
if (pid == 0) {
- execl(UMOUNT_BIN, UMOUNT_BIN, ctx->mount_path, NULL);
+ execl(pb_system_apps.umount, pb_system_apps.umount,
+ ctx->mount_path, NULL);
exit(EXIT_FAILURE);
}
ctx->id = talloc_strdup(ctx, event->device);
devname = event_get_param(ctx->event, "DEVNAME");
- if (!devname) {
- pb_log("no devname for %s?\n", event->device);
- return 0;
- }
-
+ assert(devname);
ctx->device_path = talloc_strdup(ctx, devname);
rc = mount_device(ctx);
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)
{
- int rc = 0;
-
- switch (event->type) {
- case EVENT_TYPE_UDEV:
- switch (event->action) {
- case EVENT_ACTION_ADD:
- rc = handle_add_udev_event(handler, event);
- break;
- case EVENT_ACTION_REMOVE:
- rc = handle_remove_udev_event(handler, event);
- break;
- default:
- pb_log("%s unknown action: %d\n", __func__,
- event->action);
- break;
- }
- break;
- case EVENT_TYPE_USER:
- switch (event->action) {
- case EVENT_ACTION_ADD:
- rc = handle_add_user_event(handler, event);
- break;
- case EVENT_ACTION_REMOVE:
- rc = handle_remove_user_event(handler, event);
- break;
- default:
- pb_log("%s unknown action: %d\n", __func__,
- event->action);
- break;
- }
- break;
- default:
- pb_log("%s unknown type: %d\n", __func__, event->type);
- break;
+ 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)