[src/netbsd-1-5]: src/sys/netkey pullup (approved by releng-1-5): part of 1.3...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ecbce06cabf7
branches:  netbsd-1-5
changeset: 489650:ecbce06cabf7
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Oct 02 23:42:34 2000 +0000

description:
pullup (approved by releng-1-5): part of 1.37 -> 1.38
update comment on ipcomp PFKEY behavior.

diffstat:

 sys/netkey/key.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 8f92fd8dcd6e -r ecbce06cabf7 sys/netkey/key.c
--- a/sys/netkey/key.c  Mon Oct 02 23:41:31 2000 +0000
+++ b/sys/netkey/key.c  Mon Oct 02 23:42:34 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: key.c,v 1.23.2.6 2000/09/29 06:42:43 itojun Exp $      */
-/*     $KAME: key.c,v 1.160 2000/09/22 16:04:37 itojun Exp $   */
+/*     $NetBSD: key.c,v 1.23.2.7 2000/10/02 23:42:34 itojun Exp $      */
+/*     $KAME: key.c,v 1.162 2000/10/01 12:37:21 itojun Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -5410,6 +5410,7 @@
 }
 
 /*
+ * not really an official behavior.  discussed in pf_key%inner.net@localhost in Sep2000.
  * XXX reorder combinations by preference
  */
 static struct mbuf *
@@ -5505,7 +5506,7 @@
 /*
  * SADB_ACQUIRE processing called by key_checkrequest() and key_acquire2().
  * send
- *   <base, SA, address(SD), (address(P)),
+ *   <base, SA, address(SD), (address(P)), x_policy,
  *       (identity(SD),) (sensitivity,) proposal>
  * to KMD, and expect to receive
  *   <base> with SADB_ACQUIRE if error occured,
@@ -5513,9 +5514,10 @@
  *   <base, src address, dst address, (SPI range)> with SADB_GETSPI
  * from KMD by PF_KEY.
  *
+ * XXX x_policy is outside of RFC2367 (KAME extension).
  * XXX sensitivity is not supported.
- * XXX proposal is considered to be optional for now, due to the lack of
- * ipcomp support in RFC2367.
+ * XXX for ipcomp, RFC2367 does not define how to fill in proposal.
+ * see comment for key_getcomb_ipcomp().
  *
  * OUT:
  *    0     : succeed