X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=446f8bf6f1c2ad37cfe2b6ac0635e60834232777;hb=2f7e758941df10e5915682ead8b04c39efbd805c;hp=f20723b440166e222265d28ff0ceeb1b2d5a1ba3;hpb=f3b40ff333214839ed3a47cfa95b2bd87628d0d6;p=collectd.git

diff --git a/src/netapp.c b/src/netapp.c
index f20723b4..446f8bf6 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -133,11 +133,13 @@ typedef struct {
 /*!
  * \brief Configuration struct for volume usage data (free / used).
  */
-#define VOLUME_INIT           0x01
-#define VOLUME_DF             0x02
-#define VOLUME_SNAP           0x04
+#define CFG_VOLUME_USAGE_INIT           0x0001
+#define CFG_VOLUME_USAGE_DF             0x0002
+#define CFG_VOLUME_USAGE_SNAP           0x0004
+#define HAVE_VOLUME_USAGE_SNAP          0x0008
 typedef struct {
 	uint32_t flags;
+	uint64_t snap_used;
 } cfg_volume_usage_t;
 
 typedef struct service_config_s {
@@ -209,7 +211,76 @@ struct host_config_s {
 };
 #define HOST_INIT {NULL, NULL, NA_SERVER_TRANSPORT_HTTPS, NULL, 0, NULL, NULL, 10, NULL, NULL, NULL, NULL}
 
-static host_config_t *host_config;
+static host_config_t *global_host_config;
+
+/*
+ * Free functions
+ *
+ * Used to free the various structures above.
+ */
+static void free_volume (volume_t *volume) /* {{{ */
+{
+	volume_t *next;
+
+	next = volume->next;
+
+	sfree (volume->name);
+	sfree (volume);
+
+	free_volume (next);
+} /* }}} void free_volume */
+
+static void free_disk (disk_t *disk) /* {{{ */
+{
+	disk_t *next;
+
+	next = disk->next;
+
+	sfree (disk->name);
+	sfree (disk);
+
+	free_disk (next);
+} /* }}} void free_disk */
+
+static void free_cfg_service (cfg_service_t *service) /* {{{ */
+{
+	cfg_service_t *next;
+
+	if (service == NULL)
+		return;
+	
+	next = service->next;
+
+	/* FIXME: Free service->data? */
+	na_elem_free(service->query);
+	
+	sfree (service);
+
+	free_cfg_service (next);
+} /* }}} void free_cfg_service */
+
+static void free_host_config (host_config_t *hc) /* {{{ */
+{
+	host_config_t *next;
+
+	if (hc == NULL)
+		return;
+
+	next = hc->next;
+
+	sfree (hc->name);
+	sfree (hc->host);
+	sfree (hc->username);
+	sfree (hc->password);
+
+	free_cfg_service (hc->services);
+	free_disk (hc->disks);
+	free_volume (hc->volumes);
+
+	sfree (hc);
+
+	free_host_config (next);
+} /* }}} void free_host_config */
 
 /*
  * Auxiliary functions
@@ -226,7 +297,7 @@ static volume_t *get_volume (host_config_t *host, const char *name, /* {{{ */
 	
 	/* Make sure the default flags include the init-bit. */
 	if (vol_usage_flags != 0)
-		vol_usage_flags |= VOLUME_INIT;
+		vol_usage_flags |= CFG_VOLUME_USAGE_INIT;
 	if (vol_perf_flags != 0)
 		vol_perf_flags |= CFG_VOLUME_PERF_INIT;
 
@@ -235,7 +306,7 @@ static volume_t *get_volume (host_config_t *host, const char *name, /* {{{ */
 			continue;
 
 		/* Check if the flags have been initialized. */
-		if (((v->cfg_volume_usage.flags & VOLUME_INIT) == 0)
+		if (((v->cfg_volume_usage.flags & CFG_VOLUME_USAGE_INIT) == 0)
 				&& (vol_usage_flags != 0))
 			v->cfg_volume_usage.flags = vol_usage_flags;
 		if (((v->perf_data.flags & CFG_VOLUME_PERF_INIT) == 0)
@@ -295,7 +366,7 @@ static disk_t *get_disk(host_config_t *host, const char *name) /* {{{ */
 	return v;
 } /* }}} disk_t *get_disk */
 
-static void set_global_perf_vol_flag(const host_config_t *host, /* {{{ */
+static void host_set_all_perf_data_flags(const host_config_t *host, /* {{{ */
 		uint32_t flag, _Bool set)
 {
 	volume_t *v;
@@ -306,9 +377,9 @@ static void set_global_perf_vol_flag(const host_config_t *host, /* {{{ */
 		else /* if (!set) */
 			v->perf_data.flags &= ~flag;
 	}
-} /* }}} void set_global_perf_vol_flag */
+} /* }}} void host_set_all_perf_data_flags */
 
-static void set_global_vol_flag(const host_config_t *host, /* {{{ */
+static void host_set_all_cfg_volume_usage_flags(const host_config_t *host, /* {{{ */
 		uint32_t flag, _Bool set) {
 	volume_t *v;
 	
@@ -318,7 +389,7 @@ static void set_global_vol_flag(const host_config_t *host, /* {{{ */
 		else /* if (!set) */
 			v->cfg_volume_usage.flags &= ~flag;
 	}
-} /* }}} void set_global_vol_flag */
+} /* }}} void host_set_all_cfg_volume_usage_flags */
 
 /*
  * Various submit functions.
@@ -431,7 +502,7 @@ static int submit_cache_ratio (const char *host, /* {{{ */
 				&v, 1, timestamp));
 } /* }}} int submit_cache_ratio */
 
-/* Submits all the caches used by WAFL. Uses "submit_cache_ratio".
+/* Submits all the caches used by WAFL. Uses "submit_cache_ratio". */
 static int submit_wafl_data (const host_config_t *host, const char *instance, /* {{{ */
 		data_wafl_t *old_data, const data_wafl_t *new_data)
 {
@@ -751,22 +822,27 @@ static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data)
 		if (volume == NULL)
 			continue;
 
-		if (!(volume->cfg_volume_usage.flags & VOLUME_DF))
+		if (!(volume->cfg_volume_usage.flags & CFG_VOLUME_USAGE_DF))
 			continue;
 
 		/* 2^4 exa-bytes? This will take a while ;) */
 		size_free = na_child_get_uint64(inst, "size-available", UINT64_MAX);
 		if (size_free != UINT64_MAX)
-			submit_double (host->name, volume->name, "df_complex", "used",
-					(double) size_used, /* time = */ 0);
-
-		size_used = na_child_get_uint64(inst, "size-used", UINT64_MAX);
-		if (size_free != UINT64_MAX)
 			submit_double (host->name, volume->name, "df_complex", "free",
 					(double) size_free, /* time = */ 0);
 
+		size_used = na_child_get_uint64(inst, "size-used", UINT64_MAX);
+		if (size_used != UINT64_MAX) {
+			if ((volume->cfg_volume_usage.flags & HAVE_VOLUME_USAGE_SNAP)
+					&& (size_used >= volume->cfg_volume_usage.snap_used))
+				size_used -= volume->cfg_volume_usage.snap_used;
+			submit_double (host->name, volume->name, "df_complex", "used",
+					(double) size_used, /* time = */ 0);
+		}
+
 		snap_reserved = na_child_get_uint64(inst, "snapshot-blocks-reserved", UINT64_MAX);
-		if (snap_reserved != UINT64_MAX)
+		if (!(volume->cfg_volume_usage.flags & HAVE_VOLUME_USAGE_SNAP) && (snap_reserved != UINT64_MAX))
+			/* If we have snap usage data this value has already been submitted. */
 			/* 1 block == 1024 bytes  as per API docs */
 			submit_double (host->name, volume->name, "df_complex", "snap_reserved",
 					(double) (1024 * snap_reserved), /* time = */ 0);
@@ -941,7 +1017,7 @@ static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *
 			cpu_total = (counter_t) value;
 			counter_flags |= 0x20;
 		} else if ((cfg_system->flags & CFG_SYSTEM_OPS)
-				&& (strlen(name) > 4)
+				&& (value > 0) && (strlen(name) > 4)
 				&& (!strcmp(name + strlen(name) - 4, "_ops"))) {
 			submit_counter (host->name, instance, "disk_ops_complex", name,
 					(counter_t) value, timestamp);
@@ -970,7 +1046,9 @@ static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *
 /*
  * Configuration handling
  */
-static int config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */
+/* Sets a given flag if the boolean argument is true and unsets the flag if it
+ * is false. On error, the flag-field is not changed. */
+static int cna_config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */
 		uint32_t *flags, uint32_t flag)
 {
 	if ((ci == NULL) || (flags == NULL))
@@ -989,9 +1067,10 @@ static int config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */
 		*flags &= ~flag;
 
 	return (0);
-} /* }}} int config_bool_to_flag */
+} /* }}} int cna_config_bool_to_flag */
 
-static int config_get_multiplier (const oconfig_item_t *ci, /* {{{ */
+/* Handling of the "Multiplier" option which is allowed in every block. */
+static int cna_config_get_multiplier (const oconfig_item_t *ci, /* {{{ */
 		cfg_service_t *service)
 {
 	int tmp;
@@ -1016,11 +1095,11 @@ static int config_get_multiplier (const oconfig_item_t *ci, /* {{{ */
 	service->skip_countdown = tmp;
 
 	return (0);
-} /* }}} int config_get_multiplier */
+} /* }}} int cna_config_get_multiplier */
 
 /* Handling of the "GetIO", "GetOps" and "GetLatency" options within a
  * <GetVolumePerfData /> block. */
-static void process_perf_volume_flag (host_config_t *host, /* {{{ */
+static void cna_config_volume_performance_option (host_config_t *host, /* {{{ */
 		cfg_volume_perf_t *perf_volume, const oconfig_item_t *item,
 		uint32_t flag)
 {
@@ -1052,7 +1131,7 @@ static void process_perf_volume_flag (host_config_t *host, /* {{{ */
 			else /* if (!set) */
 				perf_volume->flags &= ~flag;
 
-			set_global_perf_vol_flag(host, flag, set);
+			host_set_all_perf_data_flags(host, flag, set);
 			continue;
 		}
 
@@ -1065,10 +1144,10 @@ static void process_perf_volume_flag (host_config_t *host, /* {{{ */
 		else /* if (!set) */
 			v->perf_data.flags &= ~flag;
 	} /* for (i = 0 .. item->values_num) */
-} /* }}} void process_perf_volume_flag */
+} /* }}} void cna_config_volume_performance_option */
 
 /* Corresponds to a <GetDiskPerfData /> block */
-static void build_perf_vol_config(host_config_t *host, const oconfig_item_t *ci) { /* {{{ */
+static void cna_config_volume_performance(host_config_t *host, const oconfig_item_t *ci) { /* {{{ */
 	int i, had_io = 0, had_ops = 0, had_latency = 0;
 	cfg_service_t *service;
 	cfg_volume_perf_t *perf_volume;
@@ -1085,34 +1164,34 @@ static void build_perf_vol_config(host_config_t *host, const oconfig_item_t *ci)
 		
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			config_get_multiplier (item, service);
+			cna_config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetIO")) {
 			had_io = 1;
-			process_perf_volume_flag(host, perf_volume, item, CFG_VOLUME_PERF_IO);
+			cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_IO);
 		} else if (!strcasecmp(item->key, "GetOps")) {
 			had_ops = 1;
-			process_perf_volume_flag(host, perf_volume, item, CFG_VOLUME_PERF_OPS);
+			cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_OPS);
 		} else if (!strcasecmp(item->key, "GetLatency")) {
 			had_latency = 1;
-			process_perf_volume_flag(host, perf_volume, item, CFG_VOLUME_PERF_LATENCY);
+			cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_LATENCY);
 		}
 	}
 	if (!had_io) {
 		perf_volume->flags |= CFG_VOLUME_PERF_IO;
-		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_IO, /* set = */ true);
+		host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_IO, /* set = */ true);
 	}
 	if (!had_ops) {
 		perf_volume->flags |= CFG_VOLUME_PERF_OPS;
-		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_OPS, /* set = */ true);
+		host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_OPS, /* set = */ true);
 	}
 	if (!had_latency) {
 		perf_volume->flags |= CFG_VOLUME_PERF_LATENCY;
-		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true);
+		host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true);
 	}
-} /* }}} void build_perf_vol_config */
+} /* }}} void cna_config_volume_performance */
 
 /* Handling of the "GetDiskUtil" option within a <GetVolumeData /> block. */
-static void process_volume_flag (host_config_t *host, /* {{{ */
+static void cna_config_volume_usage_option (host_config_t *host, /* {{{ */
 		cfg_volume_usage_t *cfg_volume_data, const oconfig_item_t *item, uint32_t flag)
 {
 	int i;
@@ -1143,7 +1222,7 @@ static void process_volume_flag (host_config_t *host, /* {{{ */
 			else /* if (!set) */
 				cfg_volume_data->flags &= ~flag;
 
-			set_global_vol_flag(host, flag, set);
+			host_set_all_cfg_volume_usage_flags(host, flag, set);
 			continue;
 		}
 
@@ -1159,10 +1238,10 @@ static void process_volume_flag (host_config_t *host, /* {{{ */
 		else /* if (!set) */
 			v->cfg_volume_usage.flags &= ~flag;
 	}
-} /* }}} void process_volume_flag */
+} /* }}} void cna_config_volume_usage_option */
 
 /* Corresponds to a <GetVolumeData /> block */
-static void build_volume_config(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
+static void cna_config_volume_usage(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
 	int i, had_df = 0;
 	cfg_service_t *service;
 	cfg_volume_usage_t *cfg_volume_data;
@@ -1171,7 +1250,7 @@ static void build_volume_config(host_config_t *host, oconfig_item_t *ci) { /* {{
 	service->query = 0;
 	service->handler = collect_volume_data;
 	cfg_volume_data = service->data = malloc(sizeof(*cfg_volume_data));
-	cfg_volume_data->flags = VOLUME_INIT;
+	cfg_volume_data->flags = CFG_VOLUME_USAGE_INIT;
 	service->next = host->services;
 	host->services = service;
 	for (i = 0; i < ci->children_num; ++i) {
@@ -1179,20 +1258,26 @@ static void build_volume_config(host_config_t *host, oconfig_item_t *ci) { /* {{
 		
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			config_get_multiplier (item, service);
+			cna_config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetDiskUtil")) {
 			had_df = 1;
-			process_volume_flag(host, cfg_volume_data, item, VOLUME_DF);
+			cna_config_volume_usage_option(host, cfg_volume_data, item, CFG_VOLUME_USAGE_DF);
+		} else if (!strcasecmp(item->key, "GetSnapUtil")) {
+			had_df = 1;
+			cna_config_volume_usage_option(host, cfg_volume_data, item, CFG_VOLUME_USAGE_SNAP);
 		}
 	}
 	if (!had_df) {
-		cfg_volume_data->flags |= VOLUME_DF;
-		set_global_vol_flag(host, VOLUME_DF, /* set = */ true);
+		cfg_volume_data->flags |= CFG_VOLUME_USAGE_DF;
+		host_set_all_cfg_volume_usage_flags(host, CFG_VOLUME_USAGE_DF, /* set = */ true);
 	}
-} /* }}} void build_volume_config */
+	if (cfg_volume_data->flags & CFG_VOLUME_USAGE_SNAP) {
+		WARNING("netapp plugin: The \"GetSnapUtil\" option does not support the \"+\" wildcard.");
+	}
+} /* }}} void cna_config_volume_usage */
 
 /* Corresponds to a <GetDiskPerfData /> block */
-static void build_perf_disk_config(host_config_t *temp, oconfig_item_t *ci) { /* {{{ */
+static void cna_config_disk(host_config_t *temp, oconfig_item_t *ci) { /* {{{ */
 	int i;
 	cfg_service_t *service;
 	cfg_disk_t *cfg_disk;
@@ -1209,15 +1294,15 @@ static void build_perf_disk_config(host_config_t *temp, oconfig_item_t *ci) { /*
 		
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			config_get_multiplier (item, service);
+			cna_config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetBusy")) {
-			config_bool_to_flag (item, &cfg_disk->flags, CFG_SYSTEM_CPU);
+			cna_config_bool_to_flag (item, &cfg_disk->flags, CFG_SYSTEM_CPU);
 		}
 	}
-} /* }}} void build_perf_disk_config */
+} /* }}} void cna_config_disk */
 
 /* Corresponds to a <GetWaflPerfData /> block */
-static void build_perf_wafl_config(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
+static void cna_config_wafl(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
 	int i;
 	cfg_service_t *service;
 	data_wafl_t *perf_wafl;
@@ -1236,15 +1321,15 @@ static void build_perf_wafl_config(host_config_t *host, oconfig_item_t *ci) { /*
 		oconfig_item_t *item = ci->children + i;
 		
 		if (!strcasecmp(item->key, "Multiplier")) {
-			config_get_multiplier (item, service);
+			cna_config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetNameCache")) {
-			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_NAME_CACHE);
+			cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_NAME_CACHE);
 		} else if (!strcasecmp(item->key, "GetDirCache")) {
-			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_DIR_CACHE);
+			cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_DIR_CACHE);
 		} else if (!strcasecmp(item->key, "GetBufCache")) {
-			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_BUF_CACHE);
+			cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_BUF_CACHE);
 		} else if (!strcasecmp(item->key, "GetInodeCache")) {
-			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_INODE_CACHE);
+			cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_INODE_CACHE);
 		} else {
 			WARNING ("netapp plugin: The %s config option is not allowed within "
 					"`GetWaflPerfData' blocks.", item->key);
@@ -1253,10 +1338,10 @@ static void build_perf_wafl_config(host_config_t *host, oconfig_item_t *ci) { /*
 
 	service->next = host->services;
 	host->services = service;
-} /* }}} void build_perf_wafl_config */
+} /* }}} void cna_config_wafl */
 
 /* Corresponds to a <GetSystemPerfData /> block */
-static int build_perf_sys_config (host_config_t *host, /* {{{ */
+static int cna_config_system (host_config_t *host, /* {{{ */
 		oconfig_item_t *ci, const cfg_service_t *default_service)
 {
 	int i;
@@ -1283,15 +1368,15 @@ static int build_perf_sys_config (host_config_t *host, /* {{{ */
 		oconfig_item_t *item = ci->children + i;
 
 		if (!strcasecmp(item->key, "Multiplier")) {
-			config_get_multiplier (item, service);
+			cna_config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetCPULoad")) {
-			config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_CPU);
+			cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_CPU);
 		} else if (!strcasecmp(item->key, "GetInterfaces")) {
-			config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_NET);
+			cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_NET);
 		} else if (!strcasecmp(item->key, "GetDiskOps")) {
-			config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_OPS);
+			cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_OPS);
 		} else if (!strcasecmp(item->key, "GetDiskIO")) {
-			config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_DISK);
+			cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_DISK);
 		} else {
 			WARNING ("netapp plugin: The %s config option is not allowed within "
 					"`GetSystemPerfData' blocks.", item->key);
@@ -1302,95 +1387,105 @@ static int build_perf_sys_config (host_config_t *host, /* {{{ */
 	host->services = service;
 
 	return (0);
-} /* }}} int build_perf_sys_config */
+} /* }}} int cna_config_system */
 
 /* Corresponds to a <Host /> block. */
-static host_config_t *build_host_config (const oconfig_item_t *ci, /* {{{ */
+static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */
 		const host_config_t *default_host, const cfg_service_t *def_def_service)
 {
-	int i;
 	oconfig_item_t *item;
-	host_config_t *host, *hc, temp = *default_host;
+	host_config_t *host;
 	cfg_service_t default_service = *def_def_service;
+	int status;
+	int i;
 	
 	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) {
 		WARNING("netapp plugin: \"Host\" needs exactly one string argument. Ignoring host block.");
 		return 0;
 	}
 
-	temp.name = ci->values[0].value.string;
+	host = malloc(sizeof(*host));
+	memcpy (host, default_host, sizeof (*host));
+
+	status = cf_util_get_string (ci, &host->name);
+	if (status != 0)
+	{
+		sfree (host);
+		return (NULL);
+	}
+
 	for (i = 0; i < ci->children_num; ++i) {
 		item = ci->children + i;
 
-		/* if (!item || !item->key || !*item->key) continue; */
+		status = 0;
+
 		if (!strcasecmp(item->key, "Address")) {
-			if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING)) {
-				WARNING("netapp plugin: \"Name\" needs exactly one string argument. Ignoring host block \"%s\".", ci->values[0].value.string);
-				return 0;
-			}
-			temp.host = item->values[0].value.string;
+			status = cf_util_get_string (item, &host->host);
 		} else if (!strcasecmp(item->key, "Port")) {
-			if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_NUMBER) || (item->values[0].value.number != (int) (item->values[0].value.number)) || (item->values[0].value.number < 1) || (item->values[0].value.number > 65535)) {
-				WARNING("netapp plugin: \"Port\" needs exactly one integer argument in the range of 1-65535. Ignoring host block \"%s\".", ci->values[0].value.string);
-				return 0;
-			}
-			temp.port = item->values[0].value.number;
+			int tmp;
+
+			tmp = cf_util_get_port_number (item);
+			if (tmp > 0)
+				host->port = tmp;
 		} else if (!strcasecmp(item->key, "Protocol")) {
 			if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING) || (strcasecmp(item->values[0].value.string, "http") && strcasecmp(item->values[0].value.string, "https"))) {
 				WARNING("netapp plugin: \"Protocol\" needs to be either \"http\" or \"https\". Ignoring host block \"%s\".", ci->values[0].value.string);
 				return 0;
 			}
-			if (!strcasecmp(item->values[0].value.string, "http")) temp.protocol = NA_SERVER_TRANSPORT_HTTP;
-			else temp.protocol = NA_SERVER_TRANSPORT_HTTPS;
-		} else if (!strcasecmp(item->key, "Login")) {
-			if ((item->values_num != 2) || (item->values[0].type != OCONFIG_TYPE_STRING) || (item->values[1].type != OCONFIG_TYPE_STRING)) {
-				WARNING("netapp plugin: \"Login\" needs exactly two string arguments, username and password. Ignoring host block \"%s\".", ci->values[0].value.string);
-				return 0;
-			}
-			temp.username = item->values[0].value.string;
-			temp.password = item->values[1].value.string;
+			if (!strcasecmp(item->values[0].value.string, "http")) host->protocol = NA_SERVER_TRANSPORT_HTTP;
+			else host->protocol = NA_SERVER_TRANSPORT_HTTPS;
+		} else if (!strcasecmp(item->key, "User")) {
+			status = cf_util_get_string (item, &host->username);
+		} else if (!strcasecmp(item->key, "Password")) {
+			status = cf_util_get_string (item, &host->password);
 		} else if (!strcasecmp(item->key, "Interval")) {
 			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 2) {
 				WARNING("netapp plugin: \"Interval\" of host %s needs exactly one integer argument.", ci->values[0].value.string);
 				continue;
 			}
-			temp.interval = item->values[0].value.number;
+			host->interval = item->values[0].value.number;
 		} else if (!strcasecmp(item->key, "GetVolumePerfData")) {
-			build_perf_vol_config(&temp, item);
+			cna_config_volume_performance(host, item);
 		} else if (!strcasecmp(item->key, "GetSystemPerfData")) {
-			build_perf_sys_config(&temp, item, &default_service);
+			cna_config_system(host, item, &default_service);
 		} else if (!strcasecmp(item->key, "GetWaflPerfData")) {
-			build_perf_wafl_config(&temp, item);
+			cna_config_wafl(host, item);
 		} else if (!strcasecmp(item->key, "GetDiskPerfData")) {
-			build_perf_disk_config(&temp, item);
+			cna_config_disk(host, item);
 		} else if (!strcasecmp(item->key, "GetVolumeData")) {
-			build_volume_config(&temp, item);
+			cna_config_volume_usage(host, item);
 		} else {
 			WARNING("netapp plugin: Ignoring unknown config option \"%s\" in host block \"%s\".",
 					item->key, ci->values[0].value.string);
 		}
+
+		if (status != 0)
+			break;
 	}
-	
-	if (!temp.host) temp.host = temp.name;
-	if (!temp.port) temp.port = temp.protocol == NA_SERVER_TRANSPORT_HTTP ? 80 : 443;
-	if (!temp.username) {
-		WARNING("netapp plugin: Please supply login information for host \"%s\". Ignoring host block.", temp.name);
-		return 0;
+
+	if (host->host == NULL)
+		host->host = strdup (host->name);
+
+	if (host->host == NULL)
+		status = -1;
+
+	if (host->port <= 0)
+		host->port = (host->protocol == NA_SERVER_TRANSPORT_HTTP) ? 80 : 443;
+
+	if ((host->username == NULL) || (host->password == NULL)) {
+		WARNING("netapp plugin: Please supply login information for host \"%s\". "
+				"Ignoring host block.", host->name);
+		status = -1;
 	}
-	for (hc = host_config; hc; hc = hc->next) {
-		if (!strcasecmp(hc->name, temp.name)) WARNING("netapp plugin: Duplicate definition of host \"%s\". This is probably a bad idea.", hc->name);
+
+	if (status != 0)
+	{
+		free_host_config (host);
+		return (NULL);
 	}
-	host = malloc(sizeof(*host));
-	*host = temp;
-	host->name = strdup(temp.name);
-	host->protocol = temp.protocol;
-	host->host = strdup(temp.host);
-	host->username = strdup(temp.username);
-	host->password = strdup(temp.password);
-	host->next = host_config;
-	host_config = host;
+
 	return host;
-} /* }}} host_config_t *build_host_config */
+} /* }}} host_config_t *cna_config_host */
 
 /*
  * Callbacks registered with the daemon
@@ -1403,7 +1498,7 @@ static int cna_init(void) { /* {{{ */
 	host_config_t *host;
 	cfg_service_t *service;
 	
-	if (!host_config) {
+	if (!global_host_config) {
 		WARNING("netapp plugin: Plugin loaded but no hosts defined.");
 		return 1;
 	}
@@ -1413,7 +1508,7 @@ static int cna_init(void) { /* {{{ */
 		return 1;
 	}
 
-	for (host = host_config; host; host = host->next) {
+	for (host = global_host_config; host; host = host->next) {
 		host->srv = na_server_open(host->host, 1, 1); 
 		na_server_set_transport_type(host->srv, host->protocol, 0);
 		na_server_set_port(host->srv, host->port);
@@ -1432,6 +1527,8 @@ static int cna_init(void) { /* {{{ */
 				na_child_add_string(e, "foo", "system");
 				na_child_add(root, e);*/
 				e = na_elem_new("counters");
+				/* "foo" means: This string has to be here but
+				   the content doesn't matter. */
 				na_child_add_string(e, "foo", "read_ops");
 				na_child_add_string(e, "foo", "write_ops");
 				na_child_add_string(e, "foo", "read_data");
@@ -1484,9 +1581,30 @@ static int cna_config (oconfig_item_t *ci) { /* {{{ */
 	for (i = 0; i < ci->children_num; ++i) {
 		item = ci->children + i;
 
-		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Host")) {
-			build_host_config(item, &default_host, &default_service);
+			host_config_t *host;
+			host_config_t *tmp;
+
+			host = cna_config_host(item, &default_host, &default_service);
+			if (host == NULL)
+				continue;
+
+			for (tmp = global_host_config; tmp != NULL; tmp = tmp->next)
+			{
+				if (strcasecmp (host->name, tmp->name) == 0)
+					WARNING ("netapp plugin: Duplicate definition of host `%s'. "
+							"This is probably a bad idea.",
+							host->name);
+
+				if (tmp->next == NULL)
+					break;
+			}
+
+			host->next = NULL;
+			if (tmp == NULL)
+				global_host_config = host;
+			else
+				tmp->next = host;
 		} else {
 			WARNING("netapp plugin: Ignoring unknown config option \"%s\".", item->key);
 		}
@@ -1499,7 +1617,7 @@ static int cna_read(void) { /* {{{ */
 	host_config_t *host;
 	cfg_service_t *service;
 	
-	for (host = host_config; host; host = host->next) {
+	for (host = global_host_config; host; host = host->next) {
 		for (service = host->services; service; service = service->next) {
 			if (--service->skip_countdown > 0) continue;
 			service->skip_countdown = service->multiplier;