From owner-p4-projects@FreeBSD.ORG  Tue Mar 11 15:09:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF33B1065679; Tue, 11 Mar 2008 15:09:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E30A1065675
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 15:09:00 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6329F8FC2D
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 15:09:00 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BF90TS043784
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 15:09:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BF9051043782
	for perforce@freebsd.org; Tue, 11 Mar 2008 15:09:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 11 Mar 2008 15:09:00 GMT
Message-Id: <200803111509.m2BF9051043782@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137406 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2008 15:09:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=137406

Change 137406 by rwatson@rwatson_cinnamon on 2008/03/11 15:08:32

	Embed the size of struct xbpf_d in the structure so that userspace
	can check that the run-time version is the same as the
	compile-time version.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/net/bpf.c#49 edit
.. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#10 edit

Differences ...

==== //depot/projects/zcopybpf/src/sys/net/bpf.c#49 (text+ko) ====

@@ -1959,6 +1959,7 @@
 
 	bzero(d, sizeof(*d));
 	BPFD_LOCK_ASSERT(bd);
+	d->bd_structsize = sizeof(*d);
 	d->bd_immediate = bd->bd_immediate;
 	d->bd_promisc = bd->bd_promisc;
 	d->bd_hdrcmplt = bd->bd_hdrcmplt;

==== //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#10 (text+ko) ====

@@ -114,6 +114,7 @@
  * External representation of the bpf descriptor
  */
 struct xbpf_d {
+	u_int		bd_structsize;	/* Size of this structure. */
 	u_char		bd_promisc;
 	u_char		bd_immediate;
 	int		bd_hdrcmplt;