Skip to content

Commit f2b6880

Browse files
authored
Fix ipv6.c for DragonflyBSD (net-snmp#841)
Fixes: ebb758e (x Fix var_udp6 and var_tcp6 on FreeBSD)
1 parent 34ec1fa commit f2b6880

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

agent/mibgroup/mibII/ipv6.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ var_udp6(register struct variable * vp,
15161516
int result;
15171517
int i, j;
15181518
caddr_t p;
1519-
#if defined(openbsd4)
1519+
#if defined(openbsd4) || defined(dragonfly)
15201520
static struct inpcb in6pcb, savpcb;
15211521
#elif defined(freebsd3)
15221522
static struct xinpcb in6pcb, savpcb;
@@ -1618,7 +1618,7 @@ var_udp6(register struct variable * vp,
16181618
) {
16191619
DEBUGMSGTL(("mibII/ipv6", "looping: p=%p\n", p));
16201620

1621-
#if defined(freebsd3)
1621+
#if defined(freebsd3) &&!defined(dragonfly)
16221622
in6pcb = *(struct xinpcb *) xig;
16231623
#elif defined(darwin)
16241624
in6pcb = ((struct xinpcb *) xig)->xi_inp;
@@ -2112,15 +2112,15 @@ var_tcp6(register struct variable * vp,
21122112
int result;
21132113
int i, j;
21142114
caddr_t p;
2115-
#if defined(openbsd4)
2115+
#if defined(openbsd4) || defined(dragonfly)
21162116
static struct inpcb in6pcb, savpcb;
21172117
#elif defined(freebsd3)
21182118
static struct xinpcb in6pcb;
21192119
static int savstate;
21202120
#else
21212121
static struct in6pcb in6pcb, savpcb;
21222122
#endif
2123-
#if !defined(freebsd3)
2123+
#if !defined(freebsd3) || defined(dragonfly)
21242124
struct tcpcb tcpcb;
21252125
#endif
21262126
int state;
@@ -2217,10 +2217,10 @@ var_tcp6(register struct variable * vp,
22172217
) {
22182218
DEBUGMSGTL(("mibII/ipv6", "looping: p=%p\n", p));
22192219

2220-
#if defined(freebsd3)
2221-
in6pcb = ((struct xtcpcb *) xig)->xt_inp;
2222-
#elif defined(dragonfly)
2220+
#if defined(dragonfly)
22232221
in6pcb = xtp->xt_inp;
2222+
#elif defined(freebsd3)
2223+
in6pcb = ((struct xtcpcb *) xig)->xt_inp;
22242224
#elif defined(darwin)
22252225
in6pcb = ((struct xinpcb *) xig)->xi_inp;
22262226
#else
@@ -2303,7 +2303,7 @@ var_tcp6(register struct variable * vp,
23032303
#endif
23042304
result = snmp_oid_compare(name, *length, newname, j);
23052305
if (exact && (result == 0)) {
2306-
#if defined(freebsd3)
2306+
#if defined(freebsd3) && !defined(dragonfly)
23072307
savstate = ((struct xtcpcb *) xig)->t_state;
23082308
#else
23092309
memcpy(&savpcb, &in6pcb, sizeof(savpcb));
@@ -2318,7 +2318,7 @@ var_tcp6(register struct variable * vp,
23182318
*/
23192319
if ((savnameLen == 0) ||
23202320
(snmp_oid_compare(savname, savnameLen, newname, j) > 0)) {
2321-
#if defined(freebsd3)
2321+
#if defined(freebsd3) && !defined(dragonfly)
23222322
savstate = ((struct xtcpcb *) xig)->t_state;
23232323
#else
23242324
memcpy(&savpcb, &in6pcb, sizeof(savpcb));
@@ -2361,7 +2361,7 @@ var_tcp6(register struct variable * vp,
23612361
return NULL;
23622362
*length = savnameLen;
23632363
memcpy((char *) name, (char *) savname, *length * sizeof(oid));
2364-
#if defined(freebsd3)
2364+
#if defined(freebsd3) && !defined(dragonfly)
23652365
state = savstate;
23662366
#elif defined(__NetBSD__) && __NetBSD_Version__ >= 999010400
23672367
memcpy(&in6pcb, &savpcb, sizeof(savpcb));

0 commit comments

Comments
 (0)