From owner-freebsd-current@FreeBSD.ORG Wed Nov 16 12:02:05 2005 Return-Path: X-Original-To: current@FreeBSD.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B00C16A41F for ; Wed, 16 Nov 2005 12:02:05 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51D5043D83 for ; Wed, 16 Nov 2005 12:01:53 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id jAGC1q36001162; Wed, 16 Nov 2005 14:01:52 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 06513-01-6; Wed, 16 Nov 2005 14:01:50 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id jAGC0FmU000732 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Nov 2005 14:00:15 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.4/8.13.4) id jAGC0NZN087171; Wed, 16 Nov 2005 14:00:23 +0200 (EET) (envelope-from ru) Date: Wed, 16 Nov 2005 14:00:23 +0200 From: Ruslan Ermilov To: Michael Reifenberger Message-ID: <20051116120023.GB86977@ip.net.ua> References: <20051116123612.J2025@fw.reifenberger.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="DBIVS5p969aUjpLe" Content-Disposition: inline In-Reply-To: <20051116123612.J2025@fw.reifenberger.com> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua Cc: FreeBSD-Current Subject: Re: ng_split X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Nov 2005 12:02:05 -0000 --DBIVS5p969aUjpLe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 16, 2005 at 12:41:48PM +0100, Michael Reifenberger wrote: > Hi, > the change below doesnt look canonical to me, > since it contains an NG at the beginning allready > and no other ng node type does this. >=20 You're right about this, but you probably read the patch in reverse way. My fix makes the name match the rest of the world: $ grep NGM_.*_COOKIE *.h | grep NGM_NG | wc -l 0 $ grep NGM_.*_COOKIE *.h | grep -v NGM_NG | wc -l 46 Furthemore, it was necessary to add this type to libnetgraph/debug.c, that's how I noticed it wasn't canonical. > Furthermore it breaks -current and RELENG_6 at least. >=20 How? > Can we revert it? >=20 I fail to see a reason at the moment., > Index: ng_split.h > =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: /home/ncvs/src/sys/netgraph/ng_split.h,v > retrieving revision 1.4 > retrieving revision 1.5 > diff -u -r1.4 -r1.5 > --- ng_split.h 7 Jan 2005 01:45:39 -0000 1.4 > +++ ng_split.h 25 Oct 2005 20:56:12 -0000 1.5 > @@ -25,7 +25,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE=20 > POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/netgraph/ng_split.h,v 1.4 2005/01/07=20 > 01:45:39 imp Exp $ > + * $FreeBSD: src/sys/netgraph/ng_split.h,v 1.5 2005/10/25=20 > 20:56:12 ru Exp $ > * > */ >=20 > @@ -35,7 +35,7 @@ >=20 > /* Node type name and magic cookie */ > #define NG_SPLIT_NODE_TYPE "split" > -#define NGM_NG_SPLIT_COOKIE 949409402 > +#define NGM_SPLIT_COOKIE 949409402 Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --DBIVS5p969aUjpLe Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDex9XqRfpzJluFF4RAp1BAJ970hzJTKdUwf4GGCYStSHrhQ6azwCcCGEl xm/GodeNC6Up9fqcuZmhgIQ= =1TQA -----END PGP SIGNATURE----- --DBIVS5p969aUjpLe--