From owner-freebsd-net@FreeBSD.ORG Fri Aug 20 00:39:35 2004 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA2F716A4CE; Fri, 20 Aug 2004 00:39:35 +0000 (GMT) Received: from mail.vicor-nb.com (bigwoop.vicor-nb.com [208.206.78.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85B3143D1F; Fri, 20 Aug 2004 00:39:35 +0000 (GMT) (envelope-from julian@elischer.org) Received: from elischer.org (julian.vicor-nb.com [208.206.78.97]) by mail.vicor-nb.com (Postfix) with ESMTP id 64CC27A3E1; Thu, 19 Aug 2004 17:39:35 -0700 (PDT) Message-ID: <41254847.9020102@elischer.org> Date: Thu, 19 Aug 2004 17:39:35 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3.1) Gecko/20030516 X-Accept-Language: en, hu MIME-Version: 1.0 To: Scott Long References: <4123A2B2.2040209@elischer.org> <4123C26E.8040901@elischer.org> <20040819084605.GC76085@ip.net.ua> <412523FE.3080407@samsco.org> In-Reply-To: <412523FE.3080407@samsco.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: freebsd-net@freebsd.org cc: re@freebsd.org cc: John Polstra Subject: Re: netgraph only on i386/ia64 - why ? X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2004 00:39:35 -0000 Ok so what is the next number that should be used? it's currently #define __FreeBSD_version 600000 600001? here's a cut-n-paste version.. for comment.. it's ready to commit. Index: UPDATING =================================================================== RCS file: /home/ncvs/src/UPDATING,v retrieving revision 1.344 diff -u -r1.344 UPDATING --- UPDATING 19 Aug 2004 19:45:28 -0000 1.344 +++ UPDATING 20 Aug 2004 00:35:43 -0000 @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20040819: + Netgraph changed its message format slightly to allign the data + portion well on 64 bit machines. + Netgraph using utilities (e.g. ngctl, nghook, ppp, mpd, + pppoed, bluetooth, ATM) should be recompiled when a new kernel + is installed. + 20040817: IPFW has been converted to use PFIL_HOOKS. This change is transparent to userland and preserves the ipfw ABI. The ipfw Index: sys/sys/param.h =================================================================== RCS file: /home/ncvs/src/sys/sys/param.h,v retrieving revision 1.211 diff -u -r1.211 param.h --- sys/sys/param.h 18 Aug 2004 03:13:16 -0000 1.211 +++ sys/sys/param.h 20 Aug 2004 00:35:43 -0000 @@ -55,7 +55,7 @@ * scheme is: <0 if release branch, otherwise 1>xx */ #undef __FreeBSD_version -#define __FreeBSD_version 600000 /* Master, propagated to newvers */ +#define __FreeBSD_version 600001 /* Master, propagated to newvers */ #ifndef LOCORE #include Index: sys/netgraph/netgraph.h =================================================================== RCS file: /home/ncvs/src/sys/netgraph/netgraph.h,v retrieving revision 1.43 diff -u -r1.43 netgraph.h --- sys/netgraph/netgraph.h 27 Jul 2004 20:30:55 -0000 1.43 +++ sys/netgraph/netgraph.h 20 Aug 2004 00:35:43 -0000 @@ -62,7 +62,7 @@ * Change it for NETGRAPH_DEBUG version so we cannot mix debug and non debug * modules. */ -#define _NG_ABI_VERSION 9 +#define _NG_ABI_VERSION 10 #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ #define NG_ABI_VERSION (_NG_ABI_VERSION + 0x10000) #else /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ Index: sys/netgraph/ng_message.h =================================================================== RCS file: /home/ncvs/src/sys/netgraph/ng_message.h,v retrieving revision 1.23 diff -u -r1.23 ng_message.h --- sys/netgraph/ng_message.h 7 Jun 2004 22:11:12 -0000 1.23 +++ sys/netgraph/ng_message.h 20 Aug 2004 00:35:44 -0000 @@ -67,10 +67,11 @@ u_char version; /* == NGM_VERSION */ u_char spare; /* pad to 2 bytes */ u_int16_t arglen; /* length of data */ + u_int32_t cmd; /* command identifier */ u_int32_t flags; /* message status */ + u_int32_t spare2; /* pad to 8 bytes */ u_int32_t token; /* match with reply */ u_int32_t typecookie; /* node's type cookie */ - u_int32_t cmd; /* command identifier */ u_char cmdstr[NG_CMDSTRSIZ]; /* cmd string + \0 */ } header; char data[]; /* placeholder for actual data */ @@ -84,10 +85,11 @@ { "version", &ng_parse_uint8_type }, \ { "spare", &ng_parse_uint8_type }, \ { "arglen", &ng_parse_uint16_type }, \ + { "cmd", &ng_parse_uint32_type }, \ { "flags", &ng_parse_hint32_type }, \ + { "spare2", &ng_parse_uint32_type }, \ { "token", &ng_parse_uint32_type }, \ { "typecookie", &ng_parse_uint32_type }, \ - { "cmd", &ng_parse_uint32_type }, \ { "cmdstr", &ng_parse_cmdbuf_type }, \ { "data", (dtype) }, \ { NULL } \ @@ -98,7 +100,7 @@ * Interfaces within the kernel are defined by a different * value (see NG_ABI_VERSION in netgraph.g) */ -#define NG_VERSION 6 +#define NG_VERSION 7 /* Flags field flags */ #define NGF_ORIG 0x00000000 /* the msg is the original request */ Scott Long wrote: > Ruslan Ermilov wrote: > >> On Wed, Aug 18, 2004 at 01:56:14PM -0700, Julian Elischer wrote: >> [...] >> >>> re: >>> >>> I'll do the commit to -current today.. >>> what other files should I change..? >>> UPDATING (user utilitiesw will need recompile) >>> >> >> UPDATING for sure, followed by a HEADS UP message to current@. >> >> >>> and I guess the 50xxxx number.. >>> (where is that number again?) >>> >> >> src/include/sys/param.h, and document it in the Porter's Handbook. >> >> >> Cheers, > > > Btw, > I haven't been ignoring this discussion, but we are pretty busy with > other things for BETA1. CAn you guys settle this and plan on getting > it into the tree in a few days? > > Scott