X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=51a846af8a0c6ae8e75582f1eea619a75e8c1eb7;hp=c0bd2af01e84a0321be6f511fdfbc64e6046b07f;hb=1c3cb3b066bae9a981732d6ab868cee6df2136b4;hpb=0adfe11dc0738321cdd529f30773899cc8f79855 diff --git a/discover/network.c b/discover/network.c index c0bd2af..51a846a 100644 --- a/discover/network.c +++ b/discover/network.c @@ -8,16 +8,17 @@ #include #include #include +#include #include #include +#include #include #include #include #include #include -#include "file.h" #include "network.h" #include "sysinfo.h" #include "platform.h" @@ -65,6 +66,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 +129,38 @@ 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) +{ + 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; @@ -162,35 +214,18 @@ 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; - 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, @@ -207,7 +242,7 @@ void network_register_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; @@ -221,7 +256,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; @@ -279,7 +314,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]; @@ -297,6 +333,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); @@ -323,11 +362,16 @@ 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; + 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); @@ -357,6 +401,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; } @@ -374,8 +428,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 */ @@ -422,11 +479,13 @@ 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(interface, config); + configure_interface_static(network, interface, config); } + + interface->state = IFSTATE_CONFIGURED; } static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) @@ -486,6 +545,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) { @@ -497,6 +559,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(