net/net-snmp: Fix IPv6 option on DragonFly

Another victim of _KERNEL STRUCTURES...

2 files changed, 37 insertions, 23 deletions

diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 1506d88f82b..00fb84ee1d3 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2012/05/17 12:56:17 spz Exp $
+$NetBSD: distinfo,v 1.66 2012/05/17 14:37:07 marino Exp $
 
 SHA1 (net-snmp-5.6.1.1.tar.gz) = ec88ba3e0dff4d1b3d342ccebb48ea84c9fa6fa9
 RMD160 (net-snmp-5.6.1.1.tar.gz) = 9a4a83f7fe9431a0694b5fee33866ccea80fcab4
@@ -24,7 +24,7 @@ SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1
 SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582
 SHA1 (patch-dc) = f84beba7fae731bb0e38b9635dd2f7009c3659aa
 SHA1 (patch-dd) = 08da0d1da485959549ac461e5cbb7030f800e643
-SHA1 (patch-de) = 605215c1604d14a7ac96d643ef685778df3517fb
+SHA1 (patch-de) = 532045f8e509b4df0acc46bf5e778d10d3b36012
 SHA1 (patch-df) = 8851ce05e61345496d2abe65cac2896268d72624
 SHA1 (patch-dg) = 6e6e396add0613dd76e3b8618008a7ebf8103c7c
 SHA1 (patch-dh) = 41530526190fb9a0419db1c604c2ac6025417706
diff --git a/net/net-snmp/patches/patch-de b/net/net-snmp/patches/patch-de
index b912a6d0616..a04073c42c0 100644
--- a/net/net-snmp/patches/patch-de
+++ b/net/net-snmp/patches/patch-de
@@ -1,4 +1,4 @@
-$NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
+$NetBSD: patch-de,v 1.8 2012/05/17 14:37:07 marino Exp $
 
 --- agent/mibgroup/mibII/ipv6.c.orig	2010-12-08 13:17:10.000000000 +0000
 +++ agent/mibgroup/mibII/ipv6.c
@@ -11,7 +11,21 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
  # if HAVE_SYS_SOCKETVAR_H
  #  include <sys/socketvar.h>
  # endif
-@@ -80,7 +80,7 @@
+@@ -51,7 +51,13 @@
+ #endif
+ #include <net/if.h>
+ #if HAVE_NET_IF_VAR_H
++#  ifdef __DragonFly__
++#  define _KERNEL_STRUCTURES
++#  endif
+ #include <net/if_var.h>
++#  ifdef __DragonFly__
++#  undef _KERNEL_STRUCTURES
++#  endif
+ #endif
+ #if HAVE_NET_IF_DL_H
+ #include <net/if_dl.h>
+@@ -80,7 +86,7 @@
  # include <netinet6/ip6_var.h>
  #endif
  #include <net/route.h>
@@ -20,7 +34,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
  # if HAVE_NETINET_IN_PCB_H
  #  include <netinet/in_pcb.h>
  # endif
-@@ -616,7 +616,7 @@ if_getifnet(int idx, struct ifnet *resul
+@@ -616,7 +622,7 @@ if_getifnet(int idx, struct ifnet *resul
              memcpy(result, &tmp, sizeof(tmp));
              return 0;
          }
@@ -29,7 +43,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
          q = (caddr_t) TAILQ_NEXT(&tmp, if_link);
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -846,13 +846,36 @@ var_ifv6Entry(register struct variable *
+@@ -846,13 +852,36 @@ var_ifv6Entry(register struct variable *
          {
              struct ifnet    ifnet;
              struct ifaddr   ifaddr;
@@ -67,7 +81,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
              ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrlist);
-@@ -878,8 +901,20 @@ var_ifv6Entry(register struct variable *
+@@ -878,8 +907,20 @@ var_ifv6Entry(register struct variable *
                      *var_len = sdl.sdl_alen;
                      return (u_char *) (sdl.sdl_data + sdl.sdl_nlen);
                  }
@@ -89,7 +103,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
                  ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_list);
-@@ -1285,7 +1320,11 @@ var_udp6(register struct variable * vp,
+@@ -1285,7 +1326,11 @@ var_udp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable udbtable;
      caddr_t	    first;
@@ -102,7 +116,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1300,10 +1339,31 @@ var_udp6(register struct variable * vp,
+@@ -1300,10 +1345,31 @@ var_udp6(register struct variable * vp,
      if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable)))
          return NULL;
      first = p = (caddr_t)udbtable.inpt_queue.cqh_first;
@@ -135,7 +149,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
  #else
      {
          const char     *udblist = "net.inet.udp.pcblist";
-@@ -1331,15 +1391,17 @@ var_udp6(register struct variable * vp,
+@@ -1331,15 +1397,17 @@ var_udp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p &&  p != first
@@ -155,7 +169,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
          if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) {
              DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n",
                          p));
-@@ -1352,7 +1414,7 @@ var_udp6(register struct variable * vp,
+@@ -1352,7 +1420,7 @@ var_udp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          if (in6pcb.in6p_af != AF_INET6)
              goto skip;
@@ -164,7 +178,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1395,13 +1457,15 @@ var_udp6(register struct variable * vp,
+@@ -1395,13 +1463,15 @@ var_udp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
@@ -182,7 +196,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
      free(sysctl_buf);
  #endif
      DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found));
-@@ -1460,7 +1524,7 @@ var_tcp6(register struct variable * vp,
+@@ -1460,7 +1530,7 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable tcbtable;
      caddr_t	    first;
@@ -191,7 +205,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1490,7 +1554,7 @@ var_tcp6(register struct variable * vp,
+@@ -1490,7 +1560,7 @@ var_tcp6(register struct variable * vp,
      if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
          return NULL;
      first = p = (caddr_t)tcbtable.inpt_queue.cqh_first;
@@ -200,7 +214,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
      if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6)))
          return NULL;
      p = (caddr_t) tcb6.in6p_next;
-@@ -1521,7 +1585,7 @@ var_tcp6(register struct variable * vp,
+@@ -1521,7 +1591,7 @@ var_tcp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p &&  p != first
@@ -209,7 +223,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
                p && (u_long) p != auto_nlist_value("tcb6")
  #else
                xig->xig_len > sizeof(struct xinpgen)
-@@ -1529,7 +1593,7 @@ var_tcp6(register struct variable * vp,
+@@ -1529,7 +1599,7 @@ var_tcp6(register struct variable * vp,
          ) {
          DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
  
@@ -218,7 +232,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
          if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) {
              DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n",
                          p));
-@@ -1542,7 +1606,7 @@ var_tcp6(register struct variable * vp,
+@@ -1542,7 +1612,7 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          if (in6pcb.in6p_af != AF_INET6)
              goto skip;
@@ -227,7 +241,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1599,13 +1663,13 @@ var_tcp6(register struct variable * vp,
+@@ -1599,13 +1669,13 @@ var_tcp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
@@ -243,7 +257,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
      free(sysctl_buf);
  #endif
      DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found));
-@@ -1697,7 +1761,11 @@ var_tcp6(register struct variable * vp,
+@@ -1697,7 +1767,11 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable tcbtable;
      caddr_t	    first;
@@ -256,7 +270,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1712,10 +1780,31 @@ var_tcp6(register struct variable * vp,
+@@ -1712,10 +1786,31 @@ var_tcp6(register struct variable * vp,
      if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
          return NULL;
      first = p = (caddr_t)tcbtable.inpt_queue.cqh_first;
@@ -289,7 +303,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
  #else
      {
          const char     *tcblist = "net.inet.tcp.pcblist";
-@@ -1732,7 +1821,8 @@ var_tcp6(register struct variable * vp,
+@@ -1732,7 +1827,8 @@ var_tcp6(register struct variable * vp,
              return NULL;
          }
          oxig = (struct xinpgen *) sysctl_buf;
@@ -299,7 +313,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
          p = (caddr_t) ((char *) xig); /* silence compiler warning */
      }
  #endif
-@@ -1743,28 +1833,32 @@ var_tcp6(register struct variable * vp,
+@@ -1743,28 +1839,32 @@ var_tcp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p && p != first
@@ -335,7 +349,7 @@ $NetBSD: patch-de,v 1.7 2011/05/27 10:55:25 adam Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1820,13 +1914,15 @@ var_tcp6(register struct variable * vp,
+@@ -1820,13 +1920,15 @@ var_tcp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;