X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=60d1f6e0f4e1790ba4b2bb2b18bd3a7b81efe70b;hp=edb7358b5c36618cc6ee46d94cb7e1fb2f789483;hb=ae3c354e844698bdb4ed35a6845aa9dca1e9205f;hpb=573a345f2e6b325d80e4040420bee0947e40ce33 diff --git a/discover/network.c b/discover/network.c index edb7358..60d1f6e 100644 --- a/discover/network.c +++ b/discover/network.c @@ -14,17 +14,18 @@ #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 #define PIDFILE_BASE (LOCAL_STATE_DIR "/petitboot/") +#define INITIAL_BUFSIZE 4096 #define for_each_nlmsg(buf, nlmsg, len) \ for (nlmsg = (struct nlmsghdr *)buf; \ @@ -58,6 +59,8 @@ struct network { struct device_handler *handler; struct waiter *waiter; int netlink_sd; + void *netlink_buf; + unsigned int netlink_buf_size; bool manual_config; bool dry_run; }; @@ -66,7 +69,7 @@ static const struct interface_config *find_config_by_hwaddr( uint8_t *hwaddr) { const struct config *config; - int i; + unsigned int i; config = config_get(); if (!config) @@ -116,6 +119,10 @@ static int network_init_netlink(struct network *network) return -1; } + network->netlink_buf_size = INITIAL_BUFSIZE; + network->netlink_buf = talloc_array(network, char, + network->netlink_buf_size); + return 0; } @@ -174,6 +181,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) { @@ -197,7 +213,7 @@ static int interface_down(struct interface *interface) static void udhcpc_process_exit(struct process *process) { struct interface *interface = process->data; - pb_log("udhcp client [pid %d] for interface %s exited, rc %d\n", + pb_debug("udhcp client [pid %d] for interface %s exited, rc %d\n", process->pid, interface->name, process->exit_status); interface->udhcpc_process = NULL; process_release(process); @@ -205,20 +221,32 @@ 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; @@ -362,6 +390,7 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) info = NLMSG_DATA(nlmsg); have_ifaddr = have_ifname = false; + mtu = 1; attrlen = nlmsg->nlmsg_len - sizeof(*info); @@ -407,14 +436,15 @@ 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); } + /* 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); @@ -426,19 +456,48 @@ static int network_netlink_process(void *arg) { struct network *network = arg; struct nlmsghdr *nlmsg; + struct msghdr msg; + struct iovec iov; unsigned int len; - char buf[4096]; - int rc; + int rc, flags; + + memset(&msg, 0, sizeof(msg)); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + + flags = MSG_PEEK; + +retry: + iov.iov_len = network->netlink_buf_size; + iov.iov_base = network->netlink_buf; + + rc = recvmsg(network->netlink_sd, &msg, flags); - rc = recv(network->netlink_sd, buf, sizeof(buf), 0); if (rc < 0) { - perror("netlink recv"); + perror("netlink recv header"); return -1; } len = rc; - for_each_nlmsg(buf, nlmsg, len) + /* if the netlink message was larger than our buffer, realloc + * before reading again */ + if (len > network->netlink_buf_size || msg.msg_flags & MSG_TRUNC) { + network->netlink_buf_size *= 2; + network->netlink_buf = talloc_realloc(network, + network->netlink_buf, + char *, + network->netlink_buf_size); + goto retry; + } + + /* otherwise, we're good to read the entire message without PEEK */ + if (flags == MSG_PEEK) { + flags = 0; + goto retry; + } + + for_each_nlmsg(network->netlink_buf, nlmsg, len) network_handle_nlmsg(network, nlmsg); return 0; @@ -447,7 +506,8 @@ static int network_netlink_process(void *arg) static void network_init_dns(struct network *network) { const struct config *config; - int i, rc, len; + unsigned int i; + int rc, len; bool modified; char *buf; @@ -483,7 +543,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); @@ -508,8 +568,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); @@ -534,7 +594,6 @@ err: return NULL; } - int network_shutdown(struct network *network) { struct interface *interface; @@ -542,8 +601,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);