Implement the i3bar JSON protocol

[i3/i3status] / src / print_ipv6_addr.c

diff --git a/src/print_ipv6_addr.c b/src/print_ipv6_addr.c
index b9486bee09f73cc99bac6e8aa7b38f43e9eed69d..3ace6a24fe20c0856e22ad7c88802de246a6bbfc 100644 (file)
--- a/src/print_ipv6_addr.c
+++ b/src/print_ipv6_addr.c
@@ -9,7 +9,9 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-static bool print_sockname(struct addrinfo *addr) {
+#include "i3status.h"
+
+static char *get_sockname(struct addrinfo *addr) {
         static char buf[INET6_ADDRSTRLEN+1];
         struct sockaddr_storage local;
         int ret;
@@ -17,7 +19,7 @@ static bool print_sockname(struct addrinfo *addr) {
 
         if ((fd = socket(addr->ai_family, SOCK_DGRAM, 0)) == -1) {
                 perror("socket()");
-                return false;
+                return NULL;
         }
 
         /* Since the socket was created with SOCK_DGRAM, this is
@@ -31,16 +33,14 @@ static bool print_sockname(struct addrinfo *addr) {
                  * Thus, don’t spam the user’s console but just
                  * try the next address. */
                 (void)close(fd);
-                return false;
+                return NULL;
         }
 
-
         socklen_t local_len = sizeof(struct sockaddr_storage);
         if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) {
                 perror("getsockname()");
                 (void)close(fd);
-                printf("no IPv6");
-                return true;
+                return NULL;
         }
 
         memset(buf, 0, INET6_ADDRSTRLEN + 1);
@@ -49,20 +49,18 @@ static bool print_sockname(struct addrinfo *addr) {
                                NI_NUMERICHOST)) != 0) {
                 fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
                 (void)close(fd);
-                printf("no IPv6");
-                return true;
+                return NULL;
         }
 
         (void)close(fd);
-        printf("%s", buf);
-        return true;
+        return buf;
 }
 
 /*
  * Returns the IPv6 address with which you have connectivity at the moment.
- *
+ * The char * is statically allocated and mustn't be freed
  */
-static void print_ipv6_addr() {
+static char *get_ipv6_addr() {
         struct addrinfo hints;
         struct addrinfo *result, *resp;
         static struct addrinfo *cached = NULL;
@@ -70,11 +68,11 @@ static void print_ipv6_addr() {
         /* To save dns lookups (if they are not cached locally) and creating
          * sockets, we save the fd and keep it open. */
         if (cached != NULL)
-                if (print_sockname(cached))
-                        return;
+                return get_sockname(cached);
 
         memset(&hints, 0, sizeof(struct addrinfo));
         hints.ai_family = AF_INET6;
+        hints.ai_socktype = SOCK_DGRAM;
 
         /* 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
@@ -83,42 +81,58 @@ static void print_ipv6_addr() {
                 /* We don’t display the error here because most
                  * likely, there just is no connectivity.
                  * Thus, don’t spam the user’s console. */
-                printf("no IPv6");
-                return;
+                return NULL;
         }
 
         for (resp = result; resp != NULL; resp = resp->ai_next) {
-                if (!print_sockname(resp))
+                char *addr_string = get_sockname(resp);
+                /* If we could not get our own address and there is more than
+                 * one result for resolving k.root-servers.net, we cannot
+                 * cache. Otherwise, no matter if we got IPv6 connectivity or
+                 * not, we will cache the (single) result and are done. */
+                if (!addr_string && result->ai_next != NULL)
                         continue;
 
                 if ((cached = malloc(sizeof(struct addrinfo))) == NULL)
-                        return;
+                        return NULL;
                 memcpy(cached, resp, sizeof(struct addrinfo));
                 if ((cached->ai_addr = malloc(resp->ai_addrlen)) == NULL) {
                         cached = NULL;
-                        return;
+                        return NULL;
                 }
                 memcpy(cached->ai_addr, resp->ai_addr, resp->ai_addrlen);
                 freeaddrinfo(result);
-                return;
+                return addr_string;
         }
 
         freeaddrinfo(result);
-        printf("no IPv6");
+        return NULL;
 }
 
-void print_ipv6_info(const char *format) {
+void print_ipv6_info(const char *format_up, const char *format_down) {
         const char *walk;
+        char *addr_string = get_ipv6_addr();
+
+        if (output_format == O_I3BAR)
+                printf("{\"name\":\"ipv6\", \"full_text\":\"");
 
-        for (walk = format; *walk != '\0'; walk++) {
+        if (addr_string == NULL) {
+                printf("%s", format_down);
+                return;
+        }
+
+        for (walk = format_up; *walk != '\0'; walk++) {
                 if (*walk != '%') {
                         putchar(*walk);
                         continue;
                 }
 
                 if (strncmp(walk+1, "ip", strlen("ip")) == 0) {
-                        print_ipv6_addr();
+                        printf("%s", addr_string);
                         walk += strlen("ip");
                 }
         }
+
+        if (output_format == O_I3BAR)
+                printf("\"}");
 }