X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=1a527895878d4de36f17406c3fe7ad44c1ceb07d;hp=6747e78a8064f7a04a5b377b3535a6a412658a71;hb=6532debf0bd95509cff9eb8634f57aef20a696b9;hpb=5eb7f7bcd3431cd8f634b02b71bd78f6162c2af3

diff --git a/discover/udev.c b/discover/udev.c
index 6747e78..1a52789 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -10,10 +10,11 @@
 #include <sys/un.h>
 
 #include <talloc/talloc.h>
+#include <waiter/waiter.h>
+#include <log/log.h>
 
+#include "event.h"
 #include "udev.h"
-#include "log.h"
-#include "waiter.h"
 #include "pb-discover.h"
 #include "device-handler.h"
 
@@ -26,52 +27,7 @@ struct udev {
 	int socket;
 };
 
-static void parse_event_params(struct udev_event *event, char *buf, int len)
-{
-	int param_len, name_len, value_len;
-	struct param *param;
-	char *sep;
-
-	for (; len > 0; len -= param_len + 1, buf += param_len + 1) {
-
-		/* find the length of the whole parameter */
-		param_len = strnlen(buf, len);
-		if (!param_len) {
-			/* multiple NULs? skip over */
-			param_len = 1;
-			continue;
-		}
-
-		/* find the separator */
-		sep = memchr(buf, '=', param_len);
-		if (!sep)
-			continue;
-
-		name_len = sep - buf;
-		value_len = param_len - name_len - 1;
-
-		/* update the params array */
-		event->params = talloc_realloc(event, event->params,
-					struct param, ++event->n_params);
-		param = &event->params[event->n_params - 1];
-
-		param->name = talloc_strndup(event, buf, name_len);
-		param->value = talloc_strndup(event, sep + 1, value_len);
-	}
-}
-
-const char *udev_event_param(struct udev_event *event, const char *name)
-{
-	int i;
-
-	for (i = 0; i < event->n_params; i++)
-		if (!strcasecmp(event->params[i].name, name))
-			return event->params[i].value;
-
-	return NULL;
-}
-
-static void print_event(struct udev_event *event)
+static void udev_print_event(struct event *event)
 {
 	const char *action, *params[] = {
 		"DEVNAME", "ID_TYPE", "ID_BUS", "ID_FS_UUID", "ID_FS_LABEL",
@@ -79,63 +35,32 @@ static void print_event(struct udev_event *event)
 	};
 	int i;
 
-	action = event->action == UDEV_ACTION_ADD ? "add" : "remove";
+	action = event->action == EVENT_ACTION_ADD ? "add" : "remove";
 
 	pb_log("udev %s event:\n", action);
-	printf("\tdevice: %s\n", event->device);
+	pb_log("\tdevice: %s\n", event->device);
 
 	for (i = 0; params[i]; i++)
-		printf("\t%-12s => %s\n",
-				params[i], udev_event_param(event, params[i]));
+		pb_log("\t%-12s => %s\n",
+				params[i], event_get_param(event, params[i]));
 
 }
 
-static void handle_udev_message(struct udev *udev, char *buf, int len)
+static void udev_handle_message(struct udev *udev, char *buf, int len)
 {
-	char *sep, *device;
-	enum udev_action action;
-	struct udev_event *event;
-	int device_len;
-
-	/* we should see an <action>@<device>\0 at the head of the buffer */
-	sep = strchr(buf, '@');
-	if (!sep)
-		return;
-
-	/* terminate the action string */
-	*sep = '\0';
-	len -= sep - buf + 1;
+	int result;
+	struct event *event;
 
-	if (!strcmp(buf, "add")) {
-		action = UDEV_ACTION_ADD;
+	event = talloc(udev, struct event);
+	event->type = EVENT_TYPE_UDEV;
 
-	} else if (!strcmp(buf, "remove")) {
-		action = UDEV_ACTION_REMOVE;
+	result = event_parse_ad_message(event, buf, len);
 
-	} else {
+	if (result)
 		return;
-	}
-
-	/* initialise the device string */
-	device = sep + 1;
-	device_len = strnlen(device, len);
-	if (!device_len)
-		return;
-
-	/* now we have an action and a device, we can construct an event */
-	event = talloc(udev, struct udev_event);
-	event->action = action;
-	event->device = talloc_strndup(event, device, device_len);
-	event->n_params = 0;
-	event->params = NULL;
-
-	len -= device_len + 1;
-	parse_event_params(event, device + device_len + 1, len);
-
-	print_event(event);
 
+	udev_print_event(event);
 	device_handler_event(udev->handler, event);
-
 	talloc_free(event);
 
 	return;
@@ -157,7 +82,7 @@ static int udev_process(void *arg)
 	if (len == 0)
 		return 0;
 
-	handle_udev_message(udev, buf, len);
+	udev_handle_message(udev, buf, len);
 
 	return 0;
 }
@@ -201,6 +126,8 @@ struct udev *udev_init(struct device_handler *handler)
 
 	waiter_register(udev->socket, WAIT_IN, udev_process, udev);
 
+	pb_log("%s: waiting on %s\n", __func__, PBOOT_DEVICE_SOCKET);
+
 	return udev;
 
 out_err:
@@ -208,6 +135,16 @@ out_err:
 	return NULL;
 }
 
+int udev_trigger(struct udev __attribute__((unused)) *udev)
+{
+	int rc = system("/sbin/udevadm trigger --subsystem-match=block");
+
+	if (rc)
+		pb_log("udev trigger failed: %d (%d)\n", rc, WEXITSTATUS(rc));
+
+	return WEXITSTATUS(rc);
+}
+
 void udev_destroy(struct udev *udev)
 {
 	talloc_free(udev);