From owner-freebsd-hackers@FreeBSD.ORG Mon Nov 27 14:27:53 2006 Return-Path: X-Original-To: freebsd-hackers@FreeBSD.org Delivered-To: freebsd-hackers@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9743D16A47B for ; Mon, 27 Nov 2006 14:27:53 +0000 (UTC) (envelope-from henning@openbsd.org) Received: from smtp.bsws.de (smtp.bsws.de [80.86.183.51]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98DA943E07 for ; Mon, 27 Nov 2006 14:22:22 +0000 (GMT) (envelope-from henning@openbsd.org) Received: (qmail 2851 invoked from network); 27 Nov 2006 14:23:13 -0000 Received: from nudo.bsws.de ([80.86.183.71]) (envelope-sender ) by smtp.bsws.de (qmail-ldap-1.03) with SMTP for ; 27 Nov 2006 14:23:13 -0000 Received: (qmail 27915 invoked by uid 1000); 27 Nov 2006 14:23:12 -0000 Message-ID: <20061127142312.17227.qmail@nudo.bsws.de> Date: Mon, 27 Nov 2006 15:23:12 +0100 From: Henning Brauer To: Vasil Dimov References: <604f76120611270203n3d065114vdbe8487cc04357e1@mail.gmail.com> <20061127125022.GA5690@qlovarnika.bg.datamax> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="6sX45UoQRIJXqkqR" Content-Disposition: inline In-Reply-To: <20061127125022.GA5690@qlovarnika.bg.datamax> X-PGP-Key: 3A83DF32 User-Agent: Mutt/1.5.12-2006-07-14 X-Mailman-Approved-At: Mon, 27 Nov 2006 14:32:28 +0000 Cc: mlaier@FreeBSD.org, freebsd-hackers@FreeBSD.org, Earl Lapus , henning@openbsd.org, Ryan Thomas McBride Subject: Re: pfctl X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2006 14:27:53 -0000 --6sX45UoQRIJXqkqR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Vasil Dimov [2006-11-27 15:13]: > > I was browsing through some code and stumbled upon this: > > if ((opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 !=3D 0) || > > (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 !=3D 0) || > > (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 !=3D 0)) { > > warnx("m1 must be zero for convex curve: %s", pa->qname); > > return (-1); > > } > Seems like a bug to me. Maybe rtsc should be changed to lssc and ulsc > respectively on 712 and 713 line. indeed. 1.24 (henning 17-Dec-02): if ((opts->rtsc_m1 > 0 && opts->rts= c_m2 =3D=3D 0) || 1.24 (henning 17-Dec-02): (opts->lssc_m1 > 0 && opts->lss= c_m2 =3D=3D 0) || 1.24 (henning 17-Dec-02): (opts->ulsc_m1 > 0 && opts->uls= c_m2 =3D=3D 0)) { almost 4 years, and nobody noticed ;( Index: pfctl_altq.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/sbin/pfctl/pfctl_altq.c,v retrieving revision 1.90 diff -u -p -r1.90 pfctl_altq.c --- pfctl_altq.c 10 Nov 2006 06:07:11 -0000 1.90 +++ pfctl_altq.c 27 Nov 2006 14:19:45 -0000 @@ -680,8 +680,8 @@ eval_pfqueue_hfsc(struct pfctl *pf, stru } =20 if ((opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 !=3D 0) || - (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 !=3D 0) || - (opts->rtsc_m1 < opts->rtsc_m2 && opts->rtsc_m1 !=3D 0)) { + (opts->lssc_m1 < opts->lssc_m2 && opts->lssc_m1 !=3D 0) || + (opts->ulsc_m1 < opts->ulsc_m2 && opts->ulsc_m1 !=3D 0)) { warnx("m1 must be zero for convex curve: %s", pa->qname); return (-1); } --6sX45UoQRIJXqkqR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (OpenBSD) iD8DBQFFavTPqmHuiTqD3zIRAl5xAJoDbqczqJoxdXGcbfW9HcOs/BBsKwCcDYjb VLkyAHmrBL1Jc7Sip02t9A4= =N1+T -----END PGP SIGNATURE----- --6sX45UoQRIJXqkqR--