summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortteras <tteras@NetBSD.org>2013-04-12 09:53:10 +0000
committertteras <tteras@NetBSD.org>2013-04-12 09:53:10 +0000
commite28f12f2399e4fa02bf30244986bf5bbf7168fdd (patch)
treeb82d8405e2211a8031ce2ee2178c81145d935277
parent2bec0aa8c0472c0574df35ca0ba7ec5a4a206b78 (diff)
Some logging improvements.
-rw-r--r--crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c5
-rw-r--r--crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c b/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
index 0ce2fe30b00..3226da23910 100644
--- a/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
+++ b/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.c,v 1.30 2013/02/05 11:36:17 tteras Exp $ */
+/* $NetBSD: grabmyaddr.c,v 1.31 2013/04/12 09:53:10 tteras Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>.
@@ -764,6 +764,7 @@ kernel_handle_message(msg)
case RTM_ADD:
case RTM_DELETE:
case RTM_CHANGE:
+ case RTM_GET:
case RTM_MISS:
case RTM_IFINFO:
#ifdef RTM_OIFINFO
@@ -779,7 +780,7 @@ kernel_handle_message(msg)
break;
default:
plog(LLV_WARNING, LOCATION, NULL,
- "unrecognized route message with rtm_type: %d",
+ "unrecognized route message with rtm_type: %d\n",
rtm->rtm_type);
break;
}
diff --git a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
index 7c7695b59ac..601e02a0b89 100644
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_inf.c,v 1.49 2013/01/24 06:47:50 tteras Exp $ */
+/* $NetBSD: isakmp_inf.c,v 1.50 2013/04/12 09:53:10 tteras Exp $ */
/* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
@@ -1116,6 +1116,7 @@ purge_ipsec_spi(dst0, proto, spi, n)
u_int64_t created;
size_t i;
caddr_t mhp[SADB_EXT_MAX + 1];
+ unsigned num_purged = 0;
plog(LLV_DEBUG2, LOCATION, NULL,
"purge_ipsec_spi:\n");
@@ -1172,6 +1173,7 @@ purge_ipsec_spi(dst0, proto, spi, n)
plog(LLV_DEBUG2, LOCATION, NULL, "src: %s\n", saddr2str(src));
plog(LLV_DEBUG2, LOCATION, NULL, "dst: %s\n", saddr2str(dst));
+ plog(LLV_DEBUG2, LOCATION, NULL, "spi: %u\n", ntohl(sa->sadb_sa_spi));
/* XXX n^2 algorithm, inefficient */
@@ -1210,6 +1212,7 @@ purge_ipsec_spi(dst0, proto, spi, n)
"purged IPsec-SA proto_id=%s spi=%u.\n",
s_ipsecdoi_proto(proto),
ntohl(spi[i]));
+ num_purged++;
}
msg = next;
@@ -1217,6 +1220,8 @@ purge_ipsec_spi(dst0, proto, spi, n)
if (buf)
vfree(buf);
+
+ plog(LLV_DEBUG, LOCATION, NULL, "purged %u SAs.\n", num_purged);
}
/*