X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetwork.c;h=c347552e904a981b0588028093ed759b10847d61;hb=b7d9bc30c8853f75a50482ae14a74de31871cf6e;hp=ad8d530e4780d4ff9ce8ab96d72b65455a243c42;hpb=785feb9d2544aff7f561fbda30aa762eec9e07bc;p=collectd.git

diff --git a/src/network.c b/src/network.c
index ad8d530e..c347552e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -166,7 +166,7 @@ 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;
@@ -184,12 +184,12 @@ static int cache_flush (void)
 
 	char   *key;
 	time_t *value;
-	avl_iterator_t *iter;
+	c_avl_iterator_t *iter;
 
 	time_t curtime = time (NULL);
 
-	iter = avl_get_iterator (cache_tree);
-	while (avl_iterator_next (iter, (void *) &key, (void *) &value) == 0)
+	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;
@@ -198,7 +198,7 @@ static int cache_flush (void)
 		if (tmp == NULL)
 		{
 			sfree (keys);
-			avl_iterator_destroy (iter);
+			c_avl_iterator_destroy (iter);
 			ERROR ("network plugin: cache_flush: realloc"
 					" failed.");
 			return (-1);
@@ -206,15 +206,15 @@ static int cache_flush (void)
 		keys = tmp;
 		keys[keys_num] = key;
 		keys_num++;
-	} /* while (avl_iterator_next) */
-	avl_iterator_destroy (iter);
+	} /* while (c_avl_iterator_next) */
+	c_avl_iterator_destroy (iter);
 
 	for (i = 0; i < keys_num; i++)
 	{
-		if (avl_remove (cache_tree, keys[i], (void *) &key,
+		if (c_avl_remove (cache_tree, keys[i], (void *) &key,
 					(void *) &value) != 0)
 		{
-			WARNING ("network plugin: cache_flush: avl_remove"
+			WARNING ("network plugin: cache_flush: c_avl_remove"
 					" (%s) failed.", keys[i]);
 			continue;
 		}
@@ -246,7 +246,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)
 		{
@@ -267,7 +267,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
@@ -682,6 +682,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);
 
@@ -989,7 +999,7 @@ static int network_add_sending_socket (const char *node, const char *service)
 	return (0);
 } /* int network_get_listen_socket */
 
-int network_receive (void)
+static int network_receive (void)
 {
 	char buffer[BUFF_SIZE];
 	int  buffer_len;
@@ -1091,7 +1101,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)
@@ -1100,8 +1109,6 @@ 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)
@@ -1110,8 +1117,6 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					(uint64_t) vl->interval))
 			return (-1);
 		vl_def->interval = vl->interval;
-		DEBUG ("network plugin: add_to_buffer: interval = %i",
-				(int) vl->interval);
 	}
 
 	if (strcmp (vl_def->plugin, vl->plugin) != 0)
@@ -1120,8 +1125,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)
@@ -1131,8 +1134,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)
@@ -1141,7 +1142,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)
@@ -1151,8 +1151,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)
@@ -1249,7 +1247,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)
@@ -1290,8 +1292,6 @@ static int network_config (const char *key, const char *val)
 
 static int network_shutdown (void)
 {
-	DEBUG ("Shutting down.");
-
 	listen_loop++;
 
 	if (listen_thread != (pthread_t) 0)
@@ -1301,19 +1301,20 @@ static int network_shutdown (void)
 		listen_thread = (pthread_t) 0;
 	}
 
-	listen_thread = 0;
+	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;
 	}
 
@@ -1336,7 +1337,7 @@ 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 */