X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=e2cae912182265eef225c86b130afc4fffafaea2;hp=f763687f8b53bbb8c57b14f1c0abe63e171e147b;hb=9a5c9c9331f0c0c539cad423a4654015598b0d9d;hpb=32d3249e252fe201eb81155cbf3b800ce5cf88e0 diff --git a/discover/network.c b/discover/network.c index f763687..e2cae91 100644 --- a/discover/network.c +++ b/discover/network.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -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/") @@ -52,6 +54,7 @@ struct interface { struct list_item list; struct process *udhcpc_process; struct discover_device *dev; + bool ready; }; struct network { @@ -65,6 +68,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 +131,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 +216,17 @@ 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, +static void create_interface_dev(struct network *network, struct interface *interface) { - list_add(&network->interfaces, &interface->list); - interface->dev = discover_device_create(network->handler, - interface->name); + char *uuid = mac_bytes_to_string(interface, interface->hwaddr, + sizeof(interface->hwaddr)); + + 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 +243,10 @@ void network_register_device(struct network *network, { struct interface *iface; - iface = find_interface_by_name(network, dev->device->id); + if (dev->uuid) + iface = find_interface_by_uuid(network, dev->uuid); + else + iface = find_interface_by_name(network, dev->label); if (!iface) return; @@ -234,7 +260,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 +318,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 +337,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 +372,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 +388,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) @@ -374,7 +412,11 @@ static void configure_interface_static(struct network *network, if (config->static_config.url) { pb_log("config URL %s\n", config->static_config.url); device_handler_process_url(network->handler, - config->static_config.url); + config->static_config.url, + mac_bytes_to_string(interface->dev, + interface->hwaddr, + sizeof(interface->hwaddr)), + config->static_config.address); } return; @@ -394,8 +436,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 */ @@ -442,17 +487,21 @@ 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; } 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; @@ -506,6 +555,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) { @@ -514,7 +566,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 */ @@ -533,6 +596,14 @@ 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); + + if (!interface->ready && strncmp(interface->name, "lo", strlen("lo"))) { + pb_log("%s not marked ready yet\n", interface->name); + return 0; + } + configure_interface(network, interface, info->ifi_flags & IFF_UP, info->ifi_flags & IFF_LOWER_UP); @@ -540,6 +611,72 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) return 0; } +void network_mark_interface_ready(struct device_handler *handler, + int ifindex, const char *ifname, uint8_t *mac, int hwsize) +{ + struct network *network = device_handler_get_network(handler); + struct interface *interface, *tmp = NULL; + char *macstr; + + if (!network) { + pb_log("Network not ready - can not mark interface ready\n"); + return; + } + + if (hwsize != HWADDR_SIZE) + return; + + if (strncmp(ifname, "lo", strlen("lo")) == 0) + return; + + interface = find_interface_by_ifindex(network, ifindex); + if (!interface) { + pb_debug("Creating ready interface %d - %s\n", + ifindex, ifname); + interface = talloc_zero(network, struct interface); + interface->ifindex = ifindex; + interface->state = IFSTATE_NEW; + memcpy(interface->hwaddr, mac, HWADDR_SIZE); + strncpy(interface->name, ifname, sizeof(interface->name) - 1); + + 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; + } + + list_add(&network->interfaces, &interface->list); + create_interface_dev(network, interface); + } + + if (interface->ready) { + pb_log("%s already ready\n", interface->name); + return; + } + + if (strncmp(interface->name, ifname, strlen(ifname)) != 0) { + pb_debug("ifname update from udev: %s -> %s\n", interface->name, ifname); + strncpy(interface->name, ifname, sizeof(interface->name) - 1); + talloc_free(interface->dev->device->id); + interface->dev->device->id = + talloc_strdup(interface->dev->device, ifname); + } + + if (memcmp(interface->hwaddr, mac, HWADDR_SIZE) != 0) { + macstr = mac_bytes_to_string(interface, mac, hwsize); + pb_log("Warning - new MAC for interface %d does not match: %s\n", + ifindex, macstr); + talloc_free(macstr); + } + + pb_log("Interface %s ready\n", ifname); + interface->ready = true; + configure_interface(network, interface, false, false); +} + static int network_netlink_process(void *arg) { struct network *network = arg;