Received: by mail.netbsd.org (Postfix, from userid 605) id 25D5614A321; Mon, 6 Jun 2011 16:48:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1EE8B14A215 for ; Mon, 6 Jun 2011 16:48:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id zP99jHp53JQH for ; Mon, 6 Jun 2011 16:48:35 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 8561D14A1CA for ; Mon, 6 Jun 2011 16:48:35 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 6C142175DD; Mon, 6 Jun 2011 16:48:35 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Mon, 6 Jun 2011 16:48:35 +0000 From: "Matthias Drochner" Subject: CVS commit: src/sys/netipsec To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20110606164835.6C142175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Matthias Drochner" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: drochner Date: Mon Jun 6 16:48:35 UTC 2011 Modified Files: src/sys/netipsec: ipsec_output.c key.c xform_ipip.c Log Message: remove a limitation that inner and outer IP version must be equal for an ESP tunnel, and add some fixes which make v4-in-v6 work (v6 as inner protocol isn't ready, even v6-in-v6 can never have worked) being here, fix a statistics counter and kill an unused variable To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/netipsec/ipsec_output.c cvs rdiff -u -r1.71 -r1.72 src/sys/netipsec/key.c cvs rdiff -u -r1.26 -r1.27 src/sys/netipsec/xform_ipip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.