X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fnet%2F_info;h=5ac83f95cec1763d27490512c4cfa98d1bf594a9;hp=0b38c440061fd77776091e8813c26e10f14c4937;hb=291237b4fed863be74051274ac5ad9920cb33cc3;hpb=04a42d50a02645aca83d7dc02d8e9838540e818d diff --git a/ccan/net/_info b/ccan/net/_info index 0b38c440..5ac83f95 100644 --- a/ccan/net/_info +++ b/ccan/net/_info @@ -1,10 +1,13 @@ -#include #include "config.h" +#include +#include /** - * net - simple IPv4/IPv6 client library + * net - simple IPv4/IPv6 socket library * - * This code makes it simple to support IPv4 and IPv6 without speed penalty. + * This code makes it simple to support IPv4 and IPv6 without speed penalty + * in clients by using non-blocking simultaneous connect, and using + * a convenience function to create both IPv4 and IPv6 sockets for servers. * * License: MIT * @@ -14,6 +17,7 @@ * #include * #include * #include + * #include * #include * #include * @@ -22,8 +26,12 @@ * struct addrinfo *addr; * const char *dest, *port; * int fd; - * struct sockaddr saddr; - * socklen_t slen = sizeof(saddr); + * union { + * struct sockaddr s; + * struct sockaddr_in v4; + * struct sockaddr_in6 v6; + * } u; + * socklen_t slen = sizeof(u); * * if (argc == 2) { * dest = argv[1]; @@ -42,10 +50,10 @@ * if (fd < 0) * err(1, "Failed to connect to %s", dest); * - * if (getsockname(fd, &saddr, &slen) == 0) + * if (getsockname(fd, &u.s, &slen) == 0) * printf("Connected via %s\n", - * saddr.sa_family == AF_INET6 ? "IPv6" - * : saddr.sa_family == AF_INET ? "IPv4" + * u.s.sa_family == AF_INET6 ? "IPv6" + * : u.s.sa_family == AF_INET ? "IPv4" * : "UNKNOWN??"); * else * err(1, "Failed to get socket type for connection");