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-5.4' into collectd-5.5
[collectd.git]
/
src
/
tcpconns.c
diff --git
a/src/tcpconns.c
b/src/tcpconns.c
index
bb089b0
..
5d4bb69
100644
(file)
--- a/
src/tcpconns.c
+++ b/
src/tcpconns.c
@@
-419,18
+419,18
@@
static void conn_reset_port_entry (void)
/* If this entry was created while reading the files (ant not when handling
* the configuration) remove it now. */
if ((pe->flags & (PORT_COLLECT_LOCAL
/* If this entry was created while reading the files (ant not when handling
* the configuration) remove it now. */
if ((pe->flags & (PORT_COLLECT_LOCAL
- | PORT_COLLECT_REMOTE
- | PORT_IS_LISTENING)) == 0)
+
| PORT_COLLECT_REMOTE
+
| PORT_IS_LISTENING)) == 0)
{
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 %"PRIu16, pe->port);
+
"for listening port %"PRIu16, pe->port);
if (prev == NULL)
if (prev == NULL)
- port_list_head = next;
+
port_list_head = next;
else
else
- prev->next = next;
+
prev->next = next;
sfree (pe);
pe = next;
sfree (pe);
pe = next;
@@
-442,6
+442,7
@@
static void conn_reset_port_entry (void)
memset (pe->count_remote, '\0', sizeof (pe->count_remote));
pe->flags &= ~PORT_IS_LISTENING;
memset (pe->count_remote, '\0', sizeof (pe->count_remote));
pe->flags &= ~PORT_IS_LISTENING;
+ prev = pe;
pe = pe->next;
}
} /* void conn_reset_port_entry */
pe = pe->next;
}
} /* void conn_reset_port_entry */
@@
-951,7
+952,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;
@@
-964,18
+967,32
@@
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' */
{
/* 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' */
/* 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__
@@
-990,7
+1007,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) */