X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fuser-event.c;h=20b2bea928ea75b221deac7ed675fd9f44345f81;hp=6ea754fea808de474368b887a43278aef8248fbb;hb=1c3cb3b066bae9a981732d6ab868cee6df2136b4;hpb=86c9d34380b0074dab1ba89a569a94280d6999c4;ds=sidebyside

diff --git a/discover/user-event.c b/discover/user-event.c
index 6ea754f..20b2bea 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -385,42 +385,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);
@@ -436,8 +418,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;
 
@@ -513,13 +500,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;
@@ -530,8 +514,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;
 }