X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=c072eece9627408ac7bbebab2d227d968a8f9fbf;hp=0490be9074486355ce436c173aeabb181affac64;hb=f155a58a64c660e46e74123293482561b816a39a;hpb=9239fd1ec121fc6c6eda49ef5c2dab081a026785 diff --git a/discover/network.c b/discover/network.c index 0490be9..c072eec 100644 --- a/discover/network.c +++ b/discover/network.c @@ -11,16 +11,16 @@ #include #include +#include #include #include #include -#include #include #include -#include "file.h" #include "network.h" #include "sysinfo.h" +#include "platform.h" #include "device-handler.h" #define HWADDR_SIZE 6 @@ -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,6 +175,25 @@ 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) { @@ -157,17 +201,46 @@ static void add_interface(struct network *network, interface->dev = discover_device_create(network->handler, 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); } 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"; @@ -181,6 +254,15 @@ static int interface_change(struct interface *interface, bool up) process_release(interface->udhcpc_process); } + if (!up) { + rc = process_run_simple(interface, pb_system_apps.ip, + "address", "flush", "dev", interface->name, + NULL); + if (rc) + pb_log("failed to flush addresses from interface %s\n", + interface->name); + } + rc = process_run_simple(interface, pb_system_apps.ip, "link", "set", interface->name, statestr, NULL); if (rc) { @@ -212,20 +294,31 @@ static void udhcpc_process_exit(struct process *process) static void configure_interface_dhcp(struct interface *interface) { + const struct platform *platform; + char pidfile[256], id[10]; struct process *process; - char pidfile[256]; int rc; const char *argv[] = { pb_system_apps.udhcpc, "-R", - "-n", + "-f", + "-O", "pxeconffile", + "-O", "pxepathprefix", "-p", pidfile, "-i", interface->name, + "-x", id, /* [11,12] - dhcp client identifier */ NULL, }; + snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid", PIDFILE_BASE, interface->name); + platform = platform_get(); + if (platform && platform->dhcp_arch_id != 0xffff) + snprintf(id, sizeof(id), "0x5d:%04x", platform->dhcp_arch_id); + else + argv[11] = NULL; + process = process_create(interface); process->path = pb_system_apps.udhcpc; @@ -243,7 +336,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; @@ -277,6 +371,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; } @@ -345,7 +449,7 @@ 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); } } @@ -415,14 +519,24 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) 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); + /* 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( + sizeof(interface->hwaddr), + interface->hwaddr, interface->name, + info->ifi_flags & IFF_LOWER_UP); + configure_interface(network, interface, info->ifi_flags & IFF_UP, info->ifi_flags & IFF_LOWER_UP); @@ -521,7 +635,7 @@ static void network_init_dns(struct network *network) buf = talloc_realloc(network, buf, char, len + dns_conf_len + 1); memcpy(buf + len, dns_conf, dns_conf_len); len += dns_conf_len; - buf[len - 1] = '\0'; + buf[len] = '\0'; modified = true; talloc_free(dns_conf); @@ -546,8 +660,8 @@ struct network *network_init(struct device_handler *handler, network = talloc(handler, struct network); list_init(&network->interfaces); network->handler = handler; - network->manual_config = false; network->dry_run = dry_run; + network->manual_config = config_get()->network.n_interfaces != 0; network_init_dns(network); @@ -572,7 +686,6 @@ err: return NULL; } - int network_shutdown(struct network *network) { struct interface *interface; @@ -580,8 +693,13 @@ int network_shutdown(struct network *network) if (network->waiter) waiter_remove(network->waiter); - list_for_each_entry(&network->interfaces, interface, list) + list_for_each_entry(&network->interfaces, interface, list) { + if (interface->state == IFSTATE_IGNORED) + continue; + if (!strcmp(interface->name, "lo")) + continue; interface_down(interface); + } close(network->netlink_sd); talloc_free(network);