X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=ccb9632de9a30f566450cea2e4a62e29bd0c530f;hp=4a31f013446877e45c780e7eb24a27a0a1042c3a;hb=06e47cd5c6d93afa59eadfa6e2ee89b7415180e0;hpb=5ae09eae1f157cbfcbe6f20c50d559cd6ad4c128 diff --git a/net.c b/net.c index 4a31f013..ccb9632d 100644 --- a/net.c +++ b/net.c @@ -142,9 +142,9 @@ static bool host_string_ok(const char *host) * \param hostlen The maximum length of \a host. * \param port To return the port number (if any) of \a url. * - * \return Pointer to \a host, or NULL if failed. - * If NULL is returned, \a host and \a portnum are undefined. If no - * port number was present in \a url, \a portnum is set to -1. + * \return Pointer to \a host, or \p NULL if failed. If \p NULL is returned, + * \a host and \a port are undefined. If no port number was present in \a url, + * \a port is set to -1. * * \sa RFC 3986, 3.2.2/3.2.3 */ @@ -168,16 +168,16 @@ char *parse_url(const char *url, if (*o++ != ']' || (*o != '\0' && *o != ':')) goto failed; } else { - for (; (*c = *o == ':'? '\0' : *o); c++, o++) - if (c == end) + for (; (*c = *o == ':'? '\0' : *o); c++, o++) { + if (c == end && o[1]) goto failed; + } } if (*o == ':') if (para_atoi32(++o, port) < 0 || *port < 0 || *port > 0xffff) goto failed; - if (host_string_ok(host)) return host; failed: @@ -343,76 +343,91 @@ static void flowopt_cleanup(struct flowopts *fo) free(fo); } -/** - * Resolve IPv4/IPv6 address and create a ready-to-use active or passive socket. +/* + * Resolve an IPv4/IPv6 address. * * \param l4type The layer-4 type (\p IPPROTO_xxx). - * \param passive Whether this is a passive (1) or active (0) socket. + * \param passive Whether \p AI_PASSIVE should be included as hint. * \param host Remote or local hostname or IPv/6 address string. - * \param port_number Decimal port number. - * \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. The interpretation of \a host depends on the value of - * \a passive: - * - on a passive socket host is interpreted as an interface IPv4/6 address - * (can be left NULL); - * - on an active socket, \a host is the peer DNS name or IPv4/6 address - * to connect to; - * - \a port_number is in either case the numeric port number (not service - * string). + * \param port_number Used to set the port in each returned address structure. + * \param result addrinfo structures are returned here. * - * Furthermore, 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. + * The interpretation of \a host depends on the value of \a passive. On a + * passive socket host is interpreted as an interface IPv4/6 address (can be + * left NULL). On an active socket, \a host is the peer DNS name or IPv4/6 + * address to connect to. * - * \return This function returns 1 on success and \a -E_ADDRESS_LOOKUP when no - * matching connection could be set up (with details in the error log). + * \return Standard. * - * \sa ipv6(7), getaddrinfo(3), bind(2), connect(2). + * \sa getaddrinfo(3). */ -int makesock(unsigned l4type, bool passive, - const char *host, uint16_t port_number, - struct flowopts *fo) +static int lookup_address(unsigned l4type, bool passive, const char *host, + int port_number, struct addrinfo **result) { - struct addrinfo *local = NULL, *src = NULL, *remote = NULL, - *dst = NULL, hints; - unsigned int l3type = AF_UNSPEC; - int rc, on = 1, sockfd = -1, - socktype = sock_type(l4type); + int ret; char port[6]; /* port number has at most 5 digits */ + struct addrinfo *addr = NULL, hints; - sprintf(port, "%u", port_number); + *result = NULL; + sprintf(port, "%u", port_number & 0xffff); /* Set up address hint structure */ memset(&hints, 0, sizeof(hints)); - hints.ai_family = l3type; - hints.ai_socktype = socktype; - /* + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = sock_type(l4type); + /* * getaddrinfo does not support SOCK_DCCP, so for the sake of lookup * (and only then) pretend to be UDP. */ if (l4type == IPPROTO_DCCP) hints.ai_socktype = SOCK_DGRAM; - /* only use addresses available on the host */ hints.ai_flags = AI_ADDRCONFIG; - if (l3type == AF_INET6) - /* use v4-mapped-v6 if no v6 addresses found */ - hints.ai_flags |= AI_V4MAPPED | AI_ALL; - if (passive && host == NULL) hints.ai_flags |= AI_PASSIVE; - /* Obtain local/remote address information */ - if ((rc = getaddrinfo(host, port, &hints, passive ? &local : &remote))) { - PARA_ERROR_LOG("can not resolve %s address %s#%s: %s.\n", - layer4_name(l4type), - host? host : (passive? "[loopback]" : "[localhost]"), - port, gai_strerror(rc)); - rc = -E_ADDRESS_LOOKUP; - goto out; + ret = getaddrinfo(host, port, &hints, &addr); + if (ret != 0) { + PARA_ERROR_LOG("can not resolve %s address %s#%s: %s\n", + layer4_name(l4type), + host? host : (passive? "[loopback]" : "[localhost]"), + port, gai_strerror(ret)); + return -E_ADDRESS_LOOKUP; } + *result = addr; + return 1; +} + +/** + * 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 \a lookup_address(). + * \param port_number Passed to \ref \a 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. + * + * \return Standard. + * + * \sa \ref lookup_address(), ipv6(7), getaddrinfo(3), bind(2), connect(2). + */ +int makesock(unsigned l4type, bool passive, + const char *host, uint16_t port_number, + 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 @@ -420,7 +435,7 @@ int makesock(unsigned l4type, bool passive, goto get_next_dst; /* v4 -> v6 is not possible */ sockfd = socket(src ? src->ai_family : dst->ai_family, - socktype, l4type); + sock_type(l4type), l4type); if (sockfd < 0) goto get_next_dst; @@ -469,9 +484,9 @@ out: if (src == NULL && dst == NULL) { if (rc >= 0) rc = -E_MAKESOCK; - PARA_ERROR_LOG("can not create %s socket %s#%s.\n", + PARA_ERROR_LOG("can not create %s socket %s#%d.\n", layer4_name(l4type), host? host : (passive? - "[loopback]" : "[localhost]"), port); + "[loopback]" : "[localhost]"), port_number); return rc; } return sockfd;