Module Name: src
Committed By: ozaki-r
Date: Wed Apr 19 03:28:19 UTC 2017
Modified Files:
src/sys/netipsec: ipsec.c
Log Message:
Improve message on assertion failure
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/netipsec/ipsec.c
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/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.73 src/sys/netipsec/ipsec.c:1.74
--- src/sys/netipsec/ipsec.c:1.73 Tue Apr 18 05:26:41 2017
+++ src/sys/netipsec/ipsec.c Wed Apr 19 03:28:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.73 2017/04/18 05:26:41 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.74 2017/04/19 03:28:19 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.73 2017/04/18 05:26:41 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.74 2017/04/19 03:28:19 ozaki-r Exp $");
/*
* IPsec controller part.
@@ -2273,7 +2273,9 @@ ipsec_logsastr(const struct secasvar *sa
char *p;
const struct secasindex *saidx = &sav->sah->saidx;
- KASSERT(saidx->src.sa.sa_family == saidx->dst.sa.sa_family);
+ KASSERTMSG(saidx->src.sa.sa_family == saidx->dst.sa.sa_family,
+ "af family mismatch, src %u, dst %u",
+ saidx->src.sa.sa_family, saidx->dst.sa.sa_family);
p = buf;
snprintf(buf, sizeof(buf), "SA(SPI=%u ", (u_int32_t)ntohl(sav->spi));
