From owner-freebsd-current@FreeBSD.ORG Tue Nov 11 09:06:11 2003 Return-Path: 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 F3D5316A4D0 for ; Tue, 11 Nov 2003 09:06:10 -0800 (PST) Received: from mailtoaster1.pipeline.ch (mailtoaster1.pipeline.ch [62.48.0.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD03643FBD for ; Tue, 11 Nov 2003 09:06:06 -0800 (PST) (envelope-from oppermann@pipeline.ch) Received: (qmail 36173 invoked from network); 11 Nov 2003 17:08:57 -0000 Received: from unknown (HELO pipeline.ch) ([62.48.0.53]) (envelope-sender ) by mailtoaster1.pipeline.ch (qmail-ldap-1.03) with SMTP for ; 11 Nov 2003 17:08:57 -0000 Message-ID: <3FB116FD.5BB0CF7A@pipeline.ch> Date: Tue, 11 Nov 2003 18:06:05 +0100 From: Andre Oppermann X-Mailer: Mozilla 4.76 [en] (Windows NT 5.0; U) X-Accept-Language: en MIME-Version: 1.0 To: Hajimu UMEMOTO References: <3FAE68FB.64D262FF@pipeline.ch> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: freebsd-net@freebsd.org cc: freebsd-current@freebsd.org cc: mb@imp.ch cc: sam@errno.com Subject: Re: tcp hostcache and ip fastforward for review X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 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: Tue, 11 Nov 2003 17:06:11 -0000 Hajimu UMEMOTO wrote: > > Hi, > > >>>>> On Sun, 09 Nov 2003 17:19:07 +0100 > >>>>> Andre Oppermann said: > > oppermann> The patch is here (relative to -CURRENT as of 2003-11-09): > oppermann> http://www.nrg4u.com/freebsd/tcphostcache+ipfastforward-20031109.patch > > The patch cannot be compiled: > > cc -c -O -pipe -march=pentium3 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -std=c99 -g -nostdinc -I- -I. -I/usr/home/ume/cvs/freefall/current/src/sys -I/usr/home/ume/cvs/freefall/current/src/sys/contrib/dev/acpica -I/usr/home/ume/cvs/freefall/current/src/sys/contrib/ipfilter -I/usr/home/ume/cvs/freefall/current/src/sys/contrib/dev/ath -I/usr/home/ume/cvs/freefall/current/src/sys/contrib/dev/ath/freebsd -I/usr/home/ume/cvs/freefall/current/src/sys/contrib/ngatm -D_KERNEL -include opt_global.h -fno-common -finline-limit=15000 -fno-strict-aliasing -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Werror /usr/home/ume/cvs/freefall/current/src/sys/netinet/ip_input.c > /usr/home/ume/cvs/freefall/current/src/sys/netinet/ip_input.c: In function `ip_forward': > /usr/home/ume/cvs/freefall/current/src/sys/netinet/ip_input.c:1960: warning: implicit declaration of function `ipsec_getpolicybyaddr' > /usr/home/ume/cvs/freefall/current/src/sys/netinet/ip_input.c:1963: warning: assignment makes pointer from integer without a cast > *** Error code 1 > > There is no ipsec_getpolicybyaddr() for IPSEC. And, #ifdef is > slightly complex. I've applied you fix. This was an oversight by me when collapsing the two IPSEC and FAST_IPSEC ifdef's. However there is a problem in netkey/key.c with the static variable ipsec_esp_auth which is unused if IPSEC_ESP is not defined. -- Andre > I don't tested it actually, yet. > > --- sys/netinet/ip_input.c.orig Wed Nov 12 00:08:42 2003 > +++ sys/netinet/ip_input.c Wed Nov 12 00:18:50 2003 > @@ -1957,10 +1957,17 @@ > int ipsechdr; > struct route *ro; > > +#ifdef IPSEC > + sp = ipsec4_getpolicybyaddr(mcopy, > + IPSEC_DIR_OUTBOUND, > + IP_FORWARDING, > + &ipsecerror); > +#else > sp = ipsec_getpolicybyaddr(mcopy, > IPSEC_DIR_OUTBOUND, > IP_FORWARDING, > &ipsecerror); > +#endif > > if (sp != NULL) { > /* count IPsec header size */ > @@ -1995,13 +2002,11 @@ > #else > KEY_FREESP(&sp); > #endif > - ipstat.ips_cantfrag++; > - break; > - } else > -#endif /*IPSEC || FAST_IPSEC*/ > - destifp = ia->ia_ifp; > -#if defined(IPSEC) || defined(FAST_IPSEC) > + } else > + destifp = ia->ia_ifp; > } > +#else > + destifp = ia->ia_ifp; > #endif /*IPSEC || FAST_IPSEC*/ > ipstat.ips_cantfrag++; > break; > > Sincerely, > > -- > Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan > ume@mahoroba.org ume@bisd.hitachi.co.jp ume@{,jp.}FreeBSD.org > http://www.imasy.org/~ume/