From owner-svn-src-all@FreeBSD.ORG Tue Dec 23 22:50:08 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23D5A1065673; Tue, 23 Dec 2008 22:50:08 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id CD63D8FC13; Tue, 23 Dec 2008 22:50:07 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 30B1841C64C; Tue, 23 Dec 2008 23:50:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id GI1sR8kItels; Tue, 23 Dec 2008 23:50:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id CF4DA41C64A; Tue, 23 Dec 2008 23:50:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 35F104448D5; Tue, 23 Dec 2008 22:47:07 +0000 (UTC) Date: Tue, 23 Dec 2008 22:47:07 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Robert Watson In-Reply-To: Message-ID: <20081223224000.O97918@maildrop.int.zabbadoz.net> References: <200812221254.mBMCsr67061758@svn.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r186393 - head/sys/netinet6 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Dec 2008 22:50:08 -0000 On Tue, 23 Dec 2008, Robert Watson wrote: Hi, > In IPv4 we've eliminated use of ipprotosw, although we still have > ipprotosw.h, which should go away as it's unused; I'd like to see ip6protosw > go away as well. The domain registration code assumes that when an array of > protocols are registered, the size of the array entry is sizeof(struct > protosw), which happens currently to be true for ip6protosw. At least, I > think. :-) There is some assert like code under DIAGNOSTICS in there I think. So from what I could see the main problems just changing to protosw from ip6protosw are: the pr_input and pr_output routines as they differ in either return code or arguemnts: * pr_input v4 void (struct mbuf *, int) v6 int (struct mbuf **, int *, int) * pr_output v4 int (struct mbuf *, struct socket *) v6 int (struct mbuf *, ...) All the other function pointers seem equal already. I think the pr_output is solveable more easily as I can see - which seemed strange only rip6_output int (struct mbuf *, struct socket *, struct sockaddr_in6 *, struct mbuf *) called from raw_usend(m, so), rip6_send(m, so, dst, control) are defined. I might have missed a few because they weren't yet converted to c99 style initializers. pr_input is more of a problem and we may need to break the INET case to be able to merge the INET6 case to use protosw. I'll further investigate but this might become a bit disruptive. /bz -- Bjoern A. Zeeb The greatest risk is not taking one.