X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=0161c69d2bedb6c40af1a3b004996d64ce8988c6;hp=60d1f6e0f4e1790ba4b2bb2b18bd3a7b81efe70b;hb=1def8f21aecc41ac22652e7b8bd1f5bf7a4dae98;hpb=3fa256bb478f2b3e6316c561169190457b21e616 diff --git a/discover/network.c b/discover/network.c index 60d1f6e..0161c69 100644 --- a/discover/network.c +++ b/discover/network.c @@ -11,13 +11,13 @@ #include #include +#include #include #include #include #include #include -#include "file.h" #include "network.h" #include "sysinfo.h" #include "platform.h" @@ -97,6 +97,31 @@ static struct interface *find_interface_by_ifindex(struct network *network, return NULL; } +static struct interface *find_interface_by_name(struct network *network, + const char *name) +{ + struct interface *interface; + + list_for_each_entry(&network->interfaces, interface, list) + if (!strcmp(interface->name, name)) + return interface; + + return NULL; +} + +uint8_t *find_mac_by_name(void *ctx, struct network *network, + const char *name) +{ + struct interface *interface; + + interface = find_interface_by_name(network, name); + if (!interface) + return NULL; + + return talloc_memdup(ctx, &interface->hwaddr, + sizeof(uint8_t) * HWADDR_SIZE); +} + static int network_init_netlink(struct network *network) { struct sockaddr_nl addr; @@ -150,24 +175,74 @@ 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, 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, - interface->name); + interface->dev = discover_device_create(network->handler, uuid, + interface->name); interface->dev->device->type = DEVICE_TYPE_NETWORK; device_handler_add_device(network->handler, interface->dev); + talloc_free(uuid); } static void remove_interface(struct network *network, struct interface *interface) { - device_handler_remove(network->handler, interface->dev); + if (interface->dev) + device_handler_remove(network->handler, interface->dev); list_remove(&interface->list); talloc_free(interface); } +void network_register_device(struct network *network, + struct discover_device *dev) +{ + struct interface *iface; + + iface = find_interface_by_name(network, dev->device->id); + if (!iface) + return; + + iface->dev = dev; + dev->uuid = mac_bytes_to_string(iface->dev, iface->hwaddr, + sizeof(iface->hwaddr)); +} + +void network_unregister_device(struct network *network, + struct discover_device *dev) +{ + struct interface *iface; + + iface = find_interface_by_name(network, dev->device->id); + if (!iface) + return; + + iface->dev = NULL; +} + static int interface_change(struct interface *interface, bool up) { const char *statestr = up ? "up" : "down"; @@ -228,7 +303,6 @@ static void configure_interface_dhcp(struct interface *interface) const char *argv[] = { pb_system_apps.udhcpc, "-R", - "-n", "-f", "-O", "pxeconffile", "-O", "pxepathprefix", @@ -264,7 +338,8 @@ static void configure_interface_dhcp(struct interface *interface) return; } -static void configure_interface_static(struct interface *interface, +static void configure_interface_static(struct network *network, + struct interface *interface, const struct interface_config *config) { int rc; @@ -298,6 +373,16 @@ static void configure_interface_static(struct interface *interface, interface->name); } + 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, + mac_bytes_to_string(interface->dev, + interface->hwaddr, + sizeof(interface->hwaddr)), + config->static_config.address); + } + return; } @@ -315,8 +400,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 */ @@ -366,8 +454,10 @@ static void configure_interface(struct network *network, configure_interface_dhcp(interface); } else if (config->method == CONFIG_METHOD_STATIC) { - configure_interface_static(interface, config); + configure_interface_static(network, interface, config); } + + interface->state = IFSTATE_CONFIGURED; } static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) @@ -427,6 +517,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) { @@ -438,6 +531,15 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) add_interface(network, interface); } + /* A repeated RTM_NEWLINK can represent an interface name change */ + if (strncmp(interface->name, ifname, IFNAMSIZ)) { + pb_debug("ifname update: %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); + } + /* notify the sysinfo code about changes to this interface */ if (strcmp(interface->name, "lo")) system_info_register_interface(