Changes 5.1.1:

New:
  - test suite supports testing over other transports (tcp, udp6, unix, ...)
    (see the -P switch to the testing/RUNTESTS script)
  - Solaris supports the use of it's PKCS#11 library for supporting
    cryptographic functions (OpenSSL isn't required if PKCS#11 is available)
    (see configure's --with-pkcs flag)
Fixes:
  - Improvements on 64 bit architectures.
  - A few minor memory leaks fixed.
  - An extremely large number of minor bug fixes.
  - Many perl module specific bug fixes.
  - snmpd will safely handle more signals.
Ports:
  - Many many significant Windows improvements.
    - A win32 build script in win32/build.pl
    - Support for the MinGW compiler
    - (see the README.win32 file for details on new ports)
    - Various helpful win32/*.bat files for installation, etc.
  - Some linux 2.6 support improvements

11 files changed, 105 insertions, 110 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index fe248dd06d3..28033de7223 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2004/04/22 16:50:02 christos Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/14 13:30:34 adam Exp $
 
-DISTNAME=	net-snmp-5.0.9
-PKGREVISION=	4
+DISTNAME=	net-snmp-5.1.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
 		ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index fe33967b1a8..0c64c2049a7 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/23 22:07:56 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/05/14 13:30:34 adam Exp $
 bin/encode_keychange
 bin/fixproc
 bin/ipf-mod.pl
@@ -33,7 +33,9 @@ include/net-snmp/agent/agent_registry.h
 include/net-snmp/agent/agent_trap.h
 include/net-snmp/agent/all_helpers.h
 include/net-snmp/agent/auto_nlist.h
+include/net-snmp/agent/baby_steps.h
 include/net-snmp/agent/bulk_to_next.h
+include/net-snmp/agent/cache_handler.h
 include/net-snmp/agent/debug_handler.h
 include/net-snmp/agent/ds_agent.h
 include/net-snmp/agent/instance.h
@@ -45,7 +47,9 @@ include/net-snmp/agent/net-snmp-agent-includes.h
 include/net-snmp/agent/null.h
 include/net-snmp/agent/old_api.h
 include/net-snmp/agent/read_only.h
+include/net-snmp/agent/row_merge.h
 include/net-snmp/agent/scalar.h
+include/net-snmp/agent/scalar_group.h
 include/net-snmp/agent/serialize.h
 include/net-snmp/agent/set_helper.h
 include/net-snmp/agent/snmp_agent.h
@@ -66,6 +70,9 @@ include/net-snmp/library/check_varbind.h
 include/net-snmp/library/cmu_compat.h
 include/net-snmp/library/container.h
 include/net-snmp/library/container_binary_array.h
+include/net-snmp/library/container_iterator.h
+include/net-snmp/library/container_list_ssll.h
+include/net-snmp/library/container_null.h
 include/net-snmp/library/data_list.h
 include/net-snmp/library/default_store.h
 include/net-snmp/library/factory.h
@@ -108,6 +115,7 @@ include/net-snmp/library/tools.h
 include/net-snmp/library/transform_oids.h
 include/net-snmp/library/ucd_compat.h
 include/net-snmp/library/vacm.h
+include/net-snmp/library/winpipe.h
 include/net-snmp/library/winservice.h
 include/net-snmp/machine/generic.h
 include/net-snmp/mib_api.h
@@ -133,9 +141,11 @@ include/net-snmp/system/generic.h
 include/net-snmp/system/hpux.h
 include/net-snmp/system/irix.h
 include/net-snmp/system/linux.h
+include/net-snmp/system/mingw32.h
 include/net-snmp/system/mips.h
 include/net-snmp/system/netbsd.h
 include/net-snmp/system/openbsd.h
+include/net-snmp/system/osf5.h
 include/net-snmp/system/solaris.h
 include/net-snmp/system/solaris2.6.h
 include/net-snmp/system/solaris2.7.h
@@ -193,28 +203,33 @@ include/ucd-snmp/version.h
 lib/libnetsnmp.a
 lib/libnetsnmp.la
 lib/libnetsnmp.so
-lib/libnetsnmp.so.5
-lib/libnetsnmp.so.5.9
+lib/libnetsnmp.so.6
+lib/libnetsnmp.so.6.1
 lib/libnetsnmpagent.a
 lib/libnetsnmpagent.la
 lib/libnetsnmpagent.so
-lib/libnetsnmpagent.so.5
-lib/libnetsnmpagent.so.5.9
+lib/libnetsnmpagent.so.6
+lib/libnetsnmpagent.so.6.1
 lib/libnetsnmphelpers.a
 lib/libnetsnmphelpers.la
 lib/libnetsnmphelpers.so
-lib/libnetsnmphelpers.so.5
-lib/libnetsnmphelpers.so.5.9
+lib/libnetsnmphelpers.so.6
+lib/libnetsnmphelpers.so.6.1
 lib/libnetsnmpmibs.a
 lib/libnetsnmpmibs.la
 lib/libnetsnmpmibs.so
-lib/libnetsnmpmibs.so.5
-lib/libnetsnmpmibs.so.5.9
+lib/libnetsnmpmibs.so.6
+lib/libnetsnmpmibs.so.6.1
 lib/libsnmp.a
 lib/libsnmp.la
 lib/libsnmp.so
-lib/libsnmp.so.5
-lib/libsnmp.so.5.9
+lib/libsnmp.so.6
+lib/libsnmp.so.6.1
+lib/libnetsnmptrapd.a
+lib/libnetsnmptrapd.la
+lib/libnetsnmptrapd.so
+lib/libnetsnmptrapd.so.6
+lib/libnetsnmptrapd.so.6.1
 man/man1/mib2c.1
 man/man1/snmpbulkget.1
 man/man1/snmpbulkwalk.1
@@ -233,6 +248,7 @@ man/man1/snmptest.1
 man/man1/snmptranslate.1
 man/man1/snmptrap.1
 man/man1/snmpusm.1
+man/man1/snmpvacm.1
 man/man1/snmpwalk.1
 man/man3/add_mibdir.3
 man/man3/add_module_replacement.3
@@ -241,12 +257,19 @@ man/man3/get_module_node.3
 man/man3/init_mib.3
 man/man3/init_mib_internals.3
 man/man3/mib_api.3
+man/man3/netsnmp_Container_iterator.3
 man/man3/netsnmp_agent.3
+man/man3/netsnmp_baby_steps.3
 man/man3/netsnmp_bulk_to_next.3
+man/man3/netsnmp_cache_handler.3
+man/man3/netsnmp_container.3
 man/man3/netsnmp_debug.3
+man/man3/netsnmp_deprecated.3
 man/man3/netsnmp_example_scalar_int.3
 man/man3/netsnmp_handler.3
 man/man3/netsnmp_instance.3
+man/man3/netsnmp_iterator_info_s.3
+man/man3/netsnmp_leaf.3
 man/man3/netsnmp_library.3
 man/man3/netsnmp_mib_handler_methods.3
 man/man3/netsnmp_mib_utilities.3
@@ -254,14 +277,18 @@ man/man3/netsnmp_mode_end_call.3
 man/man3/netsnmp_multiplexer.3
 man/man3/netsnmp_old_api.3
 man/man3/netsnmp_read_only.3
+man/man3/netsnmp_row_merge.3
 man/man3/netsnmp_scalar.3
+man/man3/netsnmp_scalar_group_group.3
 man/man3/netsnmp_serialize.3
+man/man3/netsnmp_stash_cache.3
 man/man3/netsnmp_table.3
 man/man3/netsnmp_table_array.3
 man/man3/netsnmp_table_data.3
 man/man3/netsnmp_table_dataset.3
 man/man3/netsnmp_table_iterator.3
 man/man3/netsnmp_todo.3
+man/man3/netsnmp_utilities.3
 man/man3/netsnmp_watcher.3
 man/man3/print_description.3
 man/man3/print_mib.3
@@ -313,13 +340,18 @@ man/man8/snmptrapd.8
 sbin/snmpd
 sbin/snmptrapd
 share/examples/net-snmp/EXAMPLE.conf
+share/snmp/mib2c.access_functions.conf
 share/snmp/mib2c.array-user.conf
+share/snmp/mib2c.check_values.conf
+share/snmp/mib2c.check_values_local.conf
 share/snmp/mib2c.column_defines.conf
 share/snmp/mib2c.column_enums.conf
 share/snmp/mib2c.conf
 share/snmp/mib2c.create-dataset.conf
 share/snmp/mib2c.int_watch.conf
 share/snmp/mib2c.iterate.conf
+share/snmp/mib2c.iterate_access.conf
+share/snmp/mib2c.notify.conf
 share/snmp/mib2c.old-api.conf
 share/snmp/mib2c.scalar.conf
 share/snmp/mibs/AGENTX-MIB.txt
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index d67a029cfc9..8614da2a1a5 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.9 2004/04/26 17:39:00 tron Exp $
+$NetBSD: distinfo,v 1.10 2004/05/14 13:30:34 adam Exp $
 
-SHA1 (net-snmp-5.0.9.tar.gz) = bb27bdf38da96833a3fa55f8c6a14732ab2c1991
-Size (net-snmp-5.0.9.tar.gz) = 2345822 bytes
-SHA1 (patch-aa) = 40ef03e182f8e8bb4f01f67f97c200c6e82f3d82
-SHA1 (patch-ab) = 0c6c2cd591b7264da102e7182413a5f7ed02d198
-SHA1 (patch-ac) = 23696f87cf5669e52ca9c70d4a7f30f649574083
-SHA1 (patch-ad) = 947bc9d8d6190584e9c7f93c2b4aeda63fd5139c
-SHA1 (patch-ae) = efc77e7985e9ac44c99e35015e2be55b0601dd4e
-SHA1 (patch-af) = 83e3e7f27865d2423b03fc1d967319bc104c877d
+SHA1 (net-snmp-5.1.1.tar.gz) = 19fe6191ac1312f6f65bf2b9513e8d25084cac1b
+Size (net-snmp-5.1.1.tar.gz) = 2977122 bytes
+SHA1 (patch-aa) = df9bcea942743e9bcd843724612b7d82ea364eca
+SHA1 (patch-ab) = d14ea51456a30cc28337cecace032167b2614163
+SHA1 (patch-ac) = 43dbf5519feac2a13b893f659090fa24de773ee8
+SHA1 (patch-ad) = 522872c90ac1e442dafb1d210af6e978ac741ce9
+SHA1 (patch-ae) = cfa956d0e67dd2ff9720faee248c0b5ca00843e4
+SHA1 (patch-af) = b274c4234ff1034e56954f24db066ee38edc8ef4
 SHA1 (patch-ag) = 6d07febd92597d1d817e3c1960ce9afcc75a6906
-SHA1 (patch-ah) = 9acc8c432c61e071257c24e2041a23b63f81cfe2
+SHA1 (patch-ah) = cd2bd7adfb66f8e250dc686644d3888f4750f2d3
+SHA1 (patch-ai) = 8518a29c82c63330f0300c6ca99f9a1c7ec0d072
diff --git a/net/net-snmp/patches/patch-aa b/net/net-snmp/patches/patch-aa
index 8437edbb09b..50b37f54575 100644
--- a/net/net-snmp/patches/patch-aa
+++ b/net/net-snmp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/09/12 12:07:19 uebayasi Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/14 13:30:34 adam Exp $
 
---- agent/snmp_agent.c.orig	Sat Mar 15 02:37:08 2003
+--- agent/snmp_agent.c.orig	2004-03-15 23:52:08.000000000 +0000
 +++ agent/snmp_agent.c
-@@ -74,6 +74,10 @@ SOFTWARE.
+@@ -92,6 +92,10 @@ SOFTWARE.
  #include <net-snmp/agent/net-snmp-agent-includes.h>
  #include <net-snmp/library/snmp_assert.h>
  
diff --git a/net/net-snmp/patches/patch-ab b/net/net-snmp/patches/patch-ab
index 0195e0cd8b8..811bf3b1089 100644
--- a/net/net-snmp/patches/patch-ab
+++ b/net/net-snmp/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2004/04/14 21:48:49 danw Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/14 13:30:34 adam Exp $
 
---- agent/mibgroup/mibII/ipv6.c.orig	Fri May 17 12:05:12 2002
+--- agent/mibgroup/mibII/ipv6.c.orig	2004-02-02 23:33:34.000000000 +0000
 +++ agent/mibgroup/mibII/ipv6.c
 @@ -11,7 +11,7 @@
  #include <sys/types.h>
@@ -273,48 +273,3 @@ $NetBSD: patch-ab,v 1.2 2004/04/14 21:48:49 danw Exp $
          p = (caddr_t) in6pcb.in6p_next;
  #else
          xig = (struct xinpgen *) ((char *) xig + xig->xig_len);
-Index: agent/mibgroup/mibII/tcpTable.c
-===================================================================
-RCS file: /cvsroot/apps/net-snmp/agent/mibgroup/mibII/tcpTable.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- agent/mibgroup/mibII/tcpTable.c	12 Sep 2003 23:10:08 -0000	1.1.1.1
-+++ agent/mibgroup/mibII/tcpTable.c	13 Sep 2003 05:36:50 -0000	1.2
-@@ -499,6 +499,10 @@
-             snmp_log_perror("TCP_Count_Connections - inpcb");
-             break;
-         }
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
-+	if (inpcb.inp_af != AF_INET)
-+	    continue;
-+#endif
- #if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2))
-         if (inpcb.INP_PREV_SYMBOL != prev) {    /* ??? */
-             sleep(1);
-Index: agent/mibgroup/mibII/udpTable.c
-===================================================================
-RCS file: /cvsroot/apps/net-snmp/agent/mibgroup/mibII/udpTable.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- agent/mibgroup/mibII/udpTable.c	12 Sep 2003 23:10:08 -0000	1.1.1.1
-+++ agent/mibgroup/mibII/udpTable.c	13 Sep 2003 05:36:50 -0000	1.2
-@@ -178,6 +178,16 @@
-     LowState = -1;              /* UDP doesn't have 'State', but it's a useful flag */
-     UDP_Scan_Init();
-     for (;;) {
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
-+	if (inpcb.inp_af != AF_INET) {
-+	    if ((i = UDP_Scan_Next(&inpcb)) < 0)
-+		goto Again;
-+	    if (i == 0)
-+		break;              /* Done */
-+	    cp = (u_char *) & inpcb.inp_laddr.s_addr;
-+	    continue;
-+	}
-+#endif
- #ifdef hpux11
-         if ((i = UDP_Scan_Next(&udp)) == 0)
-             break;              /* Done */
-
diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac
index 534edaf0a67..eedbe43747d 100644
--- a/net/net-snmp/patches/patch-ac
+++ b/net/net-snmp/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2003/12/30 19:30:48 kim Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/14 13:30:34 adam Exp $
 
---- include/net-snmp/system/netbsd.h.orig	2002-04-20 03:30:12.000000000 -0400
-+++ include/net-snmp/system/netbsd.h	2003-12-30 14:17:00.000000000 -0500
+--- include/net-snmp/system/netbsd.h.orig	2002-04-20 07:30:12.000000000 +0000
++++ include/net-snmp/system/netbsd.h
 @@ -1,5 +1,7 @@
  #include "bsd.h"
  
diff --git a/net/net-snmp/patches/patch-ad b/net/net-snmp/patches/patch-ad
index 1e46cac5eb4..243410bd723 100644
--- a/net/net-snmp/patches/patch-ad
+++ b/net/net-snmp/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/02/25 21:50:40 christos Exp $
+$NetBSD: patch-ad,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- agent/mibgroup/ucd_snmp.h.orig	2004-02-25 16:25:12.000000000 -0500
-+++ agent/mibgroup/ucd_snmp.h	2004-02-25 15:36:25.000000000 -0500
-@@ -36,6 +36,10 @@
+--- agent/mibgroup/ucd_snmp.h.orig	2003-06-09 22:11:51.000000000 +0000
++++ agent/mibgroup/ucd_snmp.h
+@@ -40,6 +40,10 @@ config_arch_require(freebsd5, ucd-snmp/v
  config_arch_require(freebsd5, ucd-snmp/memory_freebsd2)
  config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1)
  config_arch_require(netbsd1, ucd-snmp/memory_netbsd1)
@@ -12,4 +12,4 @@ $NetBSD: patch-ad,v 1.1 2004/02/25 21:50:40 christos Exp $
 +config_arch_require(netbsdelf, ucd-snmp/memory_netbsd1)
  config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1)
  config_arch_require(openbsd2, ucd-snmp/memory_netbsd1)
- config_arch_require(openbsd3, ucd-snmp/vmstat_netbsd1)
+ config_arch_require(bsdi4, ucd-snmp/vmstat_bsdi4)
diff --git a/net/net-snmp/patches/patch-ae b/net/net-snmp/patches/patch-ae
index 862bb2b2599..7195b574354 100644
--- a/net/net-snmp/patches/patch-ae
+++ b/net/net-snmp/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2004/04/14 21:48:49 danw Exp $
+$NetBSD: patch-ae,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- snmplib/snmpUDPIPv6Domain.c.orig	Fri Apr  9 19:14:10 2004
+--- snmplib/snmpUDPIPv6Domain.c.orig	2004-02-18 14:14:54.000000000 +0000
 +++ snmplib/snmpUDPIPv6Domain.c
-@@ -36,6 +36,10 @@
+@@ -52,6 +52,10 @@ const struct in6_addr in6addr_any = IN6A
  #include <dmalloc.h>
  #endif
  
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index 1ab2777bd94..a75670d431e 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,20 +1,8 @@
-$NetBSD: patch-af,v 1.1 2004/04/22 16:50:02 christos Exp $
+$NetBSD: patch-af,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- configure.in.orig	Sat Sep  6 02:41:25 2003
-+++ configure.in	Thu Apr 22 11:26:53 2004
-@@ -1362,6 +1362,8 @@
-     AC_CHECK_FUNCS(AES_cfb128_encrypt)
- fi
- 
-+AC_CHECK_LIB(des, des_cbc_encrypt)
-+
- dnl Check for libraries that the agent needs
- dnl saving old libraries
- NONAGENTLIBS=$LIBS
-
---- configure.orig	Sat Sep  6 03:22:58 2003
-+++ configure	Thu Apr 22 11:26:56 2004
-@@ -8524,6 +8524,54 @@
+--- configure.orig	2004-03-20 07:13:55.000000000 +0000
++++ configure
+@@ -11205,6 +11205,53 @@ fi
  
  fi
  
@@ -27,7 +15,7 @@ $NetBSD: patch-af,v 1.1 2004/04/22 16:50:02 christos Exp $
 +  ac_save_LIBS="$LIBS"
 +LIBS="-ldes  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 8537 "configure"
++#line 11217 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -65,7 +53,6 @@ $NetBSD: patch-af,v 1.1 2004/04/22 16:50:02 christos Exp $
 +  echo "$ac_t""no" 1>&6
 +fi
 +
-+
+ # Check for libraries that the agent needs
+ # saving old libraries
  NONAGENTLIBS=$LIBS
- 
- _cppflags="${CPPFLAGS}"
diff --git a/net/net-snmp/patches/patch-ah b/net/net-snmp/patches/patch-ah
index 3ab558716ed..6701c236def 100644
--- a/net/net-snmp/patches/patch-ah
+++ b/net/net-snmp/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/04/26 17:39:00 tron Exp $
+$NetBSD: patch-ah,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- agent/mibgroup/host/hr_filesys.c.orig	2003-02-28 19:17:35.000000000 +0100
-+++ agent/mibgroup/host/hr_filesys.c	2004-04-26 19:31:03.000000000 +0200
-@@ -85,6 +85,15 @@
+--- agent/mibgroup/host/hr_filesys.c.orig	2004-01-29 13:53:59.000000000 +0000
++++ agent/mibgroup/host/hr_filesys.c
+@@ -86,6 +86,15 @@ struct mnttab  *HRFS_entry = &HRFS_entry
  #define	HRFS_type	mnt_fstype
  #define	HRFS_statfs	statvfs
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ah,v 1.1 2004/04/26 17:39:00 tron Exp $
  #elif defined(HAVE_GETFSSTAT)
  static struct statfs *fsstats = 0;
  static int      fscount;
-@@ -447,7 +456,9 @@
+@@ -452,7 +461,9 @@ var_hrfilesys(struct variable *vp,
          return (u_char *) fsys_type_id;
  
      case HRFSYS_ACCESS:
diff --git a/net/net-snmp/patches/patch-ai b/net/net-snmp/patches/patch-ai
new file mode 100644
index 00000000000..ca9b235a122
--- /dev/null
+++ b/net/net-snmp/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 2004/05/14 13:32:11 adam Exp $
+
+--- agent/mibgroup/mibII/tcpTable.c.orig	2004-03-15 23:27:45.000000000 +0000
++++ agent/mibgroup/mibII/tcpTable.c
+@@ -88,6 +88,7 @@ struct netsnmp_inpcb_s {
+     int             state;
+     netsnmp_inpcb  *inp_next;
+ };
++#define	INP_NEXT_SYMBOL		inp_next
+ #define	TCPTABLE_ENTRY_TYPE	netsnmp_inpcb 
+ #define	TCPTABLE_STATE		state 
+ #define	TCPTABLE_LOCALADDRESS	pcb.inp_laddr.s_addr 
+@@ -771,7 +772,7 @@ tcpTable_load(netsnmp_cache *cache, void
+             nnew->state == 8 /*  closeWait  */ )
+             tcp_estab++;
+ 
+-        entry      = nnew->inp_queue.cqe_next;	/* Next kernel entry */
++        entry      = nnew->INP_NEXT_SYMBOL;	/* Next kernel entry */
+ 	nnew->inp_next = tcp_head;
+ 	tcp_head   = nnew;
+