[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19242 - in gnunet-java: . src/org/gnunet/construct src/org
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19242 - in gnunet-java: . src/org/gnunet/construct src/org/gnunet/service |
Date: |
Wed, 18 Jan 2012 15:39:14 +0100 |
Author: grothoff
Date: 2012-01-18 15:39:14 +0100 (Wed, 18 Jan 2012)
New Revision: 19242
Modified:
gnunet-java/ISSUES
gnunet-java/src/org/gnunet/construct/MsgMap.txt
gnunet-java/src/org/gnunet/service/Resolver.java
Log:
-hints
Modified: gnunet-java/ISSUES
===================================================================
--- gnunet-java/ISSUES 2012-01-18 14:19:21 UTC (rev 19241)
+++ gnunet-java/ISSUES 2012-01-18 14:39:14 UTC (rev 19242)
@@ -151,8 +151,8 @@
Questions:
* problem with annotation-based parameter parsing: anonymous classes are
private (fields not accessible),
- parameter fields have to be public, too => just make them public / don't
use anonymous classes
- => currently solved with setAccessible
+ parameter fields have to be public, too => just make them public / don't
use anonymous classes
+ => currently solved with setAccessible GOOD, KEEP
* what about unions in messages (example: ResolverRequest can have String,
socket address or nothing as payload)
* trivial solution: just use a byte array in this case
* @Maybe annotation (for resolver response message)
Modified: gnunet-java/src/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java/src/org/gnunet/construct/MsgMap.txt 2012-01-18 14:19:21 UTC
(rev 19241)
+++ gnunet-java/src/org/gnunet/construct/MsgMap.txt 2012-01-18 14:39:14 UTC
(rev 19242)
@@ -1,7 +1,7 @@
987=org.gnunet.construct.SizeTestMessage
291=org.gnunet.construct.QueryMessage
-323=org.gnunet.service.NetworkSizeEstimation$NSE_UpdateMessage
-5=org.gnunet.service.Resolver$ResolverResponse
-321=org.gnunet.service.NetworkSizeEstimation$NSE_StartMessage
+323=org.gnunet.service.NetworkSizeEstimation.NSE_UpdateMessage
+5=org.gnunet.service.Resolver.ResolverResponse
+321=org.gnunet.service.NetworkSizeEstimation.NSE_StartMessage
3210=org.gnunet.construct.SimpleTestMessage
-# generated 2012/01/16 16:34:27
+# generated 2012/01/18 15:14:33
Modified: gnunet-java/src/org/gnunet/service/Resolver.java
===================================================================
--- gnunet-java/src/org/gnunet/service/Resolver.java 2012-01-18 14:19:21 UTC
(rev 19241)
+++ gnunet-java/src/org/gnunet/service/Resolver.java 2012-01-18 14:39:14 UTC
(rev 19242)
@@ -29,6 +29,7 @@
@Nested
public MessageHeader header;
+
@UInt32
public int direction;
@UInt32
@@ -51,9 +52,27 @@
public int domain;
@ByteFill
public byte[] addr;
+
+ // @Nested(union_on="direction")
+ // AddressUnion address;
}
+ /*
+ interface AddressUnion extends Message {}
+ @UnionCase(value=3)
+ public static class AddressString implements AddressUnion
+ {
+ @ZeroTerminatedString
+ public String addr;
+ }
+
+ @UnionCase(value=45)
+ public static class AddressBinary implements AddressUnion
+ {
+ @ByteFill
+ public byte[] addr;
+ }
+*/
-
public interface HostnameCallback {
public void onHostname(String hostname);
@@ -149,11 +168,12 @@
public static void main(final String[] argv) {
new Program(argv) {
- @Argument(name="HOSTNAME")
- public String hostname;
+ // @Argument(name="HOSTNAME") public String hostname;
@Override
public void run() {
+ for (String hostname : this.unprocessedArgs)
+ {
System.out.println("resolving hostname '" + hostname + "'");
Resolver.getInstance().resolveHostname(hostname,
RelativeTime.FOREVER, new AddressCallback() {
@Override
@@ -166,6 +186,7 @@
System.out.println("done.");
}
});
+ }
}
}.start();
@@ -173,7 +194,7 @@
/**
- * Resolver used to connect to the resolver service itselv, solving the
henn-egg-problem.
+ * Resolver used to connect to the resolver service itself, solving the
chicken and egg-problem.
* Only loopback and ip addresses can be "resolved", no real domain names
*/
private class BootstrapResolver extends Resolver {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19242 - in gnunet-java: . src/org/gnunet/construct src/org/gnunet/service,
gnunet <=