discover/pxe-parser: Recognise plugin sources

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 3ccac90660b2e635786efe0a875b97da80d20325..fb3fddb5c4bc5f7390f114ec7820f33d7ec45e77 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -37,6 +37,7 @@
 #include "resource.h"
 #include "event.h"
 #include "user-event.h"
+#include "sysinfo.h"
 
 
 #define MAC_ADDR_SIZE  6
@@ -385,31 +386,20 @@ 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);
+       uint8_t hwaddr[MAC_ADDR_SIZE];
 
-       device_handler_dhcp(handler, dev, event);
+       sscanf(event_get_param(event, "mac"),
+              "%hhX:%hhX:%hhX:%hhX:%hhX:%hhX",
+              hwaddr, hwaddr + 1, hwaddr + 2,
+              hwaddr + 3, hwaddr + 4, hwaddr + 5);
 
-       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;
+       system_info_set_interface_address(sizeof(hwaddr), hwaddr,
+                                         event_get_param(event, "ip"));
 
-       val = event_get_param(event, "url");
-       if (!val)
-               return 0;
+       dev = discover_device_create(handler, event_get_param(event, "mac"),
+                                       event->device);
 
-       url = pb_url_parse(event, val);
-       if (!url)
-               return 0;
-
-       dev = discover_device_create(handler, event->device);
-
-       device_handler_conf(handler, dev, url);
+       device_handler_dhcp(handler, dev, event);
 
        return 0;
 }
@@ -420,7 +410,10 @@ static int user_event_add(struct user_event *uev, struct event *event)
        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);
@@ -436,8 +429,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;
 
@@ -514,9 +512,6 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
        case EVENT_ACTION_URL:
                result = user_event_url(uev, event);
                goto out;
-       case EVENT_ACTION_CONF:
-               result = user_event_conf(uev, event);
-               break;
        case EVENT_ACTION_DHCP:
                result = user_event_dhcp(uev, event);
                goto out;