Implement %essid and %signal for wireless on OpenBSD.

[i3/i3status] / src / print_ipv6_addr.c

diff --git a/src/print_ipv6_addr.c b/src/print_ipv6_addr.c
index 3ace6a24fe20c0856e22ad7c88802de246a6bbfc..8b11e1fbc2dbc479e3b920a1f7efd9f364b2ea9f 100644 (file)
--- a/src/print_ipv6_addr.c
+++ b/src/print_ipv6_addr.c
@@ -1,13 +1,17 @@
 // vim:ts=8:expandtab
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <stdio.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #include <string.h>
-#include <arpa/inet.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
 #include "i3status.h"
 
@@ -47,7 +51,7 @@ static char *get_sockname(struct addrinfo *addr) {
         if ((ret = getnameinfo((struct sockaddr*)&local, local_len,
                                buf, sizeof(buf), NULL, 0,
                                NI_NUMERICHOST)) != 0) {
-                fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
+                fprintf(stderr, "i3status: getnameinfo(): %s\n", gai_strerror(ret));
                 (void)close(fd);
                 return NULL;
         }
@@ -60,7 +64,7 @@ static char *get_sockname(struct addrinfo *addr) {
  * Returns the IPv6 address with which you have connectivity at the moment.
  * The char * is statically allocated and mustn't be freed
  */
-static char *get_ipv6_addr() {
+static char *get_ipv6_addr(void) {
         struct addrinfo hints;
         struct addrinfo *result, *resp;
         static struct addrinfo *cached = NULL;
@@ -74,10 +78,13 @@ static char *get_ipv6_addr() {
         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
-         * K root server is a pretty safe bet. */
-        if (getaddrinfo("k.root-servers.net", "domain", &hints, &result) != 0) {
+        /* We use the public IPv6 of the K root server here. It doesn’t matter
+         * which IPv6 address we use (we don’t even send any packets), as long
+         * as it’s considered global by the kernel.
+         * NB: We don’t use a hostname since that would trigger a DNS lookup.
+         * By using an IPv6 address, getaddrinfo() will *not* do a DNS lookup,
+         * but return the address in the appropriate struct. */
+        if (getaddrinfo("2001:7fd::1", "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. */
@@ -109,30 +116,30 @@ static char *get_ipv6_addr() {
         return NULL;
 }
 
-void print_ipv6_info(const char *format_up, const char *format_down) {
+void print_ipv6_info(yajl_gen json_gen, char *buffer, 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\":\"");
+        char *outwalk = buffer;
 
         if (addr_string == NULL) {
-                printf("%s", format_down);
+                START_COLOR("color_bad");
+                OUTPUT_FULL_TEXT(format_down);
+                END_COLOR;
                 return;
         }
 
         for (walk = format_up; *walk != '\0'; walk++) {
                 if (*walk != '%') {
-                        putchar(*walk);
+                        *(outwalk++) = *walk;
                         continue;
                 }
 
                 if (strncmp(walk+1, "ip", strlen("ip")) == 0) {
-                        printf("%s", addr_string);
+                        outwalk += sprintf(outwalk, "%s", addr_string);
                         walk += strlen("ip");
                 }
         }
-
-        if (output_format == O_I3BAR)
-                printf("\"}");
+        START_COLOR("color_good");
+        OUTPUT_FULL_TEXT(buffer);
+        END_COLOR;
 }