From owner-freebsd-stable@FreeBSD.ORG Thu Aug 18 21:35: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 931EF16A41F for ; Thu, 18 Aug 2005 21:35:02 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51C4843D46; Thu, 18 Aug 2005 21:35:02 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from freefall.freebsd.org (csjp@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7ILZ2HL076958; Thu, 18 Aug 2005 21:35:02 GMT (envelope-from csjp@freefall.freebsd.org) Received: (from csjp@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7ILZ2Y9076957; Thu, 18 Aug 2005 21:35:02 GMT (envelope-from csjp) Date: Thu, 18 Aug 2005 21:35:01 +0000 From: "Christian S.J. Peron" To: Ian Dowse Message-ID: <20050818213501.GA73617@freefall.freebsd.org> References: <148cabbc05081722171875d31e@mail.gmail.com> <200508180959.aa01820@nowhere.iedowse.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200508180959.aa01820@nowhere.iedowse.com> User-Agent: Mutt/1.4.2.1i Cc: freebsd-stable@freebsd.org, Iva Hesy 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 21:35:02 -0000 Or if you want, I will commit it. On Thu, Aug 18, 2005 at 09:59:50AM +0100, Ian Dowse wrote: > 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); > > -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer