X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconntrack.c;h=4d6771244721c9d8e6c3049502de338e3b7e73e8;hb=a1a7bcd42316459361cce17e4742e2f2eb664c60;hp=e70ff5f1834b5deecc53bfe7f0419176ce564eeb;hpb=d01c62d62182d1291760fbdb7ed0244991d52b5e;p=collectd.git diff --git a/src/conntrack.c b/src/conntrack.c index e70ff5f1..4d677124 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -31,14 +31,11 @@ #define CONNTRACK_FILE "/proc/sys/net/netfilter/nf_conntrack_count" -static void conntrack_submit (double conntrack) +static void conntrack_submit (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)); @@ -49,7 +46,7 @@ static void conntrack_submit (double conntrack) static int conntrack_read (void) { - double conntrack; + value_t conntrack; FILE *fh; char buffer[64]; @@ -64,10 +61,10 @@ static int conntrack_read (void) } fclose (fh); - conntrack = atof (buffer); + if (parse_value (buffer, &conntrack, DS_TYPE_GAUGE) == -1) + return (-1); - if (conntrack > 0.0) - conntrack_submit (conntrack); + conntrack_submit (conntrack); return (0); } /* static int conntrack_read */