X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=f4e9c604fe26cafd75ee04620158b11f5aed6726;hb=06ba160c0d9d9d3e181bf93ff41c6af4a0305349;hp=39265868eac9dfb3eee7e2c79221c5be2c92c4d2;hpb=a92f2c43e37614bb400e7a2fcd2f9f161b695901;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 39265868..f4e9c604 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -22,74 +22,81 @@
 
 #include "collectd.h"
 
-#include "libconfig/libconfig.h"
+#include "liboconfig/oconfig.h"
 
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
-#include "network.h"
-#include "utils_debug.h"
-
-#define SHORTOPT_NONE 0
-
-#define ERR_NOT_NESTED "Sections cannot be nested.\n"
-#define ERR_SECTION_ONLY "`%s' can only be used as section.\n"
-#define ERR_NEEDS_ARG "Section `%s' needs an argument.\n"
-#define ERR_NEEDS_SECTION "`%s' can only be used within a section.\n"
 
 #define ESCAPE_NULL(str) ((str) == NULL ? "(null)" : (str))
 
-#define DEBUG_CALLBACK(shortvar, var, arguments, value) \
-	DBG("shortvar = %s, var = %s, arguments = %s, value = %s, ...", \
-			ESCAPE_NULL(shortvar), \
-			ESCAPE_NULL(var), \
-			ESCAPE_NULL(arguments), \
-			ESCAPE_NULL(value))
-
-extern int operating_mode;
-
+/*
+ * Private types
+ */
 typedef struct cf_callback
 {
-	char  *type;
-	int  (*callback) (char *, char *);
-	char **keys;
+	const char  *type;
+	int  (*callback) (const char *, const char *);
+	const char **keys;
 	int    keys_num;
 	struct cf_callback *next;
 } cf_callback_t;
 
-static cf_callback_t *first_callback = NULL;
+typedef struct cf_complex_callback_s
+{
+	char *type;
+	int (*callback) (oconfig_item_t *);
+	struct cf_complex_callback_s *next;
+} cf_complex_callback_t;
+
+typedef struct cf_value_map_s
+{
+	char *key;
+	int (*func) (const oconfig_item_t *);
+} cf_value_map_t;
 
-typedef struct cf_mode_item
+typedef struct cf_global_option_s
 {
 	char *key;
 	char *value;
-	int   mode;
-} cf_mode_item_t;
+	char *def;
+} cf_global_option_t;
 
-/* TODO
- * - LogFile
+/*
+ * Prototypes of callback functions
  */
-static cf_mode_item_t cf_mode_list[] =
+static int dispatch_value_plugindir (const oconfig_item_t *ci);
+static int dispatch_value_loadplugin (const oconfig_item_t *ci);
+
+/*
+ * Private variables
+ */
+static cf_callback_t *first_callback = NULL;
+static cf_complex_callback_t *complex_callback_head = NULL;
+
+static cf_value_map_t cf_value_map[] =
 {
-	{"TimeToLive",  NULL, MODE_CLIENT                           },
-	{"PIDFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG },
-	{"DataDir",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG },
-	{"LogFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG }
+	{"PluginDir",  dispatch_value_plugindir},
+	{"LoadPlugin", dispatch_value_loadplugin}
 };
-static int cf_mode_num = 4;
-
-static int nesting_depth = 0;
-static char *current_module = NULL;
+static int cf_value_map_num = STATIC_ARRAY_LEN (cf_value_map);
 
-/* `cf_register' needs this prototype */
-static int cf_callback_plugin_dispatch (const char *, const char *,
-		const char *, const char *, lc_flags_t, void *);
+static cf_global_option_t cf_global_options[] =
+{
+	{"BaseDir",   NULL, PKGLOCALSTATEDIR},
+	{"PIDFile",   NULL, PIDFILE},
+	{"Hostname",  NULL, NULL},
+	{"Interval",  NULL, "10"},
+	{"ReadThreads", NULL, "5"},
+	{"TypesDB",   NULL, PLUGINDIR"/types.db"} /* FIXME: Configure path */
+};
+static int cf_global_options_num = STATIC_ARRAY_LEN (cf_global_options);
 
 /*
  * Functions to handle register/unregister, search, and other plugin related
  * stuff
  */
-static cf_callback_t *cf_search (char *type)
+static cf_callback_t *cf_search (const char *type)
 {
 	cf_callback_t *cf_cb;
 
@@ -103,7 +110,8 @@ static cf_callback_t *cf_search (char *type)
 	return (cf_cb);
 }
 
-static int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
+static int cf_dispatch (const char *type, const char *orig_key,
+		const char *orig_value)
 {
 	cf_callback_t *cf_cb;
 	char *key;
@@ -111,14 +119,14 @@ static int cf_dispatch (char *type, const char *orig_key, const char *orig_value
 	int ret;
 	int i;
 
-	DBG ("type = %s, key = %s, value = %s",
+	DEBUG ("type = %s, key = %s, value = %s",
 			ESCAPE_NULL(type),
 			ESCAPE_NULL(orig_key),
 			ESCAPE_NULL(orig_value));
 
 	if ((cf_cb = cf_search (type)) == NULL)
 	{
-		syslog (LOG_WARNING, "Plugin `%s' did not register a callback.", type);
+		WARNING ("Plugin `%s' did not register a callback.", type);
 		return (-1);
 	}
 
@@ -142,402 +150,313 @@ static 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'.", type, key);
+		WARNING ("Plugin `%s' did not register for value `%s'.", type, key);
 
 	free (key);
 	free (value);
 
-	DBG ("return (%i)", ret);
+	DEBUG ("return (%i)", ret);
 
 	return (ret);
-}
+} /* int cf_dispatch */
 
-void cf_unregister (char *type)
+static int dispatch_global_option (const oconfig_item_t *ci)
 {
-	cf_callback_t *this, *prev;
+	if (ci->values_num != 1)
+		return (-1);
+	if (ci->values[0].type == OCONFIG_TYPE_STRING)
+		return (global_option_set (ci->key, ci->values[0].value.string));
+	else if (ci->values[0].type == OCONFIG_TYPE_NUMBER)
+	{
+		char tmp[128];
+		snprintf (tmp, sizeof (tmp), "%lf", ci->values[0].value.number);
+		tmp[127] = '\0';
+		return (global_option_set (ci->key, tmp));
+	}
 
-	for (prev = NULL, this = first_callback;
-			this != NULL;
-			prev = this, this = this->next)
-		if (strcasecmp (this->type, type) == 0)
-		{
-			if (prev == NULL)
-				first_callback = this->next;
-			else
-				prev->next = this->next;
+	return (-1);
+} /* int dispatch_global_option */
 
-			free (this);
-			break;
-		}
+static int dispatch_value_plugindir (const oconfig_item_t *ci)
+{
+	assert (strcasecmp (ci->key, "PluginDir") == 0);
+	
+	if (ci->values_num != 1)
+		return (-1);
+	if (ci->values[0].type != OCONFIG_TYPE_STRING)
+		return (-1);
+
+	plugin_set_dir (ci->values[0].value.string);
+	return (0);
 }
 
-void cf_register (char *type,
-		int (*callback) (char *, char *),
-		char **keys, int keys_num)
+static int dispatch_value_loadplugin (const oconfig_item_t *ci)
 {
-	cf_callback_t *cf_cb;
-	char buf[64];
-	int i;
+	assert (strcasecmp (ci->key, "LoadPlugin") == 0);
 
-	/* Remove this module from the list, if it already exists */
-	cf_unregister (type);
+	if (ci->values_num != 1)
+		return (-1);
+	if (ci->values[0].type != OCONFIG_TYPE_STRING)
+		return (-1);
 
-	/* This pointer will be free'd in `cf_unregister' */
-	if ((cf_cb = (cf_callback_t *) malloc (sizeof (cf_callback_t))) == NULL)
-		return;
+	return (plugin_load (ci->values[0].value.string));
+} /* int dispatch_value_loadplugin */
 
-	cf_cb->type     = type;
-	cf_cb->callback = callback;
-	cf_cb->keys     = keys;
-	cf_cb->keys_num = keys_num;
+static int dispatch_value_plugin (const char *plugin, oconfig_item_t *ci)
+{
+	char  buffer[4096];
+	char *buffer_ptr;
+	int   buffer_free;
+	int i;
 
-	cf_cb->next = first_callback;
-	first_callback = cf_cb;
+	buffer_ptr = buffer;
+	buffer_free = sizeof (buffer);
 
-	for (i = 0; i < keys_num; i++)
+	for (i = 0; i < ci->values_num; i++)
 	{
-		if (snprintf (buf, 64, "Plugin.%s", keys[i]) < 64)
+		int status = -1;
+
+		if (ci->values[i].type == OCONFIG_TYPE_STRING)
+			status = snprintf (buffer_ptr, buffer_free, " %s",
+					ci->values[i].value.string);
+		else if (ci->values[i].type == OCONFIG_TYPE_NUMBER)
+			status = snprintf (buffer_ptr, buffer_free, " %lf",
+					ci->values[i].value.number);
+		else if (ci->values[i].type == OCONFIG_TYPE_BOOLEAN)
+			status = snprintf (buffer_ptr, buffer_free, " %s",
+					ci->values[i].value.boolean
+					? "true" : "false");
+
+		if ((status < 0) || (status >= buffer_free))
+			return (-1);
+		buffer_free -= status;
+		buffer_ptr  += status;
+	}
+	/* skip the initial space */
+	buffer_ptr = buffer + 1;
+
+	return (cf_dispatch (plugin, ci->key, buffer_ptr));
+} /* int plugin_conf_dispatch */
+
+static int dispatch_value (const oconfig_item_t *ci)
+{
+	int ret = -2;
+	int i;
+
+	for (i = 0; i < cf_value_map_num; i++)
+		if (strcasecmp (cf_value_map[i].key, ci->key) == 0)
 		{
-			/* This may be called multiple times for the same
-			 * `key', but apparently `lc_register_*' can handle
-			 * it.. */
-			lc_register_callback (buf, SHORTOPT_NONE,
-					LC_VAR_STRING, cf_callback_plugin_dispatch,
-					NULL);
+			ret = cf_value_map[i].func (ci);
+			break;
 		}
-		else
+
+	for (i = 0; i < cf_global_options_num; i++)
+		if (strcasecmp (cf_global_options[i].key, ci->key) == 0)
 		{
-			DBG ("Key was truncated: `%s'", ESCAPE_NULL(keys[i]));
+			ret = dispatch_global_option (ci);
+			break;
 		}
-	}
-}
 
-/*
- * Other query functions
- */
-char *cf_get_option (const char *key, char *def)
+	return (ret);
+} /* int dispatch_value */
+
+static int dispatch_block_plugin (oconfig_item_t *ci)
 {
 	int i;
+	char *name;
 
-	for (i = 0; i < cf_mode_num; i++)
-	{
-		if ((cf_mode_list[i].mode & operating_mode) == 0)
-			continue;
-
-		if (strcasecmp (cf_mode_list[i].key, key) != 0)
-			continue;
+	cf_complex_callback_t *cb;
 
-		if (cf_mode_list[i].value != NULL)
-			return (cf_mode_list[i].value);
-		return (def);
-	}
+	if (strcasecmp (ci->key, "Plugin") != 0)
+		return (-1);
+	if (ci->values_num < 1)
+		return (-1);
+	if (ci->values[0].type != OCONFIG_TYPE_STRING)
+		return (-1);
 
-	return (NULL);
-}
+	name = ci->values[0].value.string;
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Functions for the actual parsing                                    *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	/* Check for a complex callback first */
+	for (cb = complex_callback_head; cb != NULL; cb = cb->next)
+		if (strcasecmp (name, cb->type) == 0)
+			return (cb->callback (ci));
 
-/*
- * `cf_callback_mode'
- *   Chose the `operating_mode'
- *
- * Mode `value'
- */
-static int cf_callback_mode (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
-{
-	DEBUG_CALLBACK (shortvar, var, arguments, value);
-
-	if (strcasecmp (value, "Client") == 0)
-		operating_mode = MODE_CLIENT;
-#if HAVE_LIBRRD
-	else if (strcasecmp (value, "Server") == 0)
-		operating_mode = MODE_SERVER;
-	else if (strcasecmp (value, "Local") == 0)
-		operating_mode = MODE_LOCAL;
-#endif
-	else if (strcasecmp (value, "Log") == 0)
-		operating_mode = MODE_LOG;
-	else
+	/* Hm, no complex plugin found. Dispatch the values one by one */
+	for (i = 0; i < ci->children_num; i++)
 	{
-		syslog (LOG_ERR, "Invalid value for config option `Mode': `%s'", value);
-		return (LC_CBRET_ERROR);
+		if (ci->children[i].children == NULL)
+			dispatch_value_plugin (name, ci->children + i);
+		else
+			{DEBUG ("No nested config blocks allow for this plugin.");}
 	}
 
-	return (LC_CBRET_OKAY);
+	return (0);
 }
 
-/*
- * `cf_callback_mode_plugindir'
- *   Change the plugin directory
- *
- * <Mode xxx>
- *   PluginDir `value'
- * </Mode>
- */
-static int cf_callback_mode_plugindir (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
-{
-	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
-	plugin_set_dir (value);
+static int dispatch_block (oconfig_item_t *ci)
+{
+	if (strcasecmp (ci->key, "Plugin") == 0)
+		return (dispatch_block_plugin (ci));
 
-	return (LC_CBRET_OKAY);
+	return (0);
 }
 
-static int cf_callback_mode_option (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
+/* 
+ * Public functions
+ */
+int global_option_set (const char *option, const char *value)
 {
-	cf_mode_item_t *item;
-
-	DEBUG_CALLBACK (shortvar, var, arguments, value);
-
-	if (extra == NULL)
-	{
-		fprintf (stderr, "No extra..?\n");
-		return (LC_CBRET_ERROR);
-	}
+	int i;
 
-	item = (cf_mode_item_t *) extra;
+	DEBUG ("option = %s; value = %s;", option, value);
 
-	if (strcasecmp (item->key, shortvar))
-	{
-		fprintf (stderr, "Wrong extra..\n");
-		return (LC_CBRET_ERROR);
-	}
+	for (i = 0; i < cf_global_options_num; i++)
+		if (strcasecmp (cf_global_options[i].key, option) == 0)
+			break;
 
-	if ((operating_mode & item->mode) == 0)
-	{
-		fprintf (stderr, "Option `%s' is not valid in this mode!\n", shortvar);
-		return (LC_CBRET_ERROR);
-	}
+	if (i >= cf_global_options_num)
+		return (-1);
 
-	if (item->value != NULL)
-	{
-		free (item->value);
-		item->value = NULL;
-	}
+	sfree (cf_global_options[i].value);
 
-	if ((item->value = strdup (value)) == NULL)
-	{
-		perror ("strdup");
-		return (LC_CBRET_ERROR);
-	}
+	if (value != NULL)
+		cf_global_options[i].value = strdup (value);
+	else
+		cf_global_options[i].value = NULL;
 
-	return (LC_CBRET_OKAY);
+	return (0);
 }
 
-/*
- * `cf_callback_mode_loadmodule':
- *   Load a plugin.
- *
- * <Mode xxx>
- *   LoadPlugin `value'
- * </Mode>
- */
-static int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
+const char *global_option_get (const char *option)
 {
-	DEBUG_CALLBACK (shortvar, var, arguments, value);
+	int i;
 
-	if (plugin_load (value))
-		syslog (LOG_ERR, "plugin_load (%s): failed to load plugin", value);
+	for (i = 0; i < cf_global_options_num; i++)
+		if (strcasecmp (cf_global_options[i].key, option) == 0)
+			break;
 
-	/* Return `okay' even if there was an error, because it's not a syntax
-	 * problem.. */
-	return (LC_CBRET_OKAY);
-}
+	if (i >= cf_global_options_num)
+		return (NULL);
+	
+	return ((cf_global_options[i].value != NULL)
+			? cf_global_options[i].value
+			: cf_global_options[i].def);
+} /* char *global_option_get */
 
-static int cf_callback_socket (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
+void cf_unregister (const char *type)
 {
-	char *buffer;
+	cf_callback_t *this, *prev;
 
-	char *fields[3];
-	int   numfields;
+	for (prev = NULL, this = first_callback;
+			this != NULL;
+			prev = this, this = this->next)
+		if (strcasecmp (this->type, type) == 0)
+		{
+			if (prev == NULL)
+				first_callback = this->next;
+			else
+				prev->next = this->next;
 
-	char *node;
-	char *service = NET_DEFAULT_PORT;
+			free (this);
+			break;
+		}
+} /* void cf_unregister */
 
-	DEBUG_CALLBACK (shortvar, var, arguments, value);
+void cf_unregister_complex (const char *type)
+{
+	cf_complex_callback_t *this, *prev;
 
-	buffer = strdup (value);
-	if (buffer == NULL)
-		return (LC_CBRET_ERROR);
+	for (prev = NULL, this = complex_callback_head;
+			this != NULL;
+			prev = this, this = this->next)
+		if (strcasecmp (this->type, type) == 0)
+		{
+			if (prev == NULL)
+				complex_callback_head = this->next;
+			else
+				prev->next = this->next;
 
-	numfields = strsplit (buffer, fields, 3);
+			sfree (this->type);
+			sfree (this);
+			break;
+		}
+} /* void cf_unregister */
 
-	if ((numfields != 1) && (numfields != 2))
-	{
-		syslog (LOG_ERR, "Invalid number of arguments to `%s'",
-				shortvar);
-		free (buffer);
-		return (LC_CBRET_ERROR);
-	}
+void cf_register (const char *type,
+		int (*callback) (const char *, const char *),
+		const char **keys, int keys_num)
+{
+	cf_callback_t *cf_cb;
 
-	node = fields[0];
-	if (numfields == 2)
-		service = fields[1];
+	/* Remove this module from the list, if it already exists */
+	cf_unregister (type);
 
-	/* 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);
+	/* This pointer will be free'd in `cf_unregister' */
+	if ((cf_cb = (cf_callback_t *) malloc (sizeof (cf_callback_t))) == NULL)
+		return;
 
-	free (buffer);
+	cf_cb->type     = type;
+	cf_cb->callback = callback;
+	cf_cb->keys     = keys;
+	cf_cb->keys_num = keys_num;
 
-	return (LC_CBRET_OKAY);
-}
+	cf_cb->next = first_callback;
+	first_callback = cf_cb;
+} /* void cf_register */
 
-/*
- * `cf_callback_plugin'
- *   Start/end section `plugin'
- *
- * <Plugin `arguments'>
- *   ...
- * </Plugin>
- */
-static int cf_callback_plugin (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
+int cf_register_complex (const char *type, int (*callback) (oconfig_item_t *))
 {
-	DEBUG_CALLBACK (shortvar, var, arguments, value);
-
-	if (flags == LC_FLAGS_SECTIONSTART)
-	{
-		if (nesting_depth != 0)
-		{
-			fprintf (stderr, ERR_NOT_NESTED);
-			return (LC_CBRET_ERROR);
-		}
+	cf_complex_callback_t *new;
 
-		if (arguments == NULL)
-		{
-			fprintf (stderr, ERR_NEEDS_ARG, shortvar);
-			return (LC_CBRET_ERROR);
-		}
-
-		if ((current_module = strdup (arguments)) == NULL)
-		{
-			perror ("strdup");
-			return (LC_CBRET_ERROR);
-		}
-
-		nesting_depth++;
+	new = (cf_complex_callback_t *) malloc (sizeof (cf_complex_callback_t));
+	if (new == NULL)
+		return (-1);
 
-		if (cf_search (current_module) != NULL)
-			return (LC_CBRET_OKAY);
-		else
-			return (LC_CBRET_IGNORESECTION);
-	}
-	else if (flags == LC_FLAGS_SECTIONEND)
+	new->type = strdup (type);
+	if (new->type == NULL)
 	{
-		if (current_module != NULL)
-		{
-			free (current_module);
-			current_module = NULL;
-		}
+		sfree (new);
+		return (-1);
+	}
 
-		nesting_depth--;
+	new->callback = callback;
+	new->next = NULL;
 
-		return (LC_CBRET_OKAY);
-	}
-	else
+	if (complex_callback_head == NULL)
 	{
-		fprintf (stderr, ERR_SECTION_ONLY, shortvar);
-		return (LC_CBRET_ERROR);
+		complex_callback_head = new;
 	}
-}
-
-/*
- * `cf_callback_plugin_dispatch'
- *   Send options within `plugin' sections to the plugin that requests it.
- *
- * <Plugin `current_module'>
- *   `var' `value'
- * </Plugin>
- */
-static int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
-		const char *arguments, const char *value, lc_flags_t flags,
-		void *extra)
-{
-	DEBUG_CALLBACK (shortvar, var, arguments, value);
-
-	if ((nesting_depth == 0) || (current_module == NULL))
+	else
 	{
-		fprintf (stderr, ERR_NEEDS_SECTION, shortvar);
-		return (LC_CBRET_ERROR);
+		cf_complex_callback_t *last = complex_callback_head;
+		while (last->next != NULL)
+			last = last->next;
+		last->next = new;
 	}
 
-	/* Send the data to the plugin */
-	if (cf_dispatch (current_module, shortvar, value) < 0)
-		return (LC_CBRET_ERROR);
-
-	return (LC_CBRET_OKAY);
-}
+	return (0);
+} /* int cf_register_complex */
 
-static void cf_init (void)
+int cf_read (char *filename)
 {
-	static int run_once = 0;
+	oconfig_item_t *conf;
 	int i;
 
-	if (run_once != 0)
-		return;
-	run_once = 1;
-
-	lc_register_callback ("Mode", SHORTOPT_NONE, LC_VAR_STRING,
-			cf_callback_mode, NULL);
-	lc_register_callback ("Plugin", SHORTOPT_NONE, LC_VAR_SECTION,
-			cf_callback_plugin, NULL);
-
-	lc_register_callback ("PluginDir", SHORTOPT_NONE,
-			LC_VAR_STRING, cf_callback_mode_plugindir, NULL);
-	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++)
+	conf = oconfig_parse_file (filename);
+	if (conf == NULL)
 	{
-		cf_mode_item_t *item;
-
-		item = &cf_mode_list[i];
-
-		lc_register_callback (item->key, SHORTOPT_NONE, LC_VAR_STRING,
-				cf_callback_mode_option, (void *) item);
+		ERROR ("Unable to read config file %s.", filename);
+		return (-1);
 	}
-}
-
-int cf_read (char *filename)
-{
-	cf_init ();
-
-	if (filename == NULL)
-		filename = CONFIGFILE;
 
-	DBG ("Starting to parse file `%s'", filename);
-
-	/* int lc_process_file(const char *appname, const char *pathname, lc_conf_type_t type); */
-	if (lc_process_file ("collectd", filename, LC_CONF_APACHE))
+	for (i = 0; i < conf->children_num; i++)
 	{
-		syslog (LOG_ERR, "lc_process_file (%s): %s", filename, lc_geterrstr ());
-		return (-1);
+		if (conf->children[i].children == NULL)
+			dispatch_value (conf->children + i);
+		else
+			dispatch_block (conf->children + i);
 	}
 
-	DBG ("Done parsing file `%s'", filename);
-
-	/* free memory and stuff */
-	lc_cleanup ();
-
 	return (0);
-}
+} /* int cf_read */