From owner-svn-src-all@FreeBSD.ORG Mon Apr 27 21:04:16 2009 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 DE798106566B; Mon, 27 Apr 2009 21:04:16 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B279F8FC20; Mon, 27 Apr 2009 21:04:16 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3RL4GZQ026802; Mon, 27 Apr 2009 21:04:16 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3RL4GjJ026800; Mon, 27 Apr 2009 21:04:16 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200904272104.n3RL4GjJ026800@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 27 Apr 2009 21:04:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191599 - head/sys/netipsec 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: Mon, 27 Apr 2009 21:04:18 -0000 Author: bz Date: Mon Apr 27 21:04:16 2009 New Revision: 191599 URL: http://svn.freebsd.org/changeset/base/191599 Log: key_gettunnel() has been unsued with FAST_IPSEC (now IPSEC). KAME had explicit checks at one point using it, so just hide it behind #if 0 for now until we are sure if we can completely dump it or not. MFC after: 1 month Modified: head/sys/netipsec/key.c head/sys/netipsec/key.h Modified: head/sys/netipsec/key.c ============================================================================== --- head/sys/netipsec/key.c Mon Apr 27 20:38:27 2009 (r191598) +++ head/sys/netipsec/key.c Mon Apr 27 21:04:16 2009 (r191599) @@ -684,6 +684,7 @@ found: return sp; } +#if 0 /* * return a policy that matches this particular inbound packet. * XXX slow @@ -760,6 +761,7 @@ done: sp, sp ? sp->id : 0, sp ? sp->refcnt : 0)); return sp; } +#endif /* * allocating an SA entry for an *OUTBOUND* packet. Modified: head/sys/netipsec/key.h ============================================================================== --- head/sys/netipsec/key.h Mon Apr 27 20:38:27 2009 (r191598) +++ head/sys/netipsec/key.h Mon Apr 27 21:04:16 2009 (r191599) @@ -53,9 +53,11 @@ extern struct secpolicy *key_allocsp(str extern struct secpolicy *key_allocsp2(u_int32_t spi, union sockaddr_union *dst, u_int8_t proto, u_int dir, const char*, int); extern struct secpolicy *key_newsp(const char*, int); +#if 0 extern struct secpolicy *key_gettunnel(const struct sockaddr *, const struct sockaddr *, const struct sockaddr *, const struct sockaddr *, const char*, int); +#endif /* NB: prepend with _ for KAME IPv6 compatbility */ extern void _key_freesp(struct secpolicy **, const char*, int); @@ -65,8 +67,10 @@ extern void _key_freesp(struct secpolicy key_allocsp2(spi, dst, proto, dir, __FILE__, __LINE__) #define KEY_NEWSP() \ key_newsp(__FILE__, __LINE__) +#if 0 #define KEY_GETTUNNEL(osrc, odst, isrc, idst) \ key_gettunnel(osrc, odst, isrc, idst, __FILE__, __LINE__) +#endif #define KEY_FREESP(spp) \ _key_freesp(spp, __FILE__, __LINE__)