projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1023 from ciomaire/write_kafka_ldflags
[collectd.git]
/
src
/
tcpconns.c
diff --git
a/src/tcpconns.c
b/src/tcpconns.c
index
3f96345
..
0236c9d
100644
(file)
--- a/
src/tcpconns.c
+++ b/
src/tcpconns.c
@@
-17,7
+17,7
@@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Author:
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Author:
- * Florian octo Forster <octo at
verplant
.org>
+ * Florian octo Forster <octo at
collectd
.org>
* Michael Stapelberg <michael+git at stapelberg.de>
**/
* Michael Stapelberg <michael+git at stapelberg.de>
**/
@@
-74,7
+74,9
@@
/* sys/socket.h is necessary to compile when using netlink on older systems. */
# include <sys/socket.h>
# include <linux/netlink.h>
/* sys/socket.h is necessary to compile when using netlink on older systems. */
# include <sys/socket.h>
# include <linux/netlink.h>
+#if HAVE_LINUX_INET_DIAG_H
# include <linux/inet_diag.h>
# include <linux/inet_diag.h>
+#endif
# include <sys/socket.h>
# include <arpa/inet.h>
/* #endif KERNEL_LINUX */
# include <sys/socket.h>
# include <arpa/inet.h>
/* #endif KERNEL_LINUX */
@@
-137,10
+139,12
@@
#endif /* KERNEL_AIX */
#if KERNEL_LINUX
#endif /* KERNEL_AIX */
#if KERNEL_LINUX
+#if HAVE_STRUCT_LINUX_INET_DIAG_REQ
struct nlreq {
struct nlmsghdr nlh;
struct inet_diag_req r;
};
struct nlreq {
struct nlmsghdr nlh;
struct inet_diag_req r;
};
+#endif
static const char *tcp_state[] =
{
static const char *tcp_state[] =
{
@@
-215,13
+219,13
@@
static const char *tcp_state[] =
"CLOSED",
"LISTEN",
"SYN_SENT",
"CLOSED",
"LISTEN",
"SYN_SENT",
- "SYN_R
CVD
",
+ "SYN_R
ECV
",
"ESTABLISHED",
"CLOSE_WAIT",
"ESTABLISHED",
"CLOSE_WAIT",
- "FIN_WAIT
_
1",
+ "FIN_WAIT1",
"CLOSING",
"LAST_ACK",
"CLOSING",
"LAST_ACK",
- "FIN_WAIT
_
2",
+ "FIN_WAIT2",
"TIME_WAIT"
};
"TIME_WAIT"
};
@@
-268,17
+272,23
@@
static const char *config_keys[] =
{
"ListeningPorts",
"LocalPort",
{
"ListeningPorts",
"LocalPort",
- "RemotePort"
+ "RemotePort",
+ "AllPortsSummary"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static int port_collect_listening = 0;
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static int port_collect_listening = 0;
-static int port_collect_total =
1
;
+static int port_collect_total =
0
;
static port_entry_t *port_list_head = NULL;
static uint32_t count_total[TCP_STATE_MAX + 1];
#if KERNEL_LINUX
static port_entry_t *port_list_head = NULL;
static uint32_t count_total[TCP_STATE_MAX + 1];
#if KERNEL_LINUX
+#if HAVE_STRUCT_LINUX_INET_DIAG_REQ
+/* This depends on linux inet_diag_req because if this structure is missing,
+ * sequence_number is useless and we get a compilation warning.
+ */
static uint32_t sequence_number = 0;
static uint32_t sequence_number = 0;
+#endif
enum
{
enum
{
@@
-288,7
+298,7
@@
enum
} linux_source = SRC_DUNNO;
#endif
} linux_source = SRC_DUNNO;
#endif
-static void conn
t
_prepare_vl (value_list_t *vl, value_t *values)
+static void conn_prepare_vl (value_list_t *vl, value_t *values)
{
vl->values = values;
vl->values_len = 1;
{
vl->values = values;
vl->values_len = 1;
@@
-303,7
+313,7
@@
static void conn_submit_port_entry (port_entry_t *pe)
value_list_t vl = VALUE_LIST_INIT;
int i;
value_list_t vl = VALUE_LIST_INIT;
int i;
- conn
t
_prepare_vl (&vl, values);
+ conn_prepare_vl (&vl, values);
if (((port_collect_listening != 0) && (pe->flags & PORT_IS_LISTENING))
|| (pe->flags & PORT_COLLECT_LOCAL))
if (((port_collect_listening != 0) && (pe->flags & PORT_IS_LISTENING))
|| (pe->flags & PORT_COLLECT_LOCAL))
@@
-343,9
+353,9
@@
static void conn_submit_port_total (void)
value_list_t vl = VALUE_LIST_INIT;
int i;
value_list_t vl = VALUE_LIST_INIT;
int i;
- conn
t
_prepare_vl (&vl, values);
+ conn_prepare_vl (&vl, values);
- sstrncpy (vl.plugin
, "all", sizeof (vl.plugin
));
+ sstrncpy (vl.plugin
_instance, "all", sizeof (vl.plugin_instance
));
for (i = 1; i <= TCP_STATE_MAX; i++)
{
for (i = 1; i <= TCP_STATE_MAX; i++)
{
@@
-480,6
+490,7
@@
static int conn_handle_ports (uint16_t port_local, uint16_t port_remote, uint8_t
* zero on other errors. */
static int conn_read_netlink (void)
{
* zero on other errors. */
static int conn_read_netlink (void)
{
+#if HAVE_STRUCT_LINUX_INET_DIAG_REQ
int fd;
struct sockaddr_nl nladdr;
struct nlreq req;
int fd;
struct sockaddr_nl nladdr;
struct nlreq req;
@@
-608,6
+619,9
@@
static int conn_read_netlink (void)
/* Not reached because the while() loop above handles the exit condition. */
return (0);
/* Not reached because the while() loop above handles the exit condition. */
return (0);
+#else
+ return (1);
+#endif /* HAVE_STRUCT_LINUX_INET_DIAG_REQ */
} /* int conn_read_netlink */
static int conn_handle_line (char *buffer)
} /* int conn_read_netlink */
static int conn_handle_line (char *buffer)
@@
-725,6
+739,13
@@
static int conn_config (const char *key, const char *value)
else
pe->flags |= PORT_COLLECT_REMOTE;
}
else
pe->flags |= PORT_COLLECT_REMOTE;
}
+ else if (strcasecmp (key, "AllPortsSummary") == 0)
+ {
+ if (IS_TRUE (value))
+ port_collect_total = 1;
+ else
+ port_collect_total = 0;
+ }
else
{
return (-1);
else
{
return (-1);
@@
-736,7
+757,7
@@
static int conn_config (const char *key, const char *value)
#if KERNEL_LINUX
static int conn_init (void)
{
#if KERNEL_LINUX
static int conn_init (void)
{
- if (port_list_head == NULL)
+ if (port_
collect_total == 0 && port_
list_head == NULL)
port_collect_listening = 1;
return (0);
port_collect_listening = 1;
return (0);
@@
-930,7
+951,9
@@
static int conn_init (void)
static int conn_read (void)
{
struct inpcbtable table;
static int conn_read (void)
{
struct inpcbtable table;
+#if !defined(__OpenBSD__) && (defined(__NetBSD_Version__) && __NetBSD_Version__ <= 699002700)
struct inpcb *head;
struct inpcb *head;
+#endif
struct inpcb *next;
struct inpcb inpcb;
struct tcpcb tcpcb;
struct inpcb *next;
struct inpcb inpcb;
struct tcpcb tcpcb;
@@
-943,18
+966,30
@@
static int conn_read (void)
if (status != 0)
return (-1);
if (status != 0)
return (-1);
+#if defined(__OpenBSD__) || (defined(__NetBSD_Version__) && __NetBSD_Version__ > 699002700)
+ /* inpt_queue is a TAILQ on OpenBSD */
+ /* Get the first pcb */
+ next = (struct inpcb *)TAILQ_FIRST (&table.inpt_queue);
+ while (next)
+#else
/* Get the `head' pcb */
head = (struct inpcb *) &(inpcbtable_ptr->inpt_queue);
/* Get the first pcb */
next = (struct inpcb *)CIRCLEQ_FIRST (&table.inpt_queue);
while (next != head)
/* Get the `head' pcb */
head = (struct inpcb *) &(inpcbtable_ptr->inpt_queue);
/* Get the first pcb */
next = (struct inpcb *)CIRCLEQ_FIRST (&table.inpt_queue);
while (next != head)
+#endif
{
/* Read the pcb pointed to by `next' into `inpcb' */
kread ((u_long) next, &inpcb, sizeof (inpcb));
/* Advance `next' */
{
/* Read the pcb pointed to by `next' into `inpcb' */
kread ((u_long) next, &inpcb, sizeof (inpcb));
/* Advance `next' */
+#if defined(__OpenBSD__) || (defined(__NetBSD_Version__) && __NetBSD_Version__ > 699002700)
+ /* inpt_queue is a TAILQ on OpenBSD */
+ next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue);
+#else
next = (struct inpcb *)CIRCLEQ_NEXT (&inpcb, inp_queue);
next = (struct inpcb *)CIRCLEQ_NEXT (&inpcb, inp_queue);
+#endif
/* Ignore sockets, that are not connected. */
#ifdef __NetBSD__
/* Ignore sockets, that are not connected. */
#ifdef __NetBSD__