[GNUnet-SVN] r34092 - in gnunet-java/src/main/java/org/gnunet/transport: . messages

[gnunet]

Author: dold
Date: 2014-07-31 11:59:41 +0200 (Thu, 31 Jul 2014)
New Revision: 34092

Modified:
   gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java
   
gnunet-java/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java
Log:
fixed message format


Modified: gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java    
2014-07-31 09:46:22 UTC (rev 34091)
+++ gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java    
2014-07-31 09:59:41 UTC (rev 34092)
@@ -64,7 +64,7 @@
                     helloAddress.address = m.content.address;
                     helloAddress.transportName = m.content.plugin;
                     listCallback.onPeerAddress(helloAddress, m.content.state,
-                        AbsoluteTime.fromNetwork(m.content.validUntil));
+                        AbsoluteTime.fromNetwork(m.content.stateTimeout));
                 }
             } else {
                 if (m.content.addrLen == 0 && m.content.pluginLen == 0) {
@@ -75,7 +75,7 @@
                     helloAddress.address = m.content.address;
                     helloAddress.transportName = m.content.plugin;
                     monitorCallback.onPeerAddress(helloAddress, 
m.content.state,
-                        AbsoluteTime.fromNetwork(m.content.validUntil));
+                        AbsoluteTime.fromNetwork(m.content.stateTimeout));
                 }
             }
         }

Modified: 
gnunet-java/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java
   2014-07-31 09:46:22 UTC (rev 34091)
+++ 
gnunet-java/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessageContent.java
   2014-07-31 09:59:41 UTC (rev 34092)
@@ -28,22 +28,18 @@
     public int reserved;
     @NestedMessage
     public PeerIdentity peerIdentity;
+    @NestedMessage
+    public AbsoluteTimeMessage stateTimeout;
     @UInt32
     public int localAddresInfo;
     @UInt32
+    public int state;
+    @UInt32
     public int addrLen;
     @UInt32
     public int pluginLen;
-    @UInt32
-    public int state;
     @VariableSizeIntegerArray(lengthField = "addrLen", bitSize = 8, signed = 
true)
     public byte[] address;
     @VariableSizeString(lengthField = "pluginLen", terminationType = 
StringTerminationType.NONE)
     public String plugin;
-    @NestedMessage
-    public AbsoluteTimeMessage lastValidation;
-    @NestedMessage
-    public AbsoluteTimeMessage validUntil;
-    @NestedMessage
-    public AbsoluteTimeMessage nextValidation;
 }