[GNUnet-SVN] r29060 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-09-06 13:21:24 +0200 (Fri, 06 Sep 2013)
New Revision: 29060

Modified:
   gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-minor fixes

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-06 11:15:47 UTC 
(rev 29059)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-06 11:21:24 UTC 
(rev 29060)
@@ -1382,6 +1382,7 @@
       }
       /* find associated A/AAAA record */
       sa = NULL;
+      sa_len = 0;
       for (j=0;j<rd_count;j++)
       {
        switch (rd[j].record_type)
@@ -1430,10 +1431,19 @@
                  sizeof (struct in6_addr));
          sa = (struct sockaddr *) &v6;
          break;
+       default:
+         break;
        }
        if (NULL != sa)
          break;
       }
+      if (NULL == sa)
+      {
+       /* we cannot continue; NS without A/AAAA */
+       rh->proc (rh->proc_cls, 0, NULL);
+       GNS_resolver_lookup_cancel (rh);
+       return;
+      }
       /* expand authority chain */
       ac = GNUNET_new (struct AuthorityChain);
       ac->rh = rh;
@@ -1636,8 +1646,8 @@
        (0 == GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_ntoh 
(block->expiration_time)).rel_value_us) )
   {
     /* DHT not permitted and no local result, fail */
-    rx->proc (rx->proc_cls, 0, NULL);
-    GNS_resolver_lookup_cancel (rx);
+    rh->proc (rh->proc_cls, 0, NULL);
+    GNS_resolver_lookup_cancel (rh);
     return;
   }
   if (GNUNET_OK !=