2 files changed, 48 insertions, 55 deletions
diff --git a/src/com/isode/stroke/network/PlatformDomainNameResolver.java b/src/com/isode/stroke/network/PlatformDomainNameResolver.java
index 3eef682..32f466d 100644
--- a/src/com/isode/stroke/network/PlatformDomainNameResolver.java
+++ b/src/com/isode/stroke/network/PlatformDomainNameResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012, Isode Limited, London, England.
+ * Copyright (c) 2010-2013, Isode Limited, London, England.
  * All rights reserved.
  */
 /*
@@ -16,6 +16,8 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.xbill.DNS.Address;
+
 public class PlatformDomainNameResolver extends DomainNameResolver {
 
     private class AddressQuery extends DomainNameAddressQuery implements EventOwner {
@@ -25,10 +27,11 @@ public class PlatformDomainNameResolver extends DomainNameResolver {
             public void run() {
                 final Collection<HostAddress> results = new ArrayList<HostAddress>();
                 try {
-                    for (InetAddress result : InetAddress.getAllByName(hostname)) {
+                    for (InetAddress result : Address.getAllByName(hostname)) {
                         results.add(new HostAddress(result));
                     }
                 } catch (UnknownHostException ex) {
+                    /* results remains empty */
                 }
                 eventLoop.postEvent(new Callback() {
                     public void run() {
@@ -53,17 +56,17 @@ public class PlatformDomainNameResolver extends DomainNameResolver {
     }
 
     public PlatformDomainNameResolver(EventLoop eventLoop) {
-        this.eventLoop = eventLoop;
+        this.eventLoop_ = eventLoop;
     }
 
     @Override
     public DomainNameServiceQuery createServiceQuery(String name) {
-        return new PlatformDomainNameServiceQuery(getNormalized(name), eventLoop);
+        return new PlatformDomainNameServiceQuery(getNormalized(name), eventLoop_);
     }
 
     @Override
     public DomainNameAddressQuery createAddressQuery(String name) {
-        return new AddressQuery(getNormalized(name), eventLoop);
+        return new AddressQuery(getNormalized(name), eventLoop_);
     }
-    private final EventLoop eventLoop;
+    private final EventLoop eventLoop_;
 }
diff --git a/src/com/isode/stroke/network/PlatformDomainNameServiceQuery.java b/src/com/isode/stroke/network/PlatformDomainNameServiceQuery.java
index 0fc7976..37cf1f2 100644
--- a/src/com/isode/stroke/network/PlatformDomainNameServiceQuery.java
+++ b/src/com/isode/stroke/network/PlatformDomainNameServiceQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012, Isode Limited, London, England.
+ * Copyright (c) 2010-2013, Isode Limited, London, England.
  * All rights reserved.
  */
 /*
@@ -9,79 +9,69 @@
  */
 
 package com.isode.stroke.network;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.xbill.DNS.Lookup;
+import org.xbill.DNS.Record;
+import org.xbill.DNS.SRVRecord;
+import org.xbill.DNS.TextParseException;
+import org.xbill.DNS.Type;
 
 import com.isode.stroke.eventloop.Event.Callback;
 import com.isode.stroke.eventloop.EventLoop;
-import com.isode.stroke.eventloop.EventOwner;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
+import com.isode.stroke.network.DomainNameServiceQuery;
 
-public class PlatformDomainNameServiceQuery extends DomainNameServiceQuery implements EventOwner {
+public class PlatformDomainNameServiceQuery extends DomainNameServiceQuery {
+    private final String service;
+    private final EventLoop eventLoop;
 
-    private class QueryThread extends Thread {
+    public PlatformDomainNameServiceQuery(final String service, final EventLoop eventLoop) {
+        this.service = service;
+        this.eventLoop = eventLoop;
+    }
 
+    private class QueryThread extends Thread {
         @Override
         public void run() {
             final Collection<Result> results = new ArrayList<Result>();
-            Hashtable env = new Hashtable();
-            env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");
-            env.put("java.naming.provider.url", "dns:");
-            DirContext ctx = null;
+            Lookup request;
             try {
-                ctx = new InitialDirContext(env);
-                Attributes attrs = ctx.getAttributes(service, new String[]{"SRV"});
-                Attribute attribute = attrs.get("SRV");
-                for (int i = 0; attribute != null && i < attribute.size(); i++) {
-                    /* SRV results are going to be returned in the space-separated format
-                     * Priority Weight Port Target
-                     * (See RFC2782)
-                     */
-                    String[] srvParts = ((String) attribute.get(i)).split(" ");
-                    String host = srvParts[3];
-                    if (host.endsWith(".")) {
-                        host = host.substring(0, host.length() - 1);
+                request = new Lookup(service, Type.SRV);
+                final Record[] records = request.run();
+                if (records != null) {
+                    for (final Record record : records) {
+                        /* It's only anticipated that SRVRecords will be
+                         * returned, but check first
+                         */
+                        if (record instanceof SRVRecord) {
+                            final SRVRecord srv = (SRVRecord) record;
+                            final Result result = new Result(srv.getTarget()
+                                .toString(), srv.getPort(), srv.getPriority(),
+                                srv.getWeight());
+                            results.add(result);
+                        }
                     }
-                    Result result = new Result(host, Integer.parseInt(srvParts[2]), Integer.parseInt(srvParts[0]), Integer.parseInt(srvParts[1]));
-                    results.add(result);
                 }
-            } catch (NamingException ex) {
-                /* Turns out that you get the exception just for not finding a result, so we want to fall through to A lookups and ignore.*/
+            } catch (final TextParseException e) {
+                /* Lookup failed because "service" was not a valid DNS name;
+                 * leave "results" empty 
+                 */
             }
 
             eventLoop.postEvent(new Callback() {
+                @Override
                 public void run() {
                     onResult.emit(results);
                 }
             });
-            //close the context as otherwise this will lead to open sockets in
-            //CLOSE_WAIT condition
-            if(ctx != null) {
-                try {
-                    ctx.close();
-                } catch (NamingException e) {
-                    //at least we try to close the context
-                }
-            }
         }
     }
 
-    public PlatformDomainNameServiceQuery(String service, EventLoop eventLoop) {
-        this.service = service;
-        this.eventLoop = eventLoop;
-    }
-
     @Override
     public void run() {
-        QueryThread thread = new QueryThread();
+        final QueryThread thread = new QueryThread();
         thread.setDaemon(true);
         thread.start();
     }
-    private final String service;
-    private final EventLoop eventLoop;
 }