X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetwork.c;h=98f49dd6931c157c17e8d0efef81fd26850b1389;hb=6e855e6ab3bc654a3d6238c75102c66785de8bda;hp=96d48f8bbcf790b7bba7c5bd9713479c93c5a7eb;hpb=5e75ddfba7eb16dd035478d5267d6a86a13d8055;p=collectd.git

diff --git a/src/network.c b/src/network.c
index 96d48f8b..98f49dd6 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/network.c
- * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2005-2008  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -136,11 +136,20 @@ struct part_values_s
 };
 typedef struct part_values_s part_values_t;
 
+struct receive_list_entry_s
+{
+  char data[BUFF_SIZE];
+  int  data_len;
+  struct receive_list_entry_s *next;
+};
+typedef struct receive_list_entry_s receive_list_entry_t;
+
 /*
  * Private variables
  */
 static const char *config_keys[] =
 {
+	"CacheFlush",
 	"Listen",
 	"Server",
 	"TimeToLive",
@@ -153,24 +162,90 @@ static int network_config_forward = 0;
 
 static sockent_t *sending_sockets = NULL;
 
+static receive_list_entry_t *receive_list_head = NULL;
+static receive_list_entry_t *receive_list_tail = NULL;
+static pthread_mutex_t       receive_list_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t        receive_list_cond = PTHREAD_COND_INITIALIZER;
+
 static struct pollfd *listen_sockets = NULL;
 static int listen_sockets_num = 0;
-static pthread_t listen_thread = 0;
+
 static int listen_loop = 0;
+static pthread_t receive_thread_id = 0;
+static pthread_t dispatch_thread_id = 0;
 
 static char         send_buffer[BUFF_SIZE];
 static char        *send_buffer_ptr;
 static int          send_buffer_fill;
-static value_list_t send_buffer_vl = VALUE_LIST_INIT;
+static value_list_t send_buffer_vl = VALUE_LIST_STATIC;
 static char         send_buffer_type[DATA_MAX_NAME_LEN];
 static pthread_mutex_t send_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
 
-static avl_tree_t      *cache_tree = NULL;
+static c_avl_tree_t      *cache_tree = NULL;
 static pthread_mutex_t  cache_lock = PTHREAD_MUTEX_INITIALIZER;
+static time_t           cache_flush_last;
+static int              cache_flush_interval = 1800;
 
 /*
  * Private functions
  */
+static int cache_flush (void)
+{
+	char **keys = NULL;
+	int    keys_num = 0;
+
+	char **tmp;
+	int    i;
+
+	char   *key;
+	time_t *value;
+	c_avl_iterator_t *iter;
+
+	time_t curtime = time (NULL);
+
+	iter = c_avl_get_iterator (cache_tree);
+	while (c_avl_iterator_next (iter, (void *) &key, (void *) &value) == 0)
+	{
+		if ((curtime - *value) <= cache_flush_interval)
+			continue;
+		tmp = (char **) realloc (keys,
+				(keys_num + 1) * sizeof (char *));
+		if (tmp == NULL)
+		{
+			sfree (keys);
+			c_avl_iterator_destroy (iter);
+			ERROR ("network plugin: cache_flush: realloc"
+					" failed.");
+			return (-1);
+		}
+		keys = tmp;
+		keys[keys_num] = key;
+		keys_num++;
+	} /* while (c_avl_iterator_next) */
+	c_avl_iterator_destroy (iter);
+
+	for (i = 0; i < keys_num; i++)
+	{
+		if (c_avl_remove (cache_tree, keys[i], (void *) &key,
+					(void *) &value) != 0)
+		{
+			WARNING ("network plugin: cache_flush: c_avl_remove"
+					" (%s) failed.", keys[i]);
+			continue;
+		}
+
+		sfree (key);
+		sfree (value);
+	}
+
+	sfree (keys);
+
+	DEBUG ("network plugin: cache_flush: Removed %i %s",
+			keys_num, (keys_num == 1) ? "entry" : "entries");
+	cache_flush_last = curtime;
+	return (0);
+} /* int cache_flush */
+
 static int cache_check (const char *type, const value_list_t *vl)
 {
 	char key[1024];
@@ -186,7 +261,7 @@ static int cache_check (const char *type, const value_list_t *vl)
 
 	pthread_mutex_lock (&cache_lock);
 
-	if (avl_get (cache_tree, key, (void *) &value) == 0)
+	if (c_avl_get (cache_tree, key, (void *) &value) == 0)
 	{
 		if (*value < vl->time)
 		{
@@ -207,7 +282,7 @@ static int cache_check (const char *type, const value_list_t *vl)
 		if ((key_copy != NULL) && (value != NULL))
 		{
 			*value = vl->time;
-			avl_insert (cache_tree, key_copy, value);
+			c_avl_insert (cache_tree, key_copy, value);
 			retval = 0;
 		}
 		else
@@ -217,7 +292,8 @@ static int cache_check (const char *type, const value_list_t *vl)
 		}
 	}
 
-	/* TODO: Flush cache */
+	if ((time (NULL) - cache_flush_last) > cache_flush_interval)
+		cache_flush ();
 
 	pthread_mutex_unlock (&cache_lock);
 
@@ -230,37 +306,83 @@ static int cache_check (const char *type, const value_list_t *vl)
 static int write_part_values (char **ret_buffer, int *ret_buffer_len,
 		const data_set_t *ds, const value_list_t *vl)
 {
-	part_values_t pv;
+	char *packet_ptr;
+	int packet_len;
+	int num_values;
+
+	part_header_t pkg_ph;
+	uint16_t      pkg_num_values;
+	uint8_t      *pkg_values_types;
+	value_t      *pkg_values;
+
+	int offset;
 	int i;
 
-	i = 6 + (9 * vl->values_len);
-	if (*ret_buffer_len < i)
+	num_values = vl->values_len;
+	packet_len = sizeof (part_header_t) + sizeof (uint16_t)
+		+ (num_values * sizeof (uint8_t))
+		+ (num_values * sizeof (value_t));
+
+	if (*ret_buffer_len < packet_len)
 		return (-1);
-	*ret_buffer_len -= i;
 
-	pv.head = (part_header_t *) *ret_buffer;
-	pv.num_values = (uint16_t *) (pv.head + 1);
-	pv.values_types = (uint8_t *) (pv.num_values + 1);
-	pv.values = (value_t *) (pv.values_types + vl->values_len);
-	*ret_buffer = (void *) (pv.values + vl->values_len);
+	pkg_values_types = (uint8_t *) malloc (num_values * sizeof (uint8_t));
+	if (pkg_values_types == NULL)
+	{
+		ERROR ("network plugin: write_part_values: malloc failed.");
+		return (-1);
+	}
 
-	pv.head->type = htons (TYPE_VALUES);
-	pv.head->length = htons (6 + (9 * vl->values_len));
-	*pv.num_values = htons ((uint16_t) vl->values_len);
-	
-	for (i = 0; i < vl->values_len; i++)
+	pkg_values = (value_t *) malloc (num_values * sizeof (value_t));
+	if (pkg_values == NULL)
+	{
+		free (pkg_values_types);
+		ERROR ("network plugin: write_part_values: malloc failed.");
+		return (-1);
+	}
+
+	pkg_ph.type = htons (TYPE_VALUES);
+	pkg_ph.length = htons (packet_len);
+
+	pkg_num_values = htons ((uint16_t) vl->values_len);
+
+	for (i = 0; i < num_values; i++)
 	{
 		if (ds->ds[i].type == DS_TYPE_COUNTER)
 		{
-			pv.values_types[i] = DS_TYPE_COUNTER;
-			pv.values[i].counter = htonll (vl->values[i].counter);
+			pkg_values_types[i] = DS_TYPE_COUNTER;
+			pkg_values[i].counter = htonll (vl->values[i].counter);
 		}
 		else
 		{
-			pv.values_types[i] = DS_TYPE_GAUGE;
-			pv.values[i].gauge = vl->values[i].gauge;
+			pkg_values_types[i] = DS_TYPE_GAUGE;
+			pkg_values[i].gauge = htond (vl->values[i].gauge);
 		}
-	} /* for (values) */
+	}
+
+	/*
+	 * Use `memcpy' to write everything to the buffer, because the pointer
+	 * may be unaligned and some architectures, such as SPARC, can't handle
+	 * that.
+	 */
+	packet_ptr = *ret_buffer;
+	offset = 0;
+	memcpy (packet_ptr + offset, &pkg_ph, sizeof (pkg_ph));
+	offset += sizeof (pkg_ph);
+	memcpy (packet_ptr + offset, &pkg_num_values, sizeof (pkg_num_values));
+	offset += sizeof (pkg_num_values);
+	memcpy (packet_ptr + offset, pkg_values_types, num_values * sizeof (uint8_t));
+	offset += num_values * sizeof (uint8_t);
+	memcpy (packet_ptr + offset, pkg_values, num_values * sizeof (value_t));
+	offset += num_values * sizeof (value_t);
+
+	assert (offset == packet_len);
+
+	*ret_buffer = packet_ptr + packet_len;
+	*ret_buffer_len -= packet_len;
+
+	free (pkg_values_types);
+	free (pkg_values);
 
 	return (0);
 } /* int write_part_values */
@@ -268,20 +390,34 @@ static int write_part_values (char **ret_buffer, int *ret_buffer_len,
 static int write_part_number (char **ret_buffer, int *ret_buffer_len,
 		int type, uint64_t value)
 {
-	part_number_t pn;
+	char *packet_ptr;
+	int packet_len;
+
+	part_header_t pkg_head;
+	uint64_t pkg_value;
+	
+	int offset;
+
+	packet_len = sizeof (pkg_head) + sizeof (pkg_value);
 
-	if (*ret_buffer_len < 12)
+	if (*ret_buffer_len < packet_len)
 		return (-1);
 
-	pn.head = (part_header_t *) *ret_buffer;
-	pn.value = (uint64_t *) (pn.head + 1);
+	pkg_head.type = htons (type);
+	pkg_head.length = htons (packet_len);
+	pkg_value = htonll (value);
 
-	pn.head->type = htons (type);
-	pn.head->length = htons (12);
-	*pn.value = htonll (value);
+	packet_ptr = *ret_buffer;
+	offset = 0;
+	memcpy (packet_ptr + offset, &pkg_head, sizeof (pkg_head));
+	offset += sizeof (pkg_head);
+	memcpy (packet_ptr + offset, &pkg_value, sizeof (pkg_value));
+	offset += sizeof (pkg_value);
 
-	*ret_buffer = (char *) (pn.value + 1);
-	*ret_buffer_len -= 12;
+	assert (offset == packet_len);
+
+	*ret_buffer = packet_ptr + packet_len;
+	*ret_buffer_len -= packet_len;
 
 	return (0);
 } /* int write_part_number */
@@ -289,23 +425,33 @@ static int write_part_number (char **ret_buffer, int *ret_buffer_len,
 static int write_part_string (char **ret_buffer, int *ret_buffer_len,
 		int type, const char *str, int str_len)
 {
-	part_string_t ps;
-	int len;
+	char *packet_ptr;
+	int packet_len;
+
+	part_header_t pkg_head;
+
+	int offset;
 
-	len = 4 + str_len + 1;
-	if (*ret_buffer_len < len)
+	packet_len = sizeof (pkg_head) + str_len + 1;
+	if (*ret_buffer_len < packet_len)
 		return (-1);
-	*ret_buffer_len -= len;
 
-	ps.head = (part_header_t *) *ret_buffer;
-	ps.value = (char *) (ps.head + 1);
+	pkg_head.type = htons (type);
+	pkg_head.length = htons (packet_len);
+
+	packet_ptr = *ret_buffer;
+	offset = 0;
+	memcpy (packet_ptr + offset, &pkg_head, sizeof (pkg_head));
+	offset += sizeof (pkg_head);
+	memcpy (packet_ptr + offset, str, str_len);
+	offset += str_len;
+	memset (packet_ptr + offset, '\0', 1);
+	offset += 1;
 
-	ps.head->type = htons ((uint16_t) type);
-	ps.head->length = htons ((uint16_t) str_len + 5);
-	if (str_len > 0)
-		memcpy (ps.value, str, str_len);
-	ps.value[str_len] = '\0';
-	*ret_buffer = (void *) (ps.value + (str_len + 1));
+	assert (offset == packet_len);
+
+	*ret_buffer = packet_ptr + packet_len;
+	*ret_buffer_len -= packet_len;
 
 	return (0);
 } /* int write_part_string */
@@ -324,7 +470,8 @@ static int parse_part_values (void **ret_buffer, int *ret_buffer_len,
 
 	if (buffer_len < (15))
 	{
-		DEBUG ("packet is too short: buffer_len = %i", buffer_len);
+		DEBUG ("network plugin: packet is too short: buffer_len = %i",
+				buffer_len);
 		return (-1);
 	}
 
@@ -349,6 +496,8 @@ static int parse_part_values (void **ret_buffer, int *ret_buffer_len,
 	for (i = 0; i < h_num; i++)
 		if (pv.values_types[i] == DS_TYPE_COUNTER)
 			pv.values[i].counter = ntohll (pv.values[i].counter);
+		else
+			pv.values[i].gauge = ntohd (pv.values[i].gauge);
 
 	*ret_buffer     = (void *) (pv.values + h_num);
 	*ret_buffer_len = buffer_len - h_length;
@@ -412,7 +561,8 @@ static int parse_part_string (void **ret_buffer, int *ret_buffer_len,
 			|| (h_type == TYPE_PLUGIN)
 			|| (h_type == TYPE_PLUGIN_INSTANCE)
 			|| (h_type == TYPE_TYPE)
-			|| (h_type == TYPE_TYPE_INSTANCE));
+			|| (h_type == TYPE_TYPE_INSTANCE)
+			|| (h_type == TYPE_MESSAGE));
 
 	ps.value = buffer + 4;
 	if (ps.value[h_length - 5] != '\0')
@@ -443,15 +593,18 @@ static int parse_packet (void *buffer, int buffer_len)
 
 	value_list_t vl = VALUE_LIST_INIT;
 	char type[DATA_MAX_NAME_LEN];
+	notification_t n;
 
 	DEBUG ("network plugin: parse_packet: buffer = %p; buffer_len = %i;",
 			buffer, buffer_len);
 
 	memset (&vl, '\0', sizeof (vl));
 	memset (&type, '\0', sizeof (type));
+	memset (&n, '\0', sizeof (n));
 	status = 0;
 
-	while ((status == 0) && (buffer_len > sizeof (part_header_t)))
+	while ((status == 0) && (0 < buffer_len)
+			&& ((unsigned int) buffer_len > sizeof (part_header_t)))
 	{
 		header = (part_header_t *) buffer;
 
@@ -493,37 +646,112 @@ static int parse_packet (void *buffer, int buffer_len)
 			uint64_t tmp = 0;
 			status = parse_part_number (&buffer, &buffer_len, &tmp);
 			if (status == 0)
+			{
 				vl.time = (time_t) tmp;
+				n.time = (time_t) tmp;
+			}
+		}
+		else if (ntohs (header->type) == TYPE_INTERVAL)
+		{
+			uint64_t tmp = 0;
+			status = parse_part_number (&buffer, &buffer_len, &tmp);
+			if (status == 0)
+				vl.interval = (int) tmp;
 		}
 		else if (ntohs (header->type) == TYPE_HOST)
 		{
 			status = parse_part_string (&buffer, &buffer_len,
 					vl.host, sizeof (vl.host));
-			DEBUG ("network plugin: parse_packet: vl.host = %s", vl.host);
+			strncpy (n.host, vl.host, sizeof (n.host));
+			n.host[sizeof (n.host) - 1] = '\0';
+			DEBUG ("network plugin: parse_packet: vl.host = %s",
+					vl.host);
 		}
 		else if (ntohs (header->type) == TYPE_PLUGIN)
 		{
 			status = parse_part_string (&buffer, &buffer_len,
 					vl.plugin, sizeof (vl.plugin));
-			DEBUG ("network plugin: parse_packet: vl.plugin = %s", vl.plugin);
+			strncpy (n.plugin, vl.plugin, sizeof (n.plugin));
+			n.plugin[sizeof (n.plugin) - 1] = '\0';
+			DEBUG ("network plugin: parse_packet: vl.plugin = %s",
+					vl.plugin);
 		}
 		else if (ntohs (header->type) == TYPE_PLUGIN_INSTANCE)
 		{
 			status = parse_part_string (&buffer, &buffer_len,
-					vl.plugin_instance, sizeof (vl.plugin_instance));
-			DEBUG ("network plugin: parse_packet: vl.plugin_instance = %s", vl.plugin_instance);
+					vl.plugin_instance,
+					sizeof (vl.plugin_instance));
+			strncpy (n.plugin_instance, vl.plugin_instance,
+					sizeof (n.plugin_instance));
+			n.plugin_instance[sizeof (n.plugin_instance) - 1] = '\0';
+			DEBUG ("network plugin: parse_packet: "
+					"vl.plugin_instance = %s",
+					vl.plugin_instance);
 		}
 		else if (ntohs (header->type) == TYPE_TYPE)
 		{
 			status = parse_part_string (&buffer, &buffer_len,
 					type, sizeof (type));
-			DEBUG ("network plugin: parse_packet: type = %s", type);
+			strncpy (n.type, type, sizeof (n.type));
+			n.type[sizeof (n.type) - 1] = '\0';
+			DEBUG ("network plugin: parse_packet: type = %s",
+					type);
 		}
 		else if (ntohs (header->type) == TYPE_TYPE_INSTANCE)
 		{
 			status = parse_part_string (&buffer, &buffer_len,
-					vl.type_instance, sizeof (vl.type_instance));
-			DEBUG ("network plugin: parse_packet: vl.type_instance = %s", vl.type_instance);
+					vl.type_instance,
+					sizeof (vl.type_instance));
+			strncpy (n.type_instance, vl.type_instance,
+					sizeof (n.type_instance));
+			n.type_instance[sizeof (n.type_instance) - 1] = '\0';
+			DEBUG ("network plugin: parse_packet: "
+					"vl.type_instance = %s",
+					vl.type_instance);
+		}
+		else if (ntohs (header->type) == TYPE_MESSAGE)
+		{
+			status = parse_part_string (&buffer, &buffer_len,
+					n.message, sizeof (n.message));
+			DEBUG ("network plugin: parse_packet: n.message = %s",
+					n.message);
+
+			if ((n.severity != NOTIF_FAILURE)
+					&& (n.severity != NOTIF_WARNING)
+					&& (n.severity != NOTIF_OKAY))
+			{
+				INFO ("network plugin: "
+						"Ignoring notification with "
+						"unknown severity %s.",
+						n.severity);
+			}
+			else if (n.time <= 0)
+			{
+				INFO ("network plugin: "
+						"Ignoring notification with "
+						"time == 0.");
+			}
+			else if (strlen (n.message) <= 0)
+			{
+				INFO ("network plugin: "
+						"Ignoring notification with "
+						"an empty message.");
+			}
+			else
+			{
+				/*
+				 * TODO: Let this do a separate thread so that
+				 * no packets are lost if this takes too long.
+				 */
+				plugin_dispatch_notification (&n);
+			}
+		}
+		else if (ntohs (header->type) == TYPE_SEVERITY)
+		{
+			uint64_t tmp = 0;
+			status = parse_part_number (&buffer, &buffer_len, &tmp);
+			if (status == 0)
+				n.severity = (int) tmp;
 		}
 		else
 		{
@@ -613,6 +841,16 @@ static int network_set_ttl (const sockent_t *se, const struct addrinfo *ai)
 static int network_bind_socket (const sockent_t *se, const struct addrinfo *ai)
 {
 	int loop = 0;
+	int yes  = 1;
+
+	/* allow multiple sockets to use the same PORT number */
+	if (setsockopt(se->fd, SOL_SOCKET, SO_REUSEADDR,
+				&yes, sizeof(yes)) == -1) {
+                char errbuf[1024];
+                ERROR ("setsockopt: %s", 
+                                sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (-1);
+	}
 
 	DEBUG ("fd = %i; calling `bind'", se->fd);
 
@@ -920,7 +1158,38 @@ static int network_add_sending_socket (const char *node, const char *service)
 	return (0);
 } /* int network_get_listen_socket */
 
-int network_receive (void)
+static void *dispatch_thread (void *arg)
+{
+  while (42)
+  {
+    receive_list_entry_t *ent;
+
+    /* Lock and wait for more data to come in */
+    pthread_mutex_lock (&receive_list_lock);
+    while ((listen_loop == 0)
+	&& (receive_list_head == NULL))
+      pthread_cond_wait (&receive_list_cond, &receive_list_lock);
+
+    /* Remove the head entry and unlock */
+    ent = receive_list_head;
+    if (ent != NULL)
+      receive_list_head = ent->next;
+    pthread_mutex_unlock (&receive_list_lock);
+
+    /* Check whether we are supposed to exit. We do NOT check `listen_loop'
+     * because we dispatch all missing packets before shutting down. */
+    if (ent == NULL)
+      break;
+
+    parse_packet (ent->data, ent->data_len);
+
+    sfree (ent);
+  } /* while (42) */
+
+  return (NULL);
+} /* void *receive_thread */
+
+static int network_receive (void)
 {
 	char buffer[BUFF_SIZE];
 	int  buffer_len;
@@ -953,6 +1222,8 @@ int network_receive (void)
 
 		for (i = 0; (i < listen_sockets_num) && (status > 0); i++)
 		{
+			receive_list_entry_t *ent;
+
 			if ((listen_sockets[i].revents & (POLLIN | POLLPRI)) == 0)
 				continue;
 			status--;
@@ -969,7 +1240,35 @@ int network_receive (void)
 				return (-1);
 			}
 
-			parse_packet (buffer, buffer_len);
+			ent = malloc (sizeof (receive_list_entry_t));
+			if (ent == NULL)
+			{
+				ERROR ("network plugin: malloc failed.");
+				return (-1);
+			}
+			memset (ent, '\0', sizeof (receive_list_entry_t));
+
+			/* Hopefully this be optimized out by the compiler. It
+			 * might help prevent stupid bugs in the future though.
+			 */
+			assert (sizeof (ent->data) == sizeof (buffer));
+
+			memcpy (ent->data, buffer, buffer_len);
+			ent->data_len = buffer_len;
+
+			pthread_mutex_lock (&receive_list_lock);
+			if (receive_list_head == NULL)
+			{
+				receive_list_head = ent;
+				receive_list_tail = ent;
+			}
+			else
+			{
+				receive_list_tail->next = ent;
+				receive_list_tail = ent;
+			}
+			pthread_cond_signal (&receive_list_cond);
+			pthread_mutex_unlock (&receive_list_lock);
 		} /* for (listen_sockets) */
 	} /* while (listen_loop == 0) */
 
@@ -986,7 +1285,7 @@ static void network_send_buffer (const char *buffer, int buffer_len)
 	sockent_t *se;
 	int status;
 
-	DEBUG ("buffer_len = %i", buffer_len);
+	DEBUG ("network plugin: network_send_buffer: buffer_len = %i", buffer_len);
 
 	for (se = sending_sockets; se != NULL; se = se->next)
 	{
@@ -1022,7 +1321,6 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					vl->host, strlen (vl->host)) != 0)
 			return (-1);
 		strcpy (vl_def->host, vl->host);
-		DEBUG ("network plugin: add_to_buffer: host = %s", vl->host);
 	}
 
 	if (vl_def->time != vl->time)
@@ -1031,8 +1329,14 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					(uint64_t) vl->time))
 			return (-1);
 		vl_def->time = vl->time;
-		DEBUG ("network plugin: add_to_buffer: time = %u",
-				(unsigned int) vl->time);
+	}
+
+	if (vl_def->interval != vl->interval)
+	{
+		if (write_part_number (&buffer, &buffer_size, TYPE_INTERVAL,
+					(uint64_t) vl->interval))
+			return (-1);
+		vl_def->interval = vl->interval;
 	}
 
 	if (strcmp (vl_def->plugin, vl->plugin) != 0)
@@ -1041,8 +1345,6 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					vl->plugin, strlen (vl->plugin)) != 0)
 			return (-1);
 		strcpy (vl_def->plugin, vl->plugin);
-		DEBUG ("network plugin: add_to_buffer: plugin = %s",
-				vl->plugin);
 	}
 
 	if (strcmp (vl_def->plugin_instance, vl->plugin_instance) != 0)
@@ -1052,8 +1354,6 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					strlen (vl->plugin_instance)) != 0)
 			return (-1);
 		strcpy (vl_def->plugin_instance, vl->plugin_instance);
-		DEBUG ("network plugin: add_to_buffer: plugin_instance = %s",
-				vl->plugin_instance);
 	}
 
 	if (strcmp (type_def, ds->type) != 0)
@@ -1062,7 +1362,6 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					ds->type, strlen (ds->type)) != 0)
 			return (-1);
 		strcpy (type_def, ds->type);
-		DEBUG ("network plugin: add_to_buffer: type = %s", ds->type);
 	}
 
 	if (strcmp (vl_def->type_instance, vl->type_instance) != 0)
@@ -1072,8 +1371,6 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					strlen (vl->type_instance)) != 0)
 			return (-1);
 		strcpy (vl_def->type_instance, vl->type_instance);
-		DEBUG ("network plugin: add_to_buffer: type_instance = %s",
-				vl->type_instance);
 	}
 	
 	if (write_part_values (&buffer, &buffer_size, ds, vl) != 0)
@@ -1170,7 +1467,11 @@ static int network_config (const char *key, const char *val)
 				&& (fields_num != 2))
 			return (1);
 		else if (fields_num == 2)
+		{
+			if ((service = strchr (fields[1], '.')) != NULL)
+				*service = '\0';
 			service = fields[1];
+		}
 		node = fields[0];
 
 		if (strcasecmp ("Listen", key) == 0)
@@ -1195,39 +1496,121 @@ static int network_config (const char *key, const char *val)
 		else
 			network_config_forward = 0;
 	}
+	else if (strcasecmp ("CacheFlush", key) == 0)
+	{
+		int tmp = atoi (val);
+		if (tmp > 0)
+			cache_flush_interval = tmp;
+		else return (1);
+	}
 	else
 	{
 		return (-1);
 	}
 	return (0);
-}
+} /* int network_config */
 
-static int network_shutdown (void)
+static int network_notification (const notification_t *n)
 {
-	DEBUG ("Shutting down.");
+  char  buffer[BUFF_SIZE];
+  char *buffer_ptr = buffer;
+  int   buffer_free = sizeof (buffer);
+  int   status;
+
+  memset (buffer, '\0', sizeof (buffer));
+
+
+  status = write_part_number (&buffer_ptr, &buffer_free, TYPE_TIME,
+      (uint64_t) n->time);
+  if (status != 0)
+    return (-1);
+
+  status = write_part_number (&buffer_ptr, &buffer_free, TYPE_SEVERITY,
+      (uint64_t) n->severity);
+  if (status != 0)
+    return (-1);
+
+  if (strlen (n->host) > 0)
+  {
+    status = write_part_string (&buffer_ptr, &buffer_free, TYPE_HOST,
+	n->host, strlen (n->host));
+    if (status != 0)
+      return (-1);
+  }
+
+  if (strlen (n->plugin) > 0)
+  {
+    status = write_part_string (&buffer_ptr, &buffer_free, TYPE_PLUGIN,
+	n->plugin, strlen (n->plugin));
+    if (status != 0)
+      return (-1);
+  }
+
+  if (strlen (n->plugin_instance) > 0)
+  {
+    status = write_part_string (&buffer_ptr, &buffer_free,
+	TYPE_PLUGIN_INSTANCE,
+	n->plugin_instance, strlen (n->plugin_instance));
+    if (status != 0)
+      return (-1);
+  }
+
+  if (strlen (n->type) > 0)
+  {
+    status = write_part_string (&buffer_ptr, &buffer_free, TYPE_TYPE,
+	n->type, strlen (n->type));
+    if (status != 0)
+      return (-1);
+  }
+
+  if (strlen (n->type_instance) > 0)
+  {
+    status = write_part_string (&buffer_ptr, &buffer_free, TYPE_TYPE_INSTANCE,
+	n->type_instance, strlen (n->type_instance));
+    if (status != 0)
+      return (-1);
+  }
+
+  status = write_part_string (&buffer_ptr, &buffer_free, TYPE_MESSAGE,
+      n->message, strlen (n->message));
+  if (status != 0)
+    return (-1);
+
+  network_send_buffer (buffer, sizeof (buffer) - buffer_free);
+
+  return (0);
+} /* int network_notification */
 
+static int network_shutdown (void)
+{
 	listen_loop++;
 
-	if (listen_thread != (pthread_t) 0)
+	/* Kill the listening thread */
+	if (receive_thread_id != (pthread_t) 0)
 	{
-		pthread_kill (listen_thread, SIGTERM);
-		pthread_join (listen_thread, NULL /* no return value */);
-		listen_thread = (pthread_t) 0;
+		pthread_kill (receive_thread_id, SIGTERM);
+		pthread_join (receive_thread_id, NULL /* no return value */);
+		receive_thread_id = (pthread_t) 0;
 	}
 
-	listen_thread = 0;
+	/* Shutdown the dispatching thread */
+	if (dispatch_thread_id != (pthread_t) 0)
+		pthread_cond_broadcast (&receive_list_cond);
+
+	if (send_buffer_fill > 0)
+		flush_buffer ();
 
 	if (cache_tree != NULL)
 	{
 		void *key;
 		void *value;
 
-		while (avl_pick (cache_tree, &key, &value) == 0)
+		while (c_avl_pick (cache_tree, &key, &value) == 0)
 		{
 			sfree (key);
 			sfree (value);
 		}
-		avl_destroy (cache_tree);
+		c_avl_destroy (cache_tree);
 		cache_tree = NULL;
 	}
 
@@ -1250,19 +1633,36 @@ static int network_init (void)
 	memset (&send_buffer_vl, '\0', sizeof (send_buffer_vl));
 	memset (send_buffer_type, '\0', sizeof (send_buffer_type));
 
-	cache_tree = avl_create ((int (*) (const void *, const void *)) strcmp);
+	cache_tree = c_avl_create ((int (*) (const void *, const void *)) strcmp);
+	cache_flush_last = time (NULL);
 
 	/* setup socket(s) and so on */
 	if (sending_sockets != NULL)
+	{
 		plugin_register_write ("network", network_write);
+		plugin_register_notification ("network", network_notification);
+	}
 
-	if ((listen_sockets_num != 0) && (listen_thread == 0))
+	if ((listen_sockets_num != 0) && (receive_thread_id == 0))
 	{
 		int status;
 
-		status = pthread_create (&listen_thread, NULL /* no attributes */,
-				receive_thread, NULL /* no argument */);
+		status = pthread_create (&dispatch_thread_id,
+				NULL /* no attributes */,
+				dispatch_thread,
+				NULL /* no argument */);
+		if (status != 0)
+		{
+			char errbuf[1024];
+			ERROR ("network: pthread_create failed: %s",
+					sstrerror (errno, errbuf,
+						sizeof (errbuf)));
+		}
 
+		status = pthread_create (&receive_thread_id,
+				NULL /* no attributes */,
+				receive_thread,
+				NULL /* no argument */);
 		if (status != 0)
 		{
 			char errbuf[1024];
@@ -1279,4 +1679,4 @@ void module_register (void)
 	plugin_register_config ("network", network_config,
 			config_keys, config_keys_num);
 	plugin_register_init   ("network", network_init);
-}
+} /* void module_register */