handling replies continuously from server

[oweals/gnunet.git] / src / dns / gnunet-dns-monitor.c

diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index 18d08d4fcf54f046c4186209d703e9e7dfc3b379..82715aabc3d3a8b3e243879e9a3dc2ec481f773b 100644 (file)
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -26,7 +26,7 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_dns_service-new.h"
+#include "gnunet_dns_service.h"
 #include "gnunet_dnsparser_lib.h"
 
 /**
@@ -119,9 +119,9 @@ display_query (const struct GNUNET_DNSPARSER_Query *query)
 
 
 /**
- * Output the given DNS query to stdout.
+ * Output the given DNS record to stdout.
  *
- * @param query query to display.
+ * @param record record to display.
  */
 static void
 display_record (const struct GNUNET_DNSPARSER_Record *record)
@@ -134,16 +134,16 @@ display_record (const struct GNUNET_DNSPARSER_Record *record)
   switch (record->type)
   {
   case GNUNET_DNSPARSER_TYPE_A:
-    if (record->data_len != sizeof (struct in_addr))
+    if (record->data.raw.data_len != sizeof (struct in_addr))
       format = "<invalid>";
     else
-      format = inet_ntop (AF_INET, record->data.raw, buf, sizeof (buf));
+      format = inet_ntop (AF_INET, record->data.raw.data, buf, sizeof (buf));
     break;
   case GNUNET_DNSPARSER_TYPE_AAAA:
-    if (record->data_len != sizeof (struct in6_addr))
+    if (record->data.raw.data_len != sizeof (struct in6_addr))
       format = "<invalid>";
     else
-      format = inet_ntop (AF_INET6, record->data.raw, buf, sizeof (buf));
+      format = inet_ntop (AF_INET6, record->data.raw.data, buf, sizeof (buf));
     break;
   case GNUNET_DNSPARSER_TYPE_NS:
   case GNUNET_DNSPARSER_TYPE_CNAME:
@@ -182,8 +182,8 @@ display_record (const struct GNUNET_DNSPARSER_Record *record)
   case GNUNET_DNSPARSER_TYPE_TXT:
     GNUNET_asprintf (&tmp,
                     "%.*s",
-                    (unsigned int) record->data_len,
-                    record->data.raw);
+                    (unsigned int) record->data.raw.data_len,
+                    record->data.raw.data);
     format = tmp;
     break;
   default:
@@ -191,12 +191,11 @@ display_record (const struct GNUNET_DNSPARSER_Record *record)
     break;
   }
   fprintf (stdout,
-          "\t\t%s %s: %s = %s (%u bytes, %u s)\n",
+          "\t\t%s %s: %s = %s (%u s)\n",
           get_class (record->class),
           get_type (record->type),
           record->name,
           format,
-          (unsigned int) record->data_len,
           (unsigned int) (GNUNET_TIME_absolute_get_remaining (record->expiration_time).rel_value / 1000));
   GNUNET_free_non_null (tmp);
 }