X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=9aa975204e0f71de40070340e506d1f3ed6dd3e4;hp=4a4f93252f5a1f02693222e2ca1d6560d2a0995b;hb=b16b116422f1fb817924f4d2c3d9b1354da35614;hpb=c75acc64833eb7263b340079e7ba3153ebc60aec diff --git a/discover/network.c b/discover/network.c index 4a4f932..9aa9752 100644 --- a/discover/network.c +++ b/discover/network.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -10,12 +11,17 @@ #include #include +#include #include #include #include +#include #include +#include "file.h" #include "network.h" +#include "sysinfo.h" +#include "device-handler.h" #define HWADDR_SIZE 6 #define PIDFILE_BASE (LOCAL_STATE_DIR "/petitboot/") @@ -43,17 +49,20 @@ 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 network_config *find_config_by_hwaddr( +static const struct interface_config *find_config_by_hwaddr( uint8_t *hwaddr) { const struct config *config; @@ -63,11 +72,11 @@ static const struct network_config *find_config_by_hwaddr( if (!config) return NULL; - for (i = 0; i < config->n_network_configs; i++) { - struct network_config *netconf = config->network_configs[i]; + for (i = 0; i < config->network.n_interfaces; i++) { + struct interface_config *ifconf = config->network.interfaces[i]; - if (!memcmp(netconf->hwaddr, hwaddr, HWADDR_SIZE)) - return netconf; + if (!memcmp(ifconf->hwaddr, hwaddr, HWADDR_SIZE)) + return ifconf; } return NULL; @@ -134,30 +143,71 @@ static int network_send_link_query(struct network *network) return 0; } -static int interface_up(struct network *network, struct interface *interface) +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) { + const char *statestr = up ? "up" : "down"; int rc; - const char *argv[] = { - pb_system_apps.ip, - "link", - "set", - interface->name, - "up", - NULL, - }; - rc = pb_run_cmd(argv, 1, network->dry_run); + 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 = process_run_simple(interface, pb_system_apps.ip, + "link", "set", interface->name, statestr, NULL); if (rc) { - pb_log("failed to bring interface %s up\n", interface->name); + pb_log("failed to bring interface %s %s\n", interface->name, + statestr); return -1; } return 0; } -static void configure_interface_dhcp(struct network *network, - struct interface *interface) +static int interface_up(struct interface *interface) +{ + return interface_change(interface, true); +} + +static int interface_down(struct interface *interface) { + return interface_change(interface, false); +} + +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", @@ -169,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, - const struct network_config *config) +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, @@ -207,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", @@ -226,7 +276,7 @@ static void configure_interface_static(struct network *network, static void configure_interface(struct network *network, struct interface *interface, bool up, bool link) { - const struct network_config *config = NULL; + const struct interface_config *config = NULL; if (interface->state == IFSTATE_IGNORED) return; @@ -244,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; } @@ -268,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; @@ -285,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); } } @@ -298,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; @@ -328,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; } @@ -352,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, @@ -383,16 +444,74 @@ static int network_netlink_process(void *arg) return 0; } -struct network *network_init(void *ctx, struct waitset *waitset, bool dry_run) +static void network_init_dns(struct network *network) +{ + const struct config *config; + int i, rc, len; + bool modified; + char *buf; + + if (network->dry_run) + return; + + config = config_get(); + if (!config || !config->network.n_dns_servers) + return; + + rc = read_file(network, "/etc/resolv.conf", &buf, &len); + + if (rc) { + buf = talloc_strdup(network, ""); + len = 0; + } + + modified = false; + + for (i = 0; i < config->network.n_dns_servers; i++) { + int dns_conf_len; + char *dns_conf; + + dns_conf = talloc_asprintf(network, "nameserver %s\n", + config->network.dns_servers[i]); + + if (strstr(buf, dns_conf)) { + talloc_free(dns_conf); + continue; + } + + dns_conf_len = strlen(dns_conf); + buf = talloc_realloc(network, buf, char, len + dns_conf_len); + memcpy(buf + len, dns_conf, dns_conf_len); + len += dns_conf_len; + modified = true; + + talloc_free(dns_conf); + } + + 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(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; + network_init_dns(network); + rc = network_init_netlink(network); if (rc) goto err; @@ -417,9 +536,14 @@ err: int network_shutdown(struct network *network) { + struct interface *interface; + if (network->waiter) waiter_remove(network->waiter); + list_for_each_entry(&network->interfaces, interface, list) + interface_down(interface); + close(network->netlink_sd); talloc_free(network); return 0;