X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=6e03ef3fa159136b6015983a0054411cb7f126c8;hp=7e5819c5bd972d8284a9f70ac1c9eb1efbb9d0bb;hb=52b9db95764fcdee9195113d7df225634a19c9f4;hpb=61679084243c471053b0b1b9865b40d721586958

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 7e5819c..6e03ef3 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -8,13 +9,15 @@
 
 #include <talloc/talloc.h>
 #include <list/list.h>
+#include <log/log.h>
 #include <pb-protocol/pb-protocol.h>
+#include <system/system.h>
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "event.h"
 #include "parser.h"
 #include "udev.h"
-#include "log.h"
 #include "paths.h"
 
 #define MOUNT_BIN "/bin/mount"
@@ -24,8 +27,8 @@
 struct device_handler {
 	struct discover_server *server;
 
-	struct device *devices;
-	int n_devices;
+	struct device **devices;
+	unsigned int n_devices;
 
 	struct list contexts;
 };
@@ -35,103 +38,86 @@ struct mount_map {
 	char *mount_point;
 };
 
+/**
+ * device_handler_add - Add a device to the handler device array.
+ */
 
-static struct boot_option options[] = {
-	{
-		.id = "1.1",
-		.name = "meep one",
-		.description = "meep description one",
-		.icon_file = "meep.one.png",
-		.boot_args = "root=/dev/sda1",
-	},
-};
-
-static struct device device = {
-	.id = "1",
-	.name = "meep",
-	.description = "meep description",
-	.icon_file = "meep.png",
-};
-
-int device_handler_get_current_devices(
-		struct device_handler *handler __attribute__((unused)),
-		struct device **devices)
-
+static void device_handler_add(struct device_handler *handler,
+	struct device *device)
 {
-	*devices = &device;
-	return 1;
+	handler->n_devices++;
+	handler->devices = talloc_realloc(handler, handler->devices,
+		struct device *, handler->n_devices);
+	handler->devices[handler->n_devices - 1] = device;
 }
 
-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;
-	}
+/**
+ * device_handler_remove - Remove a device from the handler device array.
+ */
 
-	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;
-		}
+static void device_handler_remove(struct device_handler *handler,
+	struct device *device)
+{
+	unsigned int i;
 
-		if (!sep)
+	for (i = 0; i < handler->n_devices; i++)
+		if (handler->devices[i] == device)
 			break;
 
-		/* reset dir to the full path */
-		strcpy(str, dir);
-		sep = strchr(sep + 1, '/');
+	if (i == handler->n_devices) {
+		assert(0 && "unknown device");
+		return;
 	}
 
-	talloc_free(str);
-
-	return 0;
+	handler->n_devices--;
+	memmove(&handler->devices[i], &handler->devices[i + 1],
+		(handler->n_devices - i) * sizeof(handler->devices[0]));
+	handler->devices = talloc_realloc(handler, handler->devices,
+		struct device *, handler->n_devices);
 }
 
-static int rmdir_recursive(const char *base, const char *dir)
+/**
+ * device_handler_find - Find a handler device by id.
+ */
+
+static struct device *device_handler_find(struct device_handler *handler,
+	const char *id)
 {
-	char *cur, *pos;
+	unsigned int i;
 
-	/* sanity check: make sure that dir is within base */
-	if (strncmp(base, dir, strlen(base)))
-		return -1;
+	assert(id);
 
-	cur = talloc_strdup(NULL, dir);
+	for (i = 0; i < handler->n_devices; i++)
+		if (handler->devices[i]->id
+			&& streq(handler->devices[i]->id, id))
+			return handler->devices[i];
 
-	while (strcmp(base, dir)) {
+	pb_log("%s: unknown device: %s\n", __func__, id);
+	return NULL;
+}
 
-		rmdir(dir);
+/**
+ * device_handler_get_device_count - Get the count of current handler devices.
+ */
 
-		/* null-terminate at the last slash */
-		pos = strrchr(dir, '/');
-		if (!pos)
-			break;
+int device_handler_get_device_count(const struct device_handler *handler)
+{
+	return handler->n_devices;
+}
 
-		*pos = '\0';
-	}
+/**
+ * device_handler_get_device - Get a handler device by index.
+ */
 
-	talloc_free(cur);
+const struct device *device_handler_get_device(
+	const struct device_handler *handler, unsigned int index)
+{
+	if (index >= handler->n_devices) {
+		assert(0 && "bad index");
+		return NULL;
+	}
 
-	return 0;
+	return handler->devices[index];
 }
 
 static void setup_device_links(struct discover_context *ctx)
@@ -156,7 +142,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;
 
@@ -164,7 +150,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",
@@ -197,44 +183,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. */
 
-	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
-		goto out_rmdir;
+		argv[0] = MOUNT_BIN;
+		argv[1] = ctx->device_path;
+		argv[2] = ctx->mount_path;
+		argv[3] = NULL;
+
+		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;
 }
 
@@ -265,7 +249,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;
 }
@@ -283,7 +267,6 @@ static struct discover_context *find_context(struct device_handler *handler,
 	return NULL;
 }
 
-
 static int destroy_context(void *arg)
 {
 	struct discover_context *ctx = arg;
@@ -294,8 +277,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;
@@ -310,17 +293,12 @@ 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);
 	if (rc) {
-		pb_log("mount_device failed for %s\n", event->device);
 		talloc_free(ctx);
 		return 0;
 	}
@@ -336,13 +314,16 @@ static int handle_add_event(struct device_handler *handler,
 	/* run the parsers */
 	iterate_parsers(ctx);
 
+	/* add device to handler device array */
+	device_handler_add(handler, ctx->device);
+
 	discover_server_notify_add(handler->server, ctx->device);
 
 	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;
 
@@ -352,23 +333,96 @@ static int handle_remove_event(struct device_handler *handler,
 
 	discover_server_notify_remove(handler->server, ctx->device);
 
+	/* remove device from handler device array */
+	device_handler_remove(handler, ctx->device);
+
 	talloc_free(ctx);
 
 	return 0;
 }
 
+static int handle_add_user_event(struct device_handler *handler,
+		struct event *event)
+{
+	struct device *device;
+
+	assert(event->device);
+
+	device = talloc_zero(handler, struct device);
+
+	if (!device)
+		goto fail;
+
+	device->id = talloc_strdup(device, event->device);
+	list_init(&device->boot_options);
+
+	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;
+}
+
 int device_handler_event(struct device_handler *handler,
-		struct udev_event *event)
+		struct event *event)
 {
-	int rc;
+	int rc = 0;
 
-	switch (event->action) {
-	case UDEV_ACTION_ADD:
-		rc = handle_add_event(handler, event);
+	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 UDEV_ACTION_REMOVE:
-		rc = handle_remove_event(handler, event);
+	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;
 	}
 
@@ -378,7 +432,6 @@ int device_handler_event(struct device_handler *handler,
 struct device_handler *device_handler_init(struct discover_server *server)
 {
 	struct device_handler *handler;
-	unsigned int i;
 
 	handler = talloc(NULL, struct device_handler);
 	handler->devices = NULL;
@@ -388,13 +441,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());
-
-	/* setup out test objects */
-	list_init(&device.boot_options);
-
-	for (i = 0; i < sizeof(options) / sizeof(options[0]); i++)
-		list_add(&device.boot_options, &options[i].list);
+	pb_mkdir_recursive(mount_base());
 
 	parser_init();
 
@@ -405,4 +452,3 @@ void device_handler_destroy(struct device_handler *handler)
 {
 	talloc_free(handler);
 }
-