X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fsocket-util.c;h=aa0c7196da9926de38b7388b8e28ead12e12913e;hb=HEAD;hp=a428534e270eaa64a6669c856c02df58bf3dd63b;hpb=7ff04d92445beaaea4123cbc3083d950278b1d55;p=sliver-openvswitch.git diff --git a/lib/socket-util.c b/lib/socket-util.c index a428534e2..aa0c7196d 100644 --- a/lib/socket-util.c +++ b/lib/socket-util.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -40,7 +39,7 @@ #include "poll-loop.h" #include "util.h" #include "vlog.h" -#if AF_PACKET && LINUX_DATAPATH +#ifdef __linux__ #include #endif #ifdef HAVE_NETLINK @@ -52,9 +51,11 @@ 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_DATAPATH)" instead of "#ifdef __linux__". */ -#ifndef LINUX_DATAPATH -#define LINUX_DATAPATH 0 + * writing "if (LINUX)" instead of "#ifdef __linux__". */ +#ifdef __linux__ +#define LINUX 1 +#else +#define LINUX 0 #endif #ifndef O_DIRECTORY @@ -109,60 +110,42 @@ int set_dscp(int fd, uint8_t dscp) { int val; + bool success; if (dscp > 63) { return EINVAL; } + /* Note: this function is used for both of IPv4 and IPv6 sockets */ + success = false; val = dscp << 2; if (setsockopt(fd, IPPROTO_IP, IP_TOS, &val, sizeof val)) { - return sock_errno(); - } - - return 0; -} - -static bool -rlim_is_finite(rlim_t limit) -{ - if (limit == RLIM_INFINITY) { - return false; - } - -#ifdef RLIM_SAVED_CUR /* FreeBSD 8.0 lacks RLIM_SAVED_CUR. */ - if (limit == RLIM_SAVED_CUR) { - return false; - } +#ifndef _WIN32 + if (sock_errno() != ENOPROTOOPT) { +#else + if (sock_errno() != WSAENOPROTOOPT) { #endif - -#ifdef RLIM_SAVED_MAX /* FreeBSD 8.0 lacks RLIM_SAVED_MAX. */ - if (limit == RLIM_SAVED_MAX) { - return false; + return sock_errno(); + } + } else { + success = true; } + if (setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, &val, sizeof val)) { +#ifndef _WIN32 + if (sock_errno() != ENOPROTOOPT) { +#else + if (sock_errno() != WSAENOPROTOOPT) { #endif - - return true; -} - -/* Returns the maximum valid FD value, plus 1. */ -int -get_max_fds(void) -{ - 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; - } else { - VLOG_WARN("failed to obtain fd limit, defaulting to 1024"); - max_fds = 1024; + return sock_errno(); } - ovsthread_once_done(&once); + } else { + success = true; + } + if (!success) { + return ENOPROTOOPT; } - return max_fds; + return 0; } /* Translates 'host_name', which must be a string representation of an IP @@ -171,7 +154,7 @@ get_max_fds(void) int lookup_ip(const char *host_name, struct in_addr *addr) { - if (!inet_aton(host_name, addr)) { + if (!inet_pton(AF_INET, host_name, addr)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "\"%s\" is not a valid IP address", host_name); return ENOENT; @@ -208,7 +191,7 @@ lookup_hostname(const char *host_name, struct in_addr *addr) struct addrinfo *result; struct addrinfo hints; - if (inet_aton(host_name, addr)) { + if (inet_pton(AF_INET, host_name, addr)) { return 0; } @@ -267,14 +250,19 @@ check_connection_completion(int fd) pfd.fd = fd; pfd.events = POLLOUT; + +#ifndef _WIN32 do { retval = poll(&pfd, 1, 0); } while (retval < 0 && errno == EINTR); +#else + retval = WSAPoll(&pfd, 1, 0); +#endif if (retval == 1) { if (pfd.revents & POLLERR) { - ssize_t n = send(fd, "", 1, MSG_DONTWAIT); + ssize_t n = send(fd, "", 1, 0); if (n < 0) { - return errno; + return sock_errno(); } else { VLOG_ERR_RL(&rl, "poll return POLLERR but send succeeded"); return EPROTO; @@ -282,13 +270,14 @@ check_connection_completion(int fd) } return 0; } else if (retval < 0) { - VLOG_ERR_RL(&rl, "poll: %s", ovs_strerror(errno)); + VLOG_ERR_RL(&rl, "poll: %s", sock_strerror(sock_errno())); return errno; } else { return EAGAIN; } } +#ifndef _WIN32 /* Drain all the data currently in the receive queue of a datagram socket (and * possibly additional data). There is no way to know how many packets are in * the receive queue, but we do know that the total number of bytes queued does @@ -313,7 +302,7 @@ drain_rcvbuf(int fd) * * On other Unix-like OSes, MSG_TRUNC has no effect in the flags * argument. */ - char buffer[LINUX_DATAPATH ? 1 : 2048]; + char buffer[LINUX ? 1 : 2048]; ssize_t n_bytes = recv(fd, buffer, sizeof buffer, MSG_TRUNC | MSG_DONTWAIT); if (n_bytes <= 0 || n_bytes >= rcvbuf) { @@ -323,6 +312,7 @@ drain_rcvbuf(int fd) } return 0; } +#endif /* Returns the size of socket 'sock''s receive buffer (SO_RCVBUF), or a * negative errno value if an error occurs. */ @@ -370,7 +360,7 @@ shorten_name_via_proc(const char *name, char short_name[MAX_UN_LEN + 1], int dirfd; int len; - if (!LINUX_DATAPATH) { + if (!LINUX) { return ENAMETOOLONG; } @@ -790,7 +780,7 @@ inet_open_active(int style, const char *target, uint16_t default_port, * 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, sock_strerror(error)); + VLOG_ERR("%s: set_dscp: %s", target, sock_strerror(error)); goto exit; } @@ -927,7 +917,7 @@ inet_open_passive(int style, const char *target, int default_port, * 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, sock_strerror(error)); + VLOG_ERR("%s: set_dscp: %s", target, sock_strerror(error)); goto error; } @@ -964,28 +954,6 @@ error: return -error; } -/* Returns a readable and writable fd for /dev/null, if successful, otherwise - * a negative errno value. The caller must not close the returned fd (because - * the same fd will be handed out to subsequent callers). */ -int -get_null_fd(void) -{ - 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", ovs_strerror(error)); - null_fd = -error; - } - ovsthread_once_done(&once); - } - - return null_fd; -} - int read_fully(int fd, void *p_, size_t size, size_t *bytes_read) { @@ -1089,6 +1057,7 @@ get_mtime(const char *file_name, struct timespec *mtime) } } +#ifndef _WIN32 void xpipe(int fds[2]) { @@ -1104,6 +1073,7 @@ xpipe_nonblocking(int fds[2]) xset_nonblocking(fds[0]); xset_nonblocking(fds[1]); } +#endif static int getsockopt_int(int fd, int level, int option, const char *optname, int *valuep) @@ -1186,7 +1156,7 @@ describe_sockaddr(struct ds *string, int fd, } } #endif -#if AF_PACKET && LINUX_DATAPATH +#if __linux__ else if (ss.ss_family == AF_PACKET) { struct sockaddr_ll sll; @@ -1216,7 +1186,7 @@ describe_sockaddr(struct ds *string, int fd, } -#ifdef LINUX_DATAPATH +#ifdef __linux__ static void put_fd_filename(struct ds *string, int fd) { @@ -1261,7 +1231,7 @@ describe_fd(int fd) : S_ISFIFO(s.st_mode) ? "FIFO" : S_ISLNK(s.st_mode) ? "symbolic link" : "unknown")); -#ifdef LINUX_DATAPATH +#ifdef __linux__ put_fd_filename(&string, fd); #endif }