[GNUnet-SVN] r19422 - gnunet-java/src/org/gnunet/util

[gnunet]

Author: dold
Date: 2012-01-26 10:58:53 +0100 (Thu, 26 Jan 2012)
New Revision: 19422

Modified:
   gnunet-java/src/org/gnunet/util/Resolver.java
Log:
fix

Modified: gnunet-java/src/org/gnunet/util/Resolver.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Resolver.java       2012-01-26 08:39:17 UTC 
(rev 19421)
+++ gnunet-java/src/org/gnunet/util/Resolver.java       2012-01-26 09:58:53 UTC 
(rev 19422)
@@ -55,18 +55,16 @@
     public static class ResponseBody implements Message {
         @UInt8
         public int domain;
-        public
         @UInt8
-        byte pad1;
-        public
+        public byte pad1;
         @UInt8
-        byte pad2;
-        public
+        public byte pad2;
         @UInt8
-        byte pad3;
+        public byte pad3;
         @ByteFill
         public byte[] addr;
 
+        // xxx: direction does not seem to be transmitted
         // @Nested(union_on="direction")
         // AddressUnion address;
     }
@@ -306,7 +304,7 @@
 
                                         } else if (gmsg.responseBody.domain == 
GetMessage.AF_INET6) {
                                             in_addr = 
Inet6Address.getByAddress(
-                                                    
Arrays.copyOfRange(gmsg.responseBody.addr, 0, 16));
+                                                    
Arrays.copyOfRange(gmsg.responseBody.addr, 4, 20));
                                         } else {
                                             throw new 
MessageFormatException("unknown AF_* domain");
                                         }
@@ -378,9 +376,12 @@
             }
 
             public void resolve() {
-                for (String hostname : this.unprocessedArgs) {
-                    System.out.println("resolving hostname '" + hostname + 
"'");
-                    Resolver.getInstance().resolveHostname(hostname, 
RelativeTime.FOREVER, new AddressCallback() {
+                if (unprocessedArgs.length == 0) {
+                    System.out.println("no hostnames given");
+                } else {
+                    System.out.println("resolving hostname '" + 
unprocessedArgs[0] + "'");
+                    Resolver.getInstance().resolveHostname(unprocessedArgs[0], 
RelativeTime.FOREVER, new AddressCallback() {
+                        int next = 1;
                         @Override
                         public void onAddress(InetAddress addr) {
                             System.out.println(addr);
@@ -389,9 +390,15 @@
                         @Override
                         public void onFinished() {
                             System.out.println("done.");
+                            if (unprocessedArgs.length > next) {
+                                System.out.println("resolving hostname '" + 
unprocessedArgs[next] + "'");
+                                
Resolver.getInstance().resolveHostname(unprocessedArgs[next], 
RelativeTime.FOREVER, this);
+                                next++;
+                            }
                         }
                     });
                 }
+
             }
 
             @Override