X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fuser-event.c;h=ee282bb48c7f6b909134e42ef1388e0c27b9cde9;hb=f5fb1751ec92110669a039bb0de209bffe74538a;hp=77d28c116e635fb74698e49f0c59dfb1cb193335;hpb=8b46ab92aeff52b7354bf4f250835f75b4bd824c;p=petitboot

diff --git a/discover/user-event.c b/discover/user-event.c
index 77d28c1..ee282bb 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -390,13 +390,22 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
 
 	uint8_t hwaddr[MAC_ADDR_SIZE];
 
+	if (!event_get_param(event, "mac"))
+		return -1;
+	if (!event_get_param(event, "ip") && !event_get_param(event, "ipv6"))
+		return -1;
+
 	sscanf(event_get_param(event, "mac"),
 	       "%hhX:%hhX:%hhX:%hhX:%hhX:%hhX",
 	       hwaddr, hwaddr + 1, hwaddr + 2,
 	       hwaddr + 3, hwaddr + 4, hwaddr + 5);
 
-	system_info_set_interface_address(sizeof(hwaddr), hwaddr,
-					  event_get_param(event, "ip"));
+	if (event_get_param(event, "ipv6"))
+		system_info_set_interface_address(sizeof(hwaddr), hwaddr,
+						  event_get_param(event, "ipv6"));
+	else
+		system_info_set_interface_address(sizeof(hwaddr), hwaddr,
+						  event_get_param(event, "ip"));
 
 	dev = discover_device_create(handler, event_get_param(event, "mac"),
 					event->device);
@@ -411,6 +420,7 @@ 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;
+	int rc;
 
 	/* In case this is a network interface, try to refer to it by UUID */
 	dev = discover_device_create(handler, event_get_param(event, "mac"),
@@ -418,7 +428,11 @@ static int user_event_add(struct user_event *uev, struct event *event)
 	dev->device->id = talloc_strdup(dev, event->device);
 	ctx = device_handler_discover_context_create(handler, dev);
 
-	parse_user_event(ctx, event);
+	rc = parse_user_event(ctx, event);
+	if (rc) {
+		pb_log("parse_user_event returned %d\n", rc);
+		return rc;
+	}
 
 	device_handler_discover_context_commit(handler, ctx);