X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=2a7e0b80cc41ef0e0bf912dab58895bb88b8ee56;hb=3469385f04ffcfa2f4ef06d34ed4b24acb378b34;hp=2365d1ff15f344f53f8992129fa87dab96880da9;hpb=09c6d16ffba1b1b15e50579bbcf663f05f630932;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 2365d1ff..2a7e0b80 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/apache.c
- * Copyright (C) 2006,2007  Florian octo Forster
+ * Copyright (C) 2006-2008  Florian octo Forster
  * Copyright (C) 2007  Florent EppO Monbillard
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -36,36 +36,46 @@ static char *cacert = NULL;
 
 static CURL *curl = NULL;
 
-#define ABUFFER_SIZE 16384
-static char apache_buffer[ABUFFER_SIZE];
-static int  apache_buffer_len = 0;
-static char apache_curl_error[CURL_ERROR_SIZE];
+static char  *apache_buffer = NULL;
+static size_t apache_buffer_size = 0;
+static size_t apache_buffer_fill = 0;
+static char   apache_curl_error[CURL_ERROR_SIZE];
 
 static const char *config_keys[] =
 {
 	"URL",
 	"User",
 	"Password",
-	"CACert",
-	NULL
+	"CACert"
 };
-static int config_keys_num = 4;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
-static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
+static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
+		void *stream)
 {
 	size_t len = size * nmemb;
 
-	if ((apache_buffer_len + len) >= ABUFFER_SIZE)
-	{
-		len = (ABUFFER_SIZE - 1) - apache_buffer_len;
-	}
-
 	if (len <= 0)
 		return (len);
 
-	memcpy (apache_buffer + apache_buffer_len, (char *) buf, len);
-	apache_buffer_len += len;
-	apache_buffer[apache_buffer_len] = '\0';
+	if ((apache_buffer_fill + len) >= apache_buffer_size)
+	{
+		char *temp;
+
+		temp = (char *) realloc (apache_buffer,
+				apache_buffer_fill + len + 1);
+		if (temp == NULL)
+		{
+			ERROR ("apache plugin: realloc failed.");
+			return (0);
+		}
+		apache_buffer = temp;
+		apache_buffer_size = apache_buffer_fill + len + 1;
+	}
+
+	memcpy (apache_buffer + apache_buffer_fill, (char *) buf, len);
+	apache_buffer_fill += len;
+	apache_buffer[apache_buffer_fill] = 0;
 
 	return (len);
 }
@@ -102,6 +112,13 @@ static int init (void)
 {
 	static char credentials[1024];
 
+	if (url == NULL)
+	{
+		WARNING ("apache plugin: init: No URL configured, returning "
+				"an error.");
+		return (-1);
+	}
+
 	if (curl != NULL)
 	{
 		curl_easy_cleanup (curl);
@@ -109,7 +126,7 @@ static int init (void)
 
 	if ((curl = curl_easy_init ()) == NULL)
 	{
-		ERROR ("apache: `curl_easy_init' failed.");
+		ERROR ("apache plugin: init: `curl_easy_init' failed.");
 		return (-1);
 	}
 
@@ -119,19 +136,23 @@ static int init (void)
 
 	if (user != NULL)
 	{
-		if (snprintf (credentials, 1024, "%s:%s", user, pass == NULL ? "" : pass) >= 1024)
+		int status;
+
+		status = snprintf (credentials, sizeof (credentials), "%s:%s",
+				user, (pass == NULL) ? "" : pass);
+		if (status >= sizeof (credentials))
 		{
-			ERROR ("apache: Credentials would have been truncated.");
+			ERROR ("apache plugin: init: Returning an error "
+					"because the credentials have been "
+					"truncated.");
 			return (-1);
 		}
+		credentials[sizeof (credentials) - 1] = '\0';
 
 		curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
 	}
 
-	if (url != NULL)
-	{
-		curl_easy_setopt (curl, CURLOPT_URL, url);
-	}
+	curl_easy_setopt (curl, CURLOPT_URL, url);
 
 	if (cacert != NULL)
 	{
@@ -142,14 +163,11 @@ static int init (void)
 } /* int init */
 
 static void submit_counter (const char *type, const char *type_instance,
-		unsigned long long value)
+		counter_t value)
 {
 	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	DEBUG ("type = %s; type_instance = %s; value = %llu;",
-			type, type_instance, value);
-
 	values[0].counter = value;
 
 	vl.values = values;
@@ -158,20 +176,23 @@ static void submit_counter (const char *type, const char *type_instance,
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "apache");
 	strcpy (vl.plugin_instance, "");
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+
+	if (type_instance != NULL)
+	{
+		strncpy (vl.type_instance, type_instance,
+				sizeof (vl.type_instance));
+		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+	}
 
 	plugin_dispatch_values (type, &vl);
 } /* void submit_counter */
 
 static void submit_gauge (const char *type, const char *type_instance,
-		double value)
+		gauge_t value)
 {
 	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	DEBUG ("type = %s; type_instance = %s; value = %lf;",
-			type, type_instance, value);
-
 	values[0].gauge = value;
 
 	vl.values = values;
@@ -182,8 +203,11 @@ static void submit_gauge (const char *type, const char *type_instance,
 	strcpy (vl.plugin_instance, "");
 
 	if (type_instance != NULL)
+	{
 		strncpy (vl.type_instance, type_instance,
 				sizeof (vl.type_instance));
+		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+	}
 
 	plugin_dispatch_values (type, &vl);
 } /* void submit_counter */
@@ -256,7 +280,7 @@ static int apache_read (void)
 	if (url == NULL)
 		return (-1);
 
-	apache_buffer_len = 0;
+	apache_buffer_fill = 0;
 	if (curl_easy_perform (curl) != 0)
 	{
 		ERROR ("apache: curl_easy_perform failed: %s",
@@ -299,7 +323,7 @@ static int apache_read (void)
 		}
 	}
 
-	apache_buffer_len = 0;
+	apache_buffer_fill = 0;
 
 	return (0);
 } /* int apache_read */