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 #774 from trenkel/master
[collectd.git]
/
src
/
tcpconns.c
diff --git
a/src/tcpconns.c
b/src/tcpconns.c
index
4d90c41
..
5a04231
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"
};
@@
-275,9
+279,14
@@
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static int port_collect_listening = 0;
static port_entry_t *port_list_head = NULL;
static int port_collect_listening = 0;
static port_entry_t *port_list_head = NULL;
+#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
-#if KERNEL_LINUX
enum
{
SRC_DUNNO,
enum
{
SRC_DUNNO,
@@
-446,6
+455,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;
@@
-574,6
+584,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)