X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=c11f67c4bac3f7f316daa317ae71ed8ebe6f10a9;hp=ccb9632de9a30f566450cea2e4a62e29bd0c530f;hb=69a294cd641c623db61f46ee86901845789a1c7b;hpb=06e47cd5c6d93afa59eadfa6e2ee89b7415180e0 diff --git a/net.c b/net.c index ccb9632d..c11f67c4 100644 --- a/net.c +++ b/net.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Andre Noll + * Copyright (C) 2005-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -12,6 +12,11 @@ */ #define _GNU_SOURCE +#include +#include +#include +#include +#include #include /* At least NetBSD needs these. */ @@ -328,7 +333,14 @@ static void flowopt_setopts(int sockfd, struct flowopts *fo) } } -static void flowopt_cleanup(struct flowopts *fo) +/** + * Deallocate all resources of a flowopts structure. + * + * \param fo A pointer as returned from flowopt_new(). + * + * It's OK to pass \p NULL here in which case the function does nothing. + */ +void flowopt_cleanup(struct flowopts *fo) { struct pre_conn_opt *cur, *next; @@ -343,7 +355,7 @@ static void flowopt_cleanup(struct flowopts *fo) free(fo); } -/* +/** * Resolve an IPv4/IPv6 address. * * \param l4type The layer-4 type (\p IPPROTO_xxx). @@ -361,7 +373,7 @@ static void flowopt_cleanup(struct flowopts *fo) * * \sa getaddrinfo(3). */ -static int lookup_address(unsigned l4type, bool passive, const char *host, +int lookup_address(unsigned l4type, bool passive, const char *host, int port_number, struct addrinfo **result) { int ret; @@ -398,98 +410,94 @@ static int lookup_address(unsigned l4type, bool passive, const char *host, } /** - * Resolve IPv4/IPv6 address and create a ready-to-use active or passive socket. + * Create an active or passive socket. * - * \param l4type The layer-4 type (\p IPPROTO_xxx). - * \param passive Whether this is a passive or active socket. - * \param host Passed to \ref \a lookup_address(). - * \param port_number Passed to \ref \a lookup_address(). + * \param l4type \p IPPROTO_TCP, \p IPPROTO_UDP, or \p IPPROTO_DCCP. + * \param passive Whether to call bind(2) or connect(2). + * \param ai Address information as obtained from \ref lookup_address(). * \param fo Socket options to be set before making the connection. * - * This creates a ready-made IPv4/v6 socket structure after looking up the - * necessary parameters. - * * bind(2) is called on passive sockets, and connect(2) on active sockets. The * algorithm tries all possible address combinations until it succeeds. If \a - * fo is supplied, options are set and cleanup is performed. + * fo is supplied, options are set but cleanup must be performed in the caller. * - * \return Standard. + * \return File descriptor on success, \p E_MAKESOCK on errors. * - * \sa \ref lookup_address(), ipv6(7), getaddrinfo(3), bind(2), connect(2). + * \sa \ref lookup_address(), \ref makesock(), ip(7), ipv6(7), bind(2), + * connect(2). */ -int makesock(unsigned l4type, bool passive, - const char *host, uint16_t port_number, - struct flowopts *fo) +int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai, + struct flowopts *fo) { - struct addrinfo *local = NULL, *src = NULL, *remote = NULL, *dst = NULL; - int rc, on = 1, sockfd = -1; - - rc = lookup_address(l4type, passive, host, port_number, passive? - &local : &remote); - if (rc < 0) - goto out; - /* Iterate over all src/dst combination, exhausting dst first */ - for (src = local, dst = remote; src != NULL || dst != NULL; /* no op */ ) { - if (src && dst && src->ai_family == AF_INET - && dst->ai_family == AF_INET6) - goto get_next_dst; /* v4 -> v6 is not possible */ - - sockfd = socket(src ? src->ai_family : dst->ai_family, - sock_type(l4type), l4type); - if (sockfd < 0) - goto get_next_dst; + int ret = -E_MAKESOCK, on = 1; + for (; ai; ai = ai->ai_next) { + int fd; + ret = socket(ai->ai_family, sock_type(l4type), l4type); + if (ret < 0) + continue; + fd = ret; + flowopt_setopts(fd, fo); + if (!passive) { + if (connect(fd, ai->ai_addr, ai->ai_addrlen) == 0) + return fd; + close(fd); + continue; + } /* * Reuse the address on passive sockets to avoid failure on * restart (protocols using listen()) and when creating * multiple listener instances (UDP multicast). */ - if (passive && setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, - &on, sizeof(on)) == -1) { - rc = errno; - close(sockfd); - PARA_ERROR_LOG("can not set SO_REUSEADDR: %s\n", - strerror(rc)); - rc = -ERRNO_TO_PARA_ERROR(rc); - break; - } - flowopt_setopts(sockfd, fo); - - if (src) { - if (bind(sockfd, src->ai_addr, src->ai_addrlen) < 0) { - close(sockfd); - goto get_next_src; - } - if (!dst) /* bind-only completed successfully */ - break; + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, + sizeof(on)) == -1) { + close(fd); + continue; } - - if (dst && connect(sockfd, dst->ai_addr, dst->ai_addrlen) == 0) - break; /* connection completed successfully */ - close(sockfd); -get_next_dst: - if (dst && (dst = dst->ai_next)) + if (bind(fd, ai->ai_addr, ai->ai_addrlen) < 0) { + close(fd); continue; -get_next_src: - if (src && (src = src->ai_next)) /* restart inner loop */ - dst = remote; + } + return fd; } -out: - if (local) - freeaddrinfo(local); - if (remote) - freeaddrinfo(remote); - flowopt_cleanup(fo); - - if (src == NULL && dst == NULL) { - if (rc >= 0) - rc = -E_MAKESOCK; + return -E_MAKESOCK; +} + +/** + * Resolve IPv4/IPv6 address and create a ready-to-use active or passive socket. + * + * \param l4type The layer-4 type (\p IPPROTO_xxx). + * \param passive Whether this is a passive or active socket. + * \param host Passed to \ref lookup_address(). + * \param port_number Passed to \ref lookup_address(). + * \param fo Passed to \ref makesock_addrinfo(). + * + * This creates a ready-made IPv4/v6 socket structure after looking up the + * necessary parameters. The function first calls \ref lookup_address() and + * passes the address information to makesock_addrinfo() to create and + * initialize the socket. + * + * \return The newly created file descriptor on success, a negative error code + * on failure. + * + * \sa \ref lookup_address(), \ref makesock_addrinfo(). + */ +int makesock(unsigned l4type, bool passive, const char *host, uint16_t port_number, + struct flowopts *fo) +{ + struct addrinfo *ai; + int ret = lookup_address(l4type, passive, host, port_number, &ai); + + if (ret >= 0) + ret = makesock_addrinfo(l4type, passive, ai, fo); + if (ai) + freeaddrinfo(ai); + if (ret < 0) { PARA_ERROR_LOG("can not create %s socket %s#%d.\n", - layer4_name(l4type), host? host : (passive? - "[loopback]" : "[localhost]"), port_number); - return rc; + layer4_name(l4type), host? host : (passive? + "[loopback]" : "[localhost]"), port_number); } - return sockfd; + return ret; } /** @@ -702,6 +710,32 @@ void extract_v4_addr(const struct sockaddr_storage *ss, struct in_addr *ia) *ia = ((struct sockaddr_in *)sa)->sin_addr; } +/** + * Compare the address part of IPv4/6 addresses. + * + * \param sa1 First address. + * \param sa2 Second address. + * + * \return True iff the IP address of \a sa1 and \a sa2 match. + */ +bool sockaddr_equal(const struct sockaddr *sa1, const struct sockaddr *sa2) +{ + if (!sa1 || !sa2) + return false; + if (sa1->sa_family != sa2->sa_family) + return false; + if (sa1->sa_family == AF_INET) { + struct sockaddr_in *a1 = (typeof(a1))sa1, + *a2 = (typeof (a2))sa2; + return a1->sin_addr.s_addr == a2->sin_addr.s_addr; + } else if (sa1->sa_family == AF_INET6) { + struct sockaddr_in6 *a1 = (typeof(a1))sa1, + *a2 = (typeof (a2))sa2; + return !memcmp(a1, a2, sizeof(*a1)); + } else + return false; +} + /** * Receive data from a file descriptor. *