Module Name: src Committed By: ozaki-r Date: Fri May 26 08:10:46 UTC 2017
Modified Files: src/sys/netipsec: key.c key.h Log Message: Make key_cmpspidx_exactly and key_cmpspidx_withmask static To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/sys/netipsec/key.c cvs rdiff -u -r1.17 -r1.18 src/sys/netipsec/key.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netipsec/key.c diff -u src/sys/netipsec/key.c:1.143 src/sys/netipsec/key.c:1.144 --- src/sys/netipsec/key.c:1.143 Fri May 26 08:09:44 2017 +++ src/sys/netipsec/key.c Fri May 26 08:10:46 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.143 2017/05/26 08:09:44 ozaki-r Exp $ */ +/* $NetBSD: key.c,v 1.144 2017/05/26 08:10:46 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.143 2017/05/26 08:09:44 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.144 2017/05/26 08:10:46 ozaki-r Exp $"); /* * This code is referd to RFC 2367 @@ -461,6 +461,11 @@ static int key_bbcmp (const void *, cons static u_int16_t key_satype2proto (u_int8_t); static u_int8_t key_proto2satype (u_int16_t); +static int key_cmpspidx_exactly(const struct secpolicyindex *, + const struct secpolicyindex *); +static int key_cmpspidx_withmask(const struct secpolicyindex *, + const struct secpolicyindex *); + static int key_getspi (struct socket *, struct mbuf *, const struct sadb_msghdr *); static u_int32_t key_do_getnewspi (const struct sadb_spirange *, @@ -4238,7 +4243,7 @@ key_cmpsaidx( * 1 : equal * 0 : not equal */ -int +static int key_cmpspidx_exactly( const struct secpolicyindex *spidx0, const struct secpolicyindex *spidx1) @@ -4268,7 +4273,7 @@ key_cmpspidx_exactly( * 1 : equal * 0 : not equal */ -int +static int key_cmpspidx_withmask( const struct secpolicyindex *spidx0, const struct secpolicyindex *spidx1) Index: src/sys/netipsec/key.h diff -u src/sys/netipsec/key.h:1.17 src/sys/netipsec/key.h:1.18 --- src/sys/netipsec/key.h:1.17 Fri May 26 08:09:44 2017 +++ src/sys/netipsec/key.h Fri May 26 08:10:46 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: key.h,v 1.17 2017/05/26 08:09:44 ozaki-r Exp $ */ +/* $NetBSD: key.h,v 1.18 2017/05/26 08:10:46 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 $ */ @@ -92,8 +92,6 @@ int key_checkrequest (struct ipsecreques struct secpolicy *key_msg2sp (const struct sadb_x_policy *, size_t, int *); struct mbuf *key_sp2msg (const struct secpolicy *); int key_ismyaddr (const struct sockaddr *); -int key_cmpspidx_exactly (const struct secpolicyindex *, const struct secpolicyindex *); -int key_cmpspidx_withmask (const struct secpolicyindex *, const struct secpolicyindex *); int key_spdacquire (const struct secpolicy *); u_long key_random (void); void key_randomfill (void *, size_t);