X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fconntrack.c;h=10c6f5adc76962caa8ef62c9446c4de42ca8d42d;hp=e70ff5f1834b5deecc53bfe7f0419176ce564eeb;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hpb=307459f5a1d79ee373cf59c7c8a0824d325c43e3

diff --git a/src/conntrack.c b/src/conntrack.c
index e70ff5f1..10c6f5ad 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -8,7 +8,7 @@
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
@@ -18,7 +18,7 @@
  * Authors:
  *   Tomasz Pala <gotar at pld-linux.org>
  * based on entropy.c by:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
@@ -30,33 +30,62 @@
 #endif
 
 #define CONNTRACK_FILE "/proc/sys/net/netfilter/nf_conntrack_count"
+#define CONNTRACK_MAX_FILE "/proc/sys/net/netfilter/nf_conntrack_max"
 
-static void conntrack_submit (double conntrack)
+static void conntrack_submit (const char *type, const char *type_instance,
+			      value_t conntrack)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].gauge = conntrack;
-
-	vl.values = values;
+	vl.values = &conntrack;
 	vl.values_len = 1;
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "conntrack", sizeof (vl.plugin));
-	sstrncpy (vl.type, "conntrack", sizeof (vl.type));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	if (type_instance != NULL)
+		sstrncpy (vl.type_instance, type_instance,
+			  sizeof (vl.type_instance));
 
 	plugin_dispatch_values (&vl);
 } /* static void conntrack_submit */
 
 static int conntrack_read (void)
 {
-	double conntrack;
+	value_t conntrack, conntrack_max, conntrack_pct;
 	FILE *fh;
 	char buffer[64];
+	size_t buffer_len;
 
 	fh = fopen (CONNTRACK_FILE, "r");
 	if (fh == NULL)
 		return (-1);
 
+	memset (buffer, 0, sizeof (buffer));
+	if (fgets (buffer, sizeof (buffer), fh) == NULL)
+	{
+		fclose (fh);
+		return (-1);
+	}
+	fclose (fh);
+
+	/* strip trailing newline. */
+	buffer_len = strlen (buffer);
+	while ((buffer_len > 0) && isspace ((int) buffer[buffer_len - 1]))
+	{
+		buffer[buffer_len - 1] = 0;
+		buffer_len--;
+	}
+
+	if (parse_value (buffer, &conntrack, DS_TYPE_GAUGE) != 0)
+		return (-1);
+
+	conntrack_submit ("conntrack", NULL, conntrack);
+
+	fh = fopen (CONNTRACK_MAX_FILE, "r");
+	if (fh == NULL)
+		return (-1);
+
+	memset (buffer, 0, sizeof (buffer));
 	if (fgets (buffer, sizeof (buffer), fh) == NULL)
 	{
 		fclose (fh);
@@ -64,10 +93,21 @@ static int conntrack_read (void)
 	}
 	fclose (fh);
 
-	conntrack = atof (buffer);
+	/* strip trailing newline. */
+	buffer_len = strlen (buffer);
+	while ((buffer_len > 0) && isspace ((int) buffer[buffer_len - 1]))
+	{
+		buffer[buffer_len - 1] = 0;
+		buffer_len--;
+	}
+
+	if (parse_value (buffer, &conntrack_max, DS_TYPE_GAUGE) != 0)
+		return (-1);
+
+	conntrack_submit ("conntrack", "max", conntrack_max);
+	conntrack_pct.gauge = (conntrack.gauge / conntrack_max.gauge) * 100;
+	conntrack_submit ("percent", "used", conntrack_pct);
 
-	if (conntrack > 0.0)
-		conntrack_submit (conntrack);
 
 	return (0);
 } /* static int conntrack_read */