X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetwork.c;h=0f558ca921dcbfbb66a523ba140de1c6576e9f6f;hb=d767db104769bed7fefea61538bdacb364434e9a;hp=b67928c7c2fe6a10aec868ba61c5c7fbe512f6c9;hpb=3469385f04ffcfa2f4ef06d34ed4b24acb378b34;p=collectd.git

diff --git a/src/network.c b/src/network.c
index b67928c7..0f558ca9 100644
--- a/src/network.c
+++ b/src/network.c
@@ -183,7 +183,7 @@ static pthread_mutex_t send_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static c_avl_tree_t      *cache_tree = NULL;
 static pthread_mutex_t  cache_lock = PTHREAD_MUTEX_INITIALIZER;
-static time_t           cache_flush_last;
+static time_t           cache_flush_last = 0;
 static int              cache_flush_interval = 1800;
 
 /*
@@ -1405,7 +1405,7 @@ static int add_to_buffer (char *buffer, int buffer_size,
 		if (write_part_string (&buffer, &buffer_size, TYPE_HOST,
 					vl->host, strlen (vl->host)) != 0)
 			return (-1);
-		strcpy (vl_def->host, vl->host);
+		sstrncpy (vl_def->host, vl->host, sizeof (vl_def->host));
 	}
 
 	if (vl_def->time != vl->time)
@@ -1429,7 +1429,7 @@ static int add_to_buffer (char *buffer, int buffer_size,
 		if (write_part_string (&buffer, &buffer_size, TYPE_PLUGIN,
 					vl->plugin, strlen (vl->plugin)) != 0)
 			return (-1);
-		strcpy (vl_def->plugin, vl->plugin);
+		sstrncpy (vl_def->plugin, vl->plugin, sizeof (vl_def->plugin));
 	}
 
 	if (strcmp (vl_def->plugin_instance, vl->plugin_instance) != 0)
@@ -1438,7 +1438,7 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					vl->plugin_instance,
 					strlen (vl->plugin_instance)) != 0)
 			return (-1);
-		strcpy (vl_def->plugin_instance, vl->plugin_instance);
+		sstrncpy (vl_def->plugin_instance, vl->plugin_instance, sizeof (vl_def->plugin_instance));
 	}
 
 	if (strcmp (type_def, ds->type) != 0)
@@ -1446,7 +1446,7 @@ static int add_to_buffer (char *buffer, int buffer_size,
 		if (write_part_string (&buffer, &buffer_size, TYPE_TYPE,
 					ds->type, strlen (ds->type)) != 0)
 			return (-1);
-		strcpy (type_def, ds->type);
+		sstrncpy (type_def, ds->type, sizeof (type_def));
 	}
 
 	if (strcmp (vl_def->type_instance, vl->type_instance) != 0)
@@ -1455,7 +1455,7 @@ static int add_to_buffer (char *buffer, int buffer_size,
 					vl->type_instance,
 					strlen (vl->type_instance)) != 0)
 			return (-1);
-		strcpy (vl_def->type_instance, vl->type_instance);
+		sstrncpy (vl_def->type_instance, vl->type_instance, sizeof (vl_def->type_instance));
 	}
 	
 	if (write_part_values (&buffer, &buffer_size, ds, vl) != 0)
@@ -1706,11 +1706,19 @@ static int network_shutdown (void)
 	plugin_unregister_write ("network");
 	plugin_unregister_shutdown ("network");
 
+	/* Let the init function do it's move again ;) */
+	cache_flush_last = 0;
+
 	return (0);
 } /* int network_shutdown */
 
 static int network_init (void)
 {
+	/* Check if we were already initialized. If so, just return - there's
+	 * nothing more to do (for now, that is). */
+	if (cache_flush_last != 0)
+		return (0);
+
 	plugin_register_shutdown ("network", network_shutdown);
 
 	send_buffer_ptr  = send_buffer;
@@ -1759,9 +1767,25 @@ static int network_init (void)
 	return (0);
 } /* int network_init */
 
+static int network_flush (int timeout)
+{
+	pthread_mutex_lock (&send_buffer_lock);
+
+	if (((time (NULL) - cache_flush_last) >= timeout)
+			&& (send_buffer_fill > 0))
+	{
+		flush_buffer ();
+	}
+
+	pthread_mutex_unlock (&send_buffer_lock);
+
+	return (0);
+} /* int network_flush */
+
 void module_register (void)
 {
 	plugin_register_config ("network", network_config,
 			config_keys, config_keys_num);
 	plugin_register_init   ("network", network_init);
+	plugin_register_flush   ("network", network_flush);
 } /* void module_register */