X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpf.c;h=44f0c7bcdec158b3244ec6f7b0d9212b9cd652d5;hb=99d7118d9ec6fd9b2907cef30bfa91c72b3a5826;hp=9b69fecfd88905d44467b4ae796f35731d17de1a;hpb=7a0995fb1e8355ef8e89f32d1d50f6382a6c66e8;p=collectd.git

diff --git a/src/pf.c b/src/pf.c
index 9b69fecf..44f0c7bc 100644
--- a/src/pf.c
+++ b/src/pf.c
@@ -15,95 +15,121 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "pfcommon.h"
+#include "collectd.h"
+#include "plugin.h"
+#include "common.h"
 
-static int	pf_init(void);
-static int	pf_read(void);
-static void	submit_counter(const char *, const char *, counter_t);
+#if HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_NET_IF_H
+# include <net/if.h>
+#endif
+
+#include <net/pfvar.h>
+
+#ifndef FCNT_NAMES
+# if FCNT_MAX != 3
+#  error "Unexpected value for FCNT_MAX"
+# endif
+# define FCNT_NAMES {"search", "insert", "removals", NULL};
+#endif
+
+#ifndef SCNT_NAMES
+# if SCNT_MAX != 3
+#  error "Unexpected value for SCNT_MAX"
+# endif
+# define SCNT_NAMES {"search", "insert", "removals", NULL};
+#endif
 
-void
-submit_counter(const char *type, const char *inst, counter_t val)
+static char const *pf_reasons[PFRES_MAX+1] = PFRES_NAMES;
+static char const *pf_lcounters[LCNT_MAX+1] = LCNT_NAMES;
+static char const *pf_fcounters[FCNT_MAX+1] = FCNT_NAMES;
+static char const *pf_scounters[SCNT_MAX+1] = SCNT_NAMES;
+
+static char const *pf_device = "/dev/pf";
+
+static void pf_submit (char const *type, char const *type_instance,
+		uint64_t val, _Bool is_gauge)
 {
-#ifndef TEST
 	value_t		values[1];
 	value_list_t	vl = VALUE_LIST_INIT;
 
-	values[0].gauge = val;
+	if (is_gauge)
+		values[0].gauge = (gauge_t) val;
+	else
+		values[0].derive = (derive_t) val;
 
 	vl.values = values;
 	vl.values_len = 1;
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "pf", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof(vl.type));
-	sstrncpy (vl.type_instance, inst, sizeof(vl.type_instance));
-	plugin_dispatch_values(&vl);
-#else
-	printf("%s.%s: %lld\n", type, inst, val);
-#endif
-}
+	sstrncpy (vl.type_instance, type_instance, sizeof(vl.type_instance));
 
+	plugin_dispatch_values(&vl);
+} /* void pf_submit */
 
-int
-pf_init(void)
+static int pf_read (void)
 {
-	struct pf_status	status;
+	struct pf_status state;
+	int fd;
+	int status;
+	int i;
 
-	if ((pfdev = open(PF_SOCKET, O_RDWR)) == -1) {
-		return (-1);
-	}
-	if (ioctl(pfdev, DIOCGETSTATUS, &status) == -1) {
+	fd = open (pf_device, O_RDONLY);
+	if (fd < 0)
+	{
+		char errbuf[1024];
+		ERROR("pf plugin: Unable to open %s: %s",
+				pf_device,
+				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
 
-	close(pfdev);
-	if (!status.running)
+	memset (&state, 0, sizeof (state));
+	status = ioctl (fd, DIOCGETSTATUS, &state);
+	if (status != 0)
+	{
+		char errbuf[1024];
+		ERROR("pf plugin: ioctl(DIOCGETSTATUS) failed: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		close(fd);
 		return (-1);
+	}
 
-	return (0);
-}
-
-int
-pf_read(void)
-{
-	int			i;
-	struct pf_status	status;
-
-	char		*cnames[] = PFRES_NAMES;
-	char		*lnames[] = LCNT_NAMES;
-	char		*names[] = { "searches", "inserts", "removals" };
+	close (fd);
+	fd = -1;
 
-	if ((pfdev = open(PF_SOCKET, O_RDWR)) == -1) {
-		return (-1);
-	}
-	if (ioctl(pfdev, DIOCGETSTATUS, &status) == -1) {
+	if (!state.running)
+	{
+		WARNING ("pf plugin: PF is not running.");
 		return (-1);
 	}
 
-	close(pfdev);
 	for (i = 0; i < PFRES_MAX; i++)
-		submit_counter("pf_counters", cnames[i], status.counters[i]);
+		pf_submit ("pf_counters", pf_reasons[i], state.counters[i],
+				/* is gauge = */ 0);
 	for (i = 0; i < LCNT_MAX; i++)
-		submit_counter("pf_limits", lnames[i], status.lcounters[i]);
+		pf_submit ("pf_limits", pf_lcounters[i], state.lcounters[i],
+				/* is gauge = */ 0);
 	for (i = 0; i < FCNT_MAX; i++)
-		submit_counter("pf_state", names[i], status.fcounters[i]);
+		pf_submit ("pf_state", pf_fcounters[i], state.fcounters[i],
+				/* is gauge = */ 0);
 	for (i = 0; i < SCNT_MAX; i++)
-		submit_counter("pf_source", names[i], status.scounters[i]);
+		pf_submit ("pf_source", pf_scounters[i], state.scounters[i],
+				/* is gauge = */ 0);
+
+	pf_submit ("pf_states", "current", (uint32_t) state.states,
+			/* is gauge = */ 1);
+
 	return (0);
-}
+} /* int pf_read */
 
-#ifdef TEST
-int
-main(int argc, char *argv[])
+void module_register (void)
 {
-	if (pf_init())
-		err(1, "pf_init");
-	if (pf_read())
-		err(1, "pf_read");
-	return (0);
-}
-#else
-void module_register(void) {
-	plugin_register_init("pf", pf_init);
-	plugin_register_read("pf", pf_read);
+	plugin_register_read ("pf", pf_read);
 }
-#endif