From owner-svn-src-all@FreeBSD.ORG  Thu May  3 17:08:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4E46410656B5;
	Thu,  3 May 2012 17:08:41 +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 398218FC15;
	Thu,  3 May 2012 17:08:41 +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 q43H8fQO053626;
	Thu, 3 May 2012 17:08:41 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q43H8fax053623;
	Thu, 3 May 2012 17:08:41 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201205031708.q43H8fax053623@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Thu, 3 May 2012 17:08:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234975 - head/tools/tools/netmap
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 May 2012 17:08:41 -0000

Author: luigi
Date: Thu May  3 17:08:40 2012
New Revision: 234975
URL: http://svn.freebsd.org/changeset/base/234975

Log:
  add support for pcap receive statistics (used by net-mgmt/darkstat)

Modified:
  head/tools/tools/netmap/README
  head/tools/tools/netmap/pcap.c

Modified: head/tools/tools/netmap/README
==============================================================================
--- head/tools/tools/netmap/README	Thu May  3 16:54:32 2012	(r234974)
+++ head/tools/tools/netmap/README	Thu May  3 17:08:40 2012	(r234975)
@@ -20,3 +20,4 @@ BSD	netmap
 ---------------------------------------------------
  0.77	 3.82	ports/trafshow (version 5)
  0.94	 7.7	net-mgmt/ipcad (ip accounting daemon)
+ 0.9	 5.0	net-mgmt/darkstat (ip accounting + graphing)

Modified: head/tools/tools/netmap/pcap.c
==============================================================================
--- head/tools/tools/netmap/pcap.c	Thu May  3 16:54:32 2012	(r234974)
+++ head/tools/tools/netmap/pcap.c	Thu May  3 17:08:40 2012	(r234975)
@@ -154,6 +154,8 @@ int pcap_setdirection(pcap_t *p, pcap_di
 char *pcap_lookupdev(char *errbuf);
 int pcap_inject(pcap_t *p, const void *buf, size_t size);
 int pcap_fileno(pcap_t *p);
+const char *pcap_lib_version(void);
+
 
 struct eproto {
 	const char *s;
@@ -318,6 +320,11 @@ struct eproto eproto_db[] = {
 };
 
 
+const char *pcap_lib_version(void)
+{
+	return pcap_version;
+}
+
 int
 pcap_findalldevs(pcap_if_t **alldevsp, __unused char *errbuf)
 {
@@ -532,10 +539,8 @@ pcap_stats(pcap_t *p, struct pcap_stat *
 	struct my_ring *me = p;
 	ND("");
 
-	me->st.ps_recv += 10;
 	*ps = me->st;
-	sprintf(me->msg, "stats not supported");
-	return -1;
+	return 0;	/* accumulate from pcap_dispatch() */
 };
 
 char *
@@ -670,6 +675,7 @@ pcap_dispatch(pcap_t *p, int cnt, pcap_h
 			got++;
 		}
 	}
+	me->st.ps_recv += got;
 	return got;
 }