[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon Remove unused labels, fun...

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

details:   https://anonhg.NetBSD.org/src/rev/d0052a00f98b
branches:  trunk
changeset: 361958:d0052a00f98b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat May 19 19:47:47 2018 +0000

description:
Remove unused labels, functions, and function prototypes.

diffstat:

 crypto/dist/ipsec-tools/src/racoon/backupsa.c   |   3 +-
 crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c |   4 +-
 crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c |  30 +------------------------
 crypto/dist/ipsec-tools/src/racoon/session.c    |   4 +--
 4 files changed, 5 insertions(+), 36 deletions(-)

diffs (107 lines):

diff -r 2a9c1853ed76 -r d0052a00f98b crypto/dist/ipsec-tools/src/racoon/backupsa.c
--- a/crypto/dist/ipsec-tools/src/racoon/backupsa.c     Sat May 19 19:32:16 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/backupsa.c     Sat May 19 19:47:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: backupsa.c,v 1.10 2010/04/02 15:15:00 christos Exp $   */
+/*     $NetBSD: backupsa.c,v 1.11 2018/05/19 19:47:47 maxv Exp $       */
 
 /*     $KAME: backupsa.c,v 1.16 2001/12/31 20:13:40 thorpej Exp $      */
 
@@ -228,7 +228,6 @@
                memset(&tm, 0, sizeof(tm));
                p = str2tmx(buf, &tm);
                if (*p != '%') {
-       err:
                        plog(LLV_ERROR, LOCATION, NULL,
                                "illegal format line#%d in %s: %s\n",
                                line, lcconf->pathinfo[LC_PATHTYPE_BACKUPSA], 
diff -r 2a9c1853ed76 -r d0052a00f98b crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c   Sat May 19 19:32:16 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c   Sat May 19 19:47:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_cfg.c,v 1.27 2018/05/19 19:32:16 maxv Exp $     */
+/*     $NetBSD: isakmp_cfg.c,v 1.28 2018/05/19 19:47:47 maxv Exp $     */
 
 /* Id: isakmp_cfg.c,v 1.55 2006/08/22 18:17:17 manubsd Exp */
 
@@ -740,7 +740,7 @@
                delph1(iph1);
                iph1 = NULL;
        }
-end:
+
        vfree(payload);
 
        /* 
diff -r 2a9c1853ed76 -r d0052a00f98b crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c   Sat May 19 19:32:16 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c   Sat May 19 19:47:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_inf.c,v 1.52 2018/05/19 19:23:15 maxv Exp $     */
+/*     $NetBSD: isakmp_inf.c,v 1.53 2018/05/19 19:47:47 maxv Exp $     */
 
 /* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
 
@@ -110,8 +110,6 @@
 static void isakmp_info_send_r_u __P((struct sched *));
 #endif
 
-static void purge_isakmp_spi __P((int, isakmp_index *, size_t));
-
 /* %%%
  * Information Exchange
  */
@@ -1072,32 +1070,6 @@
        return buf;
 }
 
-static void
-purge_isakmp_spi(proto, spi, n)
-       int proto;
-       isakmp_index *spi;      /*network byteorder*/
-       size_t n;
-{
-       struct ph1handle *iph1;
-       size_t i;
-
-       for (i = 0; i < n; i++) {
-               iph1 = getph1byindex(&spi[i]);
-               if (!iph1)
-                       continue;
-
-               plog(LLV_INFO, LOCATION, NULL,
-                       "purged ISAKMP-SA proto_id=%s spi=%s.\n",
-                       s_ipsecdoi_proto(proto),
-                       isakmp_pindex(&spi[i], 0));
-
-               iph1->status = PHASE1ST_EXPIRED;
-               isakmp_ph1delete(iph1);
-       }
-}
-
-
-
 void
 purge_ipsec_spi(dst0, proto, spi, n)
        struct sockaddr *dst0;
diff -r 2a9c1853ed76 -r d0052a00f98b crypto/dist/ipsec-tools/src/racoon/session.c
--- a/crypto/dist/ipsec-tools/src/racoon/session.c      Sat May 19 19:32:16 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/session.c      Sat May 19 19:47:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: session.c,v 1.33 2018/05/19 19:23:15 maxv Exp $        */
+/*     $NetBSD: session.c,v 1.34 2018/05/19 19:47:47 maxv Exp $        */
 
 /*     $KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $        */
 
@@ -111,11 +111,9 @@
 #define NUM_PRIORITIES 2
 
 static void close_session __P((void));
-static void initfds __P((void));
 static void init_signal __P((void));
 static int set_signal __P((int sig, RETSIGTYPE (*func) __P((int))));
 static void check_sigreq __P((void));
-static void check_flushsa __P((void));
 static int close_sockets __P((void));
 
 static fd_set preset_mask, active_mask;