From owner-freebsd-stable Thu Nov 2 22:16:48 2000 Delivered-To: freebsd-stable@freebsd.org Received: from piano.mahoroba.org (to2-093.netspace.or.jp [202.210.89.93]) by hub.freebsd.org (Postfix) with ESMTP id 8A05737B4CF; Thu, 2 Nov 2000 22:16:43 -0800 (PST) Received: from localhost (IDENT:4h/11InY13NDCEu6E7X0qQetQa2WBYvHjEPUkku4tIhRWJRzBqRPez0YwIIt4U9g@localhost [::1]) by piano.mahoroba.org (8.11.1/8.11.1/piano) with ESMTP id eA36G9T90902; Fri, 3 Nov 2000 15:16:09 +0900 (JST) (envelope-from 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? In-Reply-To: <3A021A69.8AC39AE2@isi.edu> References: <3A021A69.8AC39AE2@isi.edu> X-Mailer: xcite1.20> Mew version 1.94.2 on Emacs 20.7 / Mule 4.0 =?iso-2022-jp?B?KBskQjJWMWMbKEIp?= X-PGP-Public-Key: http://www.imasy.org/~ume/publickey.asc X-PGP-Fingerprint: 6B 0C 53 FC 5D D0 37 91 05 D0 B3 EF 36 9B 6A BC X-URL: http://www.imasy.org/~ume/ X-OS: FreeBSD 4.1.1-RELEASE Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20001103151607T.ume@mahoroba.org> Date: Fri, 03 Nov 2000 15:16:07 +0900 From: Hajimu UMEMOTO X-Dispatcher: imput version 20000414(IM141) Lines: 40 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG >>>>> On Thu, 02 Nov 2000 17:52:41 -0800 >>>>> Lars Eggert 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 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