From owner-freebsd-stable@FreeBSD.ORG Thu Aug 18 09:00:02 2005 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1280E16A420; Thu, 18 Aug 2005 09:00:02 +0000 (GMT) (envelope-from iedowse@iedowse.com) Received: from nowhere.iedowse.com (nowhere.iedowse.com [82.195.144.75]) by mx1.FreeBSD.org (Postfix) with SMTP id 0EE3143D49; Thu, 18 Aug 2005 08:59:58 +0000 (GMT) (envelope-from iedowse@iedowse.com) Received: from localhost ([127.0.0.1] helo=iedowse.com) by nowhere.iedowse.com via local-iedowse id ; 18 Aug 2005 09:59:57 +0100 (IST) To: Iva Hesy In-Reply-To: Your message of "Wed, 17 Aug 2005 22:17:10 PDT." <148cabbc05081722171875d31e@mail.gmail.com> Date: Thu, 18 Aug 2005 09:59:50 +0100 From: Ian Dowse Message-ID: <200508180959.aa01820@nowhere.iedowse.com> Cc: freebsd-stable@freebsd.org, csjp@freebsd.org Subject: Re: Too short ethernet frame... X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2005 09:00:02 -0000 In message <148cabbc05081722171875d31e@mail.gmail.com>, Iva Hesy writes: >OK, now, I get the result: >"tag=RELENG_6 date=2005.07.30.22.00.00" works fine, "tag=RELENG_6 >date=2005.07.31.03.00.00" makes noise, many many ethernet frames can >be sniffered. >the cvsup log: >Updating collection src-all/cvs > Edit src/sys/dev/mlx/mlx_pci.c > Add delta 1.23.2.1 2005.07.31.00.41.53 csjp > Edit src/sys/net/bpf.c > Add delta 1.153.2.1 2005.07.31.00.48.18 csjp > Edit src/sys/net/bpfdesc.h > Add delta 1.29.2.1 2005.07.31.00.48.18 csjp >Shutting down connection to server >Finished successfully >I guess it should be bpf.c... There appear to be some braces missed in that revision of bpf.c. Does the following patch help? Ian Index: sys/net/bpf.c =================================================================== RCS file: /dump/FreeBSD-CVS/src/sys/net/bpf.c,v retrieving revision 1.153.2.2 diff -u -r1.153.2.2 bpf.c --- sys/net/bpf.c 13 Aug 2005 21:24:16 -0000 1.153.2.2 +++ sys/net/bpf.c 18 Aug 2005 08:55:49 -0000 @@ -1256,13 +1256,14 @@ BPFD_LOCK(d); ++d->bd_rcount; slen = bpf_filter(d->bd_filter, (u_char *)m, pktlen, 0); - if (slen != 0) + if (slen != 0) { d->bd_fcount++; #ifdef MAC if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0) #endif catchpacket(d, (u_char *)m, pktlen, slen, bpf_mcopy); + } BPFD_UNLOCK(d); } BPFIF_UNLOCK(bp); @@ -1308,13 +1309,14 @@ BPFD_LOCK(d); ++d->bd_rcount; slen = bpf_filter(d->bd_filter, (u_char *)&mb, pktlen, 0); - if (slen != 0) + if (slen != 0) { d->bd_fcount++; #ifdef MAC if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0) #endif catchpacket(d, (u_char *)&mb, pktlen, slen, bpf_mcopy); + } BPFD_UNLOCK(d); } BPFIF_UNLOCK(bp);