discover: register network devices with the device handler

We'd like to correlate incoming network boot options with a device, so
register the interface with the device hander.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

3 files changed, 29 insertions, 14 deletions

diff --git a/discover/network.c b/discover/network.c
index eaf6d1b..c853a97 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -11,6 +11,7 @@
 
 #include <log/log.h>
 #include <list/list.h>
+#include <types/types.h>
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
 #include <pb-config/pb-config.h>
@@ -19,6 +20,7 @@
 
 #include "file.h"
 #include "network.h"
+#include "device-handler.h"
 
 #define HWADDR_SIZE	6
 #define PIDFILE_BASE	(LOCAL_STATE_DIR "/petitboot/")
@@ -47,14 +49,16 @@ struct interface {
 
 	struct list_item list;
 	struct process *udhcpc_process;
+	struct discover_device *dev;
 };
 
 struct network {
-	struct list	interfaces;
-	struct waiter	*waiter;
-	int		netlink_sd;
-	bool		manual_config;
-	bool		dry_run;
+	struct list		interfaces;
+	struct device_handler	*handler;
+	struct waiter		*waiter;
+	int			netlink_sd;
+	bool			manual_config;
+	bool			dry_run;
 };
 
 static const struct interface_config *find_config_by_hwaddr(
@@ -142,10 +146,16 @@ static void add_interface(struct network *network,
 		struct interface *interface)
 {
 	list_add(&network->interfaces, &interface->list);
+	interface->dev = discover_device_create(network->handler,
+					interface->name);
+	interface->dev->device->type = DEVICE_TYPE_NETWORK;
+	device_handler_add_device(network->handler, interface->dev);
 }
 
-static void remove_interface(struct interface *interface)
+static void remove_interface(struct network *network,
+		struct interface *interface)
 {
+	device_handler_remove(network->handler, interface->dev);
 	list_remove(&interface->list);
 	talloc_free(interface);
 }
@@ -383,7 +393,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 		if (!interface)
 			return 0;
 		pb_log("network: interface %s removed\n", interface->name);
-		remove_interface(interface);
+		remove_interface(network, interface);
 		return 0;
 	}
 
@@ -481,13 +491,15 @@ static void network_init_dns(struct network *network)
 	talloc_free(buf);
 }
 
-struct network *network_init(void *ctx, struct waitset *waitset, bool dry_run)
+struct network *network_init(struct device_handler *handler,
+		struct waitset *waitset, bool dry_run)
 {
 	struct network *network;
 	int rc;
 
-	network = talloc(ctx, struct network);
+	network = talloc(handler, struct network);
 	list_init(&network->interfaces);
+	network->handler = handler;
 	network->manual_config = false;
 	network->dry_run = dry_run;
 
diff --git a/discover/network.h b/discover/network.h
index c90af40..912174f 100644
--- a/discover/network.h
+++ b/discover/network.h
@@ -2,9 +2,11 @@
 #define NETWORK_H
 
 struct network;
+struct device_handler;
 struct waitset;
 
-struct network *network_init(void *ctx, struct waitset *waitset, bool dry_run);
+struct network *network_init(struct device_handler *handler,
+		struct waitset *waitset, bool dry_run);
 int network_shutdown(struct network *network);
 
 #endif /* NETWORK_H */
diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 26df9b3..6def090 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -173,20 +173,21 @@ int main(int argc, char *argv[])
 
 	config_init(NULL);
 
-	network = network_init(server, waitset, opts.dry_run == opt_yes);
-	if (!network)
-		return EXIT_FAILURE;
-
 	handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
 	if (!handler)
 		return EXIT_FAILURE;
 
 	discover_server_set_device_source(server, handler);
 
+	/* init our device sources: udev, network and user events */
 	udev = udev_init(waitset, handler);
 	if (!udev)
 		return EXIT_FAILURE;
 
+	network = network_init(handler, waitset, opts.dry_run == opt_yes);
+	if (!network)
+		return EXIT_FAILURE;
+
 	uev = user_event_init(waitset, handler);
 	if (!uev)
 		return EXIT_FAILURE;