Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netipsec/key.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netipsec/key.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.80 retrieving revision 1.81 diff -u -p -r1.80 -r1.81 --- src/sys/netipsec/key.c 2013/06/04 22:47:37 1.80 +++ src/sys/netipsec/key.c 2013/06/05 19:01:26 1.81 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.80 2013/06/04 22:47:37 christos Exp $ */ +/* $NetBSD: key.c,v 1.81 2013/06/05 19:01:26 christos 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 -__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.80 2013/06/04 22:47:37 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.81 2013/06/05 19:01:26 christos Exp $"); /* * This code is referd to RFC 2367 @@ -8179,7 +8179,7 @@ sysctl_net_key_dumpsp(SYSCTLFN_ARGS) } /* - * Create sysctl tree for native FAST_IPSEC key knobs, originally + * Create sysctl tree for native IPSEC key knobs, originally * under name "net.keyv2" * with MIB number { CTL_NET, PF_KEY_V2. }. * However, sysctl(8) never checked for nodes under { CTL_NET, PF_KEY_V2 }; * and in any case the part of our sysctl namespace used for dumping the @@ -8187,16 +8187,16 @@ sysctl_net_key_dumpsp(SYSCTLFN_ARGS) * namespace, for API reasons. * * Pending a consensus on the right way to fix this, add a level of - * indirection in how we number the `native' FAST_IPSEC key nodes; + * indirection in how we number the `native' IPSEC key nodes; * and (as requested by Andrew Brown) move registration of the * KAME-compatible names to a separate function. */ #if 0 -# define FAST_IPSEC_PFKEY PF_KEY_V2 -# define FAST_IPSEC_PFKEY_NAME "keyv2" +# define IPSEC_PFKEY PF_KEY_V2 +# define IPSEC_PFKEY_NAME "keyv2" #else -# define FAST_IPSEC_PFKEY PF_KEY -# define FAST_IPSEC_PFKEY_NAME "key" +# define IPSEC_PFKEY PF_KEY +# define IPSEC_PFKEY_NAME "key" #endif static int @@ -8216,55 +8216,55 @@ SYSCTL_SETUP(sysctl_net_keyv2_setup, "sy CTL_NET, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, FAST_IPSEC_PFKEY_NAME, NULL, + CTLTYPE_NODE, IPSEC_PFKEY_NAME, NULL, NULL, 0, NULL, 0, - CTL_NET, FAST_IPSEC_PFKEY, CTL_EOL); + CTL_NET, IPSEC_PFKEY, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "debug", NULL, NULL, 0, &key_debug_level, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_DEBUG_LEVEL, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_DEBUG_LEVEL, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "spi_try", NULL, NULL, 0, &key_spi_trycnt, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_SPI_TRY, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_SPI_TRY, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "spi_min_value", NULL, NULL, 0, &key_spi_minval, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_SPI_MIN_VALUE, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_SPI_MIN_VALUE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "spi_max_value", NULL, NULL, 0, &key_spi_maxval, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_SPI_MAX_VALUE, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_SPI_MAX_VALUE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "random_int", NULL, NULL, 0, &key_int_random, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_RANDOM_INT, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_RANDOM_INT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "larval_lifetime", NULL, NULL, 0, &key_larval_lifetime, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_LARVAL_LIFETIME, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_LARVAL_LIFETIME, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "blockacq_count", NULL, NULL, 0, &key_blockacq_count, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_BLOCKACQ_COUNT, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_BLOCKACQ_COUNT, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "blockacq_lifetime", NULL, NULL, 0, &key_blockacq_lifetime, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_BLOCKACQ_LIFETIME, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_BLOCKACQ_LIFETIME, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "esp_keymin", NULL, NULL, 0, &ipsec_esp_keymin, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_ESP_KEYMIN, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_ESP_KEYMIN, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "prefered_oldsa", NULL, @@ -8274,26 +8274,26 @@ SYSCTL_SETUP(sysctl_net_keyv2_setup, "sy CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "esp_auth", NULL, NULL, 0, &ipsec_esp_auth, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_ESP_AUTH, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_ESP_AUTH, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "ah_keymin", NULL, NULL, 0, &ipsec_ah_keymin, 0, - CTL_NET, FAST_IPSEC_PFKEY, KEYCTL_AH_KEYMIN, CTL_EOL); + CTL_NET, IPSEC_PFKEY, KEYCTL_AH_KEYMIN, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRUCT, "stats", SYSCTL_DESCR("PF_KEY statistics"), sysctl_net_key_stats, 0, NULL, 0, - CTL_NET, FAST_IPSEC_PFKEY, CTL_CREATE, CTL_EOL); + CTL_NET, IPSEC_PFKEY, CTL_CREATE, CTL_EOL); } /* * Register sysctl names used by setkey(8). For historical reasons, * and to share a single API, these names appear under { CTL_NET, PF_KEY } - * for both FAST_IPSEC and KAME IPSEC. + * for both IPSEC and KAME IPSEC. */ -SYSCTL_SETUP(sysctl_net_key_compat_setup, "sysctl net.key subtree setup for FAST_IPSEC") +SYSCTL_SETUP(sysctl_net_key_compat_setup, "sysctl net.key subtree setup for IPSEC") { /* Make sure net.key exists before we register nodes underneath it. */