Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

humanize printing of ip addresses

This commit is contained in:
christos 2017-09-29 14:59:43 +00:00
parent 0cdd6f1a35
commit e760fba74d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/netipsec/key.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: key.c,v 1.228 2017/09/28 17:21:42 christos Exp $ */ /* $NetBSD: key.c,v 1.229 2017/09/29 14:59:43 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms 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 $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.228 2017/09/28 17:21:42 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: key.c,v 1.229 2017/09/29 14:59:43 christos Exp $");
/* /*
* This code is referd to RFC 2367 * This code is referd to RFC 2367
@ -4633,6 +4633,7 @@ key_sockaddr_match(
{ {
const struct sockaddr_in *sin1, *sin2; const struct sockaddr_in *sin1, *sin2;
const struct sockaddr_in6 *sin61, *sin62; const struct sockaddr_in6 *sin61, *sin62;
char s1[IPSEC_ADDRSTRLEN], s2[IPSEC_ADDRSTRLEN];
if (sa1->sa_family != sa2->sa_family || sa1->sa_len != sa2->sa_len) { if (sa1->sa_family != sa2->sa_family || sa1->sa_len != sa2->sa_len) {
KEYDEBUG_PRINTF(KEYDEBUG_MATCH, KEYDEBUG_PRINTF(KEYDEBUG_MATCH,
@ -4654,17 +4655,20 @@ key_sockaddr_match(
sin2 = (const struct sockaddr_in *)sa2; sin2 = (const struct sockaddr_in *)sa2;
if (sin1->sin_addr.s_addr != sin2->sin_addr.s_addr) { if (sin1->sin_addr.s_addr != sin2->sin_addr.s_addr) {
KEYDEBUG_PRINTF(KEYDEBUG_MATCH, KEYDEBUG_PRINTF(KEYDEBUG_MATCH,
"addr fail %#x != %#x\n", "addr fail %s != %s\n",
sin1->sin_addr.s_addr, sin2->sin_addr.s_addr); (in_print(s1, sizeof(s1), &sin1->sin_addr), s1),
(in_print(s2, sizeof(s2), &sin2->sin_addr), s2));
return 0; return 0;
} }
if (key_portcomp(sin1->sin_port, sin2->sin_port, howport)) { if (key_portcomp(sin1->sin_port, sin2->sin_port, howport)) {
return 0; return 0;
} }
KEYDEBUG_PRINTF(KEYDEBUG_MATCH, KEYDEBUG_PRINTF(KEYDEBUG_MATCH,
"addr success %#x[%d] == %#x[%d]\n", "addr success %s[%d] == %s[%d]\n",
sin1->sin_addr.s_addr, sin1->sin_port, (in_print(s1, sizeof(s1), &sin1->sin_addr), s1),
sin2->sin_addr.s_addr, sin2->sin_port); sin1->sin_port,
(in_print(s2, sizeof(s2), &sin2->sin_addr), s2),
sin2->sin_port);
break; break;
case AF_INET6: case AF_INET6:
sin61 = (const struct sockaddr_in6 *)sa1; sin61 = (const struct sockaddr_in6 *)sa1;