This is needed for OpenBSD 5.6+. It does break older versions but 5.6
was released in 2014 and support for this ended Oct 2015; I'd find
it unlikely that anyone still running this would be building up-to-date
net-snmp.
>From 239b1fa52b34708f6733e2f673891f38c66ec2b9 Mon Sep 17 00:00:00 2001
From: Stuart Henderson <s...@spacehopper.org>
Date: Fri, 4 May 2018 13:41:11 +0100
Subject: [PATCH 2/2] inpt_queue changed from CIRCLEQ to TAILQ in OpenBSD 5.6
Signed-off-by: Stuart Henderson <st...@openbsd.org>
---
.../mibgroup/tcp-mib/data_access/tcpConn_openbsd.c | 32 ++++++++++++----------
.../udp-mib/data_access/udp_endpoint_openbsd.c | 30 ++++++++++----------
2 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/agent/mibgroup/tcp-mib/data_access/tcpConn_openbsd.c
b/agent/mibgroup/tcp-mib/data_access/tcpConn_openbsd.c
index f297ecb59..efa740cfb 100644
--- a/agent/mibgroup/tcp-mib/data_access/tcpConn_openbsd.c
+++ b/agent/mibgroup/tcp-mib/data_access/tcpConn_openbsd.c
@@ -218,8 +218,8 @@ static int
_load(netsnmp_container *container, u_int load_flags)
{
struct inpcbtable table;
- struct inpcb *head, *next, *prev;
- struct inpcb inpcb;
+ struct inpcb *next, *prev;
+ struct inpcb inpcb, previnpcb;
struct tcpcb tcpcb;
int StateMap[] = { 1, 2, 3, 4, 5, 8, 6, 10, 9, 7, 11 };
netsnmp_tcpconn_entry *entry;
@@ -234,21 +234,28 @@ _load(netsnmp_container *container, u_int load_flags)
return -1;
}
- prev = (struct inpcb *)&CIRCLEQ_FIRST(&table.inpt_queue);
+ next = (struct inpcb *)&TAILQ_FIRST(&table.inpt_queue);
prev = NULL;
- head = next = CIRCLEQ_FIRST(&table.inpt_queue);
while (next) {
if (!NETSNMP_KLOOKUP(next, (char *)&inpcb, sizeof(inpcb))) {
DEBUGMSGTL(("tcp-mib/data_access/tcpConn", "klookup inpcb
failed\n"));
break;
}
- if (prev && CIRCLEQ_PREV(&inpcb, inp_queue) != prev) {
- snmp_log(LOG_ERR,"tcbtable link error\n");
- break;
+ if (prev != NULL) {
+ if (!NETSNMP_KLOOKUP(prev, (char *)&previnpcb,
+ sizeof(previnpcb))) {
+ DEBUGMSGTL(("tcp-mib/data_access/tcpConn",
+ "klookup previnpcb failed\n"));
+ break;
+ }
+ if (TAILQ_NEXT(&previnpcb, inp_queue) != next) {
+ snmp_log(LOG_ERR,"tcbtable link error\n");
+ break;
+ }
}
prev = next;
- next = CIRCLEQ_NEXT(&inpcb, inp_queue);
+ next = TAILQ_NEXT(&inpcb, inp_queue);
if (!NETSNMP_KLOOKUP(inpcb.inp_ppcb, (char *)&tcpcb, sizeof(tcpcb))) {
DEBUGMSGTL(("tcp-mib/data_access/tcpConn", "klookup tcpcb
failed\n"));
break;
@@ -260,19 +267,19 @@ _load(netsnmp_container *container, u_int load_flags)
if (load_flags & NETSNMP_ACCESS_TCPCONN_LOAD_NOLISTEN) {
DEBUGMSGT(("verbose:access:tcpconn:container",
" skipping listen\n"));
- goto skip;
+ continue;
}
}
else if (load_flags & NETSNMP_ACCESS_TCPCONN_LOAD_ONLYLISTEN) {
DEBUGMSGT(("verbose:access:tcpconn:container",
" skipping non-listen\n"));
- goto skip;
+ continue;
}
}
#if !defined(NETSNMP_ENABLE_IPV6)
if (inpcb.inp_flags & INP_IPV6)
- goto skip;
+ continue;
#endif
entry = netsnmp_access_tcpconn_entry_create();
@@ -306,9 +313,6 @@ _load(netsnmp_container *container, u_int load_flags)
*/
entry->arbitrary_index = CONTAINER_SIZE(container) + 1;
CONTAINER_INSERT(container, entry);
-skip:
- if (head == next)
- break;
}
if(rc<0)
diff --git a/agent/mibgroup/udp-mib/data_access/udp_endpoint_openbsd.c
b/agent/mibgroup/udp-mib/data_access/udp_endpoint_openbsd.c
index 3ebde321e..8612ff8b6 100644
--- a/agent/mibgroup/udp-mib/data_access/udp_endpoint_openbsd.c
+++ b/agent/mibgroup/udp-mib/data_access/udp_endpoint_openbsd.c
@@ -192,8 +192,8 @@ static int
_load(netsnmp_container *container, u_int load_flags)
{
struct inpcbtable table;
- struct inpcb *head, *next, *prev;
- struct inpcb inpcb;
+ struct inpcb *next, *prev;
+ struct inpcb inpcb, previnpcb;
netsnmp_udp_endpoint_entry *entry;
int rc = 0;
@@ -205,22 +205,29 @@ _load(netsnmp_container *container, u_int load_flags)
return -1;
}
- prev = (struct inpcb *)&CIRCLEQ_FIRST(&table.inpt_queue);
+ next = (struct inpcb *)&TAILQ_FIRST(&table.inpt_queue);
prev = NULL;
- head = next = CIRCLEQ_FIRST(&table.inpt_queue);
while (next) {
NETSNMP_KLOOKUP(next, (char *)&inpcb, sizeof(inpcb));
- if (prev && CIRCLEQ_PREV(&inpcb, inp_queue) != prev) {
- snmp_log(LOG_ERR,"udbtable link error\n");
- break;
+ if (prev != NULL) {
+ if (!NETSNMP_KLOOKUP(prev, (char *)&previnpcb,
+ sizeof(previnpcb))) {
+ DEBUGMSGTL(("udp-mib/data_access/udpConn",
+ "klookup previnpcb failed\n"));
+ break;
+ }
+ if (TAILQ_NEXT(&previnpcb, inp_queue) != next) {
+ snmp_log(LOG_ERR,"udptable link error\n");
+ break;
+ }
}
prev = next;
- next = CIRCLEQ_NEXT(&inpcb, inp_queue);
+ next = TAILQ_NEXT(&inpcb, inp_queue);
#if !defined(NETSNMP_ENABLE_IPV6)
if (inpcb.inp_flags & INP_IPV6)
- goto skip;
+ continue;
#endif
entry = netsnmp_access_udp_endpoint_entry_create();
if (NULL == entry) {
@@ -250,11 +257,6 @@ _load(netsnmp_container *container, u_int load_flags)
*/
entry->index = CONTAINER_SIZE(container) + 1;
CONTAINER_INSERT(container, entry);
-#if !defined(NETSNMP_ENABLE_IPV6)
- skip:
-#endif
- if (next == head)
- break;
}
if (rc < 0)
--
2.16.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Net-snmp-coders mailing list
Net-snmp-coders@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/net-snmp-coders
