#include "device-handler.h"
#include "discover-server.h"
+#include "event.h"
#include "parser.h"
#include "udev.h"
#include "paths.h"
if (handler->devices[i] == device)
break;
- if (i < handler->n_devices) {
+ if (i == handler->n_devices) {
assert(0 && "unknown device");
return;
}
&& 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;
}
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;
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;
ctx->id = talloc_strdup(ctx, event->device);
- devname = udev_event_param(ctx->event, "DEVNAME");
+ devname = event_get_param(ctx->event, "DEVNAME");
if (!devname) {
pb_log("no devname for %s?\n", event->device);
return 0;
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;
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;
}