Date: Mon, 27 Nov 2006 15:23:12 +0100 From: Henning Brauer <henning@openbsd.org> To: Vasil Dimov <vd@FreeBSD.org> Cc: mlaier@FreeBSD.org, freebsd-hackers@FreeBSD.org, Earl Lapus <earl.lapus@gmail.com>, henning@openbsd.org, Ryan Thomas McBride <mcbride@cvs.openbsd.org> Subject: Re: pfctl Message-ID: <20061127142312.17227.qmail@nudo.bsws.de> In-Reply-To: <20061127125022.GA5690@qlovarnika.bg.datamax> References: <604f76120611270203n3d065114vdbe8487cc04357e1@mail.gmail.com> <20061127125022.GA5690@qlovarnika.bg.datamax>
next in thread | previous in thread | raw e-mail | index | archive | help
--6sX45UoQRIJXqkqR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
* Vasil Dimov <vd@FreeBSD.org> [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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061127142312.17227.qmail>