1 files changed, 19 insertions, 30 deletions

diff --git a/src/gnunet/service/gns/dns.go b/src/gnunet/service/gns/dns.go
index fe138b0..18e2b78 100644
--- a/src/gnunet/service/gns/dns.go
+++ b/src/gnunet/service/gns/dns.go
@@ -45,9 +45,11 @@ func DNSNameFromBytes(b []byte, offset int) (int, string) {
         return pos + 1, str
 }
 
-// queryDNS resolves a name on a given nameserver and delivers all matching
-// resource record (of type 'kind') to the result channel.
-func queryDNS(id int, name string, server net.IP, kind RRTypeList, res chan *GNSRecordSet) {
+func QueryDNS(id int, name string, server net.IP, kind RRTypeList) *GNSRecordSet {
+        // get default nameserver if not defined.
+        if server == nil {
+                server = net.IPv4(8, 8, 8, 8)
+        }
         logger.Printf(logger.DBG, "[dns][%d] Starting query for '%s' on '%s'...\n", id, name, server.String())
 
         // assemble query
@@ -80,14 +82,13 @@ func queryDNS(id int, name string, server net.IP, kind RRTypeList, res chan *GNS
                                 continue
                         }
                         logger.Printf(logger.ERROR, "[dns][%d] Error: %s\n", id, errMsg)
-                        res <- nil
+                        return nil
                 }
                 // process results
                 logger.Printf(logger.WARN, "[dns][%d] Response from DNS server received (%d/5).\n", id, retry+1)
                 if in == nil {
                         logger.Printf(logger.ERROR, "[dns][%d] No results\n", id)
-                        res <- nil
-                        return
+                        return nil
                 }
                 set := NewGNSRecordSet()
                 for _, record := range in.Answer {
@@ -118,12 +119,11 @@ func queryDNS(id int, name string, server net.IP, kind RRTypeList, res chan *GNS
                                 set.AddRecord(rr)
                         }
                 }
-                logger.Printf(logger.WARN, "[dns][%d] %d resource records extracted from response (%d/5).\n", id, set.Count, retry+1)
-                res <- set
-                return
+                logger.Printf(logger.INFO, "[dns][%d] %d resource records extracted from response (%d/5).\n", id, set.Count, retry+1)
+                return set
         }
         logger.Printf(logger.WARN, "[dns][%d] Resolution failed -- giving up...\n", id)
-        res <- nil
+        return nil
 }
 
 // ResolveDNS resolves a name in DNS. Multiple DNS servers are queried in
@@ -135,29 +135,16 @@ func (gns *GNSModule) ResolveDNS(name string, servers []string, kind RRTypeList,
         // start DNS queries concurrently
         res := make(chan *GNSRecordSet)
         running := 0
-        for idx, srv := range servers {
+        for _, srv := range servers {
                 // check if srv is an IPv4/IPv6 address
                 addr := net.ParseIP(srv)
                 logger.Printf(logger.DBG, "ParseIP('%s', len=%d) --> %v\n", srv, len(srv), addr)
                 if addr == nil {
+                        // no, it is a name... try to resolve an IP address from the name
                         query := NewRRTypeList(enums.GNS_TYPE_DNS_A, enums.GNS_TYPE_DNS_AAAA)
-                        // no; resolve server name in GNS
-                        if strings.HasSuffix(srv, ".+") {
-                                // resolve server name relative to current zone
-                                zone := util.EncodeBinaryToString(pkey.Bytes())
-                                srv = strings.TrimSuffix(srv, ".+")
-                                set, err = gns.Resolve(srv, pkey, query, enums.GNS_LO_DEFAULT)
-                                if err != nil {
-                                        logger.Printf(logger.ERROR, "[dns] Can't resolve NS server '%s' in '%s'\n", srv, zone)
-                                        continue
-                                }
-                        } else {
-                                // resolve absolute GNS name (name MUST end in a PKEY)
-                                set, err = gns.Resolve(srv, nil, query, enums.GNS_LO_DEFAULT)
-                                if err != nil {
-                                        logger.Printf(logger.ERROR, "[dns] Can't resolve NS server '%s'\n", srv)
-                                        continue
-                                }
+                        if set, err = gns.ResolveUnknown(srv, pkey, query); err != nil {
+                                logger.Printf(logger.ERROR, "[dns] Can't resolve NS server '%s': %s\n", srv, err.Error())
+                                continue
                         }
                         // traverse resource records for 'A' and 'AAAA' records.
                 rec_loop:
@@ -173,12 +160,14 @@ func (gns *GNSModule) ResolveDNS(name string, servers []string, kind RRTypeList,
                         }
                         // check if we have an IP address available
                         if addr == nil {
-                                logger.Printf(logger.WARN, "[dns] No IP address for nameserver in GNS")
+                                logger.Printf(logger.WARN, "[dns] No IP address for nameserver '%s'\n", srv)
                                 continue
                         }
                 }
                 // query DNS concurrently
-                go queryDNS(idx, name, addr, kind, res)
+                go func() {
+                        res <- QueryDNS(util.NextID(), name, addr, kind)
+                }()
                 running++
         }
         // check if we started some queries at all.