Author: ae
Date: Sun Apr 24 09:05:29 2016
New Revision: 298536
URL: https://svnweb.freebsd.org/changeset/base/298536

Log:
  Use ipsec_address() function to print IP addresses.

Modified:
  head/sys/netipsec/key_debug.c

Modified: head/sys/netipsec/key_debug.c
==============================================================================
--- head/sys/netipsec/key_debug.c       Sun Apr 24 09:02:17 2016        
(r298535)
+++ head/sys/netipsec/key_debug.c       Sun Apr 24 09:05:29 2016        
(r298536)
@@ -506,6 +506,8 @@ kdebug_secpolicy(struct secpolicy *sp)
 void
 kdebug_secpolicyindex(struct secpolicyindex *spidx)
 {
+       char buf[INET6_ADDRSTRLEN];
+
        /* sanity check */
        if (spidx == NULL)
                panic("%s: NULL pointer was passed.\n", __func__);
@@ -513,19 +515,15 @@ kdebug_secpolicyindex(struct secpolicyin
        printf("secpolicyindex{ dir=%u prefs=%u prefd=%u ul_proto=%u\n",
                spidx->dir, spidx->prefs, spidx->prefd, spidx->ul_proto);
 
-       ipsec_hexdump((caddr_t)&spidx->src,
-               ((struct sockaddr *)&spidx->src)->sa_len);
-       printf("\n");
-       ipsec_hexdump((caddr_t)&spidx->dst,
-               ((struct sockaddr *)&spidx->dst)->sa_len);
-       printf("}\n");
-
-       return;
+       printf("%s -> ", ipsec_address(&spidx->src, buf, sizeof(buf)));
+       printf("%s }\n", ipsec_address(&spidx->dst, buf, sizeof(buf)));
 }
 
 void
 kdebug_secasindex(struct secasindex *saidx)
 {
+       char buf[INET6_ADDRSTRLEN];
+
        /* sanity check */
        if (saidx == NULL)
                panic("%s: NULL pointer was passed.\n", __func__);
@@ -533,14 +531,8 @@ kdebug_secasindex(struct secasindex *sai
        printf("secasindex{ mode=%u proto=%u\n",
                saidx->mode, saidx->proto);
 
-       ipsec_hexdump((caddr_t)&saidx->src,
-               ((struct sockaddr *)&saidx->src)->sa_len);
-       printf("\n");
-       ipsec_hexdump((caddr_t)&saidx->dst,
-               ((struct sockaddr *)&saidx->dst)->sa_len);
-       printf("\n");
-
-       return;
+       printf("%s -> ", ipsec_address(&saidx->src, buf, sizeof(buf)));
+       printf("%s }\n", ipsec_address(&saidx->dst, buf, sizeof(buf)));
 }
 
 static void
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to