From owner-svn-src-stable@FreeBSD.ORG  Thu Jun 14 15:39:15 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 588F51065678;
	Thu, 14 Jun 2012 15:39:15 +0000 (UTC)
	(envelope-from emax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 43CAC8FC17;
	Thu, 14 Jun 2012 15:39:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5EFdF8r003282;
	Thu, 14 Jun 2012 15:39:15 GMT (envelope-from emax@svn.freebsd.org)
Received: (from emax@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5EFdFSR003280;
	Thu, 14 Jun 2012 15:39:15 GMT (envelope-from emax@svn.freebsd.org)
Message-Id: <201206141539.q5EFdFSR003280@svn.freebsd.org>
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Thu, 14 Jun 2012 15:39:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237078 - stable/9/contrib/bsnmp/snmp_mibII
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2012 15:39:15 -0000

Author: emax
Date: Thu Jun 14 15:39:14 2012
New Revision: 237078
URL: http://svn.freebsd.org/changeset/base/237078

Log:
  MFC r236693
  
  Count both IPv4 and IPv6 TCP connections in tcpCurrEstab
  
  Timeout from:	current, syrinx

Modified:
  stable/9/contrib/bsnmp/snmp_mibII/mibII_tcp.c
Directory Properties:
  stable/9/contrib/bsnmp/   (props changed)

Modified: stable/9/contrib/bsnmp/snmp_mibII/mibII_tcp.c
==============================================================================
--- stable/9/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Thu Jun 14 15:37:15 2012	(r237077)
+++ stable/9/contrib/bsnmp/snmp_mibII/mibII_tcp.c	Thu Jun 14 15:39:14 2012	(r237078)
@@ -109,10 +109,12 @@ fetch_tcp(void)
              ptr = (struct xinpgen *)(void *)((char *)ptr + ptr->xig_len)) {
 		tp = (struct xtcpcb *)ptr;
 		if (tp->xt_inp.inp_gencnt > xinpgen->xig_gen ||
-		    (tp->xt_inp.inp_vflag & INP_IPV4) == 0)
+		    (tp->xt_inp.inp_vflag & (INP_IPV4|INP_IPV6)) == 0)
 			continue;
 
-		tcp_total++;
+		if (tp->xt_inp.inp_vflag & INP_IPV4)
+			tcp_total++;
+
 		if (tp->xt_tp.t_state == TCPS_ESTABLISHED ||
 		    tp->xt_tp.t_state == TCPS_CLOSE_WAIT)
 			tcp_count++;