Removed `gethostbyname' and replaced with protocol independend `getaddrinfo'

[collectd.git] / src / configfile.c

diff --git a/src/configfile.c b/src/configfile.c
index ed8cb77e438138aa01044f063d5f64bb94914936..c217724ad94c46b3ed39b946d66908b3293f3ad9 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -27,8 +27,10 @@
 
 #include "libconfig/libconfig.h"
 
+#include "common.h"
 #include "plugin.h"
 #include "configfile.h"
+#include "network.h"
 #include "utils_debug.h"
 
 #define SHORTOPT_NONE 0
@@ -67,13 +69,15 @@ typedef struct cf_mode_item
  */
 static cf_mode_item_t cf_mode_list[] =
 {
+       /*
        {"Server",      NULL, MODE_CLIENT                           },
        {"Port",        NULL, MODE_CLIENT | MODE_SERVER             },
+       */
        {"PIDFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
-       {"DataDir",     NULL, MODE_SERVER |               MODE_LOCAL},
-       {"LogFile",     NULL, MODE_SERVER | MODE_SERVER | MODE_LOCAL}
+       {"DataDir",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
+       {"LogFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL}
 };
-static int cf_mode_num = 5;
+static int cf_mode_num = 3;
 
 static int nesting_depth = 0;
 static char *current_module = NULL;
@@ -376,6 +380,49 @@ int cf_callback_mode_switch (const char *shortvar, const char *var,
        return (LC_CBRET_OKAY);
 }
 
+int cf_callback_socket (const char *shortvar, const char *var,
+               const char *arguments, const char *value, lc_flags_t flags,
+               void *extra)
+{
+       char *buffer;
+
+       char *fields[3];
+       int   numfields;
+
+       char *node;
+       char *service = NET_DEFAULT_PORT;
+
+       DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
+                       shortvar, var, arguments, value);
+
+       buffer = strdup (value);
+       if (buffer == NULL)
+               return (LC_CBRET_ERROR);
+
+       numfields = strsplit (buffer, fields, 3);
+
+       if ((numfields != 1) && (numfields != 2))
+       {
+               syslog (LOG_ERR, "Invalid number of arguments to `%s'",
+                               shortvar);
+               free (buffer);
+               return (LC_CBRET_ERROR);
+       }
+
+       node = fields[0];
+       if (numfields == 2)
+               service = fields[1];
+
+       /* Still return `LC_CBRET_OKAY' because this is not an syntax error */
+       if (network_create_socket (node, service) < 1)
+               syslog (LOG_ERR, "network_create_socket (%s, %s) failed",
+                               node, service);
+
+       free (buffer);
+
+       return (LC_CBRET_OKAY);
+}
+
 /*
  * `cf_callback_plugin'
  *   Start/end section `plugin'
@@ -484,6 +531,11 @@ void cf_init (void)
        lc_register_callback ("LoadPlugin", SHORTOPT_NONE,
                        LC_VAR_STRING, cf_callback_mode_loadmodule, NULL);
 
+       lc_register_callback ("Listen", SHORTOPT_NONE,
+                       LC_VAR_STRING, cf_callback_socket, NULL);
+       lc_register_callback ("Server", SHORTOPT_NONE,
+                       LC_VAR_STRING, cf_callback_socket, NULL);
+
        for (i = 0; i < cf_mode_num; i++)
        {
                cf_mode_item_t *item;