X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=69223b149adacd0c133beb06de88d06300e324a4;hp=c072eece9627408ac7bbebab2d227d968a8f9fbf;hb=0d3caaf8e9a75e9b6ebc9427c75ed2914c60439d;hpb=f155a58a64c660e46e74123293482561b816a39a

diff --git a/discover/network.c b/discover/network.c
index c072eec..69223b1 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -8,6 +8,7 @@
 #include <linux/if.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <i18n/i18n.h>
 
 #include <log/log.h>
 #include <list/list.h>
@@ -65,6 +66,25 @@ struct network {
 	bool			dry_run;
 };
 
+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 const struct interface_config *find_config_by_hwaddr(
 		uint8_t *hwaddr)
 {
@@ -109,6 +129,25 @@ static struct interface *find_interface_by_name(struct network *network,
 	return NULL;
 }
 
+static struct interface *find_interface_by_uuid(struct network *network,
+		const char *uuid)
+{
+	struct interface *interface;
+	char *mac;
+
+	list_for_each_entry(&network->interfaces, interface, list) {
+		mac = mac_bytes_to_string(interface, interface->hwaddr,
+					sizeof(interface->hwaddr));
+		if (!strcmp(mac, uuid)) {
+			talloc_free(mac);
+			return interface;
+		}
+		talloc_free(mac);
+	}
+
+	return NULL;
+}
+
 uint8_t *find_mac_by_name(void *ctx, struct network *network,
 		const char *name)
 {
@@ -175,35 +214,18 @@ 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)
 {
+	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,
@@ -220,7 +242,7 @@ void network_register_device(struct network *network,
 {
 	struct interface *iface;
 
-	iface = find_interface_by_name(network, dev->device->id);
+	iface = find_interface_by_uuid(network, dev->uuid);
 	if (!iface)
 		return;
 
@@ -234,7 +256,7 @@ void network_unregister_device(struct network *network,
 {
 	struct interface *iface;
 
-	iface = find_interface_by_name(network, dev->device->id);
+	iface = find_interface_by_uuid(network, dev->uuid);
 	if (!iface)
 		return;
 
@@ -292,7 +314,8 @@ static void udhcpc_process_exit(struct process *process)
 	process_release(process);
 }
 
-static void configure_interface_dhcp(struct interface *interface)
+static void configure_interface_dhcp(struct network *network,
+		struct interface *interface)
 {
 	const struct platform *platform;
 	char pidfile[256], id[10];
@@ -310,6 +333,9 @@ static void configure_interface_dhcp(struct interface *interface)
 		NULL,
 	};
 
+	device_handler_status_dev_info(network->handler, interface->dev,
+			_("Configuring with DHCP"));
+
 	snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid",
 			PIDFILE_BASE, interface->name);
 
@@ -342,6 +368,10 @@ static void configure_interface_static(struct network *network,
 {
 	int rc;
 
+	device_handler_status_dev_info(network->handler, interface->dev,
+			_("Configuring with static address (ip: %s)"),
+			config->static_config.address);
+
 	rc = process_run_simple(interface, pb_system_apps.ip,
 			"address", "add", config->static_config.address,
 			"dev", interface->name, NULL);
@@ -354,6 +384,10 @@ static void configure_interface_static(struct network *network,
 		return;
 	}
 
+	system_info_set_interface_address(sizeof(interface->hwaddr),
+				interface->hwaddr,
+				config->static_config.address);
+
 	/* we need the interface up before we can route through it */
 	rc = interface_up(interface);
 	if (rc)
@@ -398,8 +432,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 */
@@ -446,11 +483,13 @@ static void configure_interface(struct network *network,
 	pb_log("network: configuring interface %s\n", interface->name);
 
 	if (!config || config->method == CONFIG_METHOD_DHCP) {
-		configure_interface_dhcp(interface);
+		configure_interface_dhcp(network, interface);
 
 	} else if (config->method == CONFIG_METHOD_STATIC) {
 		configure_interface_static(network, interface, config);
 	}
+
+	interface->state = IFSTATE_CONFIGURED;
 }
 
 static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
@@ -510,6 +549,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) {