Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netipsec Comment out unused key_freesp_so and key_freeso



details:   https://anonhg.NetBSD.org/src/rev/5f22545ea361
branches:  trunk
changeset: 353865:5f22545ea361
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri May 26 08:09:44 2017 +0000

description:
Comment out unused key_freesp_so and key_freeso

diffstat:

 sys/netipsec/key.c |  13 +++++++++----
 sys/netipsec/key.h |   3 +--
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r e3a07db2504e -r 5f22545ea361 sys/netipsec/key.c
--- a/sys/netipsec/key.c        Fri May 26 08:09:08 2017 +0000
+++ b/sys/netipsec/key.c        Fri May 26 08:09:44 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.142 2017/05/26 08:00:15 ozaki-r Exp $        */
+/*     $NetBSD: key.c,v 1.143 2017/05/26 08:09:44 ozaki-r Exp $        */
 /*     $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $        */
 /*     $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $   */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.142 2017/05/26 08:00:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.143 2017/05/26 08:09:44 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -374,7 +374,10 @@
 };
 
 static struct secasvar *key_allocsa_policy (const struct secasindex *);
-static void key_freesp_so (struct secpolicy **);
+#if 0
+static void key_freeso(struct socket *);
+static void key_freesp_so(struct secpolicy **);
+#endif
 static struct secasvar *key_do_allocsa_policy (struct secashead *, u_int);
 static void key_delsp (struct secpolicy *);
 static struct secpolicy *key_getsp (const struct secpolicyindex *);
@@ -1250,11 +1253,12 @@
        }
 }
 
+#if 0
 /*
  * Must be called after calling key_allocsp().
  * For the packet with socket.
  */
-void
+static void
 key_freeso(struct socket *so)
 {
        /* sanity check */
@@ -1322,6 +1326,7 @@
            "invalid policy %u", (*sp)->policy);
        KEY_FREESP(sp);
 }
+#endif
 
 /*
  * Must be called after calling key_allocsa().
diff -r e3a07db2504e -r 5f22545ea361 sys/netipsec/key.h
--- a/sys/netipsec/key.h        Fri May 26 08:09:08 2017 +0000
+++ b/sys/netipsec/key.h        Fri May 26 08:09:44 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.h,v 1.16 2017/05/16 02:59:22 ozaki-r Exp $ */
+/*     $NetBSD: key.h,v 1.17 2017/05/26 08:09:44 ozaki-r Exp $ */
 /*     $FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $        */
 /*     $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $    */
 
@@ -86,7 +86,6 @@
 #define        KEY_FREESAV(psav)                                       \
        key_freesav(psav, __func__, __LINE__)
 
-void key_freeso (struct socket *);
 int key_checktunnelsanity (struct secasvar *, u_int, void *, void *);
 int key_checkrequest (struct ipsecrequest *isr, const struct secasindex *);
 



Home | Main Index | Thread Index | Old Index