X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=c0bd2af01e84a0321be6f511fdfbc64e6046b07f;hp=2b7e94cbbdad0a4987cb7cb54d820a2df8f0d3dc;hb=e1f6ffb9ca9e35738385a3524ba46896a0b519e6;hpb=71dfb52e615d66c0ed595f0c3b0f406deb959b63

diff --git a/discover/network.c b/discover/network.c
index 2b7e94c..c0bd2af 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -97,6 +97,18 @@ static struct interface *find_interface_by_ifindex(struct network *network,
 	return NULL;
 }
 
+static struct interface *find_interface_by_name(struct network *network,
+		const char *name)
+{
+	struct interface *interface;
+
+	list_for_each_entry(&network->interfaces, interface, list)
+		if (!strcmp(interface->name, name))
+			return interface;
+
+	return NULL;
+}
+
 static int network_init_netlink(struct network *network)
 {
 	struct sockaddr_nl addr;
@@ -150,6 +162,25 @@ static int network_send_link_query(struct network *network)
 	return 0;
 }
 
+static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
+{
+	const int l = strlen("xx:");
+	char *buf;
+	int i;
+
+	if (len <= 0)
+		return talloc_strdup(ctx, "");
+
+	buf = talloc_array(ctx, char, (len * l) + 1);
+
+	for (i = 0; i < len; i++)
+		sprintf(buf + (l * i), "%02x:", addr[i]);
+
+	*(buf + (l * len) - 1) = '\0';
+
+	return buf;
+}
+
 static void add_interface(struct network *network,
 		struct interface *interface)
 {
@@ -157,17 +188,46 @@ static void add_interface(struct network *network,
 	interface->dev = discover_device_create(network->handler,
 					interface->name);
 	interface->dev->device->type = DEVICE_TYPE_NETWORK;
+	interface->dev->uuid = mac_bytes_to_string(interface->dev,
+			interface->hwaddr, sizeof(interface->hwaddr));
 	device_handler_add_device(network->handler, interface->dev);
 }
 
 static void remove_interface(struct network *network,
 		struct interface *interface)
 {
-	device_handler_remove(network->handler, interface->dev);
+	if (interface->dev)
+		device_handler_remove(network->handler, interface->dev);
 	list_remove(&interface->list);
 	talloc_free(interface);
 }
 
+void network_register_device(struct network *network,
+		struct discover_device *dev)
+{
+	struct interface *iface;
+
+	iface = find_interface_by_name(network, dev->device->id);
+	if (!iface)
+		return;
+
+	iface->dev = dev;
+	dev->uuid = mac_bytes_to_string(iface->dev, iface->hwaddr,
+			sizeof(iface->hwaddr));
+}
+
+void network_unregister_device(struct network *network,
+		struct discover_device *dev)
+{
+	struct interface *iface;
+
+	iface = find_interface_by_name(network, dev->device->id);
+	if (!iface)
+		return;
+
+	iface->dev = NULL;
+}
+
 static int interface_change(struct interface *interface, bool up)
 {
 	const char *statestr = up ? "up" : "down";
@@ -228,7 +288,7 @@ static void configure_interface_dhcp(struct interface *interface)
 	const char *argv[] = {
 		pb_system_apps.udhcpc,
 		"-R",
-		"-n",
+		"-f",
 		"-O", "pxeconffile",
 		"-O", "pxepathprefix",
 		"-p", pidfile,