projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "curl_json plugin: Be more clever building the type instance." into collectd...
[collectd.git]
/
src
/
teamspeak2.c
diff --git
a/src/teamspeak2.c
b/src/teamspeak2.c
index
e81dbe3
..
502145d
100644
(file)
--- a/
src/teamspeak2.c
+++ b/
src/teamspeak2.c
@@
-299,6
+299,13
@@
static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
char *buffer_ptr;
buffer_ptr = fgets (buffer, sizeof (buffer), global_read_fh);
char *buffer_ptr;
buffer_ptr = fgets (buffer, sizeof (buffer), global_read_fh);
+ if (buffer_ptr == NULL)
+ {
+ WARNING ("teamspeak2 plugin: Unexpected EOF received "
+ "from remote host %s:%s.",
+ config_host ? config_host : DEFAULT_HOST,
+ config_port ? config_port : DEFAULT_PORT);
+ }
buffer[sizeof (buffer) - 1] = 0;
if (memcmp ("[TS]\r\n", buffer, 6) != 0)
buffer[sizeof (buffer) - 1] = 0;
if (memcmp ("[TS]\r\n", buffer, 6) != 0)
@@
-406,7
+413,7
@@
static int tss2_select_vserver (FILE *read_fh, FILE *write_fh, vserver_list_t *v
} /* int tss2_select_vserver */
static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
} /* int tss2_select_vserver */
static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
-
vserver_list_t *vserver,
gauge_t *ret_value)
+ gauge_t *ret_value)
{
/*
* Reads the vserver's average packet loss and submits it to collectd.
{
/*
* Reads the vserver's average packet loss and submits it to collectd.
@@
-677,7
+684,7
@@
static int tss2_read_vserver (vserver_list_t *vserver)
* with an error. */
if ((status == 0) && (vserver != NULL))
{
* with an error. */
if ((status == 0) && (vserver != NULL))
{
- status = tss2_vserver_gapl (read_fh, write_fh,
vserver,
&packet_loss);
+ status = tss2_vserver_gapl (read_fh, write_fh, &packet_loss);
if (status == 0)
{
valid |= 0x20;
if (status == 0)
{
valid |= 0x20;