pf plugin: cleaner error-handling

[collectd.git] / src / pf.c

diff --git a/src/pf.c b/src/pf.c
index 9d99e3a..1c5f316 100644 (file)
--- a/src/pf.c
+++ b/src/pf.c
@@ -21,41 +21,25 @@ static int  pf_init(void);
 static int     pf_read(void);
 static void    submit_counter(const char *, const char *, counter_t);
 
-void
-submit_counter(const char *type, const char *inst, counter_t val)
-{
-#ifndef TEST
-       value_t         values[1];
-       value_list_t    vl = VALUE_LIST_INIT;
-
-       values[0].counter = 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
-}
-
+int    pfdev = -1;
 
 int
 pf_init(void)
 {
        struct pf_status        status;
 
-       if ((dev = open(PF_SOCKET, O_RDONLY)) == -1) {
+       if ((pfdev = open(PF_SOCKET, O_RDONLY)) == -1) {
+               warn("unable to open %s", PF_SOCKET);
                return (-1);
        }
-       if (ioctl(dev, DIOCGETSTATUS, &status) == -1) {
+
+       if (ioctl(pfdev, DIOCGETSTATUS, &status) == -1) {
+               warn("DIOCGETSTATUS: %i", pfdev);
+               close(pfdev);
                return (-1);
        }
 
-       close(dev);
+       close(pfdev);
        if (!status.running)
                return (-1);
 
@@ -72,14 +56,19 @@ pf_read(void)
        char            *lnames[] = LCNT_NAMES;
        char            *names[] = { "searches", "inserts", "removals" };
 
-       if ((dev = open(PF_SOCKET, O_RDONLY)) == -1) {
+       if ((pfdev = open(PF_SOCKET, O_RDONLY)) == -1) {
+               warn("unable tot open %s", PF_SOCKET);
                return (-1);
        }
-       if (ioctl(dev, DIOCGETSTATUS, &status) == -1) {
+
+       if (ioctl(pfdev, DIOCGETSTATUS, &status) == -1) {
+               warn("DIOCGETSTATUS: %i", pfdev);
+               close(pfdev);
                return (-1);
        }
 
-       close(dev);
+       close(pfdev);
+
        for (i = 0; i < PFRES_MAX; i++)
                submit_counter("pf_counters", cnames[i], status.counters[i]);
        for (i = 0; i < LCNT_MAX; i++)
@@ -88,9 +77,31 @@ pf_read(void)
                submit_counter("pf_state", names[i], status.fcounters[i]);
        for (i = 0; i < SCNT_MAX; i++)
                submit_counter("pf_source", names[i], status.scounters[i]);
+
        return (0);
 }
 
+void
+submit_counter(const char *type, const char *inst, counter_t val)
+{
+#ifndef TEST
+       value_t         values[1];
+       value_list_t    vl = VALUE_LIST_INIT;
+
+       values[0].counter = 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
+}
+
 #ifdef TEST
 int
 main(int argc, char *argv[])