Corrected some defines and the handling of `io_master_port'.

[collectd.git] / src / configfile.c

diff --git a/src/configfile.c b/src/configfile.c
index 21fcc8d..e7eb981 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -20,15 +20,14 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-/* TODO
- * make internal-only functions `static' */
-
 #include "collectd.h"
 
 #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,11 +66,10 @@ typedef struct cf_mode_item
  */
 static cf_mode_item_t cf_mode_list[] =
 {
-       {"Server",      NULL,             MODE_CLIENT                           },
-       {"Port",        NULL,             MODE_CLIENT | MODE_SERVER             },
-       {"PIDFile",     PIDFILE,          MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
-       {"DataDir",     PKGLOCALSTATEDIR, MODE_SERVER |               MODE_LOCAL},
-       {"LogFile",     LOGFILE,          MODE_SERVER | MODE_SERVER | MODE_LOCAL},
+       {"TimeToLive",  NULL, MODE_CLIENT                           },
+       {"PIDFile",     NULL, MODE_CLIENT | 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 = 4;
 
@@ -79,14 +77,14 @@ static int nesting_depth = 0;
 static char *current_module = NULL;
 
 /* `cf_register' needs this prototype */
-int cf_callback_plugin_dispatch (const char *, const char *, const char *,
-               const char *, lc_flags_t, void *);
+static int cf_callback_plugin_dispatch (const char *, const char *,
+               const char *, const char *, lc_flags_t, void *);
 
 /*
  * Functions to handle register/unregister, search, and other plugin related
  * stuff
  */
-cf_callback_t *cf_search (char *type)
+static cf_callback_t *cf_search (char *type)
 {
        cf_callback_t *cf_cb;
 
@@ -100,7 +98,7 @@ cf_callback_t *cf_search (char *type)
        return (cf_cb);
 }
 
-int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
+static int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 {
        cf_callback_t *cf_cb;
        char *key;
@@ -112,7 +110,7 @@ int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 
        if ((cf_cb = cf_search (type)) == NULL)
        {
-               syslog (LOG_WARNING, "Plugin `%s' did not register a callback.\n", type);
+               syslog (LOG_WARNING, "Plugin `%s' did not register a callback.", type);
                return (-1);
        }
 
@@ -136,11 +134,13 @@ int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
        }
 
        if (i >= cf_cb->keys_num)
-               syslog (LOG_WARNING, "Plugin `%s' did not register for value `%s'.\n", type, key);
+               syslog (LOG_WARNING, "Plugin `%s' did not register for value `%s'.", type, key);
 
        free (key);
        free (value);
 
+       DBG ("return (%i)", ret);
+
        return (ret);
 }
 
@@ -207,7 +207,7 @@ void cf_register (char *type,
 /*
  * Other query functions
  */
-char *cf_get_mode_option (const char *key)
+char *cf_get_option (const char *key, char *def)
 {
        int i;
 
@@ -216,8 +216,12 @@ char *cf_get_mode_option (const char *key)
                if ((cf_mode_list[i].mode & operating_mode) == 0)
                        continue;
 
-               if (strcasecmp (cf_mode_list[i].key, key) == 0)
+               if (strcasecmp (cf_mode_list[i].key, key) != 0)
+                       continue;
+
+               if (cf_mode_list[i].value != NULL)
                        return (cf_mode_list[i].value);
+               return (def);
        }
 
        return (NULL);
@@ -233,7 +237,7 @@ char *cf_get_mode_option (const char *key)
  *
  * Mode `value'
  */
-int cf_callback_mode (const char *shortvar, const char *var,
+static int cf_callback_mode (const char *shortvar, const char *var,
                const char *arguments, const char *value, lc_flags_t flags,
                void *extra)
 {
@@ -263,7 +267,7 @@ int cf_callback_mode (const char *shortvar, const char *var,
  *   PluginDir `value'
  * </Mode>
  */
-int cf_callback_mode_plugindir (const char *shortvar, const char *var,
+static int cf_callback_mode_plugindir (const char *shortvar, const char *var,
                const char *arguments, const char *value, lc_flags_t flags,
                void *extra)
 {
@@ -275,7 +279,7 @@ int cf_callback_mode_plugindir (const char *shortvar, const char *var,
        return (LC_CBRET_OKAY);
 }
 
-int cf_callback_mode_option (const char *shortvar, const char *var,
+static int cf_callback_mode_option (const char *shortvar, const char *var,
                const char *arguments, const char *value, lc_flags_t flags,
                void *extra)
 {
@@ -327,7 +331,7 @@ int cf_callback_mode_option (const char *shortvar, const char *var,
  *   LoadPlugin `value'
  * </Mode>
  */
-int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
+static int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
                const char *arguments, const char *value, lc_flags_t flags,
                void *extra)
 {
@@ -342,33 +346,46 @@ int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
        return (LC_CBRET_OKAY);
 }
 
-/*
- * `cf_callback_mode_switch'
- *   Change the contents of the global variable `operating_mode'
- *
- *   This should be command line options. One *can* do this in the config
- *   files, but I will not document this. Don't whine abount it not working as
- *   you expect if you do it anyways.
- */
-int cf_callback_mode_switch (const char *shortvar, const char *var,
+static 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);
 
-       if (strcasecmp (shortvar, "Client") == 0)
-               operating_mode = MODE_CLIENT;
-       else if (strcasecmp (shortvar, "Local") == 0)
-               operating_mode = MODE_LOCAL;
-       else if (strcasecmp (shortvar, "Server") == 0)
-               operating_mode = MODE_SERVER;
-       else
+       buffer = strdup (value);
+       if (buffer == NULL)
+               return (LC_CBRET_ERROR);
+
+       numfields = strsplit (buffer, fields, 3);
+
+       if ((numfields != 1) && (numfields != 2))
        {
-               fprintf (stderr, "cf_callback_mode_switch: Wrong mode!\n");
+               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);
 }
 
@@ -380,7 +397,7 @@ int cf_callback_mode_switch (const char *shortvar, const char *var,
  *   ...
  * </Plugin>
  */
-int cf_callback_plugin (const char *shortvar, const char *var,
+static int cf_callback_plugin (const char *shortvar, const char *var,
                const char *arguments, const char *value, lc_flags_t flags,
                void *extra)
 {
@@ -441,7 +458,7 @@ int cf_callback_plugin (const char *shortvar, const char *var,
  *   `var' `value'
  * </Plugin>
  */
-int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
+static int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
                const char *arguments, const char *value, lc_flags_t flags,
                void *extra)
 {
@@ -461,7 +478,7 @@ int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
        return (LC_CBRET_OKAY);
 }
 
-void cf_init (void)
+static void cf_init (void)
 {
        static int run_once = 0;
        int i;
@@ -470,13 +487,6 @@ void cf_init (void)
                return;
        run_once = 1;
 
-       lc_register_callback ("Client", SHORTOPT_NONE, LC_VAR_NONE,
-                       cf_callback_mode_switch, NULL);
-       lc_register_callback ("Local", SHORTOPT_NONE, LC_VAR_NONE,
-                       cf_callback_mode_switch, NULL);
-       lc_register_callback ("Server", SHORTOPT_NONE, LC_VAR_NONE,
-                       cf_callback_mode_switch, NULL);
-
        lc_register_callback ("Mode", SHORTOPT_NONE, LC_VAR_STRING,
                        cf_callback_mode, NULL);
        lc_register_callback ("Plugin", SHORTOPT_NONE, LC_VAR_SECTION,
@@ -487,17 +497,18 @@ 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++)
        {
-               char            longvar[256];
                cf_mode_item_t *item;
 
                item = &cf_mode_list[i];
 
-               if (snprintf (longvar, 256, "Mode.%s", item->key) >= 256)
-                       continue;
-
-               lc_register_callback (longvar, SHORTOPT_NONE, LC_VAR_STRING,
+               lc_register_callback (item->key, SHORTOPT_NONE, LC_VAR_STRING,
                                cf_callback_mode_option, (void *) item);
        }
 }