Date: Fri, 03 Nov 2000 15:16:07 +0900 From: Hajimu UMEMOTO <ume@mahoroba.org> To: larse@ISI.EDU, jkh@winston.osd.bsdi.com Cc: stable@freebsd.org, rwatson@freebsd.org, touch@ISI.EDU Subject: Re: bugfix from KAME sys/296 before code freeze? Message-ID: <20001103151607T.ume@mahoroba.org> In-Reply-To: <3A021A69.8AC39AE2@isi.edu> References: <3A021A69.8AC39AE2@isi.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
>>>>> On Thu, 02 Nov 2000 17:52:41 -0800 >>>>> Lars Eggert <larse@ISI.EDU> said: larse> Any chance to get a bug fix to KAME (see KAME PR sys/296 at larse> http://orange.kame.net/dev/query-pr.cgi?pr=296) into -STABLE before the larse> code freeze? It's required for correct operation of the X-Bone port. I just committed it into -current. However, I believe -stable is already in code freeze. Jordan, can I commit it into -stable to be in time for 4.2-RELEASE? larse> It's an extremely small change that fixes a problem where IPsec transport larse> mode packets that go over an IPIP tunnel are incorrectly classifies as larse> IPsec tunnel mode packets by KAME. larse> --- ipsec.c Mon Oct 23 12:58:50 2000 larse> +++ ipsec.c.new Mon Oct 23 12:57:01 2000 larse> @@ -3200,6 +3200,8 @@ larse> if (nxt != IPPROTO_IPV4) larse> return 0; larse> + if (sav->sah->saidx.mode == IPSEC_MODE_TRANSPORT) larse> + return 0; larse> #ifdef _IP_VHL larse> hlen = _IP_VHL_HL(ip->ip_vhl) << 2; larse> #else larse> @@ -3238,6 +3240,8 @@ larse> if (nxt != IPPROTO_IPV6) larse> return 0; larse> + if (sav->sah->saidx.mode == IPSEC_MODE_TRANSPORT) larse> + return 0; larse> switch (((struct sockaddr *)&sav->sah->saidx.dst)->sa_family) larse> { larse> case AF_INET6: larse> sin6 = ((struct sockaddr_in6 *)&sav->sah->saidx.dst); larse> -- larse> Lars Eggert <larse@isi.edu> Information Sciences Institute larse> http://www.isi.edu/larse/ University of Southern California To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001103151607T.ume>