From owner-p4-projects@FreeBSD.ORG  Thu Feb  8 16:35:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A80D16A406; Thu,  8 Feb 2007 16:34:52 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A5CAB16A400
	for <perforce@freebsd.org>; Thu,  8 Feb 2007 16:34:48 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C2B013C441
	for <perforce@freebsd.org>; Thu,  8 Feb 2007 16:34:48 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l18GYmLQ043899
	for <perforce@freebsd.org>; Thu, 8 Feb 2007 16:34:48 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18GYm9X043894
	for perforce@freebsd.org; Thu, 8 Feb 2007 16:34:48 GMT
	(envelope-from csjp@freebsd.org)
Date: Thu, 8 Feb 2007 16:34:48 GMT
Message-Id: <200702081634.l18GYm9X043894@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114242 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: Thu, 08 Feb 2007 16:35:14 -0000

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

Change 114242 by csjp@csjp_rnd01 on 2007/02/08 16:34:38

	Clean up packet access options

Affected files ...

.. //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#12 edit

Differences ...

==== //depot/projects/zcopybpf/utils/bpfnull/bpfnull.c#12 (text+ko) ====

@@ -95,6 +95,8 @@
 	u_char *b,*bp, *ep, *p, by;
 #define bhp ((struct bpf_hdr *)bp)
 
+	if (!wflag && !tflag && !Tflag)
+		return;
 	b = bp = bz->bz_bufa;
 	ep = bp + bz->bz_buflen;
 	while (bp < ep) {
@@ -114,13 +116,15 @@
 			bp += BPF_WORDALIGN(clen + hlen);
 			continue;
 		}
-		pcap_dump((u_char *)dp, &phd, p);
-		if (ferror((FILE *)dp)) {
-			perror("dump.pcap");
-			exit(1);
+		if (wflag) {
+			pcap_dump((u_char *)dp, &phd, p);
+			if (ferror((FILE *)dp)) {
+				perror("dump.pcap");
+				exit(1);
+			}
+			fflush((FILE *)dp);
+			bp += BPF_WORDALIGN(clen + hlen);
 		}
-		fflush((FILE *)dp);
-		bp += BPF_WORDALIGN(clen + hlen);
 	}
 }
 
@@ -160,8 +164,7 @@
 				err(1, "read failed");
 			bz.bz_bufa = pbuf;
 			bz.bz_buflen = n;
-			if (wflag)
-				bpf_process_packets(&bz, "W");
+			bpf_process_packets(&bz, "W");
 		} else {
 			processed_data = 0;
 			bzha = (struct bpf_zbuf_header *)bufa;
@@ -179,16 +182,14 @@
 				bz.bz_bufa = bufa;
 				bz.bz_bufa += sizeof(struct bpf_zbuf_header);
 				bz.bz_buflen = bzha->bzh_kernel_len;
-				if (wflag)
-					bpf_process_packets(&bz, "A");
+				bpf_process_packets(&bz, "A");
 				bzha->bzh_user_gen++;
 				processed_data++;
 			} else if (bzhb->bzh_kernel_gen > bzhb->bzh_user_gen) {
 				bz.bz_bufa = bufb;
 				bz.bz_bufa += sizeof(struct bpf_zbuf_header);
 				bz.bz_buflen = bzhb->bzh_kernel_len;
-				if (wflag)
-					bpf_process_packets(&bz, "B");
+				bpf_process_packets(&bz, "B");
 				bzhb->bzh_user_gen++;
 				processed_data++;
 			}