gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r32968 - in gnunet-java/src/main/java/org/gnunet: core core


From: gnunet
Subject: [GNUnet-SVN] r32968 - in gnunet-java/src/main/java/org/gnunet: core core/messages dht dht/messages gns mesh peerinfo peerinfo/messages
Date: Tue, 8 Apr 2014 12:00:26 +0200

Author: dold
Date: 2014-04-08 12:00:26 +0200 (Tue, 08 Apr 2014)
New Revision: 32968

Added:
   gnunet-java/src/main/java/org/gnunet/core/messages/
   gnunet-java/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java
   
gnunet-java/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java
   gnunet-java/src/main/java/org/gnunet/core/messages/InitMessage.java
   gnunet-java/src/main/java/org/gnunet/core/messages/InitReplyMessage.java
   
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
   
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
   gnunet-java/src/main/java/org/gnunet/core/messages/SendMessage.java
   gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageReady.java
   gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageRequest.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/
   gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java
   
gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java
   gnunet-java/src/main/java/org/gnunet/mesh/ChannelEndHandler.java
   gnunet-java/src/main/java/org/gnunet/peerinfo/messages/
   gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java
   gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java
   
gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java
   gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java
Removed:
   gnunet-java/src/main/java/org/gnunet/core/ConnectNotifyMessage.java
   gnunet-java/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java
   gnunet-java/src/main/java/org/gnunet/core/InitMessage.java
   gnunet-java/src/main/java/org/gnunet/core/InitReplyMessage.java
   gnunet-java/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
   gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
   gnunet-java/src/main/java/org/gnunet/core/SendMessage.java
   gnunet-java/src/main/java/org/gnunet/core/SendMessageReady.java
   gnunet-java/src/main/java/org/gnunet/core/SendMessageRequest.java
   gnunet-java/src/main/java/org/gnunet/dht/ClientGetMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/ClientPutMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/ClientResultMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java
   gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java
   gnunet-java/src/main/java/org/gnunet/gns/GNS.java
   gnunet-java/src/main/java/org/gnunet/mesh/TunnelEndHandler.java
   gnunet-java/src/main/java/org/gnunet/peerinfo/InfoEnd.java
   gnunet-java/src/main/java/org/gnunet/peerinfo/InfoMessage.java
   gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
   gnunet-java/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java
Log:
fix rename chaos caused be IntelliJ

Deleted: gnunet-java/src/main/java/org/gnunet/core/ConnectNotifyMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/ConnectNotifyMessage.java 
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/ConnectNotifyMessage.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,54 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.*;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Message sent by the service to clients to notify them
- * about a peer connecting.
- */
address@hidden(67)
-public class ConnectNotifyMessage implements GnunetMessage.Body {
-    /**
-     * Number of ATS key-value pairs that follow this struct
-     * (excluding the 0-terminator).
-     */
-    @UInt32
-    public long atsCount;
-
-    /**
-     * Identity of the connecting peer.
-     */
-    @NestedMessage
-    public PeerIdentity peer;
-
-
-    @FillWith @UInt8
-    public byte[] atsInfo;
-
-
-    //@FillWith
-    //public ATSInformation[] atsInformation;
-
-}

Deleted: gnunet-java/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java      
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java      
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,46 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Message sent by the service to clients to notify them
- * about a peer disconnecting.
- */
address@hidden(68)
-public class DisconnectNotifyMessage implements GnunetMessage.Body {
-    /**
-     * Always zero.
-     */
-    @UInt32
-    public int reserved;
-
-    /**
-     * Identity of the connecting peer.
-     */
-    @NestedMessage
-    public PeerIdentity peer;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/core/InitMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/InitMessage.java  2014-04-08 
09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/InitMessage.java  2014-04-08 
10:00:26 UTC (rev 32968)
@@ -1,45 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.IntegerFill;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
-
address@hidden(64)
-public class InitMessage implements GnunetMessage.Body {
-    /*
-    * Options used to tell core what kind of traffic notify messages we are 
interested in.
-    */
-    private final static int
-            OPTION_FULL_INBOUND = 8,
-            OPTION_HDR_INBOUND = 16,
-            OPTION_FULL_OUTBOUND = 32,
-            OPTION_HDR_OUTBOUND = 64;
-
-    @UInt32
-    public long options;
-
-    @IntegerFill(signed = false, bitSize = 16)
-    public int[] interested;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/core/InitReplyMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/InitReplyMessage.java     
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/InitReplyMessage.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,39 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-
address@hidden(65)
-public class InitReplyMessage implements GnunetMessage.Body {
-    @UInt32
-    public int reserved = 0;
-    /**
-     * pubkey of the local peer
-     */
-    @NestedMessage
-    public PeerIdentity myIdentity;
-}

Deleted: 
gnunet-java/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java  
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java  
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,49 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.FillWith;
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt8;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-
address@hidden(70)
-public class NotifyInboundTrafficMessage implements GnunetMessage.Body {
-    /**
-     * Identity of the receiver or sender.
-     */
-    @NestedMessage
-    public PeerIdentity peer;
-
-    @NestedMessage(newFrame = true)
-    public GnunetMessage.Header payloadHeader;
-
-    /**
-     * The (optional) message body corresponding to payloadHeader.
-     * Not typed as GnunetMessage.Body because the message type may not be 
known by this
-     * peer.
-     */
-    @FillWith @UInt8
-    public byte[] payloadBody;
-}

Deleted: 
gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java 
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,58 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.*;
-import org.gnunet.util.ATSInformation;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-
address@hidden(71)
-public class NotifyOutboundTrafficMessage implements GnunetMessage.Body {
-    /**
-     * Number of ATS key-value pairs that follow this struct
-     * (excluding the 0-terminator).
-     */
-    @UInt32
-    public long atsCount;
-
-    /**
-     * Identity of the receiver or sender.
-     */
-    @NestedMessage
-    public PeerIdentity peer;
-
-    @VariableSizeArray(lengthField = "atsCount")
-    public ATSInformation[] atsRest;
-
-    @NestedMessage(newFrame = true)
-    public GnunetMessage.Header payloadHeader;
-
-    /**
-     * The (optional) message body corresponding to payloadHeader.
-     * Not typed as GnunetMessage.Body because the message type may not be 
known by this
-     * peer.
-     */
-    @FillWith @UInt8
-    public byte[] payloadBody;
-
-}

Deleted: gnunet-java/src/main/java/org/gnunet/core/SendMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/SendMessage.java  2014-04-08 
09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/SendMessage.java  2014-04-08 
10:00:26 UTC (rev 32968)
@@ -1,70 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.AbsoluteTimeMessage;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Client asking core to transmit a particular message to a particular
- * target (response to GNUNET_MESSAGE_TYPE_CORE_SEND_READY).
- */
address@hidden(76)
-public class SendMessage implements GnunetMessage.Body {
-    /**
-     * How important is this message?
-     */
-    @UInt32
-    public long priority;
-
-    /**
-     * By what time would the sender really like to see this
-     * message transmitted?
-     */
-    @NestedMessage
-    public AbsoluteTimeMessage deadline;
-
-    /**
-     * Identity of the intended receiver.
-     */
-    @NestedMessage
-    public PeerIdentity peer;
-
-    /**
-     * GNUNET_YES if corking is allowed, GNUNET_NO if not.
-     */
-    @UInt32
-    public int cork;
-
-    /**
-     * Always 0.
-     */
-    @UInt32
-    public int reserved;
-
-    @NestedMessage(newFrame = true)
-    public GnunetMessage payloadMessage;
-
-}

Deleted: gnunet-java/src/main/java/org/gnunet/core/SendMessageReady.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/SendMessageReady.java     
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/SendMessageReady.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,56 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt16;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Core notifying client that it is allowed to now
- * transmit a message to the given target
- * (response to GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST).
- */
address@hidden(75)
-public class SendMessageReady implements GnunetMessage.Body {
-    /**
-     * How many bytes are allowed for transmission?
-     * Guaranteed to be at least as big as the requested size,
-     * or ZERO if the getRequestIdentifier is rejected (will timeout,
-     * peer disconnected, queue full, etc.).
-     */
-    @UInt16
-    public int size;
-
-    /**
-     * smrId from the getRequestIdentifier.
-     */
-    @UInt16
-    public int smrId;
-
-    /**
-     * Identity of the intended target.
-     */
-    @NestedMessage
-    public PeerIdentity peer;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/core/SendMessageRequest.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/SendMessageRequest.java   
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/core/SendMessageRequest.java   
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,73 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.core;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt16;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.AbsoluteTimeMessage;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Client notifying core about the maximum-priority
- * message it has in the queue for a particular target.
- */
address@hidden(74)
-public class SendMessageRequest implements GnunetMessage.Body {
-    /**
-     * How important is this message?
-     */
-    @UInt32
-    public long priority;
-
-    /**
-     * By what time would the sender really like to see this
-     * message transmitted?
-     */
-    @NestedMessage
-    public AbsoluteTimeMessage deadline;
-
-    /**
-     * Identity of the intended target.
-     */
-    @NestedMessage
-    public PeerIdentity peer;
-
-    /**
-     * How large is the client's message queue for this peer?
-     */
-    @UInt32
-    public byte reserved;
-
-    /**
-     * How large is the message?
-     */
-    @UInt16
-    public int size;
-
-    /**
-     * Counter for this peer to match SMRs to replies.
-     */
-    @UInt16
-    public int smrId;
-}

Added: 
gnunet-java/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java    
                            (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java    
    2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,54 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message sent by the service to clients to notify them
+ * about a peer connecting.
+ */
address@hidden(67)
+public class ConnectNotifyMessage implements GnunetMessage.Body {
+    /**
+     * Number of ATS key-value pairs that follow this struct
+     * (excluding the 0-terminator).
+     */
+    @UInt32
+    public long atsCount;
+
+    /**
+     * Identity of the connecting peer.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+
+
+    @FillWith @UInt8
+    public byte[] atsInfo;
+
+
+    //@FillWith
+    //public ATSInformation[] atsInformation;
+
+}

Added: 
gnunet-java/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java 
                            (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java 
    2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,46 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message sent by the service to clients to notify them
+ * about a peer disconnecting.
+ */
address@hidden(68)
+public class DisconnectNotifyMessage implements GnunetMessage.Body {
+    /**
+     * Always zero.
+     */
+    @UInt32
+    public int reserved;
+
+    /**
+     * Identity of the connecting peer.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+}

Added: gnunet-java/src/main/java/org/gnunet/core/messages/InitMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/messages/InitMessage.java         
                (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/core/messages/InitMessage.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,45 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.IntegerFill;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+
address@hidden(64)
+public class InitMessage implements GnunetMessage.Body {
+    /*
+    * Options used to tell core what kind of traffic notify messages we are 
interested in.
+    */
+    private final static int
+            OPTION_FULL_INBOUND = 8,
+            OPTION_HDR_INBOUND = 16,
+            OPTION_FULL_OUTBOUND = 32,
+            OPTION_HDR_OUTBOUND = 64;
+
+    @UInt32
+    public long options;
+
+    @IntegerFill(signed = false, bitSize = 16)
+    public int[] interested;
+}

Added: gnunet-java/src/main/java/org/gnunet/core/messages/InitReplyMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/messages/InitReplyMessage.java    
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/core/messages/InitReplyMessage.java    
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,39 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+
address@hidden(65)
+public class InitReplyMessage implements GnunetMessage.Body {
+    @UInt32
+    public int reserved = 0;
+    /**
+     * pubkey of the local peer
+     */
+    @NestedMessage
+    public PeerIdentity myIdentity;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
                         (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java
 2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,49 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.FillWith;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt8;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+
address@hidden(70)
+public class NotifyInboundTrafficMessage implements GnunetMessage.Body {
+    /**
+     * Identity of the receiver or sender.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+
+    @NestedMessage(newFrame = true)
+    public GnunetMessage.Header payloadHeader;
+
+    /**
+     * The (optional) message body corresponding to payloadHeader.
+     * Not typed as GnunetMessage.Body because the message type may not be 
known by this
+     * peer.
+     */
+    @FillWith @UInt8
+    public byte[] payloadBody;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
                                (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java
        2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,58 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.ATSInformation;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+
address@hidden(71)
+public class NotifyOutboundTrafficMessage implements GnunetMessage.Body {
+    /**
+     * Number of ATS key-value pairs that follow this struct
+     * (excluding the 0-terminator).
+     */
+    @UInt32
+    public long atsCount;
+
+    /**
+     * Identity of the receiver or sender.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+
+    @VariableSizeArray(lengthField = "atsCount")
+    public ATSInformation[] atsRest;
+
+    @NestedMessage(newFrame = true)
+    public GnunetMessage.Header payloadHeader;
+
+    /**
+     * The (optional) message body corresponding to payloadHeader.
+     * Not typed as GnunetMessage.Body because the message type may not be 
known by this
+     * peer.
+     */
+    @FillWith @UInt8
+    public byte[] payloadBody;
+
+}

Added: gnunet-java/src/main/java/org/gnunet/core/messages/SendMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/messages/SendMessage.java         
                (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/core/messages/SendMessage.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,70 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Client asking core to transmit a particular message to a particular
+ * target (response to GNUNET_MESSAGE_TYPE_CORE_SEND_READY).
+ */
address@hidden(76)
+public class SendMessage implements GnunetMessage.Body {
+    /**
+     * How important is this message?
+     */
+    @UInt32
+    public long priority;
+
+    /**
+     * By what time would the sender really like to see this
+     * message transmitted?
+     */
+    @NestedMessage
+    public AbsoluteTimeMessage deadline;
+
+    /**
+     * Identity of the intended receiver.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+
+    /**
+     * GNUNET_YES if corking is allowed, GNUNET_NO if not.
+     */
+    @UInt32
+    public int cork;
+
+    /**
+     * Always 0.
+     */
+    @UInt32
+    public int reserved;
+
+    @NestedMessage(newFrame = true)
+    public GnunetMessage payloadMessage;
+
+}

Added: gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageReady.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageReady.java    
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageReady.java    
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,56 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt16;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Core notifying client that it is allowed to now
+ * transmit a message to the given target
+ * (response to GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST).
+ */
address@hidden(75)
+public class SendMessageReady implements GnunetMessage.Body {
+    /**
+     * How many bytes are allowed for transmission?
+     * Guaranteed to be at least as big as the requested size,
+     * or ZERO if the getRequestIdentifier is rejected (will timeout,
+     * peer disconnected, queue full, etc.).
+     */
+    @UInt16
+    public int size;
+
+    /**
+     * smrId from the getRequestIdentifier.
+     */
+    @UInt16
+    public int smrId;
+
+    /**
+     * Identity of the intended target.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageRequest.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageRequest.java  
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/core/messages/SendMessageRequest.java  
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,73 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.core.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt16;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Client notifying core about the maximum-priority
+ * message it has in the queue for a particular target.
+ */
address@hidden(74)
+public class SendMessageRequest implements GnunetMessage.Body {
+    /**
+     * How important is this message?
+     */
+    @UInt32
+    public long priority;
+
+    /**
+     * By what time would the sender really like to see this
+     * message transmitted?
+     */
+    @NestedMessage
+    public AbsoluteTimeMessage deadline;
+
+    /**
+     * Identity of the intended target.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+
+    /**
+     * How large is the client's message queue for this peer?
+     */
+    @UInt32
+    public byte reserved;
+
+    /**
+     * How large is the message?
+     */
+    @UInt16
+    public int size;
+
+    /**
+     * Counter for this peer to match SMRs to replies.
+     */
+    @UInt16
+    public int smrId;
+}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/ClientGetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/ClientGetMessage.java      
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/ClientGetMessage.java      
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,44 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.*;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-
address@hidden(143)
-public class ClientGetMessage implements GnunetMessage.Body {
-    /**
-     * Combination of RouteOption.*
-     */
-    @UInt32
-    public int options;
-    @UInt32
-    public int desiredReplicationLevel;
-    @UInt32
-    public int type;
-    @NestedMessage
-    public HashCode key;
-    @UInt64
-    public long uniqueId;
-    @FillWith @UInt8
-    public byte[] xquery;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java  
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java  
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,42 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UInt64;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-
-/**
- * Sent by the client to the service.
- * Requests that the service stops a 'get' operation.
- */
address@hidden(144)
-public class ClientGetStopMessage implements GnunetMessage.Body {
-    @UInt32
-    public int reserved = 0;
-    @UInt64
-    public long uniqueId;
-    @NestedMessage
-    public HashCode key;
-}

Deleted: 
gnunet-java/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java  
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java  
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,38 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UInt64;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
-
address@hidden(155)
-public class ClientPutConfirmationMessage implements GnunetMessage.Body {
-    @UInt32
-    public int reserved;
-    /**
-     * UID used to identify getRequestIdentifier with the response
-     */
-    @UInt64
-    public long uid;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/ClientPutMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/ClientPutMessage.java      
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/ClientPutMessage.java      
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,54 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.*;
-import org.gnunet.util.AbsoluteTimeMessage;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-
-
address@hidden(142)
-public class ClientPutMessage implements GnunetMessage.Body {
-    /**
-     * Type of data to insert, one of BlockType.*
-     */
-    @UInt32
-    public int type;
-    /**
-     * Combination of RouteOption.*
-     */
-    @UInt32
-    public int options;
-    @UInt32
-    public int desiredReplicationLevel;
-    /**
-     * UID used to identify getRequestIdentifier with the response
-     */
-    @UInt64
-    public long uid;
-    @NestedMessage
-    public AbsoluteTimeMessage expiration;
-    @NestedMessage
-    public HashCode hash;
-    @FillWith @UInt8
-    public byte[] data;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/ClientResultMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/ClientResultMessage.java   
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/ClientResultMessage.java   
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,49 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.*;
-import org.gnunet.util.AbsoluteTimeMessage;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-import org.gnunet.util.PeerIdentity;
-
address@hidden(145)
-public class ClientResultMessage implements GnunetMessage.Body {
-    @UInt32
-    public int type;
-    @UInt32
-    public int putPathLength;
-    @UInt32
-    public int getPathLength;
-    @UInt64
-    public long uid;
-    @NestedMessage
-    public AbsoluteTimeMessage expiration;
-    @NestedMessage
-    public HashCode key;
-    @VariableSizeArray(lengthField = "putPathLength")
-    public PeerIdentity[] putPath;
-    @VariableSizeArray(lengthField = "getPathLength")
-    public PeerIdentity[] getPath;
-    @FillWith @UInt8
-    public byte[] data;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java     
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,75 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.construct.VariableSizeArray;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Message to monitor get requests going through peer, DHT service -> clients.
- */
address@hidden(149)
-public class MonitorGetMessage implements GnunetMessage.Body {
-    /**
-     * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
-     */
-    @UInt32
-    public int options;
-
-    /**
-     * The type of data in the getRequestIdentifier.
-     */
-    @UInt32
-    public int type;
-
-    /**
-     * Hop count
-     */
-    @UInt32
-    public int hopCount;
-
-    /**
-     * Replication level for this message
-     */
-    @UInt32
-    public int desiredReplicationLevel;
-
-    /**
-     * Number of peers recorded in the outgoing path from source to the
-     * storage location of this message.
-     */
-    @UInt32
-    public int getPathLength;
-
-    /**
-     * The key to store the value under.
-     */
-    @NestedMessage
-    public HashCode key;
-
-    @VariableSizeArray(lengthField = "getPathLength")
-    public PeerIdentity[] getPath;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java 
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,72 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.*;
-import org.gnunet.util.AbsoluteTimeMessage;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Message to monitor get results going through peer, DHT service --> clients.
- */
address@hidden(150)
-public class MonitorGetRespMessage implements GnunetMessage.Body {
-    /**
-     * Content type.
-     */
-    @UInt32
-    int type;
-
-    /**
-     * Length of the PUT path that follows (if tracked).
-     */
-    @UInt32
-    int putPathLength;
-
-    /**
-     * Length of the GET path that follows (if tracked).
-     */
-    @UInt32
-    int getPathLength;
-
-    /**
-     * When does the content expire?
-     */
-    @NestedMessage
-    public AbsoluteTimeMessage expiration;
-
-    /**
-     * The key of the corresponding GET getRequestIdentifier.
-     */
-    @NestedMessage
-    public HashCode key;
-
-    @VariableSizeArray(lengthField = "putPathLength")
-    public PeerIdentity[] putPath;
-
-    @VariableSizeArray(lengthField = "getPathLength")
-    public PeerIdentity[] getPath;
-
-    @FillWith @UInt8
-    public byte[] data;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java     
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,82 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.*;
-import org.gnunet.util.AbsoluteTimeMessage;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Message to monitor put requests going through peer, DHT service --> clients.
- */
address@hidden(151)
-public class MonitorPutMessage implements GnunetMessage.Body {
-    /**
-     * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
-     */
-    @UInt32
-    public int options;
-
-    /**
-     * The type of data in the getRequestIdentifier.
-     */
-    @UInt32
-    public int type;
-
-    /**
-     * Hop count so far.
-     */
-    @UInt32
-    public int hopCount;
-
-    /**
-     * Replication level for this message
-     */
-    @UInt32
-    public int desiredReplicationLevel;
-
-    /**
-     * Number of peers recorded in the outgoing path from source to the
-     * storage location of this message.
-     */
-    @UInt32
-    public int putPathLength;
-
-    /**
-     * How long should this data persist?
-     */
-    @NestedMessage
-    public AbsoluteTimeMessage expirationTime;
-
-    /**
-     * The key to store the value under.
-     */
-    @NestedMessage
-    public HashCode key;
-
-    @VariableSizeArray(lengthField = "putPathLength")
-    public PeerIdentity[] putPath;
-
-    @FillWith @UInt8
-    public byte[] data;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java      
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java      
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,70 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.dht;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt16;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
-
-/**
- * Message to getRequestIdentifier monitoring messages, clients --> DHT 
service.
- */
address@hidden(153)
-public class MonitorStartStop implements GnunetMessage.Body {
-    /**
-     * The type of data desired, GNUNET_BLOCK_TYPE_ANY for all.
-     */
-    @UInt32
-    public int type;
-
-    /**
-     * Flag whether to notify about GET messages.
-     */
-    @UInt16
-    public int get;
-
-    /**
-     * Flag whether to notify about GET_REPONSE messages.
-     */
-    @UInt16
-    public int getResp;
-
-    /**
-     * Flag whether to notify about PUT messages.
-     */
-    @UInt16
-    public int put;
-
-    /**
-     * Flag whether to use the provided key to filter messages.
-     */
-    @UInt16
-    public int filterKey;
-
-    /*
-    The key to filter messages by.
-     */
-    @NestedMessage
-    public HashCode key;
-}

Added: gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java     
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,44 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
address@hidden(143)
+public class ClientGetMessage implements GnunetMessage.Body {
+    /**
+     * Combination of RouteOption.*
+     */
+    @UInt32
+    public int options;
+    @UInt32
+    public int desiredReplicationLevel;
+    @UInt32
+    public int type;
+    @NestedMessage
+    public HashCode key;
+    @UInt64
+    public long uniqueId;
+    @FillWith @UInt8
+    public byte[] xquery;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java 
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,42 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+/**
+ * Sent by the client to the service.
+ * Requests that the service stops a 'get' operation.
+ */
address@hidden(144)
+public class ClientGetStopMessage implements GnunetMessage.Body {
+    @UInt32
+    public int reserved = 0;
+    @UInt64
+    public long uniqueId;
+    @NestedMessage
+    public HashCode key;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
                         (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java
 2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,38 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+
address@hidden(155)
+public class ClientPutConfirmationMessage implements GnunetMessage.Body {
+    @UInt32
+    public int reserved;
+    /**
+     * UID used to identify getRequestIdentifier with the response
+     */
+    @UInt64
+    public long uid;
+}

Added: gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java     
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,54 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+
address@hidden(142)
+public class ClientPutMessage implements GnunetMessage.Body {
+    /**
+     * Type of data to insert, one of BlockType.*
+     */
+    @UInt32
+    public int type;
+    /**
+     * Combination of RouteOption.*
+     */
+    @UInt32
+    public int options;
+    @UInt32
+    public int desiredReplicationLevel;
+    /**
+     * UID used to identify getRequestIdentifier with the response
+     */
+    @UInt64
+    public long uid;
+    @NestedMessage
+    public AbsoluteTimeMessage expiration;
+    @NestedMessage
+    public HashCode hash;
+    @FillWith @UInt8
+    public byte[] data;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java  
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java  
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,49 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
address@hidden(145)
+public class ClientResultMessage implements GnunetMessage.Body {
+    @UInt32
+    public int type;
+    @UInt32
+    public int putPathLength;
+    @UInt32
+    public int getPathLength;
+    @UInt64
+    public long uid;
+    @NestedMessage
+    public AbsoluteTimeMessage expiration;
+    @NestedMessage
+    public HashCode key;
+    @VariableSizeArray(lengthField = "putPathLength")
+    public PeerIdentity[] putPath;
+    @VariableSizeArray(lengthField = "getPathLength")
+    public PeerIdentity[] getPath;
+    @FillWith @UInt8
+    public byte[] data;
+}

Added: gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java    
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java    
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,75 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.VariableSizeArray;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message to monitor get requests going through peer, DHT service -> clients.
+ */
address@hidden(149)
+public class MonitorGetMessage implements GnunetMessage.Body {
+    /**
+     * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+     */
+    @UInt32
+    public int options;
+
+    /**
+     * The type of data in the getRequestIdentifier.
+     */
+    @UInt32
+    public int type;
+
+    /**
+     * Hop count
+     */
+    @UInt32
+    public int hopCount;
+
+    /**
+     * Replication level for this message
+     */
+    @UInt32
+    public int desiredReplicationLevel;
+
+    /**
+     * Number of peers recorded in the outgoing path from source to the
+     * storage location of this message.
+     */
+    @UInt32
+    public int getPathLength;
+
+    /**
+     * The key to store the value under.
+     */
+    @NestedMessage
+    public HashCode key;
+
+    @VariableSizeArray(lengthField = "getPathLength")
+    public PeerIdentity[] getPath;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java    
                            (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java    
    2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,72 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message to monitor get results going through peer, DHT service --> clients.
+ */
address@hidden(150)
+public class MonitorGetRespMessage implements GnunetMessage.Body {
+    /**
+     * Content type.
+     */
+    @UInt32
+    public int type;
+
+    /**
+     * Length of the PUT path that follows (if tracked).
+     */
+    @UInt32
+    public int putPathLength;
+
+    /**
+     * Length of the GET path that follows (if tracked).
+     */
+    @UInt32
+    public int getPathLength;
+
+    /**
+     * When does the content expire?
+     */
+    @NestedMessage
+    public AbsoluteTimeMessage expiration;
+
+    /**
+     * The key of the corresponding GET getRequestIdentifier.
+     */
+    @NestedMessage
+    public HashCode key;
+
+    @VariableSizeArray(lengthField = "putPathLength")
+    public PeerIdentity[] putPath;
+
+    @VariableSizeArray(lengthField = "getPathLength")
+    public PeerIdentity[] getPath;
+
+    @FillWith @UInt8
+    public byte[] data;
+}

Added: gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java    
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java    
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,82 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message to monitor put requests going through peer, DHT service --> clients.
+ */
address@hidden(151)
+public class MonitorPutMessage implements GnunetMessage.Body {
+    /**
+     * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+     */
+    @UInt32
+    public int options;
+
+    /**
+     * The type of data in the getRequestIdentifier.
+     */
+    @UInt32
+    public int type;
+
+    /**
+     * Hop count so far.
+     */
+    @UInt32
+    public int hopCount;
+
+    /**
+     * Replication level for this message
+     */
+    @UInt32
+    public int desiredReplicationLevel;
+
+    /**
+     * Number of peers recorded in the outgoing path from source to the
+     * storage location of this message.
+     */
+    @UInt32
+    public int putPathLength;
+
+    /**
+     * How long should this data persist?
+     */
+    @NestedMessage
+    public AbsoluteTimeMessage expirationTime;
+
+    /**
+     * The key to store the value under.
+     */
+    @NestedMessage
+    public HashCode key;
+
+    @VariableSizeArray(lengthField = "putPathLength")
+    public PeerIdentity[] putPath;
+
+    @FillWith @UInt8
+    public byte[] data;
+}

Added: gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java     
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,70 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.dht.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt16;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+/**
+ * Message to getRequestIdentifier monitoring messages, clients --> DHT 
service.
+ */
address@hidden(153)
+public class MonitorStartStop implements GnunetMessage.Body {
+    /**
+     * The type of data desired, GNUNET_BLOCK_TYPE_ANY for all.
+     */
+    @UInt32
+    public int type;
+
+    /**
+     * Flag whether to notify about GET messages.
+     */
+    @UInt16
+    public int get;
+
+    /**
+     * Flag whether to notify about GET_REPONSE messages.
+     */
+    @UInt16
+    public int getResp;
+
+    /**
+     * Flag whether to notify about PUT messages.
+     */
+    @UInt16
+    public int put;
+
+    /**
+     * Flag whether to use the provided key to filter messages.
+     */
+    @UInt16
+    public int filterKey;
+
+    /*
+    The key to filter messages by.
+     */
+    @NestedMessage
+    public HashCode key;
+}

Deleted: gnunet-java/src/main/java/org/gnunet/gns/GNS.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/gns/GNS.java   2014-04-08 09:53:18 UTC 
(rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/gns/GNS.java   2014-04-08 10:00:26 UTC 
(rev 32968)
@@ -1,150 +0,0 @@
-/*
- This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
-
-  GNUnet is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
-  by the Free Software Foundation; either version 3, or (at your
-  option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.gns;
-
-import org.gnunet.gns.messages.ClientLookupMessage;
-import org.gnunet.gns.messages.ClientLookupResultMessage;
-import org.gnunet.mq.Envelope;
-import org.gnunet.requests.MatchingRequestContainer;
-import org.gnunet.requests.Request;
-import org.gnunet.requests.RequestIdentifier;
-import org.gnunet.util.Cancelable;
-import org.gnunet.util.Client;
-import org.gnunet.util.Configuration;
-import org.gnunet.util.RunaboutMessageReceiver;
-import org.gnunet.util.crypto.EcdsaPrivateKey;
-import org.gnunet.util.crypto.EcdsaPublicKey;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * API to the GNUnet name system.
- */
-public class GNS {
-    private static final Logger logger = LoggerFactory
-            .getLogger(GNS.class);
-    /**
-     * All pending and active lookup requests.
-     */
-    private MatchingRequestContainer<Long, LookupRequest> lookupRequests;
-
-    private class LookupRequest extends Request {
-        long uid;
-        String name;
-        EcdsaPublicKey zone;
-        int type;
-        boolean onlyCached;
-        EcdsaPrivateKey shortenZoneKey;
-        LookupResultProcessor proc;
-
-        public LookupRequest(String name,
-                             EcdsaPublicKey zone,
-                             int type,
-                             boolean onlyCached,
-                             EcdsaPrivateKey shortenZoneKey,
-                             LookupResultProcessor proc) {
-            this.uid = nextUID++;
-            this.name = name;
-            this.zone = zone;
-            this.type = type;
-            this.onlyCached = onlyCached;
-            this.shortenZoneKey = shortenZoneKey;
-            this.proc = proc;
-        }
-
-        @Override
-        public Envelope assembleRequest() {
-            ClientLookupMessage m = new ClientLookupMessage();
-            if (null != shortenZoneKey) {
-                m.haveKey = 1;
-            } else {
-                m.shortenKey = shortenZoneKey;
-            }
-            m.id = uid;
-            m.name = name;
-            m.onlyCached = onlyCached ? 1 : 0;
-            m.type = type;
-            m.zone = zone;
-            return new Envelope(m);
-        }
-    }
-
-    public class GNSMessageReceiver extends RunaboutMessageReceiver {
-        public void visit(ClientLookupResultMessage m) {
-            RequestIdentifier<LookupRequest> r = 
lookupRequests.getRequestIdentifier(m.id);
-            if (null == r) {
-                logger.warn("no matching getRequestIdentifier for lookup 
result");
-                return;
-            }
-            r.getRequest().proc.process(m.records);
-            r.retire();
-        }
-
-        @Override
-        public void handleError() {
-        }
-    }
-
-    /**
-     * Request ID for lookup requests.
-     */
-    private long nextUID = 1;
-
-    /**
-     * Client connected to the GNS service.
-     */
-    private Client client;
-
-    /**
-     * Connect to the GNS service
-     *
-     * @param cfg configuration to use
-     */
-    public GNS(Configuration cfg) {
-        client = new Client("gns", cfg);
-        lookupRequests = new MatchingRequestContainer<Long, 
LookupRequest>(client);
-        client.installReceiver(new GNSMessageReceiver());
-    }
-
-    /**
-     * Perform an asynchronous lookup operation on the GNS.
-     *
-     * @param name the name to look up
-     * @param zone zone to look in
-     * @param type the GNS record type to look for
-     * @param onlyCached true to only check locally (not in the DHT)
-     * @param shortenZoneKey the private key of the shorten zone (can be NULL);
-     *                    specify to enable automatic shortening (given a PSEU
-     *                    record, if a given pseudonym is not yet used in the
-     *                    shorten zone, we automatically add the respective 
zone
-     *                    under that name)
-     * @param proc function to call on result
-     * @return handle to the queued getRequestIdentifier
-     */
-    public Cancelable lookup(String name,
-                             EcdsaPublicKey zone,
-                             int type, boolean onlyCached,
-                             EcdsaPrivateKey shortenZoneKey,
-                             LookupResultProcessor proc) {
-        LookupRequest r = new LookupRequest(name, zone, type, onlyCached, 
shortenZoneKey, proc);
-        return lookupRequests.addRequest(r.uid, r);
-    }
-}

Added: gnunet-java/src/main/java/org/gnunet/mesh/ChannelEndHandler.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/ChannelEndHandler.java            
                (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/mesh/ChannelEndHandler.java    
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,17 @@
+package org.gnunet.mesh;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public interface ChannelEndHandler {
+    /**
+     * Called once a channel has been destroyed.
+     * The given channel can not be used anymore, and is only provided
+     * to identify the channel that has been destroyed.
+     *
+     * @param channel channel that has been destroyed
+     */
+    void onChannelEnd(Mesh.Channel channel);
+}

Deleted: gnunet-java/src/main/java/org/gnunet/mesh/TunnelEndHandler.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/TunnelEndHandler.java     
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/mesh/TunnelEndHandler.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,17 +0,0 @@
-package org.gnunet.mesh;
-
-/**
- * ...
- *
- * @author Florian Dold
- */
-public interface TunnelEndHandler {
-    /**
-     * Called once a channel has been destroyed.
-     * The given channel can not be used anymore, and is only provided
-     * to identify the channel that has been destroyed.
-     *
-     * @param channel channel that has been destroyed
-     */
-    void onChannelEnd(Mesh.Channel channel);
-}

Deleted: gnunet-java/src/main/java/org/gnunet/peerinfo/InfoEnd.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/InfoEnd.java  2014-04-08 
09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/InfoEnd.java  2014-04-08 
10:00:26 UTC (rev 32968)
@@ -1,14 +0,0 @@
-package org.gnunet.peerinfo;
-
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
-/**
- * ...
- *
- * @author Florian Dold
- */
address@hidden(333)
-public class InfoEnd implements GnunetMessage.Body {
-
-}

Deleted: gnunet-java/src/main/java/org/gnunet/peerinfo/InfoMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/InfoMessage.java      
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/InfoMessage.java      
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,50 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.peerinfo;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.hello.HelloMessage;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * @author Florian Dold
- */
address@hidden(332)
-public class InfoMessage implements GnunetMessage.Body {
-    /**
-     * Always zero.
-     */
-    @UInt32
-    public int reserved;
-    /**
-     * About which peer are we talking here?
-     */
-    @NestedMessage
-    public PeerIdentity peerIdentity;
-    /**
-     * HELLO of the peer, null if no HELLO present.
-     */
-    @NestedMessage(optional = true)
-    public HelloMessage hello;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java      
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java      
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,37 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.peerinfo;
-
-import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
-/**
- * Message requesting a listing of all known peers,
- * possibly restricted to the specified peer identity.
- *
- * @author Florian Dold
- */
address@hidden(331)
-public class ListAllPeersMessage implements GnunetMessage.Body {
-    @UInt32
-    public int includeFriendOnly;
-}

Deleted: gnunet-java/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java  
2014-04-08 09:53:18 UTC (rev 32967)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java  
2014-04-08 10:00:26 UTC (rev 32968)
@@ -1,39 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.peerinfo;
-
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
-import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
-
-/**
- * Message requesting a listing of all known peers,
- * possibly restricted to the specified peer identity.
- *
- * @author Florian Dold
- */
-public class ListPeerMessage implements GnunetMessage.Body {
-    @UInt32
-    public int reserved;
-    @NestedMessage
-    public PeerIdentity peer;
-}

Added: gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java         
                (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,14 @@
+package org.gnunet.peerinfo.messages;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
address@hidden(333)
+public class InfoEnd implements GnunetMessage.Body {
+
+}

Added: gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java     
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java     
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,50 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.peerinfo.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.hello.HelloMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * @author Florian Dold
+ */
address@hidden(332)
+public class InfoMessage implements GnunetMessage.Body {
+    /**
+     * Always zero.
+     */
+    @UInt32
+    public int reserved;
+    /**
+     * About which peer are we talking here?
+     */
+    @NestedMessage
+    public PeerIdentity peerIdentity;
+    /**
+     * HELLO of the peer, null if no HELLO present.
+     */
+    @NestedMessage(optional = true)
+    public HelloMessage hello;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java
===================================================================
--- 
gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java 
                            (rev 0)
+++ 
gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java 
    2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,37 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.peerinfo.messages;
+
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+/**
+ * Message requesting a listing of all known peers,
+ * possibly restricted to the specified peer identity.
+ *
+ * @author Florian Dold
+ */
address@hidden(331)
+public class ListAllPeersMessage implements GnunetMessage.Body {
+    @UInt32
+    public int includeFriendOnly;
+}

Added: 
gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java 
                        (rev 0)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java 
2014-04-08 10:00:26 UTC (rev 32968)
@@ -0,0 +1,39 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.peerinfo.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * Message requesting a listing of all known peers,
+ * possibly restricted to the specified peer identity.
+ *
+ * @author Florian Dold
+ */
+public class ListPeerMessage implements GnunetMessage.Body {
+    @UInt32
+    public int reserved;
+    @NestedMessage
+    public PeerIdentity peer;
+}




reply via email to

[Prev in Thread] Current Thread [Next in Thread]