summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4a89ba5)
raw | patch | inline | side by side (parent: 4a89ba5)
author | Florian Forster <octo@collectd.org> | |
Sun, 14 Sep 2014 17:28:05 +0000 (19:28 +0200) | ||
committer | Florian Forster <octo@collectd.org> | |
Sun, 14 Sep 2014 17:28:05 +0000 (19:28 +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 6d89b37016b8d0270a612a09977e2400deca1032..0fd940584e1dac434bcf6ca4ea3db4d05b18a995 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 */