Fix build on -current, functionality is untested.


(joerg)

$NetBSD: patch-agent_mibgroup_mibII_ipv6.c,v 1.1 2013/11/29 12:59:51 joerg Exp $

--- agent/mibgroup/mibII/ipv6.c.orig	2013-11-26 22:18:51.000000000 +0000
+++ agent/mibgroup/mibII/ipv6.c
@@ -1336,7 +1336,11 @@ var_udp6(register struct variable * vp,
     DEBUGMSGOID(("mibII/ipv6", name, *length));
     DEBUGMSG(("mibII/ipv6", " %d\n", exact));
 
-#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 || defined(openbsd4)	/*1.6Y*/
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+    if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable)))
+        return NULL;
+    first = p = (caddr_t)TAILQ_FIRST(&udbtable.inpt_queue);
+#elif defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 || defined(openbsd4)	/*1.6Y*/
     if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable)))
         return NULL;
     first = p = (caddr_t)udbtable.inpt_queue.cqh_first;
@@ -1473,6 +1477,9 @@ var_udp6(register struct variable * vp,
 #if defined(openbsd4)
         p = (caddr_t)in6pcb.inp_queue.cqe_next;
 	if (p == first) break;
+#elif defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+        p = (caddr_t)TAILQ_NEXT(&in6pcb, in6p_queue);
+	if (p == first) break;
 #elif defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
         p = (caddr_t)in6pcb.in6p_queue.cqe_next;
 	if (p == first) break;
@@ -1780,7 +1787,11 @@ var_tcp6(register struct variable * vp,
     DEBUGMSGOID(("mibII/ipv6", name, *length));
     DEBUGMSG(("mibII/ipv6", " %d\n", exact));
 
-#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 || defined(openbsd4)	/*1.6Y*/
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+    if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
+        return NULL;
+    first = p = (caddr_t)TAILQ_FIRST(&tcbtable.inpt_queue);
+#elif defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 || defined(openbsd4)	/*1.6Y*/
     if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
         return NULL;
     first = p = (caddr_t)tcbtable.inpt_queue.cqh_first;
@@ -1928,6 +1939,9 @@ var_tcp6(register struct variable * vp,
 #if defined(openbsd4)
         p = (caddr_t)in6pcb.inp_queue.cqe_next;
 	if (p == first) break;
+#elif defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+        p = (caddr_t)TAILQ_NEXT(&in6pcb, in6p_queue);
+	if (p == first) break;
 #elif defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 || defined(openbsd4)	/*1.6Y*/
         p = (caddr_t)in6pcb.in6p_queue.cqe_next;
 	if (p == first) break;

$NetBSD: patch-agent_mibgroup_mibII_tcpTable.c,v 1.1 2013/11/29 12:59:51 joerg Exp $

--- agent/mibgroup/mibII/tcpTable.c.orig	2013-11-26 22:24:01.000000000 +0000
+++ agent/mibgroup/mibII/tcpTable.c
@@ -946,7 +946,11 @@ tcpTable_load(netsnmp_cache *cache, void
     /*
      *  Set up a linked list
      */
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+    entry  = TAILQ_FIRST(&table.inpt_queue);
+#else
     entry  = table.inpt_queue.cqh_first;
+#endif
     while (entry) {
    
         nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb);
@@ -970,8 +974,13 @@ tcpTable_load(netsnmp_cache *cache, void
 	nnew->inp_next = tcp_head;
 	tcp_head   = nnew;
 
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+        if (entry == TAILQ_FIRST(&table.inpt_queue))
+            break;
+#else
         if (entry == table.inpt_queue.cqh_first)
             break;
+#endif
     }
 
     if (tcp_head) {

$NetBSD: patch-agent_mibgroup_mibII_udpTable.c,v 1.1 2013/11/29 12:59:51 joerg Exp $

--- agent/mibgroup/mibII/udpTable.c.orig	2013-11-26 22:25:02.000000000 +0000
+++ agent/mibgroup/mibII/udpTable.c
@@ -395,7 +395,11 @@ udpTable_next_entry( void **loop_context
      * and update the loop context ready for the next one.
      */
     *data_context = (void*)entry;
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+    *loop_context = (void*)TAILQ_NEXT(entry, inp_queue);
+#else
     *loop_context = (void*)entry->INP_NEXT_SYMBOL;
+#endif
     return index;
 }
 
@@ -405,7 +409,11 @@ udpTable_free(netsnmp_cache *cache, void
     UDPTABLE_ENTRY_TYPE	 *p;
     while (udp_head) {
         p = udp_head;
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+        udp_head = TAILQ_NEXT(udp_head, inp_queue);
+#else
         udp_head = udp_head->INP_NEXT_SYMBOL;
+#endif
         free(p);
     }
 
@@ -705,7 +713,11 @@ udpTable_load(netsnmp_cache *cache, void
     /*
      *  Set up a linked list
      */
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+    entry  = TAILQ_FIRST(&table.inpt_queue);
+#else
     entry  = table.inpt_queue.cqh_first;
+#endif
     while (entry) {
    
         nnew = SNMP_MALLOC_TYPEDEF(struct inpcb);
@@ -717,12 +729,22 @@ udpTable_load(netsnmp_cache *cache, void
             break;
         }
 
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+        entry    = TAILQ_NEXT(nnew, inp_queue);	/* Next kernel entry */
+	TAILQ_NEXT(nnew, inp_queue) = udp_head;
+#else
         entry    = nnew->inp_queue.cqe_next;	/* Next kernel entry */
 	nnew->inp_queue.cqe_next = udp_head;
+#endif
 	udp_head = nnew;
 
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
+        if (entry == TAILQ_FIRST(&table.inpt_queue))
+            break;
+#else
         if (entry == table.inpt_queue.cqh_first)
             break;
+#endif
     }
 
     if (udp_head) {