X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fapache.c;h=280c687feebd79dcbb5c36ed80bce50d3c4ae844;hb=d35dd47646956b011a75084a979fd7850cea9a6b;hp=573a116a215bdeabc0e52feb8e1ca44c11970687;hpb=e1b0c447f57338706d45a485b40da7325faa4f34;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 573a116a..280c687f 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/apache.c
- * Copyright (C) 2006  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
@@ -27,14 +27,8 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#if HAVE_LIBCURL && HAVE_CURL_CURL_H
-#  define APACHE_HAVE_READ 1
-#  include <curl/curl.h>
-#else
-#  define APACHE_HAVE_READ 0
-#endif
+#include <curl/curl.h>
 
-#if APACHE_HAVE_READ
 static char *url    = NULL;
 static char *user   = NULL;
 static char *pass   = NULL;
@@ -52,10 +46,9 @@ 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)
 {
@@ -108,6 +101,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);
@@ -115,7 +115,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);
 	}
 
@@ -125,19 +125,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)
 	{
@@ -148,14 +152,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;
@@ -164,20 +165,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;
@@ -188,8 +192,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 */
@@ -309,14 +316,11 @@ static int apache_read (void)
 
 	return (0);
 } /* int apache_read */
-#endif /* APACHE_HAVE_READ */
 
 void module_register (void)
 {
-#if APACHE_HAVE_READ
 	plugin_register_config ("apache", config,
 			config_keys, config_keys_num);
 	plugin_register_init ("apache", init);
 	plugin_register_read ("apache", apache_read);
-#endif
 } /* void module_register */