X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=5035b7ce0895cfe0f2a3c12992ca0d1d57c06f24;hp=1851fedc616fdb5da9119d23947a74e31a93b6ea;hb=03fe06fa71f065e918c46a65e6a45e76063a07eb;hpb=82b4c9d7ecbfada62295620a6082caf1b9860ff6

diff --git a/discover/network.c b/discover/network.c
index 1851fed..5035b7c 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>
@@ -22,6 +23,7 @@
 #include "sysinfo.h"
 #include "platform.h"
 #include "device-handler.h"
+#include "paths.h"
 
 #define HWADDR_SIZE	6
 #define PIDFILE_BASE	(LOCAL_STATE_DIR "/petitboot/")
@@ -213,13 +215,12 @@ static int network_send_link_query(struct network *network)
 	return 0;
 }
 
-static void add_interface(struct network *network,
+static void create_interface_dev(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, uuid,
 						interface->name);
 	interface->dev->device->type = DEVICE_TYPE_NETWORK;
@@ -241,7 +242,10 @@ void network_register_device(struct network *network,
 {
 	struct interface *iface;
 
-	iface = find_interface_by_uuid(network, dev->uuid);
+	if (dev->uuid)
+		iface = find_interface_by_uuid(network, dev->uuid);
+	else
+		iface = find_interface_by_name(network, dev->label);
 	if (!iface)
 		return;
 
@@ -313,7 +317,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];
@@ -331,6 +336,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);
 
@@ -363,6 +371,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);
@@ -375,6 +387,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)
@@ -470,10 +486,12 @@ 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);
+		/* Nothing left to do for static interfaces */
+		pending_network_jobs_start();
 	}
 
 	interface->state = IFSTATE_CONFIGURED;
@@ -482,7 +500,7 @@ static void configure_interface(struct network *network,
 static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 {
 	bool have_ifaddr, have_ifname;
-	struct interface *interface;
+	struct interface *interface, *tmp;
 	struct ifinfomsg *info;
 	struct rtattr *attr;
 	unsigned int mtu;
@@ -547,7 +565,18 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 		interface->state = IFSTATE_NEW;
 		memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr));
 		strncpy(interface->name, ifname, sizeof(interface->name) - 1);
-		add_interface(network, interface);
+
+		list_for_each_entry(&network->interfaces, tmp, list)
+			if (memcmp(interface->hwaddr, tmp->hwaddr,
+				   sizeof(interface->hwaddr)) == 0) {
+				pb_log("%s: %s has duplicate MAC address, ignoring\n",
+				       __func__, interface->name);
+				talloc_free(interface);
+				return -1;
+			}
+
+		list_add(&network->interfaces, &interface->list);
+		create_interface_dev(network, interface);
 	}
 
 	/* A repeated RTM_NEWLINK can represent an interface name change */
@@ -566,6 +595,9 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 				interface->hwaddr, interface->name,
 				info->ifi_flags & IFF_LOWER_UP);
 
+	if (!interface->dev)
+		create_interface_dev(network, interface);
+
 	configure_interface(network, interface,
 			info->ifi_flags & IFF_UP,
 			info->ifi_flags & IFF_LOWER_UP);