From owner-svn-src-user@FreeBSD.ORG  Fri Jan 15 23:02:19 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B883E1065697;
	Fri, 15 Jan 2010 23:02:19 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A7D7C8FC18;
	Fri, 15 Jan 2010 23:02:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0FN2J10015586;
	Fri, 15 Jan 2010 23:02:19 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0FN2JdX015583;
	Fri, 15 Jan 2010 23:02:19 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001152302.o0FN2JdX015583@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 15 Jan 2010 23:02:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202422 - user/luigi/ipfw3-head/sys/netinet/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jan 2010 23:02:19 -0000

Author: luigi
Date: Fri Jan 15 23:02:19 2010
New Revision: 202422
URL: http://svn.freebsd.org/changeset/base/202422

Log:
  add a method to return the number of entries.

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.h

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c	Fri Jan 15 22:19:51 2010	(r202421)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.c	Fri Jan 15 23:02:19 2010	(r202422)
@@ -373,6 +373,12 @@ dn_ht_free(struct dn_ht *ht, int flags)
 	free(ht, M_DN_HEAP);
 }
 
+int
+dn_ht_entries(struct dn_ht *ht)
+{
+	return ht->entries;
+}
+
 /* lookup and optionally create or delete element */
 void *
 dn_ht_find(struct dn_ht *ht, uintptr_t key, int flags, void *arg)

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.h
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.h	Fri Jan 15 22:19:51 2010	(r202421)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_heap.h	Fri Jan 15 23:02:19 2010	(r202422)
@@ -162,6 +162,7 @@ void dn_ht_free(struct dn_ht *, int flag
 
 void *dn_ht_find(struct dn_ht *, uintptr_t, int, void *);
 int dn_ht_scan(struct dn_ht *, int (*)(void *, void *), void *);
+int dn_ht_entries(struct dn_ht *);
 
 enum {  /* flags values.
 	 * first two are returned by the scan callback to indicate