projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: cleanup malloc calls
[collectd.git]
/
src
/
tcpconns.c
diff --git
a/src/tcpconns.c
b/src/tcpconns.c
index
b6a3fdd
..
96221b1
100644
(file)
--- a/
src/tcpconns.c
+++ b/
src/tcpconns.c
@@
-71,13
+71,10
@@
#if KERNEL_LINUX
# include <asm/types.h>
#if KERNEL_LINUX
# include <asm/types.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>
#endif
# include <linux/netlink.h>
#if HAVE_LINUX_INET_DIAG_H
# include <linux/inet_diag.h>
#endif
-# include <sys/socket.h>
# include <arpa/inet.h>
/* #endif KERNEL_LINUX */
# include <arpa/inet.h>
/* #endif KERNEL_LINUX */
@@
-90,9
+87,6
@@
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
#if HAVE_NET_IF_H
# include <net/if.h>
#endif
#if HAVE_NET_IF_H
# include <net/if.h>
#endif
@@
-113,7
+107,6
@@
/* This is for OpenBSD and NetBSD. */
#elif HAVE_LIBKVM_NLIST
# include <sys/queue.h>
/* This is for OpenBSD and NetBSD. */
#elif HAVE_LIBKVM_NLIST
# include <sys/queue.h>
-# include <sys/socket.h>
# include <net/route.h>
# include <netinet/in.h>
# include <netinet/in_systm.h>
# include <net/route.h>
# include <netinet/in.h>
# include <netinet/in_systm.h>
@@
-290,7
+283,7
@@
static uint32_t count_total[TCP_STATE_MAX + 1];
static uint32_t sequence_number = 0;
#endif
static uint32_t sequence_number = 0;
#endif
-enum
+
static
enum
{
SRC_DUNNO,
SRC_NETLINK,
{
SRC_DUNNO,
SRC_NETLINK,
@@
-392,7
+385,7
@@
static port_entry_t *conn_get_port_entry (uint16_t port, int create)
if ((ret == NULL) && (create != 0))
{
if ((ret == NULL) && (create != 0))
{
- ret =
(port_entry_t *) malloc (sizeof (port_entry_
t));
+ ret =
malloc (sizeof (*re
t));
if (ret == NULL)
return (NULL);
memset (ret, '\0', sizeof (port_entry_t));
if (ret == NULL)
return (NULL);
memset (ret, '\0', sizeof (port_entry_t));
@@
-839,7
+832,7
@@
static int conn_read (void)
return (-1);
}
return (-1);
}
- buffer =
(char *)
malloc (buffer_len);
+ buffer = malloc (buffer_len);
if (buffer == NULL)
{
ERROR ("tcpconns plugin: malloc failed.");
if (buffer == NULL)
{
ERROR ("tcpconns plugin: malloc failed.");
@@
-982,7
+975,9
@@
static int conn_read (void)
#endif
{
/* Read the pcb pointed to by `next' into `inpcb' */
#endif
{
/* Read the pcb pointed to by `next' into `inpcb' */
- kread ((u_long) next, &inpcb, sizeof (inpcb));
+ status = kread ((u_long) next, &inpcb, sizeof (inpcb));
+ if (status != 0)
+ return (-1);
/* Advance `next' */
#if defined(__OpenBSD__) || (defined(__NetBSD_Version__) && __NetBSD_Version__ > 699002700)
/* Advance `next' */
#if defined(__OpenBSD__) || (defined(__NetBSD_Version__) && __NetBSD_Version__ > 699002700)
@@
-1005,7
+1000,9
@@
static int conn_read (void)
continue;
#endif
continue;
#endif
- kread ((u_long) inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb));
+ status = kread ((u_long) inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb));
+ if (status != 0)
+ return (-1);
conn_handle_ports (ntohs(inpcb.inp_lport), ntohs(inpcb.inp_fport), tcpcb.t_state);
} /* while (next != head) */
conn_handle_ports (ntohs(inpcb.inp_lport), ntohs(inpcb.inp_fport), tcpcb.t_state);
} /* while (next != head) */