Allow method to pass execgraph arguments containing spaces.

[monky] / src / read_tcp.c

diff --git a/src/read_tcp.c b/src/read_tcp.c
index c7fbdd6..dd935c5 100644 (file)
--- a/src/read_tcp.c
+++ b/src/read_tcp.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -28,45 +28,76 @@
  *
  */
 
+#include "conky.h"
 #include "logging.h"
 #include "text_object.h"
+#include <netdb.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <netinet/in.h>
+
+struct read_tcp_data {
+       char *host;
+       unsigned int port;
+};
 
 void parse_read_tcp_arg(struct text_object *obj, const char *arg, void *free_at_crash)
 {
-       obj->data.read_tcp.host = malloc(text_buffer_size);
-       sscanf(arg, "%s", obj->data.read_tcp.host);
-       sscanf(arg+strlen(obj->data.read_tcp.host), "%u", &(obj->data.read_tcp.port));
-       if(obj->data.read_tcp.port == 0) {
-               obj->data.read_tcp.port = atoi(obj->data.read_tcp.host);
-               strcpy(obj->data.read_tcp.host,"localhost");
+       struct read_tcp_data *rtd;
+
+       rtd = malloc(sizeof(struct read_tcp_data));
+       memset(rtd, 0, sizeof(struct read_tcp_data));
+
+       rtd->host = malloc(text_buffer_size);
+       sscanf(arg, "%s", rtd->host);
+       sscanf(arg+strlen(rtd->host), "%u", &(rtd->port));
+       if(rtd->port == 0) {
+               rtd->port = atoi(rtd->host);
+               strcpy(rtd->host,"localhost");
        }
-       if(obj->data.read_tcp.port < 1 || obj->data.read_tcp.port > 65535)
+       if(rtd->port < 1 || rtd->port > 65535)
                CRIT_ERR(obj, free_at_crash, "read_tcp: Needs \"(host) port\" as argument(s)");
 
-       obj->data.read_tcp.port = htons(obj->data.read_tcp.port);
+       rtd->port = htons(rtd->port);
+       obj->data.opaque = rtd;
 }
 
 void print_read_tcp(struct text_object *obj, char *p, int p_max_size)
 {
        int sock, received;
-       struct sockaddr_in addr;
-       struct hostent* he;
        fd_set readfds;
        struct timeval tv;
+       struct read_tcp_data *rtd = obj->data.opaque;
+       struct addrinfo hints;
+       struct addrinfo* airesult, *rp;
+       char portbuf[8];
+
+       if (!rtd)
+               return;
 
-       if (!(he = gethostbyname(obj->data.read_tcp.host))) {
+       memset(&hints, 0, sizeof(struct addrinfo));
+       hints.ai_family = AF_UNSPEC;
+       hints.ai_socktype = SOCK_STREAM;
+       hints.ai_flags = 0;
+       hints.ai_protocol = 0;
+       snprintf(portbuf, 8, "%d", rtd->port);
+       if (getaddrinfo(rtd->host, portbuf, &hints, &airesult)) {
                NORM_ERR("read_tcp: Problem with resolving the hostname");
                return;
        }
-       if ((sock = socket(he->h_addrtype, SOCK_STREAM, 0)) == -1) {
-               NORM_ERR("read_tcp: Couldn't create a socket");
-               return;
+       for (rp = airesult; rp != NULL; rp = rp->ai_next) {
+               sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+               if (sock == -1) {
+                       continue;
+               }
+               if (connect(sock, rp->ai_addr, rp->ai_addrlen) != -1) {
+                       break;
+               }
+               close(sock);
        }
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_port = obj->data.read_tcp.port;
-       memcpy(&addr.sin_addr, he->h_addr, he->h_length);
-       if (!connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr))) {
+       freeaddrinfo(airesult);
+       if (rp == NULL) {
                NORM_ERR("read_tcp: Couldn't create a connection");
                return;
        }
@@ -83,6 +114,13 @@ void print_read_tcp(struct text_object *obj, char *p, int p_max_size)
 
 void free_read_tcp(struct text_object *obj)
 {
-       if (obj->data.read_tcp.host)
-               free(obj->data.read_tcp.host);
+       struct read_tcp_data *rtd = obj->data.opaque;
+
+       if (!rtd)
+               return;
+
+       if (rtd->host)
+               free(rtd->host);
+       free(obj->data.opaque);
+       obj->data.opaque = NULL;
 }