Module Name: src
Committed By: maxv
Date: Sat May 19 19:47:47 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: backupsa.c isakmp_cfg.c
isakmp_inf.c session.c
Log Message:
Remove unused labels, functions, and function prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/dist/ipsec-tools/src/racoon/backupsa.c
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
cvs rdiff -u -r1.52 -r1.53 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
cvs rdiff -u -r1.33 -r1.34 src/crypto/dist/ipsec-tools/src/racoon/session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/backupsa.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/backupsa.c:1.10 src/crypto/dist/ipsec-tools/src/racoon/backupsa.c:1.11
--- src/crypto/dist/ipsec-tools/src/racoon/backupsa.c:1.10 Fri Apr 2 15:15:00 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/backupsa.c Sat May 19 19:47:47 2018
@@ -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 @@ backupsa_from_file()
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],
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.27 src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.28
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.27 Sat May 19 19:32:16 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c Sat May 19 19:47:47 2018
@@ -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 @@ isakmp_cfg_set(iph1, attrpl)
delph1(iph1);
iph1 = NULL;
}
-end:
+
vfree(payload);
/*
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.52 src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.53
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.52 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c Sat May 19 19:47:47 2018
@@ -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 int isakmp_info_recv_r_u_ack __P(
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 @@ isakmp_add_pl_n(buf0, np_p, type, pr, da
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;
Index: src/crypto/dist/ipsec-tools/src/racoon/session.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/session.c:1.33 src/crypto/dist/ipsec-tools/src/racoon/session.c:1.34
--- src/crypto/dist/ipsec-tools/src/racoon/session.c:1.33 Sat May 19 19:23:15 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c Sat May 19 19:47:47 2018
@@ -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 @@ struct fd_monitor {
#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;
