From 230f3167b70b5d73b3d9c0c650c9a654c06ccb51 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 21 Jul 2009 20:26:53 +0200 Subject: Add modelines and retab! all files --- src/get_ipv6_addr.c | 93 +++++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 46 deletions(-) (limited to 'src/get_ipv6_addr.c') diff --git a/src/get_ipv6_addr.c b/src/get_ipv6_addr.c index 44edc7a..95a06a6 100644 --- a/src/get_ipv6_addr.c +++ b/src/get_ipv6_addr.c @@ -1,3 +1,4 @@ +// vim:ts=8:expandtab #include #include #include @@ -12,50 +13,50 @@ * */ const char *get_ipv6_addr() { - static char buf[INET6_ADDRSTRLEN+1]; - struct addrinfo hints; - struct addrinfo *result, *resp; - int fd; - - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET6; - - if (getaddrinfo("k.root-servers.net", "domain", &hints, &result) != 0) { - perror("getaddrinfo()"); - return "no IP"; - } - - for (resp = result; resp != NULL; resp = resp->ai_next) { - if ((fd = socket(resp->ai_family, SOCK_STREAM, 0)) == -1) { - perror("socket()"); - continue; - } - - if (connect(fd, resp->ai_addr, resp->ai_addrlen) == -1) { - perror("connect()"); - continue; - } - - struct sockaddr_storage local; - socklen_t local_len = sizeof(struct sockaddr_storage); - if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) { - perror("getsockname()"); - return "no IP"; - } - - memset(buf, 0, INET6_ADDRSTRLEN + 1); - int ret; - if ((ret = getnameinfo((struct sockaddr*)&local, local_len, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST)) != 0) { - fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret)); - return "no IP"; - } - - (void)close(fd); - - free(result); - return buf; - } - - free(result); - return "no IP"; + static char buf[INET6_ADDRSTRLEN+1]; + struct addrinfo hints; + struct addrinfo *result, *resp; + int fd; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_INET6; + + if (getaddrinfo("k.root-servers.net", "domain", &hints, &result) != 0) { + perror("getaddrinfo()"); + return "no IP"; + } + + for (resp = result; resp != NULL; resp = resp->ai_next) { + if ((fd = socket(resp->ai_family, SOCK_STREAM, 0)) == -1) { + perror("socket()"); + continue; + } + + if (connect(fd, resp->ai_addr, resp->ai_addrlen) == -1) { + perror("connect()"); + continue; + } + + struct sockaddr_storage local; + socklen_t local_len = sizeof(struct sockaddr_storage); + if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) { + perror("getsockname()"); + return "no IP"; + } + + memset(buf, 0, INET6_ADDRSTRLEN + 1); + int ret; + if ((ret = getnameinfo((struct sockaddr*)&local, local_len, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST)) != 0) { + fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret)); + return "no IP"; + } + + (void)close(fd); + + free(result); + return buf; + } + + free(result); + return "no IP"; } -- cgit v1.2.3