X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=0161c69d2bedb6c40af1a3b004996d64ce8988c6;hp=0dad087bb4199a3d2ed15510bad1f0b43cc1f1ab;hb=1def8f21aecc41ac22652e7b8bd1f5bf7a4dae98;hpb=49d7e0f299f96125620003e4b2388e1327b15d3e

diff --git a/discover/network.c b/discover/network.c
index 0dad087..0161c69 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -197,13 +197,15 @@ static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
 static void add_interface(struct network *network,
 		struct interface *interface)
 {
+	char *uuid = mac_bytes_to_string(interface, interface->hwaddr,
+						sizeof(interface->hwaddr));
+
 	list_add(&network->interfaces, &interface->list);
-	interface->dev = discover_device_create(network->handler,
-					interface->name);
+	interface->dev = discover_device_create(network->handler, uuid,
+						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);
+	talloc_free(uuid);
 }
 
 static void remove_interface(struct network *network,
@@ -336,7 +338,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;
@@ -370,6 +373,16 @@ 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,
+				mac_bytes_to_string(interface->dev,
+						interface->hwaddr,
+						sizeof(interface->hwaddr)),
+				config->static_config.address);
+	}
+
 	return;
 }
 
@@ -387,8 +400,11 @@ static void configure_interface(struct network *network,
 			interface->state = IFSTATE_NEW;
 		else if (!link)
 			interface->state = IFSTATE_UP_WAITING_LINK;
-		else
+		else {
+			pb_debug("network: skipping configured interface %s\n",
+					interface->name);
 			return;
+		}
 	}
 
 	/* always up the lookback, no other handling required */
@@ -438,8 +454,10 @@ 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);
 	}
+
+	interface->state = IFSTATE_CONFIGURED;
 }
 
 static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
@@ -499,6 +517,9 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 		return 0;
 	}
 
+	/* ignore the default tun device in some environments */
+	if (strncmp(ifname, "tun", strlen("tun")) == 0)
+		return 0;
 
 	interface = find_interface_by_ifindex(network, info->ifi_index);
 	if (!interface) {