From f947d0a446b1b99020722cbc71127fc0c06086b2 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 11 Oct 2009 22:11:09 +0200 Subject: Breaks configfiles! Major refactoring of i3status, see below MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We finally switched to libconfuse for a configuration file format which does not require much work for the programmer nor for the user. Plus, it avoids the Not-Invented-Here syndrome of yet another config file format. Furthermore, as a consequence of providing format strings for every "module" (ipv6, wireless, …), we directly print the output and thus we needed to drop support for wmii. This allowed us to get rid of quite some complexity. Documentation about the new configuration file and options will follow. This commit is the beginning of what will be i3status v2.0. --- src/get_ipv6_addr.c | 79 ----------------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 src/get_ipv6_addr.c (limited to 'src/get_ipv6_addr.c') diff --git a/src/get_ipv6_addr.c b/src/get_ipv6_addr.c deleted file mode 100644 index 341b5ba..0000000 --- a/src/get_ipv6_addr.c +++ /dev/null @@ -1,79 +0,0 @@ -// vim:ts=8:expandtab -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Returns the IPv6 address with which you have connectivity at the moment. - * - */ -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; - - /* We resolve the K root server to get a public IPv6 address. You can - * replace this with any other host which has an AAAA record, but the - * K root server is a pretty safe bet. */ - if (getaddrinfo("k.root-servers.net", "domain", &hints, &result) != 0) { - /* We don’t display the error here because most - * likely, there just is no connectivity. - * Thus, don’t spam the user’s console. */ - return "no IPv6"; - } - - for (resp = result; resp != NULL; resp = resp->ai_next) { - if ((fd = socket(resp->ai_family, SOCK_DGRAM, 0)) == -1) { - perror("socket()"); - continue; - } - - /* Since the socket was created with SOCK_DGRAM, this is - * actually not establishing a connection or generating - * any other network traffic. Instead, as a side-effect, - * it saves the local address with which packets would - * be sent to the destination. */ - if (connect(fd, resp->ai_addr, resp->ai_addrlen) == -1) { - /* We don’t display the error here because most - * likely, there just is no IPv6 connectivity. - * Thus, don’t spam the user’s console but just - * try the next address. */ - (void)close(fd); - continue; - } - - struct sockaddr_storage local; - socklen_t local_len = sizeof(struct sockaddr_storage); - if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) { - perror("getsockname()"); - (void)close(fd); - return "no IPv6"; - } - - (void)close(fd); - - 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 IPv6"; - } - - free(result); - return buf; - } - - free(result); - return "no IPv6"; -} -- cgit v1.2.3