commit 53756a6cd0f0d85dc07b4c8348a82311de7a12ef
author Olaf Bergmann <bergmann@tzi.org> Tue Feb 28 15:02:11 2017 +0100
committer Olaf Bergmann <bergmann@tzi.org> Tue Feb 28 15:02:11 2017 +0100
tree c50ccfb87e3f711eab6662e881db5bce5f63c5a7
parent 4a90b20b52dee5241abbf4b8edbfb7f4c583e806

dtls_debug.c: fix output of IP addresses for Contiki

* UIP_CONF_IPV6 is now called NETSTACK_CONF_WITH_IPV6
* As sprintf() is used anyway when NDEBUG is not set, we can also
  use it for printing IPv4 addresses.

Change-Id: I91247ba0292c23a2e389a4a6a8f15c6204473b5f

dtls_debug.c

diff --git a/dtls_debug.c b/dtls_debug.c
index a5f55b3..f4626db 100644
--- a/dtls_debug.c
+++ b/dtls_debug.c
@@ -163,7 +163,7 @@
 #else /* HAVE_ARPA_INET_H */
 # if WITH_CONTIKI
   char *p = buf;
-#  ifdef UIP_CONF_IPV6
+#  if NETSTACK_CONF_WITH_IPV6
   uint8_t i;
   const char hex[] = "0123456789ABCDEF";
 
@@ -182,12 +182,14 @@
     *p++ = hex[(addr->addr.u8[i+1] & 0x0f)];
   }
   *p++ = ']';
-#  else /* UIP_CONF_IPV6 */
-#   warning "IPv4 network addresses will not be included in debug output"
-
+#  else /* NETSTACK_CONF_IPV6 */
   if (len < 21)
     return 0;
-#  endif /* UIP_CONF_IPV6 */
+
+  p += sprintf(p, "%u.%u.%u.%u",
+               addr->addr.u8[0], addr->addr.u8[1],
+               addr->addr.u8[2], addr->addr.u8[3]);
+#  endif /* NETSTACK_CONF_IPV6 */
   if (buf + len - p < 6)
     return 0;