X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fsocket-util.c;h=d2ee8ea4fb7ad9267dc0132d3d55e0c390bf9eb9;hb=84a0ee89e29cdae2b9cc80ae383a1222ba4f5ad5;hp=e400bb543abc1cdbf34919aa84e9d111083c0849;hpb=8a8eb867724ccbfe5e5130c5b604b51c86de3b9f;p=sliver-openvswitch.git diff --git a/lib/socket-util.c b/lib/socket-util.c index e400bb543..d2ee8ea4f 100644 --- a/lib/socket-util.c +++ b/lib/socket-util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -249,6 +249,7 @@ make_unix_socket(int style, bool nonblock, bool passcred UNUSED, make_sockaddr_un(connect_path, &un, &un_len); if (connect(fd, (struct sockaddr*) &un, un_len) && errno != EINPROGRESS) { + printf("connect failed with %s\n", strerror(errno)); goto error; } } @@ -265,10 +266,10 @@ make_unix_socket(int style, bool nonblock, bool passcred UNUSED, return fd; error: + error = errno == EAGAIN ? EPROTO : errno; if (bind_path) { fatal_signal_remove_file_to_unlink(bind_path); } - error = errno; close(fd); return -error; } @@ -291,10 +292,12 @@ guess_netmask(uint32_t ip) : htonl(0)); /* ??? */ } -/* Opens a non-blocking TCP socket and connects to 'target', which should be a - * string in the format "[:]". is required. If - * 'default_port' is nonzero then is optional and defaults to - * 'default_port'. +/* Opens a non-blocking IPv4 socket of the specified 'style' and connects to + * 'target', which should be a string in the format "[:]". + * is required. If 'default_port' is nonzero then is optional and + * defaults to 'default_port'. + * + * 'style' should be SOCK_STREAM (for TCP) or SOCK_DGRAM (for UDP). * * On success, returns 0 (indicating connection complete) or EAGAIN (indicating * connection in progress), in which case the new file descriptor is stored @@ -304,8 +307,8 @@ guess_netmask(uint32_t ip) * If 'sinp' is non-null, then on success the target address is stored into * '*sinp'. */ int -tcp_open_active(const char *target_, uint16_t default_port, - struct sockaddr_in *sinp, int *fdp) +inet_open_active(int style, const char *target_, uint16_t default_port, + struct sockaddr_in *sinp, int *fdp) { char *target = xstrdup(target_); char *save_ptr = NULL; @@ -343,7 +346,7 @@ tcp_open_active(const char *target_, uint16_t default_port, } /* Create non-blocking socket. */ - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = socket(AF_INET, style, 0); if (fd < 0) { VLOG_ERR("%s: socket: %s", target_, strerror(errno)); error = errno; @@ -380,25 +383,37 @@ exit: return error; } -/* Opens a non-blocking TCP socket, binds to 'target', and listens for incoming - * connections. 'target' should be a string in the format "[][:]". - * may be omitted if 'default_port' is nonzero, in which case it - * defaults to 'default_port'. If is omitted it defaults to the wildcard - * IP address. +/* Opens a non-blocking IPv4 socket of the specified 'style', binds to + * 'target', and listens for incoming connections. 'target' should be a string + * in the format "[][:]": + * + * - If 'default_port' is -1, then is required. Otherwise, if + * is omitted, then 'default_port' is used instead. + * + * - If (or 'default_port', if used) is 0, then no port is bound + * and the TCP/IP stack will select a port. + * + * - If is omitted then the IP address is wildcarded. * - * The socket will have SO_REUSEADDR turned on. + * 'style' should be SOCK_STREAM (for TCP) or SOCK_DGRAM (for UDP). + * + * For TCP, the socket will have SO_REUSEADDR turned on. * * On success, returns a non-negative file descriptor. On failure, returns a - * negative errno value. */ + * negative errno value. + * + * If 'sinp' is non-null, then on success the bound address is stored into + * '*sinp'. */ int -tcp_open_passive(const char *target_, uint16_t default_port) +inet_open_passive(int style, const char *target_, int default_port, + struct sockaddr_in *sinp) { char *target = xstrdup(target_); char *string_ptr = target; struct sockaddr_in sin; const char *host_name; const char *port_string; - int fd, error; + int fd, error, port; unsigned int yes = 1; /* Address defaults. */ @@ -409,9 +424,9 @@ tcp_open_passive(const char *target_, uint16_t default_port) /* Parse optional port number. */ port_string = strsep(&string_ptr, ":"); - if (port_string && atoi(port_string)) { - sin.sin_port = htons(atoi(port_string)); - } else if (!default_port) { + if (port_string && str_to_int(port_string, 10, &port)) { + sin.sin_port = htons(port); + } else if (default_port < 0) { VLOG_ERR("%s: port number must be specified", target_); error = EAFNOSUPPORT; goto exit; @@ -427,7 +442,7 @@ tcp_open_passive(const char *target_, uint16_t default_port) } /* Create non-blocking socket, set SO_REUSEADDR. */ - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = socket(AF_INET, style, 0); if (fd < 0) { error = errno; VLOG_ERR("%s: socket: %s", target_, strerror(error)); @@ -437,7 +452,8 @@ tcp_open_passive(const char *target_, uint16_t default_port) if (error) { goto exit_close; } - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes) < 0) { + 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)); goto exit_close; @@ -456,6 +472,21 @@ tcp_open_passive(const char *target_, uint16_t default_port) VLOG_ERR("%s: listen: %s", target_, strerror(error)); goto exit_close; } + + if (sinp) { + socklen_t sin_len = sizeof sin; + if (getsockname(fd, (struct sockaddr *) &sin, &sin_len) < 0){ + error = errno; + VLOG_ERR("%s: getsockname: %s", target_, strerror(error)); + goto exit_close; + } + if (sin.sin_family != AF_INET || sin_len != sizeof sin) { + VLOG_ERR("%s: getsockname: invalid socket name", target_); + goto exit_close; + } + *sinp = sin; + } + error = 0; goto exit;