projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel_rdt: multiple options are explicitly denied
[collectd.git]
/
src
/
tcpconns.c
diff --git
a/src/tcpconns.c
b/src/tcpconns.c
index
f12ce5c
..
d01bcd2
100644
(file)
--- a/
src/tcpconns.c
+++ b/
src/tcpconns.c
@@
-59,8
+59,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#if defined(__OpenBSD__)
#define HAVE_KVM_GETFILES 1
#if defined(__OpenBSD__)
#define HAVE_KVM_GETFILES 1
@@
-70,12
+70,12
@@
#undef HAVE_SYSCTLBYNAME /* force HAVE_LIBKVM_NLIST path */
#endif
#undef HAVE_SYSCTLBYNAME /* force HAVE_LIBKVM_NLIST path */
#endif
-#if !KERNEL_LINUX && !HAVE_SYSCTLBYNAME && !HAVE_KVM_GETFILES && !HAVE_LIBKVM_NLIST && !KERNEL_AIX
+#if !KERNEL_LINUX && !HAVE_SYSCTLBYNAME && !HAVE_KVM_GETFILES && \
+ !HAVE_LIBKVM_NLIST && !KERNEL_AIX
#error "No applicable input method."
#endif
#if KERNEL_LINUX
#error "No applicable input method."
#endif
#if KERNEL_LINUX
-#include <asm/types.h>
#include <linux/netlink.h>
#if HAVE_LINUX_INET_DIAG_H
#include <linux/inet_diag.h>
#include <linux/netlink.h>
#if HAVE_LINUX_INET_DIAG_H
#include <linux/inet_diag.h>
@@
-110,8
+110,8
@@
/* #endif HAVE_SYSCTLBYNAME */
#elif HAVE_KVM_GETFILES
/* #endif HAVE_SYSCTLBYNAME */
#elif HAVE_KVM_GETFILES
-#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/sysctl.h>
+#include <sys/types.h>
#define _KERNEL /* for DTYPE_SOCKET */
#include <sys/file.h>
#undef _KERNEL
#define _KERNEL /* for DTYPE_SOCKET */
#include <sys/file.h>
#undef _KERNEL
@@
-127,9
+127,9
@@
#include <net/route.h>
#include <netdb.h>
#include <netinet/in.h>
#include <net/route.h>
#include <netdb.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
#include <netinet/in_pcb.h>
#include <netinet/in_systm.h>
#include <netinet/in_pcb.h>
#include <netinet/in_systm.h>
+#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
#include <netinet/tcp_timer.h>
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
#include <netinet/tcp_timer.h>
@@
-205,7
+205,7
@@
static const char *tcp_state[] = {"CLOSED", "LISTEN", "SYN_SENT",
"FIN_WAIT2", "TIME_WAIT"};
static kvm_t *kvmd;
"FIN_WAIT2", "TIME_WAIT"};
static kvm_t *kvmd;
-static u_long inpcbtable_off
= 0
;
+static u_long inpcbtable_off;
struct inpcbtable *inpcbtable_ptr = NULL;
#define TCP_STATE_LISTEN 1
struct inpcbtable *inpcbtable_ptr = NULL;
#define TCP_STATE_LISTEN 1
@@
-261,9
+261,9
@@
static const char *config_keys[] = {"ListeningPorts", "LocalPort", "RemotePort",
"AllPortsSummary"};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
"AllPortsSummary"};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
-static int port_collect_listening
= 0
;
-static int port_collect_total
= 0
;
-static port_entry_t *port_list_head
= NULL
;
+static int port_collect_listening;
+static int port_collect_total;
+static port_entry_t *port_list_head;
static uint32_t count_total[TCP_STATE_MAX + 1];
#if KERNEL_LINUX
static uint32_t count_total[TCP_STATE_MAX + 1];
#if KERNEL_LINUX
@@
-271,7
+271,7
@@
static uint32_t count_total[TCP_STATE_MAX + 1];
/* This depends on linux inet_diag_req because if this structure is missing,
* sequence_number is useless and we get a compilation warning.
*/
/* 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;
#endif
static enum { SRC_DUNNO, SRC_NETLINK, SRC_PROC } linux_source = SRC_DUNNO;
#endif
static enum { SRC_DUNNO, SRC_NETLINK, SRC_PROC } linux_source = SRC_DUNNO;
@@
-292,8
+292,8
@@
static void conn_submit_port_entry(port_entry_t *pe) {
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)) {
- s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance),
-
"%" PRIu16 "-local", pe->port);
+ snprintf(vl.plugin_instance, sizeof(vl.plugin_instance),
+ "%" PRIu16 "-local", pe->port);
for (int i = 1; i <= TCP_STATE_MAX; i++) {
vl.values[0].gauge = pe->count_local[i];
for (int i = 1; i <= TCP_STATE_MAX; i++) {
vl.values[0].gauge = pe->count_local[i];
@@
-305,8
+305,8
@@
static void conn_submit_port_entry(port_entry_t *pe) {
}
if (pe->flags & PORT_COLLECT_REMOTE) {
}
if (pe->flags & PORT_COLLECT_REMOTE) {
- s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance),
-
"%" PRIu16 "-remote", pe->port);
+ snprintf(vl.plugin_instance, sizeof(vl.plugin_instance),
+ "%" PRIu16 "-remote", pe->port);
for (int i = 1; i <= TCP_STATE_MAX; i++) {
vl.values[0].gauge = pe->count_remote[i];
for (int i = 1; i <= TCP_STATE_MAX; i++) {
vl.values[0].gauge = pe->count_remote[i];
@@
-458,7
+458,7
@@
static int conn_read_netlink(void) {
if (fd < 0) {
ERROR("tcpconns plugin: conn_read_netlink: socket(AF_NETLINK, SOCK_RAW, "
"NETLINK_INET_DIAG) failed: %s",
if (fd < 0) {
ERROR("tcpconns plugin: conn_read_netlink: socket(AF_NETLINK, SOCK_RAW, "
"NETLINK_INET_DIAG) failed: %s",
-
sstrerror(errno, buf, sizeof(buf))
);
+
STRERRNO
);
return -1;
}
return -1;
}
@@
-489,7
+489,7
@@
static int conn_read_netlink(void) {
if (sendmsg(fd, &msg, 0) < 0) {
ERROR("tcpconns plugin: conn_read_netlink: sendmsg(2) failed: %s",
if (sendmsg(fd, &msg, 0) < 0) {
ERROR("tcpconns plugin: conn_read_netlink: sendmsg(2) failed: %s",
-
sstrerror(errno, buf, sizeof(buf))
);
+
STRERRNO
);
close(fd);
return -1;
}
close(fd);
return -1;
}
@@
-498,7
+498,6
@@
static int conn_read_netlink(void) {
iov.iov_len = sizeof(buf);
while (1) {
iov.iov_len = sizeof(buf);
while (1) {
- int status;
struct nlmsghdr *h;
memset(&msg, 0, sizeof(msg));
struct nlmsghdr *h;
memset(&msg, 0, sizeof(msg));
@@
-507,13
+506,13
@@
static int conn_read_netlink(void) {
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
- status = recvmsg(fd, (void *)&msg, /* flags = */ 0);
+ s
size_t s
tatus = recvmsg(fd, (void *)&msg, /* flags = */ 0);
if (status < 0) {
if ((errno == EINTR) || (errno == EAGAIN))
continue;
ERROR("tcpconns plugin: conn_read_netlink: recvmsg(2) failed: %s",
if (status < 0) {
if ((errno == EINTR) || (errno == EAGAIN))
continue;
ERROR("tcpconns plugin: conn_read_netlink: recvmsg(2) failed: %s",
-
sstrerror(errno, buf, sizeof(buf))
);
+
STRERRNO
);
close(fd);
return -1;
} else if (status == 0) {
close(fd);
return -1;
} else if (status == 0) {
@@
-574,11
+573,11
@@
static int conn_handle_line(char *buffer) {
uint8_t state;
uint8_t state;
-
in
t buffer_len = strlen(buffer);
+
size_
t buffer_len = strlen(buffer);
while ((buffer_len > 0) && (buffer[buffer_len - 1] < 32))
buffer[--buffer_len] = '\0';
while ((buffer_len > 0) && (buffer[buffer_len - 1] < 32))
buffer[--buffer_len] = '\0';
- if (buffer_len
<
= 0)
+ if (buffer_len
=
= 0)
return -1;
fields_len = strsplit(buffer, fields, STATIC_ARRAY_SIZE(fields));
return -1;
fields_len = strsplit(buffer, fields, STATIC_ARRAY_SIZE(fields));
@@
-830,8
+829,7
@@
static int conn_read(void) {
conn_reset_port_entry();
conn_reset_port_entry();
- kf = kvm_getfiles(kvmd, KERN_FILE_BYFILE, DTYPE_SOCKET,
- sizeof(*kf), &fcnt);
+ kf = kvm_getfiles(kvmd, KERN_FILE_BYFILE, DTYPE_SOCKET, sizeof(*kf), &fcnt);
if (kf == NULL) {
ERROR("tcpconns plugin: kvm_getfiles failed.");
return -1;
if (kf == NULL) {
ERROR("tcpconns plugin: kvm_getfiles failed.");
return -1;