discover/network: Add find_interface_by_uuid

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 7350b6c3c4ef558927097c53066e81759d0a0a1f..b3410050a8ae7b15c009b205b1773c61714ae7c4 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -375,42 +375,24 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
        struct device_handler *handler = uev->handler;
        struct discover_device *dev;
 
-       dev = discover_device_create(handler, event->device);
+       dev = discover_device_create(handler, event_get_param(event, "mac"),
+                                       event->device);
 
        device_handler_dhcp(handler, dev, event);
 
        return 0;
 }
 
-static int user_event_conf(struct user_event *uev, struct event *event)
-{
-       struct device_handler *handler = uev->handler;
-       struct discover_device *dev;
-       struct pb_url *url;
-       const char *val;
-
-       val = event_get_param(event, "url");
-       if (!val)
-               return 0;
-
-       url = pb_url_parse(event, val);
-       if (!url)
-               return 0;
-
-       dev = discover_device_create(handler, event->device);
-
-       device_handler_conf(handler, dev, url);
-
-       return 0;
-}
-
 static int user_event_add(struct user_event *uev, struct event *event)
 {
        struct device_handler *handler = uev->handler;
        struct discover_context *ctx;
        struct discover_device *dev;
 
-       dev = discover_device_create(handler, event->device);
+       /* In case this is a network interface, try to refer to it by UUID */
+       dev = discover_device_create(handler, event_get_param(event, "mac"),
+                                       event->device);
+       dev->device->id = talloc_strdup(dev, event->device);
        ctx = device_handler_discover_context_create(handler, dev);
 
        parse_user_event(ctx, event);
@@ -426,8 +408,13 @@ static int user_event_remove(struct user_event *uev, struct event *event)
 {
        struct device_handler *handler = uev->handler;
        struct discover_device *dev;
+       const char *mac = event_get_param(event, "mac");
+
+       if (mac)
+               dev = device_lookup_by_uuid(handler, event_get_param(event, "mac"));
+       else
+               dev = device_lookup_by_id(handler, event->device);
 
-       dev = device_lookup_by_id(handler, event->device);
        if (!dev)
                return 0;
 
@@ -503,13 +490,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
                break;
        case EVENT_ACTION_URL:
                result = user_event_url(uev, event);
-               break;
-       case EVENT_ACTION_CONF:
-               result = user_event_conf(uev, event);
-               break;
+               goto out;
        case EVENT_ACTION_DHCP:
                result = user_event_dhcp(uev, event);
-               break;
+               goto out;
        case EVENT_ACTION_BOOT:
                result = user_event_boot(uev, event);
                break;
@@ -520,8 +504,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
                break;
        }
 
+       /* user_event_url() and user_event_dhcp() will steal the event context,
+        * but all others still need to free */
        talloc_free(event);
-
+out:
        return;
 }