// 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"
-static void print_sockname(int fd) {
+static char *get_sockname(struct addrinfo *addr) {
static char buf[INET6_ADDRSTRLEN+1];
struct sockaddr_storage local;
int ret;
+ int fd;
+
+ if ((fd = socket(addr->ai_family, SOCK_DGRAM, 0)) == -1) {
+ perror("socket()");
+ return NULL;
+ }
+
+ /* 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, addr->ai_addr, addr->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);
+ 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;
+ return NULL;
}
memset(buf, 0, INET6_ADDRSTRLEN + 1);
buf, sizeof(buf), NULL, 0,
NI_NUMERICHOST)) != 0) {
fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
- printf("no IPv6");
- return;
+ (void)close(fd);
+ return NULL;
}
- printf("%s", buf);
+ (void)close(fd);
+ 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(void) {
struct addrinfo hints;
struct addrinfo *result, *resp;
- static int fd = -1;
+ static struct addrinfo *cached = NULL;
/* To save dns lookups (if they are not cached locally) and creating
* sockets, we save the fd and keep it open. */
- if (fd > -1) {
- print_sockname(fd);
- return;
- }
+ if (cached != NULL)
+ 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
/* 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 ((fd = socket(resp->ai_family, SOCK_DGRAM, 0)) == -1) {
- perror("socket()");
+ 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;
- }
- /* 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;
+ if ((cached = malloc(sizeof(struct addrinfo))) == NULL)
+ return NULL;
+ memcpy(cached, resp, sizeof(struct addrinfo));
+ if ((cached->ai_addr = malloc(resp->ai_addrlen)) == NULL) {
+ cached = NULL;
+ return NULL;
}
-
- free(result);
-
- print_sockname(fd);
-
- return;
+ memcpy(cached->ai_addr, resp->ai_addr, resp->ai_addrlen);
+ freeaddrinfo(result);
+ return addr_string;
}
- free(result);
- printf("no IPv6");
+ freeaddrinfo(result);
+ return NULL;
}
-void print_ipv6_info(const char *format) {
+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();
+ char *outwalk = buffer;
- for (walk = format; *walk != '\0'; walk++) {
+ if (addr_string == NULL) {
+ OUTPUT_FULL_TEXT(format_down);
+ return;
+ }
+
+ for (walk = format_up; *walk != '\0'; walk++) {
if (*walk != '%') {
- putchar(*walk);
+ *(outwalk++) = *walk;
continue;
}
if (strncmp(walk+1, "ip", strlen("ip")) == 0) {
- print_ipv6_addr();
+ outwalk += sprintf(outwalk, "%s", addr_string);
walk += strlen("ip");
}
}
+
+ OUTPUT_FULL_TEXT(buffer);
}
projects / i3 / i3status / blobdiff