summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5da45d)
raw | patch | inline | side by side (parent: c5da45d)
author | Florian Forster <octo@collectd.org> | |
Sun, 14 Sep 2014 17:28:05 +0000 (19:28 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Fri, 10 Apr 2015 08:07:45 +0000 (10:07 +0200) |
In the multi1_read() function, an error (zero) was returned when no
clients were currently connected to the OpenVPN server, because the
"read" variable was initialized to zero and the while loop exited before
it was set to one. This is not the intended behavior.
Thanks to @srix for reporting this issue!
Fixes: #731
clients were currently connected to the OpenVPN server, because the
"read" variable was initialized to zero and the while loop exited before
it was set to one. This is not the intended behavior.
Thanks to @srix for reporting this issue!
Fixes: #731
src/openvpn.c | patch | blob | history |
diff --git a/src/openvpn.c b/src/openvpn.c
index 9ce23b4f4cb9c9e2550e86d337a866a451931404..2c93a00977a7fdbe72162187381391d2fc02b831 100644 (file)
--- a/src/openvpn.c
+++ b/src/openvpn.c
{
char buffer[1024];
char *fields[10];
- int fields_num, read = 0, found_header = 0;
+ int fields_num, found_header = 0;
long long sum_users = 0;
/* read the file until the "ROUTING TABLE" line is found (no more info after) */
atoll (fields[3])); /* "Bytes Sent" */
}
}
-
- read = 1;
}
+ if (ferror (fh))
+ return (0);
+
if (collect_user_count)
- {
numusers_submit(name, name, sum_users);
- read = 1;
- }
- return (read);
+ return (1);
} /* int multi1_read */
/* for reading status version 2 */