projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
teamspeak2.c
diff --git
a/src/teamspeak2.c
b/src/teamspeak2.c
index
5cd427a
..
2552ad3
100644
(file)
--- a/
src/teamspeak2.c
+++ b/
src/teamspeak2.c
@@
-25,8
+25,8
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
@@
-129,7
+129,6
@@
static void tss2_submit_gauge (const char *plugin_instance,
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
- vl.time = time (NULL);
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
@@
-147,7
+146,7
@@
static void tss2_submit_gauge (const char *plugin_instance,
} /* void tss2_submit_gauge */
static void tss2_submit_io (const char *plugin_instance, const char *type,
} /* void tss2_submit_gauge */
static void tss2_submit_io (const char *plugin_instance, const char *type,
-
counter_t rx, counter
_t tx)
+
derive_t rx, derive
_t tx)
{
/*
* Submits the io rx/tx tuple to the collectd daemon
{
/*
* Submits the io rx/tx tuple to the collectd daemon
@@
-155,12
+154,11
@@
static void tss2_submit_io (const char *plugin_instance, const char *type,
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
- values[0].
counter
= rx;
- values[1].
counter
= tx;
+ values[0].
derive
= rx;
+ values[1].
derive
= tx;
vl.values = values;
vl.values_len = 2;
vl.values = values;
vl.values_len = 2;
- vl.time = time (NULL);
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "teamspeak2", sizeof (vl.plugin));
@@
-301,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)
@@
-408,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.
@@
-500,10
+505,10
@@
static int tss2_read_vserver (vserver_list_t *vserver)
gauge_t users = NAN;
gauge_t channels = NAN;
gauge_t servers = NAN;
gauge_t users = NAN;
gauge_t channels = NAN;
gauge_t servers = NAN;
-
counter
_t rx_octets = 0;
-
counter
_t tx_octets = 0;
-
counter
_t rx_packets = 0;
-
counter
_t tx_packets = 0;
+
derive
_t rx_octets = 0;
+
derive
_t tx_octets = 0;
+
derive
_t rx_packets = 0;
+
derive
_t tx_packets = 0;
gauge_t packet_loss = NAN;
int valid = 0;
gauge_t packet_loss = NAN;
int valid = 0;
@@
-679,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;