X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fsocket-util.c;h=24fc6fe6033c1ac28bbb6932ec1925540ec060cf;hb=bdd534291ff72077390f7b1745c4443ad3833d99;hp=26e290815cbf2e4856a53ca7fa33016453bdc818;hpb=c1c19657f457a908d207a5f8313ea0ea33a4f3f5;p=sliver-openvswitch.git diff --git a/lib/socket-util.c b/lib/socket-util.c index 26e290815..24fc6fe60 100644 --- a/lib/socket-util.c +++ b/lib/socket-util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,17 +26,20 @@ #include #include #include +#include #include #include #include +#include #include #include #include "dynamic-string.h" #include "fatal-signal.h" #include "packets.h" +#include "poll-loop.h" #include "util.h" #include "vlog.h" -#if AF_PACKET && __linux__ +#if AF_PACKET && LINUX_DATAPATH #include #endif #ifdef HAVE_NETLINK @@ -48,17 +51,19 @@ VLOG_DEFINE_THIS_MODULE(socket_util); /* #ifdefs make it a pain to maintain code: you have to try to build both ways. * Thus, this file compiles all of the code regardless of the target, by - * writing "if (LINUX)" instead of "#ifdef __linux__". */ -#ifdef __linux__ -#define LINUX 1 -#else -#define LINUX 0 + * writing "if (LINUX_DATAPATH)" instead of "#ifdef __linux__". */ +#ifndef LINUX_DATAPATH +#define LINUX_DATAPATH 0 #endif #ifndef O_DIRECTORY #define O_DIRECTORY 0 #endif +/* Maximum length of the sun_path member in a struct sockaddr_un, excluding + * space for a null terminator. */ +#define MAX_UN_LEN (sizeof(((struct sockaddr_un *) 0)->sun_path) - 1) + static int getsockopt_int(int fd, int level, int option, const char *optname, int *valuep); @@ -72,15 +77,40 @@ set_nonblocking(int fd) if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) != -1) { return 0; } else { - VLOG_ERR("fcntl(F_SETFL) failed: %s", strerror(errno)); + VLOG_ERR("fcntl(F_SETFL) failed: %s", ovs_strerror(errno)); return errno; } } else { - VLOG_ERR("fcntl(F_GETFL) failed: %s", strerror(errno)); + VLOG_ERR("fcntl(F_GETFL) failed: %s", ovs_strerror(errno)); return errno; } } +void +xset_nonblocking(int fd) +{ + if (set_nonblocking(fd)) { + exit(EXIT_FAILURE); + } +} + +int +set_dscp(int fd, uint8_t dscp) +{ + int val; + + if (dscp > 63) { + return EINVAL; + } + + val = dscp << 2; + if (setsockopt(fd, IPPROTO_IP, IP_TOS, &val, sizeof val)) { + return errno; + } + + return 0; +} + static bool rlim_is_finite(rlim_t limit) { @@ -107,8 +137,10 @@ rlim_is_finite(rlim_t limit) int get_max_fds(void) { - static int max_fds = -1; - if (max_fds < 0) { + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int max_fds; + + if (ovsthread_once_start(&once)) { struct rlimit r; if (!getrlimit(RLIMIT_NOFILE, &r) && rlim_is_finite(r.rlim_cur)) { max_fds = r.rlim_cur; @@ -116,7 +148,9 @@ get_max_fds(void) VLOG_WARN("failed to obtain fd limit, defaulting to 1024"); max_fds = 1024; } + ovsthread_once_done(&once); } + return max_fds; } @@ -153,48 +187,68 @@ lookup_ipv6(const char *host_name, struct in6_addr *addr) * successful, otherwise a positive errno value. * * Most Open vSwitch code should not use this because it causes deadlocks: - * gethostbyname() sends out a DNS request but that starts a new flow for which + * getaddrinfo() sends out a DNS request but that starts a new flow for which * OVS must set up a flow, but it can't because it's waiting for a DNS reply. - * The synchronous lookup also delays other activty. (Of course we can solve + * The synchronous lookup also delays other activity. (Of course we can solve * this but it doesn't seem worthwhile quite yet.) */ int lookup_hostname(const char *host_name, struct in_addr *addr) { - struct hostent *h; + struct addrinfo *result; + struct addrinfo hints; if (inet_aton(host_name, addr)) { return 0; } - h = gethostbyname(host_name); - if (h) { - *addr = *(struct in_addr *) h->h_addr; + memset(&hints, 0, sizeof hints); + hints.ai_family = AF_INET; + + switch (getaddrinfo(host_name, NULL, &hints, &result)) { + case 0: + *addr = ALIGNED_CAST(struct sockaddr_in *, + result->ai_addr)->sin_addr; + freeaddrinfo(result); return 0; - } - return (h_errno == HOST_NOT_FOUND ? ENOENT - : h_errno == TRY_AGAIN ? EAGAIN - : h_errno == NO_RECOVERY ? EIO - : h_errno == NO_ADDRESS ? ENXIO - : EINVAL); -} +#ifdef EAI_ADDRFAMILY + case EAI_ADDRFAMILY: +#endif + case EAI_NONAME: + case EAI_SERVICE: + return ENOENT; -/* Returns the error condition associated with socket 'fd' and resets the - * socket's error status. */ -int -get_socket_error(int fd) -{ - int error; + case EAI_AGAIN: + return EAGAIN; - if (getsockopt_int(fd, SOL_SOCKET, SO_ERROR, "SO_ERROR", &error)) { - error = errno; + case EAI_BADFLAGS: + case EAI_FAMILY: + case EAI_SOCKTYPE: + return EINVAL; + + case EAI_FAIL: + return EIO; + + case EAI_MEMORY: + return ENOMEM; + +#ifdef EAI_NODATA + case EAI_NODATA: + return ENXIO; +#endif + + case EAI_SYSTEM: + return errno; + + default: + return EPROTO; } - return error; } int check_connection_completion(int fd) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 10); struct pollfd pfd; int retval; @@ -204,10 +258,18 @@ check_connection_completion(int fd) retval = poll(&pfd, 1, 0); } while (retval < 0 && errno == EINTR); if (retval == 1) { - return get_socket_error(fd); + if (pfd.revents & POLLERR) { + ssize_t n = send(fd, "", 1, MSG_DONTWAIT); + if (n < 0) { + return errno; + } else { + VLOG_ERR_RL(&rl, "poll return POLLERR but send succeeded"); + return EPROTO; + } + } + return 0; } else if (retval < 0) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 10); - VLOG_ERR_RL(&rl, "poll: %s", strerror(errno)); + VLOG_ERR_RL(&rl, "poll: %s", ovs_strerror(errno)); return errno; } else { return EAGAIN; @@ -238,7 +300,7 @@ drain_rcvbuf(int fd) * * On other Unix-like OSes, MSG_TRUNC has no effect in the flags * argument. */ - char buffer[LINUX ? 1 : 2048]; + char buffer[LINUX_DATAPATH ? 1 : 2048]; ssize_t n_bytes = recv(fd, buffer, sizeof buffer, MSG_TRUNC | MSG_DONTWAIT); if (n_bytes <= 0 || n_bytes >= rcvbuf) { @@ -279,78 +341,161 @@ drain_fd(int fd, size_t n_packets) } } -/* Stores in '*un' a sockaddr_un that refers to file 'name'. Stores in - * '*un_len' the size of the sockaddr_un. */ -static void -make_sockaddr_un__(const char *name, struct sockaddr_un *un, socklen_t *un_len) +/* Attempts to shorten 'name' by opening a file descriptor for the directory + * part of the name and indirecting through /proc/self/fd//. + * On systems with Linux-like /proc, this works as long as isn't too + * long. + * + * On success, returns 0 and stores the short name in 'short_name' and a + * directory file descriptor to eventually be closed in '*dirfpd'. */ +static int +shorten_name_via_proc(const char *name, char short_name[MAX_UN_LEN + 1], + int *dirfdp) { - un->sun_family = AF_UNIX; - ovs_strzcpy(un->sun_path, name, sizeof un->sun_path); - *un_len = (offsetof(struct sockaddr_un, sun_path) - + strlen (un->sun_path) + 1); + char *dir, *base; + int dirfd; + int len; + + if (!LINUX_DATAPATH) { + return ENAMETOOLONG; + } + + dir = dir_name(name); + dirfd = open(dir, O_DIRECTORY | O_RDONLY); + if (dirfd < 0) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + int error = errno; + + VLOG_WARN_RL(&rl, "%s: open failed (%s)", dir, ovs_strerror(error)); + free(dir); + + return error; + } + free(dir); + + base = base_name(name); + len = snprintf(short_name, MAX_UN_LEN + 1, + "/proc/self/fd/%d/%s", dirfd, base); + free(base); + + if (len >= 0 && len <= MAX_UN_LEN) { + *dirfdp = dirfd; + return 0; + } else { + close(dirfd); + return ENAMETOOLONG; + } +} + +/* Attempts to shorten 'name' by creating a symlink for the directory part of + * the name and indirecting through /. This works on + * systems that support symlinks, as long as isn't too long. + * + * On success, returns 0 and stores the short name in 'short_name' and the + * symbolic link to eventually delete in 'linkname'. */ +static int +shorten_name_via_symlink(const char *name, char short_name[MAX_UN_LEN + 1], + char linkname[MAX_UN_LEN + 1]) +{ + char *abs, *dir, *base; + const char *tmpdir; + int error; + int i; + + abs = abs_file_name(NULL, name); + dir = dir_name(abs); + base = base_name(abs); + free(abs); + + tmpdir = getenv("TMPDIR"); + if (tmpdir == NULL) { + tmpdir = "/tmp"; + } + + for (i = 0; i < 1000; i++) { + int len; + + len = snprintf(linkname, MAX_UN_LEN + 1, + "%s/ovs-un-c-%"PRIu32, tmpdir, random_uint32()); + error = (len < 0 || len > MAX_UN_LEN ? ENAMETOOLONG + : symlink(dir, linkname) ? errno + : 0); + if (error != EEXIST) { + break; + } + } + + if (!error) { + int len; + + fatal_signal_add_file_to_unlink(linkname); + + len = snprintf(short_name, MAX_UN_LEN + 1, "%s/%s", linkname, base); + if (len < 0 || len > MAX_UN_LEN) { + fatal_signal_unlink_file_now(linkname); + error = ENAMETOOLONG; + } + } + + if (error) { + linkname[0] = '\0'; + } + free(dir); + free(base); + + return error; } /* Stores in '*un' a sockaddr_un that refers to file 'name'. Stores in * '*un_len' the size of the sockaddr_un. * - * Returns 0 on success, otherwise a positive errno value. On success, - * '*dirfdp' is either -1 or a nonnegative file descriptor that the caller - * should close after using '*un' to bind or connect. On failure, '*dirfdp' is - * -1. */ + * Returns 0 on success, otherwise a positive errno value. + * + * Uses '*dirfdp' and 'linkname' to store references to data when the caller no + * longer needs to use 'un'. On success, freeing these references with + * free_sockaddr_un() is mandatory to avoid a leak; on failure, freeing them is + * unnecessary but harmless. */ static int make_sockaddr_un(const char *name, struct sockaddr_un *un, socklen_t *un_len, - int *dirfdp) + int *dirfdp, char linkname[MAX_UN_LEN + 1]) { - enum { MAX_UN_LEN = sizeof un->sun_path - 1 }; + char short_name[MAX_UN_LEN + 1]; *dirfdp = -1; + linkname[0] = '\0'; if (strlen(name) > MAX_UN_LEN) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - - if (LINUX) { - /* 'name' is too long to fit in a sockaddr_un, but we have a - * workaround for that on Linux: shorten it by opening a file - * descriptor for the directory part of the name and indirecting - * through /proc/self/fd//. */ - char *dir, *base; - char *short_name; - int dirfd; - - dir = dir_name(name); - base = base_name(name); - - dirfd = open(dir, O_DIRECTORY | O_RDONLY); - if (dirfd < 0) { - free(base); - free(dir); - return errno; - } - - short_name = xasprintf("/proc/self/fd/%d/%s", dirfd, base); - free(dir); - free(base); - - if (strlen(short_name) <= MAX_UN_LEN) { - make_sockaddr_un__(short_name, un, un_len); - free(short_name); - *dirfdp = dirfd; - return 0; - } - free(short_name); - close(dirfd); + /* 'name' is too long to fit in a sockaddr_un. Try a workaround. */ + int error = shorten_name_via_proc(name, short_name, dirfdp); + if (error == ENAMETOOLONG) { + error = shorten_name_via_symlink(name, short_name, linkname); + } + if (error) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); VLOG_WARN_RL(&rl, "Unix socket name %s is longer than maximum " - "%d bytes (even shortened)", name, MAX_UN_LEN); - } else { - /* 'name' is too long and we have no workaround. */ - VLOG_WARN_RL(&rl, "Unix socket name %s is longer than maximum " - "%d bytes", name, MAX_UN_LEN); + "%"PRIuSIZE" bytes", name, MAX_UN_LEN); + return error; } - return ENAMETOOLONG; - } else { - make_sockaddr_un__(name, un, un_len); - return 0; + name = short_name; + } + + un->sun_family = AF_UNIX; + ovs_strzcpy(un->sun_path, name, sizeof un->sun_path); + *un_len = (offsetof(struct sockaddr_un, sun_path) + + strlen (un->sun_path) + 1); + return 0; +} + +/* Clean up after make_sockaddr_un(). */ +static void +free_sockaddr_un(int dirfd, const char *linkname) +{ + if (dirfd >= 0) { + close(dirfd); + } + if (linkname[0]) { + fatal_signal_unlink_file_now(linkname); } } @@ -368,12 +513,11 @@ bind_unix_socket(int fd, struct sockaddr *sun, socklen_t sun_len) /* Creates a Unix domain socket in the given 'style' (either SOCK_DGRAM or * SOCK_STREAM) that is bound to '*bind_path' (if 'bind_path' is non-null) and * connected to '*connect_path' (if 'connect_path' is non-null). If 'nonblock' - * is true, the socket is made non-blocking. If 'passcred' is true, the socket - * is configured to receive SCM_CREDENTIALS control messages. + * is true, the socket is made non-blocking. * * Returns the socket's fd if successful, otherwise a negative errno value. */ int -make_unix_socket(int style, bool nonblock, bool passcred OVS_UNUSED, +make_unix_socket(int style, bool nonblock, const char *bind_path, const char *connect_path) { int error; @@ -389,67 +533,53 @@ make_unix_socket(int style, bool nonblock, bool passcred OVS_UNUSED, * it will only happen if style is SOCK_STREAM or SOCK_SEQPACKET, and only * if a backlog of un-accepted connections has built up in the kernel.) */ if (nonblock) { - int flags = fcntl(fd, F_GETFL, 0); - if (flags == -1) { - error = errno; - goto error; - } - if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) { - error = errno; + error = set_nonblocking(fd); + if (error) { goto error; } } if (bind_path) { + char linkname[MAX_UN_LEN + 1]; struct sockaddr_un un; socklen_t un_len; int dirfd; if (unlink(bind_path) && errno != ENOENT) { - VLOG_WARN("unlinking \"%s\": %s\n", bind_path, strerror(errno)); + VLOG_WARN("unlinking \"%s\": %s\n", + bind_path, ovs_strerror(errno)); } fatal_signal_add_file_to_unlink(bind_path); - error = make_sockaddr_un(bind_path, &un, &un_len, &dirfd); + error = make_sockaddr_un(bind_path, &un, &un_len, &dirfd, linkname); if (!error) { error = bind_unix_socket(fd, (struct sockaddr *) &un, un_len); } - if (dirfd >= 0) { - close(dirfd); - } + free_sockaddr_un(dirfd, linkname); + if (error) { goto error; } } if (connect_path) { + char linkname[MAX_UN_LEN + 1]; struct sockaddr_un un; socklen_t un_len; int dirfd; - error = make_sockaddr_un(connect_path, &un, &un_len, &dirfd); + error = make_sockaddr_un(connect_path, &un, &un_len, &dirfd, linkname); if (!error && connect(fd, (struct sockaddr*) &un, un_len) && errno != EINPROGRESS) { error = errno; } - if (dirfd >= 0) { - close(dirfd); - } - if (error) { - goto error; - } - } + free_sockaddr_un(dirfd, linkname); -#ifdef SCM_CREDENTIALS - if (passcred) { - int enable = 1; - if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable))) { - error = errno; + if (error) { goto error; } } -#endif return fd; @@ -458,7 +588,7 @@ error: error = EPROTO; } if (bind_path) { - fatal_signal_remove_file_to_unlink(bind_path); + fatal_signal_unlink_file_now(bind_path); } close(fd); return -error; @@ -544,10 +674,14 @@ exit: * and stores -1 into '*fdp'. * * If 'sinp' is non-null, then on success the target address is stored into - * '*sinp'. */ + * '*sinp'. + * + * 'dscp' becomes the DSCP bits in the IP headers for the new connection. It + * should be in the range [0, 63] and will automatically be shifted to the + * appropriately place in the IP tos field. */ int inet_open_active(int style, const char *target, uint16_t default_port, - struct sockaddr_in *sinp, int *fdp) + struct sockaddr_in *sinp, int *fdp, uint8_t dscp) { struct sockaddr_in sin; int fd = -1; @@ -562,37 +696,40 @@ inet_open_active(int style, const char *target, uint16_t default_port, /* Create non-blocking socket. */ fd = socket(AF_INET, style, 0); if (fd < 0) { - VLOG_ERR("%s: socket: %s", target, strerror(errno)); + VLOG_ERR("%s: socket: %s", target, ovs_strerror(errno)); error = errno; goto exit; } error = set_nonblocking(fd); if (error) { - goto exit_close; + goto exit; + } + + /* The dscp bits must be configured before connect() to ensure that the TOS + * field is set during the connection establishment. If set after + * connect(), the handshake SYN frames will be sent with a TOS of 0. */ + error = set_dscp(fd, dscp); + if (error) { + VLOG_ERR("%s: socket: %s", target, ovs_strerror(error)); + goto exit; } /* Connect. */ error = connect(fd, (struct sockaddr *) &sin, sizeof sin) == 0 ? 0 : errno; if (error == EINPROGRESS) { error = EAGAIN; - } else if (error && error != EAGAIN) { - goto exit_close; } - /* Success: error is 0 or EAGAIN. */ - goto exit; - -exit_close: - close(fd); exit: if (!error || error == EAGAIN) { if (sinp) { *sinp = sin; } - *fdp = fd; - } else { - *fdp = -1; + } else if (fd >= 0) { + close(fd); + fd = -1; } + *fdp = fd; return error; } @@ -663,25 +800,30 @@ exit: * negative errno value. * * If 'sinp' is non-null, then on success the bound address is stored into - * '*sinp'. */ + * '*sinp'. + * + * 'dscp' becomes the DSCP bits in the IP headers for the new connection. It + * should be in the range [0, 63] and will automatically be shifted to the + * appropriately place in the IP tos field. */ int inet_open_passive(int style, const char *target, int default_port, - struct sockaddr_in *sinp) + struct sockaddr_in *sinp, uint8_t dscp) { + bool kernel_chooses_port; struct sockaddr_in sin; int fd = 0, error; unsigned int yes = 1; if (!inet_parse_passive(target, default_port, &sin)) { - return EAFNOSUPPORT; + return -EAFNOSUPPORT; } /* Create non-blocking socket, set SO_REUSEADDR. */ fd = socket(AF_INET, style, 0); if (fd < 0) { error = errno; - VLOG_ERR("%s: socket: %s", target, strerror(error)); - return error; + VLOG_ERR("%s: socket: %s", target, ovs_strerror(error)); + return -error; } error = set_nonblocking(fd); if (error) { @@ -690,43 +832,61 @@ inet_open_passive(int style, const char *target, int default_port, if (style == SOCK_STREAM && setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes) < 0) { error = errno; - VLOG_ERR("%s: setsockopt(SO_REUSEADDR): %s", target, strerror(error)); + VLOG_ERR("%s: setsockopt(SO_REUSEADDR): %s", + target, ovs_strerror(error)); goto error; } /* Bind. */ if (bind(fd, (struct sockaddr *) &sin, sizeof sin) < 0) { error = errno; - VLOG_ERR("%s: bind: %s", target, strerror(error)); + VLOG_ERR("%s: bind: %s", target, ovs_strerror(error)); + goto error; + } + + /* The dscp bits must be configured before connect() to ensure that the TOS + * field is set during the connection establishment. If set after + * connect(), the handshake SYN frames will be sent with a TOS of 0. */ + error = set_dscp(fd, dscp); + if (error) { + VLOG_ERR("%s: socket: %s", target, ovs_strerror(error)); goto error; } /* Listen. */ - if (listen(fd, 10) < 0) { + if (style == SOCK_STREAM && listen(fd, 10) < 0) { error = errno; - VLOG_ERR("%s: listen: %s", target, strerror(error)); + VLOG_ERR("%s: listen: %s", target, ovs_strerror(error)); goto error; } - if (sinp) { + kernel_chooses_port = sin.sin_port == htons(0); + if (sinp || kernel_chooses_port) { socklen_t sin_len = sizeof sin; - if (getsockname(fd, (struct sockaddr *) &sin, &sin_len) < 0){ + if (getsockname(fd, (struct sockaddr *) &sin, &sin_len) < 0) { error = errno; - VLOG_ERR("%s: getsockname: %s", target, strerror(error)); + VLOG_ERR("%s: getsockname: %s", target, ovs_strerror(error)); goto error; } if (sin.sin_family != AF_INET || sin_len != sizeof sin) { + error = EAFNOSUPPORT; VLOG_ERR("%s: getsockname: invalid socket name", target); goto error; } - *sinp = sin; + if (sinp) { + *sinp = sin; + } + if (kernel_chooses_port) { + VLOG_INFO("%s: listening on port %"PRIu16, + target, ntohs(sin.sin_port)); + } } return fd; error: close(fd); - return error; + return -error; } /* Returns a readable and writable fd for /dev/null, if successful, otherwise @@ -735,15 +895,19 @@ error: int get_null_fd(void) { - static int null_fd = -1; - if (null_fd < 0) { + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int null_fd; + + if (ovsthread_once_start(&once)) { null_fd = open("/dev/null", O_RDWR); if (null_fd < 0) { int error = errno; - VLOG_ERR("could not open /dev/null: %s", strerror(error)); - return -error; + VLOG_ERR("could not open /dev/null: %s", ovs_strerror(error)); + null_fd = -error; } + ovsthread_once_done(&once); } + return null_fd; } @@ -808,13 +972,13 @@ fsync_parent_dir(const char *file_name) * really an error. */ } else { error = errno; - VLOG_ERR("%s: fsync failed (%s)", dir, strerror(error)); + VLOG_ERR("%s: fsync failed (%s)", dir, ovs_strerror(error)); } } close(fd); } else { error = errno; - VLOG_ERR("%s: open failed (%s)", dir, strerror(error)); + VLOG_ERR("%s: open failed (%s)", dir, ovs_strerror(error)); } free(dir); @@ -852,10 +1016,18 @@ void xpipe(int fds[2]) { if (pipe(fds)) { - VLOG_FATAL("failed to create pipe (%s)", strerror(errno)); + VLOG_FATAL("failed to create pipe (%s)", ovs_strerror(errno)); } } +void +xpipe_nonblocking(int fds[2]) +{ + xpipe(fds); + xset_nonblocking(fds[0]); + xset_nonblocking(fds[1]); +} + static int getsockopt_int(int fd, int level, int option, const char *optname, int *valuep) { @@ -867,10 +1039,10 @@ getsockopt_int(int fd, int level, int option, const char *optname, int *valuep) len = sizeof value; if (getsockopt(fd, level, option, &value, &len)) { error = errno; - VLOG_ERR_RL(&rl, "getsockopt(%s): %s", optname, strerror(error)); + VLOG_ERR_RL(&rl, "getsockopt(%s): %s", optname, ovs_strerror(error)); } else if (len != sizeof value) { error = EINVAL; - VLOG_ERR_RL(&rl, "getsockopt(%s): value is %u bytes (expected %zu)", + VLOG_ERR_RL(&rl, "getsockopt(%s): value is %u bytes (expected %"PRIuSIZE")", optname, (unsigned int) len, sizeof value); } else { error = 0; @@ -893,7 +1065,7 @@ describe_sockaddr(struct ds *string, int fd, memcpy(&sin, &ss, sizeof sin); ds_put_format(string, IP_FMT":%"PRIu16, - IP_ARGS(&sin.sin_addr.s_addr), ntohs(sin.sin_port)); + IP_ARGS(sin.sin_addr.s_addr), ntohs(sin.sin_port)); } else if (ss.ss_family == AF_UNIX) { struct sockaddr_un sun; const char *null; @@ -935,7 +1107,7 @@ describe_sockaddr(struct ds *string, int fd, } } #endif -#if AF_PACKET && __linux__ +#if AF_PACKET && LINUX_DATAPATH else if (ss.ss_family == AF_PACKET) { struct sockaddr_ll sll; @@ -965,7 +1137,7 @@ describe_sockaddr(struct ds *string, int fd, } -#ifdef __linux__ +#ifdef LINUX_DATAPATH static void put_fd_filename(struct ds *string, int fd) { @@ -995,7 +1167,7 @@ describe_fd(int fd) ds_init(&string); if (fstat(fd, &s)) { - ds_put_format(&string, "fstat failed (%s)", strerror(errno)); + ds_put_format(&string, "fstat failed (%s)", ovs_strerror(errno)); } else if (S_ISSOCK(s.st_mode)) { describe_sockaddr(&string, fd, getsockname); ds_put_cstr(&string, "<->"); @@ -1009,9 +1181,48 @@ describe_fd(int fd) : S_ISFIFO(s.st_mode) ? "FIFO" : S_ISLNK(s.st_mode) ? "symbolic link" : "unknown")); -#ifdef __linux__ +#ifdef LINUX_DATAPATH put_fd_filename(&string, fd); #endif } return ds_steal_cstr(&string); } + +/* Calls ioctl() on an AF_INET sock, passing the specified 'command' and + * 'arg'. Returns 0 if successful, otherwise a positive errno value. */ +int +af_inet_ioctl(unsigned long int command, const void *arg) +{ + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int sock; + + if (ovsthread_once_start(&once)) { + sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) { + sock = -errno; + VLOG_ERR("failed to create inet socket: %s", ovs_strerror(errno)); + } + ovsthread_once_done(&once); + } + + return (sock < 0 ? -sock + : ioctl(sock, command, arg) == -1 ? errno + : 0); +} + +int +af_inet_ifreq_ioctl(const char *name, struct ifreq *ifr, unsigned long int cmd, + const char *cmd_name) +{ + int error; + + ovs_strzcpy(ifr->ifr_name, name, sizeof ifr->ifr_name); + error = af_inet_ioctl(cmd, ifr); + if (error) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); + VLOG_DBG_RL(&rl, "%s: ioctl(%s) failed: %s", name, cmd_name, + ovs_strerror(error)); + } + return error; +} +