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.4' into collectd-4.5
[collectd.git]
/
src
/
tcpconns.c
diff --git
a/src/tcpconns.c
b/src/tcpconns.c
index
fa1e393
..
aa1fa38
100644
(file)
--- a/
src/tcpconns.c
+++ b/
src/tcpconns.c
@@
-20,7
+20,8
@@
**/
/**
**/
/**
- * Code within `__OpenBSD__' blocks is provided under the following license:
+ * Code within `HAVE_LIBKVM_NLIST' blocks is provided under the following
+ * license:
*
* $collectd: parts of tcpconns.c, 2008/08/08 03:48:30 Michael Stapelberg $
* $OpenBSD: inet.c,v 1.100 2007/06/19 05:28:30 ray Exp $
*
* $collectd: parts of tcpconns.c, 2008/08/08 03:48:30 Michael Stapelberg $
* $OpenBSD: inet.c,v 1.100 2007/06/19 05:28:30 ray Exp $
@@
-58,7
+59,7
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#if !KERNEL_LINUX && !HAVE_SYSCTLBYNAME && !
__OpenBSD__
+#if !KERNEL_LINUX && !HAVE_SYSCTLBYNAME && !
HAVE_LIBKVM_NLIST
# error "No applicable input method."
#endif
# error "No applicable input method."
#endif
@@
-94,7
+95,8
@@
# include <netinet/tcp_var.h>
/* #endif HAVE_SYSCTLBYNAME */
# include <netinet/tcp_var.h>
/* #endif HAVE_SYSCTLBYNAME */
-#elif __OpenBSD__
+/* This is for OpenBSD and possibly NetBSD. */
+#elif HAVE_LIBKVM_NLIST
# include <sys/queue.h>
# include <sys/socket.h>
# include <net/route.h>
# include <sys/queue.h>
# include <sys/socket.h>
# include <net/route.h>
@@
-109,7
+111,7
@@
# include <arpa/inet.h>
# include <nlist.h>
# include <kvm.h>
# include <arpa/inet.h>
# include <nlist.h>
# include <kvm.h>
-#endif /*
__OpenBSD__
*/
+#endif /*
HAVE_LIBKVM_NLIST
*/
#if KERNEL_LINUX
static const char *tcp_state[] =
#if KERNEL_LINUX
static const char *tcp_state[] =
@@
-154,7
+156,7
@@
static const char *tcp_state[] =
# define TCP_STATE_MAX 10
/* #endif HAVE_SYSCTLBYNAME */
# define TCP_STATE_MAX 10
/* #endif HAVE_SYSCTLBYNAME */
-#elif
__OpenBSD__
+#elif
HAVE_LIBKVM_NLIST
static const char *tcp_state[] =
{
"CLOSED",
static const char *tcp_state[] =
{
"CLOSED",
@@
-177,7
+179,7
@@
struct inpcbtable *inpcbtable_ptr = NULL;
# define TCP_STATE_LISTEN 1
# define TCP_STATE_MIN 1
# define TCP_STATE_MAX 10
# define TCP_STATE_LISTEN 1
# define TCP_STATE_MIN 1
# define TCP_STATE_MAX 10
-#endif /*
__OpenBSD__
*/
+#endif /*
HAVE_LIBKVM_NLIST
*/
#define PORT_COLLECT_LOCAL 0x01
#define PORT_COLLECT_REMOTE 0x02
#define PORT_COLLECT_LOCAL 0x01
#define PORT_COLLECT_REMOTE 0x02
@@
-220,7
+222,7
@@
static void conn_submit_port_entry (port_entry_t *pe)
|| (pe->flags & PORT_COLLECT_LOCAL))
{
ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
|| (pe->flags & PORT_COLLECT_LOCAL))
{
ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
- "%
hu
-local", pe->port);
+ "%
"PRIu16"
-local", pe->port);
for (i = 1; i <= TCP_STATE_MAX; i++)
{
for (i = 1; i <= TCP_STATE_MAX; i++)
{
@@
-235,7
+237,7
@@
static void conn_submit_port_entry (port_entry_t *pe)
if (pe->flags & PORT_COLLECT_REMOTE)
{
ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
if (pe->flags & PORT_COLLECT_REMOTE)
{
ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
- "%
hu
-remote", pe->port);
+ "%
"PRIu16"
-remote", pe->port);
for (i = 1; i <= TCP_STATE_MAX; i++)
{
for (i = 1; i <= TCP_STATE_MAX; i++)
{
@@
-301,7
+303,7
@@
static void conn_reset_port_entry (void)
port_entry_t *next = pe->next;
DEBUG ("tcpconns plugin: Removing temporary entry "
port_entry_t *next = pe->next;
DEBUG ("tcpconns plugin: Removing temporary entry "
- "for listening port %
hu"
, pe->port);
+ "for listening port %
"PRIu16
, pe->port);
if (prev == NULL)
port_list_head = next;
if (prev == NULL)
port_list_head = next;
@@
-332,8
+334,8
@@
static int conn_handle_ports (uint16_t port_local, uint16_t port_remote, uint8_t
#endif
)
{
#endif
)
{
- NOTICE ("tcpconns plugin: Ignoring connection with
unknown state 0x%02x.",
- state);
+ NOTICE ("tcpconns plugin: Ignoring connection with
"
+
"unknown state 0x%02"PRIx8".",
state);
return (-1);
}
return (-1);
}
@@
-345,7
+347,7
@@
static int conn_handle_ports (uint16_t port_local, uint16_t port_remote, uint8_t
pe->flags |= PORT_IS_LISTENING;
}
pe->flags |= PORT_IS_LISTENING;
}
- DEBUG ("tcpconns plugin: Connection %
hu <-> %hu
(%s)",
+ DEBUG ("tcpconns plugin: Connection %
"PRIu16" <-> %"PRIu16"
(%s)",
port_local, port_remote, tcp_state[state]);
pe = conn_get_port_entry (port_local, 0 /* no create */);
port_local, port_remote, tcp_state[state]);
pe = conn_get_port_entry (port_local, 0 /* no create */);
@@
-439,8
+441,8
@@
static int conn_read_file (const char *file)
#elif HAVE_SYSCTLBYNAME
/* #endif HAVE_SYSCTLBYNAME */
#elif HAVE_SYSCTLBYNAME
/* #endif HAVE_SYSCTLBYNAME */
-#elif
__OpenBSD__
-#endif /*
__OpenBSD__
*/
+#elif
HAVE_LIBKVM_NLIST
+#endif /*
HAVE_LIBKVM_NLIST
*/
static int conn_config (const char *key, const char *value)
{
static int conn_config (const char *key, const char *value)
{
@@
-583,7
+585,8
@@
static int conn_read (void)
&& ((inp->inp_vflag & INP_IPV6) == 0))
continue;
&& ((inp->inp_vflag & INP_IPV6) == 0))
continue;
- conn_handle_ports (inp->inp_lport, inp->inp_fport, tp->t_state);
+ conn_handle_ports (ntohs (inp->inp_lport), ntohs (inp->inp_fport),
+ tp->t_state);
} /* for (in_ptr) */
in_orig = NULL;
} /* for (in_ptr) */
in_orig = NULL;
@@
-596,7
+599,7
@@
static int conn_read (void)
} /* int conn_read */
/* #endif HAVE_SYSCTLBYNAME */
} /* int conn_read */
/* #endif HAVE_SYSCTLBYNAME */
-#elif
__OpenBSD__
+#elif
HAVE_LIBKVM_NLIST
static int kread (u_long addr, void *buf, int size)
{
int status;
static int kread (u_long addr, void *buf, int size)
{
int status;
@@
-694,7
+697,7
@@
static int conn_read (void)
return (0);
}
return (0);
}
-#endif /*
__OpenBSD__
*/
+#endif /*
HAVE_LIBKVM_NLIST
*/
void module_register (void)
{
void module_register (void)
{
@@
-704,7
+707,7
@@
void module_register (void)
plugin_register_init ("tcpconns", conn_init);
#elif HAVE_SYSCTLBYNAME
/* no initialization */
plugin_register_init ("tcpconns", conn_init);
#elif HAVE_SYSCTLBYNAME
/* no initialization */
-#elif
__OpenBSD__
+#elif
HAVE_LIBKVM_NLIST
plugin_register_init ("tcpconns", conn_init);
#endif
plugin_register_read ("tcpconns", conn_read);
plugin_register_init ("tcpconns", conn_init);
#endif
plugin_register_read ("tcpconns", conn_read);