X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=2057525e2fe690cf82ec5a012240f10515eb85b0;hp=e2cae912182265eef225c86b130afc4fffafaea2;hb=fed2c4da36c2708f2a5a7a09eba61d014b9339d6;hpb=58db060fbb1548a0acdfc475fa41fe86fb32dd11 diff --git a/discover/network.c b/discover/network.c index e2cae91..2057525 100644 --- a/discover/network.c +++ b/discover/network.c @@ -53,6 +53,7 @@ struct interface { struct list_item list; struct process *udhcpc_process; + struct process *udhcpc6_process; struct discover_device *dev; bool ready; }; @@ -279,6 +280,13 @@ static int interface_change(struct interface *interface, bool up) process_stop_async(interface->udhcpc_process); process_release(interface->udhcpc_process); } + if (!up && interface->udhcpc6_process) { + /* we don't care about the callback from here */ + interface->udhcpc6_process->exit_cb = NULL; + interface->udhcpc6_process->data = NULL; + process_stop_async(interface->udhcpc6_process); + process_release(interface->udhcpc6_process); + } if (!up) { rc = process_run_simple(interface, pb_system_apps.ip, @@ -312,9 +320,17 @@ static int interface_down(struct interface *interface) static void udhcpc_process_exit(struct process *process) { struct interface *interface = process->data; - pb_debug("udhcp client [pid %d] for interface %s exited, rc %d\n", - process->pid, interface->name, process->exit_status); - interface->udhcpc_process = NULL; + + if (process == interface->udhcpc_process) { + pb_debug("udhcpc client [pid %d] for interface %s exited, rc %d\n", + process->pid, interface->name, process->exit_status); + interface->udhcpc_process = NULL; + } else { + pb_debug("udhcpc6 client [pid %d] for interface %s exited, rc %d\n", + process->pid, interface->name, process->exit_status); + interface->udhcpc6_process = NULL; + } + process_release(process); } @@ -322,18 +338,33 @@ static void configure_interface_dhcp(struct network *network, struct interface *interface) { const struct platform *platform; - char pidfile[256], id[10]; - struct process *process; + char pidfile[256], idv4[10], idv6[10]; + struct process *p_v4, *p_v6; int rc; - const char *argv[] = { + const char *argv_ipv4[] = { pb_system_apps.udhcpc, "-R", "-f", "-O", "pxeconffile", "-O", "pxepathprefix", + "-O", "reboottime", + "-p", pidfile, + "-i", interface->name, + "-x", idv4, /* [11,12] - dhcp client identifier */ + NULL, + }; + + const char *argv_ipv6[] = { + pb_system_apps.udhcpc6, + "-R", + "-f", + "-O", "bootfile_url", + "-O", "bootfile_param", + "-O", "pxeconffile", + "-O", "pxepathprefix", "-p", pidfile, "-i", interface->name, - "-x", id, /* [11,12] - dhcp client identifier */ + "-x", idv6, /* [15,16] - dhcp client identifier */ NULL, }; @@ -344,24 +375,40 @@ static void configure_interface_dhcp(struct network *network, PIDFILE_BASE, interface->name); platform = platform_get(); - if (platform && platform->dhcp_arch_id != 0xffff) - snprintf(id, sizeof(id), "0x5d:%04x", platform->dhcp_arch_id); + if (platform && platform->dhcp_arch_id != 0xffff) { + snprintf(idv6, sizeof(idv6), "0x3d:%04x", + platform->dhcp_arch_id); + snprintf(idv4, sizeof(idv4), "0x5d:%04x", + platform->dhcp_arch_id); + } else { + argv_ipv4[11] = argv_ipv6[15] = NULL; + } + + p_v4 = process_create(interface); + p_v4->path = pb_system_apps.udhcpc; + p_v4->argv = argv_ipv4; + p_v4->exit_cb = udhcpc_process_exit; + p_v4->data = interface; + + pb_log("Running DHCPv4 client\n"); + rc = process_run_async(p_v4); + if (rc) + process_release(p_v4); else - argv[11] = NULL; + interface->udhcpc_process = p_v4; - 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); + pb_log("Running DHCPv6 client\n"); + p_v6 = process_create(interface); + p_v6->path = pb_system_apps.udhcpc6; + p_v6->argv = argv_ipv6; + p_v6->exit_cb = udhcpc_process_exit; + p_v6->data = interface; + rc = process_run_async(p_v6); if (rc) - process_release(process); + process_release(p_v6); else - interface->udhcpc_process = process; + interface->udhcpc6_process = p_v6; return; } @@ -417,6 +464,8 @@ static void configure_interface_static(struct network *network, interface->hwaddr, sizeof(interface->hwaddr)), config->static_config.address); + device_handler_start_requery_timeout(network->handler, + interface->dev, -1); } return; @@ -498,6 +547,49 @@ static void configure_interface(struct network *network, interface->state = IFSTATE_CONFIGURED; } +void network_requery_device(struct network *network, + struct discover_device *dev) +{ + const struct interface_config *config; + struct interface *interface; + + interface = find_interface_by_uuid(network, dev->uuid); + if (!interface) + return; + + if (interface->udhcpc_process) { + interface->udhcpc_process->exit_cb = NULL; + interface->udhcpc_process->data = NULL; + process_stop_async(interface->udhcpc_process); + process_release(interface->udhcpc_process); + } + + config = find_config_by_hwaddr(interface->hwaddr); + + if (config && config->ignore) + return; + + if (!config || config->method == CONFIG_METHOD_DHCP) { + /* Restart DHCP. Once we acquire a lease, we'll re-start + * the requery timeout (based on any reboottime DHCP option) + */ + configure_interface_dhcp(network, interface); + + } else if (config->method == CONFIG_METHOD_STATIC && + config->static_config.url) { + /* Redownload statically-provided URL, and manually restart + * requery timeout */ + 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); + device_handler_start_requery_timeout(network->handler, + dev, -1); + } +} + static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) { bool have_ifaddr, have_ifname; @@ -506,7 +598,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) struct rtattr *attr; unsigned int mtu; uint8_t ifaddr[6]; - char ifname[IFNAMSIZ+1]; + char ifname[IFNAMSIZ]; int attrlen, type; @@ -534,6 +626,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) case IFLA_IFNAME: strncpy(ifname, data, IFNAMSIZ); + ifname[IFNAMSIZ - 1] = '\0'; have_ifname = true; break; @@ -565,7 +658,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) interface->ifindex = info->ifi_index; interface->state = IFSTATE_NEW; memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr)); - strncpy(interface->name, ifname, sizeof(interface->name) - 1); + strncpy(interface->name, ifname, sizeof(interface->name)); list_for_each_entry(&network->interfaces, tmp, list) if (memcmp(interface->hwaddr, tmp->hwaddr, @@ -583,7 +676,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) /* 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); + strncpy(interface->name, ifname, sizeof(interface->name)); talloc_free(interface->dev->device->id); interface->dev->device->id = talloc_strdup(interface->dev->device, ifname);