X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=f763687f8b53bbb8c57b14f1c0abe63e171e147b;hp=1801710773b975106e43d6592de4a85d8ad55322;hb=32d3249e252fe201eb81155cbf3b800ce5cf88e0;hpb=b90b84b36d01f6663a79d9467a37cd9d6f6a68e7

diff --git a/discover/network.c b/discover/network.c
index 1801710..f763687 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -11,13 +11,13 @@
 
 #include <log/log.h>
 #include <list/list.h>
+#include <file/file.h>
 #include <types/types.h>
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
 #include <process/process.h>
 #include <system/system.h>
 
-#include "file.h"
 #include "network.h"
 #include "sysinfo.h"
 #include "platform.h"
@@ -97,6 +97,31 @@ 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;
+}
+
+uint8_t *find_mac_by_name(void *ctx, struct network *network,
+		const char *name)
+{
+	struct interface *interface;
+
+	interface = find_interface_by_name(network, name);
+	if (!interface)
+		return NULL;
+
+	return talloc_memdup(ctx, &interface->hwaddr,
+			     sizeof(uint8_t) * HWADDR_SIZE);
+}
+
 static int network_init_netlink(struct network *network)
 {
 	struct sockaddr_nl addr;
@@ -150,6 +175,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 +201,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";
@@ -263,7 +336,8 @@ static void configure_interface_dhcp(struct interface *interface)
 	return;
 }
 
-static void configure_interface_static(struct interface *interface,
+static void configure_interface_static(struct network *network,
+		struct interface *interface,
 		const struct interface_config *config)
 {
 	int rc;
@@ -297,6 +371,12 @@ static void configure_interface_static(struct interface *interface,
 				interface->name);
 	}
 
+	if (config->static_config.url) {
+		pb_log("config URL %s\n", config->static_config.url);
+		device_handler_process_url(network->handler,
+				config->static_config.url);
+	}
+
 	return;
 }
 
@@ -365,7 +445,7 @@ static void configure_interface(struct network *network,
 		configure_interface_dhcp(interface);
 
 	} else if (config->method == CONFIG_METHOD_STATIC) {
-		configure_interface_static(interface, config);
+		configure_interface_static(network, interface, config);
 	}
 }
 
@@ -437,6 +517,15 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 		add_interface(network, interface);
 	}
 
+	/* A repeated RTM_NEWLINK can represent an interface name change */
+	if (strncmp(interface->name, ifname, IFNAMSIZ)) {
+		pb_debug("ifname update: %s -> %s\n", interface->name, ifname);
+		strncpy(interface->name, ifname, sizeof(interface->name) - 1);
+		talloc_free(interface->dev->device->id);
+		interface->dev->device->id =
+			talloc_strdup(interface->dev->device, ifname);
+	}
+
 	/* notify the sysinfo code about changes to this interface */
 	if (strcmp(interface->name, "lo"))
 		system_info_register_interface(