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

diff --git a/discover/network.c b/discover/network.c
index 87075fc..1801710 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -14,13 +14,13 @@
 #include <types/types.h>
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
-#include <pb-config/pb-config.h>
 #include <process/process.h>
 #include <system/system.h>
 
 #include "file.h"
 #include "network.h"
 #include "sysinfo.h"
+#include "platform.h"
 #include "device-handler.h"
 
 #define HWADDR_SIZE	6
@@ -69,7 +69,7 @@ static const struct interface_config *find_config_by_hwaddr(
 		uint8_t *hwaddr)
 {
 	const struct config *config;
-	int i;
+	unsigned int i;
 
 	config = config_get();
 	if (!config)
@@ -181,6 +181,15 @@ static int interface_change(struct interface *interface, bool up)
 		process_release(interface->udhcpc_process);
 	}
 
+	if (!up) {
+		rc = process_run_simple(interface, pb_system_apps.ip,
+				"address", "flush", "dev", interface->name,
+				NULL);
+		if (rc)
+			pb_log("failed to flush addresses from interface %s\n",
+				interface->name);
+	}
+
 	rc = process_run_simple(interface, pb_system_apps.ip,
 			"link", "set", interface->name, statestr, NULL);
 	if (rc) {
@@ -212,20 +221,31 @@ static void udhcpc_process_exit(struct process *process)
 
 static void configure_interface_dhcp(struct interface *interface)
 {
+	const struct platform *platform;
+	char pidfile[256], id[10];
 	struct process *process;
-	char pidfile[256];
 	int rc;
 	const char *argv[] = {
 		pb_system_apps.udhcpc,
 		"-R",
-		"-n",
+		"-f",
+		"-O", "pxeconffile",
+		"-O", "pxepathprefix",
 		"-p", pidfile,
 		"-i", interface->name,
+		"-x", id, /* [11,12] - dhcp client identifier */
 		NULL,
 	};
+
 	snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid",
 			PIDFILE_BASE, interface->name);
 
+	platform = platform_get();
+	if (platform && platform->dhcp_arch_id != 0xffff)
+		snprintf(id, sizeof(id), "0x5d:%04x", platform->dhcp_arch_id);
+	else
+		argv[11] = NULL;
+
 	process = process_create(interface);
 
 	process->path = pb_system_apps.udhcpc;
@@ -415,14 +435,15 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 		memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr));
 		strncpy(interface->name, ifname, sizeof(interface->name) - 1);
 		add_interface(network, interface);
-
-		/* tell the sysinfo code about this interface */
-		if (strcmp(interface->name, "lo"))
-			system_info_register_interface(
-					sizeof(interface->hwaddr),
-					interface->hwaddr, interface->name);
 	}
 
+	/* notify the sysinfo code about changes to this interface */
+	if (strcmp(interface->name, "lo"))
+		system_info_register_interface(
+				sizeof(interface->hwaddr),
+				interface->hwaddr, interface->name,
+				info->ifi_flags & IFF_LOWER_UP);
+
 	configure_interface(network, interface,
 			info->ifi_flags & IFF_UP,
 			info->ifi_flags & IFF_LOWER_UP);
@@ -484,7 +505,8 @@ retry:
 static void network_init_dns(struct network *network)
 {
 	const struct config *config;
-	int i, rc, len;
+	unsigned int i;
+	int rc, len;
 	bool modified;
 	char *buf;
 
@@ -520,7 +542,7 @@ static void network_init_dns(struct network *network)
 		buf = talloc_realloc(network, buf, char, len + dns_conf_len + 1);
 		memcpy(buf + len, dns_conf, dns_conf_len);
 		len += dns_conf_len;
-		buf[len - 1] = '\0';
+		buf[len] = '\0';
 		modified = true;
 
 		talloc_free(dns_conf);
@@ -545,8 +567,8 @@ struct network *network_init(struct device_handler *handler,
 	network = talloc(handler, struct network);
 	list_init(&network->interfaces);
 	network->handler = handler;
-	network->manual_config = false;
 	network->dry_run = dry_run;
+	network->manual_config = config_get()->network.n_interfaces != 0;
 
 	network_init_dns(network);
 
@@ -571,7 +593,6 @@ err:
 	return NULL;
 }
 
-
 int network_shutdown(struct network *network)
 {
 	struct interface *interface;
@@ -579,8 +600,13 @@ int network_shutdown(struct network *network)
 	if (network->waiter)
 		waiter_remove(network->waiter);
 
-	list_for_each_entry(&network->interfaces, interface, list)
+	list_for_each_entry(&network->interfaces, interface, list) {
+		if (interface->state == IFSTATE_IGNORED)
+			continue;
+		if (!strcmp(interface->name, "lo"))
+			continue;
 		interface_down(interface);
+	}
 
 	close(network->netlink_sd);
 	talloc_free(network);