X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=9aa975204e0f71de40070340e506d1f3ed6dd3e4;hp=8be07aa9bb7285984c03d53dbaa7647bf76ac2a0;hb=b16b116422f1fb817924f4d2c3d9b1354da35614;hpb=6505dbd5abb00936c3e53b54f97f8aa628699e59

diff --git a/discover/network.c b/discover/network.c
index 8be07aa..9aa9752 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -11,13 +11,17 @@
 
 #include <log/log.h>
 #include <list/list.h>
+#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 "device-handler.h"
 
 #define HWADDR_SIZE	6
 #define PIDFILE_BASE	(LOCAL_STATE_DIR "/petitboot/")
@@ -45,14 +49,17 @@ struct interface {
 	} state;
 
 	struct list_item list;
+	struct process *udhcpc_process;
+	struct discover_device *dev;
 };
 
 struct network {
-	struct list	interfaces;
-	struct waiter	*waiter;
-	int		netlink_sd;
-	bool		manual_config;
-	bool		dry_run;
+	struct list		interfaces;
+	struct device_handler	*handler;
+	struct waiter		*waiter;
+	int			netlink_sd;
+	bool			manual_config;
+	bool			dry_run;
 };
 
 static const struct interface_config *find_config_by_hwaddr(
@@ -136,22 +143,39 @@ static int network_send_link_query(struct network *network)
 	return 0;
 }
 
-static int interface_change(struct network *network,
-		struct interface *interface,
-		bool up)
+static void add_interface(struct network *network,
+		struct interface *interface)
+{
+	list_add(&network->interfaces, &interface->list);
+	interface->dev = discover_device_create(network->handler,
+					interface->name);
+	interface->dev->device->type = DEVICE_TYPE_NETWORK;
+	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);
+	list_remove(&interface->list);
+	talloc_free(interface);
+}
+
+static int interface_change(struct interface *interface, bool up)
 {
-	int rc;
 	const char *statestr = up ? "up" : "down";
-	const char *argv[] = {
-		pb_system_apps.ip,
-		"link",
-		"set",
-		interface->name,
-		statestr,
-		NULL,
-	};
+	int rc;
+
+	if (!up && interface->udhcpc_process) {
+		/* we don't care about the callback from here */
+		interface->udhcpc_process->exit_cb = NULL;
+		interface->udhcpc_process->data = NULL;
+		process_stop_async(interface->udhcpc_process);
+		process_release(interface->udhcpc_process);
+	}
 
-	rc = pb_run_cmd(argv, 1, network->dry_run);
+	rc = process_run_simple(interface, pb_system_apps.ip,
+			"link", "set", interface->name, statestr, NULL);
 	if (rc) {
 		pb_log("failed to bring interface %s %s\n", interface->name,
 				statestr);
@@ -160,22 +184,30 @@ static int interface_change(struct network *network,
 	return 0;
 }
 
-static int interface_up(struct network *network,
-		struct interface *interface)
+static int interface_up(struct interface *interface)
 {
-	return interface_change(network, interface, true);
+	return interface_change(interface, true);
 }
 
-static int interface_down(struct network *network,
-		struct interface *interface)
+static int interface_down(struct interface *interface)
 {
-	return interface_change(network, interface, false);
+	return interface_change(interface, false);
 }
 
-static void configure_interface_dhcp(struct network *network,
-		struct interface *interface)
+static void udhcpc_process_exit(struct process *process)
 {
+	struct interface *interface = process->data;
+	pb_log("udhcp client [pid %d] for interface %s exited, rc %d\n",
+			process->pid, interface->name, process->exit_status);
+	interface->udhcpc_process = NULL;
+	process_release(process);
+}
+
+static void configure_interface_dhcp(struct interface *interface)
+{
+	struct process *process;
 	char pidfile[256];
+	int rc;
 	const char *argv[] = {
 		pb_system_apps.udhcpc,
 		"-R",
@@ -187,36 +219,33 @@ static void configure_interface_dhcp(struct network *network,
 	snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid",
 			PIDFILE_BASE, interface->name);
 
-	pb_run_cmd(argv, 0, network->dry_run);
+	process = process_create(interface);
+
+	process->path = pb_system_apps.udhcpc;
+	process->argv = argv;
+	process->exit_cb = udhcpc_process_exit;
+	process->data = interface;
+
+	rc = process_run_async(process);
+
+	if (rc)
+		process_release(process);
+	else
+		interface->udhcpc_process = process;
+
 	return;
 }
 
-static void configure_interface_static(struct network *network,
-		struct interface *interface,
+static void configure_interface_static(struct interface *interface,
 		const struct interface_config *config)
 {
-	const char *addr_argv[] = {
-		pb_system_apps.ip,
-		"address",
-		"add",
-		config->static_config.address,
-		"dev",
-		interface->name,
-		NULL,
-	};
-	const char *route_argv[] = {
-		pb_system_apps.ip,
-		"route",
-		"add",
-		"default",
-		"via",
-		config->static_config.gateway,
-		NULL,
-	};
 	int rc;
 
+	rc = process_run_simple(interface, pb_system_apps.ip,
+			"address", "add", config->static_config.address,
+			"dev", interface->name, NULL);
+
 
-	rc = pb_run_cmd(addr_argv, 1, network->dry_run);
 	if (rc) {
 		pb_log("failed to add address %s to interface %s\n",
 				config->static_config.address,
@@ -225,12 +254,15 @@ static void configure_interface_static(struct network *network,
 	}
 
 	/* we need the interface up before we can route through it */
-	rc = interface_up(network, interface);
+	rc = interface_up(interface);
 	if (rc)
 		return;
 
 	if (config->static_config.gateway)
-		rc = pb_run_cmd(route_argv, 1, network->dry_run);
+		rc = process_run_simple(interface, pb_system_apps.ip,
+				"route", "add", "default",
+				"via", config->static_config.gateway,
+				NULL);
 
 	if (rc) {
 		pb_log("failed to add default route %s on interface %s\n",
@@ -262,7 +294,7 @@ static void configure_interface(struct network *network,
 	/* always up the lookback, no other handling required */
 	if (!strcmp(interface->name, "lo")) {
 		if (interface->state == IFSTATE_NEW)
-			interface_up(network, interface);
+			interface_up(interface);
 		interface->state = IFSTATE_CONFIGURED;
 		return;
 	}
@@ -286,7 +318,7 @@ static void configure_interface(struct network *network,
 	/* new interface? bring up to the point so we can detect a link */
 	if (interface->state == IFSTATE_NEW) {
 		if (!up) {
-			interface_up(network, interface);
+			interface_up(interface);
 			pb_log("network: bringing up interface %s\n",
 					interface->name);
 			return;
@@ -303,10 +335,10 @@ 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(network, interface);
+		configure_interface_dhcp(interface);
 
 	} else if (config->method == CONFIG_METHOD_STATIC) {
-		configure_interface_static(network, interface, config);
+		configure_interface_static(interface, config);
 	}
 }
 
@@ -316,6 +348,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 	struct interface *interface;
 	struct ifinfomsg *info;
 	struct rtattr *attr;
+	unsigned int mtu;
 	uint8_t ifaddr[6];
 	char ifname[IFNAMSIZ+1];
 	int attrlen, type;
@@ -346,19 +379,22 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 			strncpy(ifname, data, IFNAMSIZ);
 			have_ifname = true;
 			break;
+
+		case IFLA_MTU:
+			mtu = *(unsigned int *)data;
+			break;
 		}
 	}
 
 	if (!have_ifaddr || !have_ifname)
 		return -1;
 
-	if (type == RTM_DELLINK) {
+	if (type == RTM_DELLINK || mtu == 0) {
 		interface = find_interface_by_ifindex(network, info->ifi_index);
 		if (!interface)
 			return 0;
 		pb_log("network: interface %s removed\n", interface->name);
-		list_remove(&interface->list);
-		talloc_free(interface);
+		remove_interface(network, interface);
 		return 0;
 	}
 
@@ -370,6 +406,13 @@ 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);
+
+		/* tell the sysinfo code about this interface */
+		if (strcmp(interface->name, "lo"))
+			system_info_register_interface(
+					sizeof(interface->hwaddr),
+					interface->hwaddr, interface->name);
 	}
 
 	configure_interface(network, interface,
@@ -441,26 +484,29 @@ static void network_init_dns(struct network *network)
 		memcpy(buf + len, dns_conf, dns_conf_len);
 		len += dns_conf_len;
 		modified = true;
-	}
 
-	if (!modified)
-		return;
+		talloc_free(dns_conf);
+	}
 
-	rc = replace_file("/etc/resolv.conf", buf, len);
-	if (rc) {
-		pb_log("error replacing resolv.conf: %s\n", strerror(errno));
-		return;
+	if (modified) {
+		rc = replace_file("/etc/resolv.conf", buf, len);
+		if (rc)
+			pb_log("error replacing resolv.conf: %s\n",
+					strerror(errno));
 	}
 
+	talloc_free(buf);
 }
 
-struct network *network_init(void *ctx, struct waitset *waitset, bool dry_run)
+struct network *network_init(struct device_handler *handler,
+		struct waitset *waitset, bool dry_run)
 {
 	struct network *network;
 	int rc;
 
-	network = talloc(ctx, struct network);
+	network = talloc(handler, struct network);
 	list_init(&network->interfaces);
+	network->handler = handler;
 	network->manual_config = false;
 	network->dry_run = dry_run;
 
@@ -496,7 +542,7 @@ int network_shutdown(struct network *network)
 		waiter_remove(network->waiter);
 
 	list_for_each_entry(&network->interfaces, interface, list)
-		interface_down(network, interface);
+		interface_down(interface);
 
 	close(network->netlink_sd);
 	talloc_free(network);