-fix

1 files changed, 11 insertions, 0 deletions

diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index b35ea6c27..c3c9791a4 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -44,6 +44,7 @@
 #include "gnunet_signatures.h"
 #include "dns.h"
 #include "gnunet_dns_service.h"
+#include "gnunet_dnsparser_lib.h"
 #include "gnunet_mesh_service.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_tun_lib.h"
@@ -1206,6 +1207,16 @@ handle_client_response (void *cls GNUNET_UNUSED,
                            rr->client_wait_list_length,
                            0);
       }
+      /* if query changed to answer, move past DNS resolution phase... */
+      if ( (RP_REQUEST_MONITOR == rr->phase) &&
+           (rr->payload_length > sizeof (struct GNUNET_TUN_DnsHeader)) &&
+           ((struct GNUNET_DNSPARSER_Flags*)&(((struct GNUNET_TUN_DnsHeader*) rr->payload)->flags))->query_or_response == 1)
+      {
+        rr->phase = RP_INTERNET_DNS;
+        GNUNET_array_grow (rr->client_wait_list,
+                           rr->client_wait_list_length,
+                           0);
+      }
       break;
     }
     next_phase (rr);