- adapted source tree structure to gradle/maven conventions

- added gradle wrapper
- fixes to adapt to GNUnet changes (new time unit, ...)
- helper process in util
- started implementing testbed
- skeleton for voting tools
- use new mq api
- implemented some more transport api
- mesh

17 files changed, 1043 insertions, 0 deletions

diff --git a/src/main/java/org/gnunet/core/ConnectHandler.java b/src/main/java/org/gnunet/core/ConnectHandler.java
new file mode 100644
index 0000000..a36d798
--- /dev/null
+++ b/src/main/java/org/gnunet/core/ConnectHandler.java
@@ -0,0 +1,30 @@
+/*
+ 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.util.PeerIdentity;
+
+/**
+ * Called when a new peer (with a compatible set of messages) connects to core
+ */
+public interface ConnectHandler {
+    void onConnect(PeerIdentity peerIdentity);
+}
diff --git a/src/main/java/org/gnunet/core/ConnectNotifyMessage.java b/src/main/java/org/gnunet/core/ConnectNotifyMessage.java
new file mode 100644
index 0000000..4eafe02
--- /dev/null
+++ b/src/main/java/org/gnunet/core/ConnectNotifyMessage.java
@@ -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;
+
+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.
+ */
+@UnionCase(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;
+
+}
diff --git a/src/main/java/org/gnunet/core/Core.java b/src/main/java/org/gnunet/core/Core.java
new file mode 100644
index 0000000..2895e41
--- /dev/null
+++ b/src/main/java/org/gnunet/core/Core.java
@@ -0,0 +1,347 @@
+/*
+ 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 com.google.common.collect.Maps;
+import org.gnunet.construct.Construct;
+import org.gnunet.construct.MessageLoader;
+import org.gnunet.mq.Envelope;
+import org.gnunet.requests.MatchingRequestContainer;
+import org.gnunet.requests.RequestContainer;
+import org.gnunet.util.*;
+import org.grothoff.Runabout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+
+
+/**
+ * API for the gnunet core service.
+ * <p/>
+ * Sends messages to connected peers.
+ */
+public class Core {
+    /**
+     * Logger for org.gnunet.Core.
+     */
+    private static final Logger logger = LoggerFactory
+            .getLogger(Core.class);
+
+    /**
+     * Client for connecting to the core service
+     */
+    private final Client client;
+
+    /*
+     * set to null once connected for the first time
+     */
+    private InitCallback initCallback;
+
+    /*
+     * Callback for traffic notifications. null if not interested.
+     */
+    private HeaderNotify notifyOutboundHeaders;
+
+    /*
+     * Callback for traffic notifications. null if not interested.
+     */
+    private HeaderNotify notifyInboundHeaders;
+
+    /*
+     * Callback for traffic notifications. null if not interested.
+     */
+    private MessageNotify notifyOutboundMessages;
+
+    /*
+     * Callback for traffic notifications. null if not interested.
+     */
+    private MessageNotify notifyInboundMessages;
+
+    /*
+     * Callbacks for connect events
+     */
+    private ConnectHandler connectHandler;
+
+    /**
+     * Callback for disconnect events.
+     */
+    private DisconnectHandler disconnectHandler;
+
+    /**
+     * Messages we are interested in.
+     * Per default we are interested in all messages => specific interest set is empty.
+     */
+    private int[] interested = new int[0];
+
+    /**
+     * Handler for the messages we are interested in.
+     */
+    private Runabout messageHandler;
+
+    /**
+     * Peers that we were notified about being connected to them.
+     * Every connected peer is mapped to a generator for unique request IDs.
+     */
+    private HashMap<PeerIdentity, Integer> connectedPeers = Maps.newHashMap();
+
+    /**
+     * Request container for notify transmit requests.
+     */
+    private MatchingRequestContainer<RequestIdentification, NotifyTransmitReadyRequest> ntr_requests;
+
+    public static class NotifyTransmitReadyRequest extends RequestContainer.Request {
+        private final int size;
+        final public PeerIdentity target;
+        final public long priority;
+        public int smrId;
+        final public MessageTransmitter transmitter;
+        final public AbsoluteTime deadline;
+
+        public NotifyTransmitReadyRequest(int priority, int size, PeerIdentity target, RelativeTime timeout, MessageTransmitter transmitter) {
+            this.deadline = timeout.toAbsolute();
+            this.priority = priority;
+            this.size = size;
+            this.target = target;
+            this.transmitter = transmitter;
+        }
+
+        @Override
+        public Envelope assembleRequest() {
+            SendMessageRequest m = new SendMessageRequest();
+            m.peer = target;
+            m.smrId = smrId;
+            m.priority = priority;
+            m.size = size;
+            m.deadline = deadline.asMessage();
+            return new Envelope(m);
+        }
+
+        public void cancel() {
+            // do nothing
+        }
+    }
+
+
+    public final class CoreReceiver extends RunaboutMessageReceiver {
+        public void visit(InitReplyMessage m) {
+            PeerIdentity myIdentity = m.myIdentity;
+            connectedPeers.put(myIdentity, 1);
+
+            if (initCallback != null) {
+                initCallback.onInit(m.myIdentity);
+                initCallback = null;
+            }
+        }
+
+        public void visit(ConnectNotifyMessage m) {
+            if (connectHandler != null) {
+                connectHandler.onConnect(m.peer);
+            }
+        }
+
+        public void visit(DisconnectNotifyMessage m) {
+            if (disconnectHandler != null) {
+                disconnectHandler.onDisconnect(m.peer);
+            }
+        }
+
+        public void visit(NotifyInboundTrafficMessage m) {
+            boolean found = false;
+            if (notifyInboundHeaders != null) {
+                notifyInboundHeaders.notify(m.payloadHeader);
+            }
+            if (notifyInboundMessages != null) {
+                // todo: call corresponding notify on notifyInboundMessages
+            }
+
+            for (int i : interested) {
+                if (i == m.payloadHeader.messageType) {
+                    found = true;
+                    break;
+                }
+            }
+            if (found) {
+                Class bodyClass = MessageLoader.getUnionClass(GnunetMessage.Body.class, m.payloadHeader.messageType);
+                @SuppressWarnings("unchecked")
+                GnunetMessage.Body b = (GnunetMessage.Body) Construct.parseAs(m.payloadBody, bodyClass);
+                messageHandler.visitAppropriate(b);
+            }
+        }
+
+        public void visit(NotifyOutboundTrafficMessage m) {
+            if (notifyOutboundHeaders != null) {
+                notifyOutboundHeaders.notify(m.payloadHeader);
+            }
+            if (notifyOutboundMessages != null) {
+                // todo
+            }
+        }
+
+        public void visit(SendMessageReady m) {
+            RequestIdentification rid = new RequestIdentification(m.smrId, m.peer);
+            NotifyTransmitReadyRequest req = ntr_requests.getRequest(rid);
+
+            final SendMessage sm = new SendMessage();
+            sm.cork = 0;
+            sm.peer = req.target;
+            sm.priority = req.priority;
+            sm.deadline = req.deadline.asMessage();
+
+            req.transmitter.transmit(new Connection.MessageSink() {
+                boolean sent;
+                @Override
+                public void send(GnunetMessage.Body m) {
+                    if (sent) {
+                        throw new AssertionError("sending multiple messages not supported");
+                    }
+                    sm.payloadMessage =  GnunetMessage.fromBody(m);
+                    sent = true;
+                }
+            });
+
+
+            if (sm.payloadMessage == null)
+                throw new AssertionError();
+
+            client.send(sm);
+        }
+
+        @Override
+        public void visitDefault(Object o) {
+            logger.warn("received unexpected message from core: {}", o.getClass());
+        }
+
+        @Override
+        public void handleError() {
+            if (disconnectHandler != null) {
+                for (PeerIdentity e : connectedPeers.keySet()) {
+                    disconnectHandler.onDisconnect(e);
+                }
+            }
+            connectedPeers.clear();
+        }
+    }
+
+    public Core(Configuration cfg) {
+        client = new Client("core", cfg);
+        client.installReceiver(new CoreReceiver());
+        ntr_requests = new MatchingRequestContainer<RequestIdentification, NotifyTransmitReadyRequest>(client);
+    }
+
+    /**
+     * Send to the service which messages are we interested in.
+     *
+     * @param initCallback called after the init message has been sent
+     */
+    public void init(InitCallback initCallback) {
+        this.initCallback = initCallback;
+        InitMessage initMessage = new InitMessage();
+
+        initMessage.interested = interested;
+        initMessage.options = 0;
+
+        for (int i : interested) {
+            logger.debug("we are interested in " + i);
+        }
+        client.sendPrefered(initMessage);
+    }
+
+    /**
+     * Ask the core to call "notify" once it is ready to transmit the
+     * given number of bytes to the specified "target".    Must only be
+     * called after a connection to the respective peer has been
+     * established (and the client has been informed about this).
+     *
+     * @param priority    how important is the message?
+     * @param maxdelay    how long can the message wait?
+     * @param target      the identity of the receiver
+     * @param size        the size of the message we want to transmit
+     * @param transmitter called once the core service is ready to send message
+     * @return a handle to cancel the notification
+     */
+    public Cancelable notifyTransmitReady(int priority, RelativeTime maxdelay,
+                                          PeerIdentity target, int size, final MessageTransmitter transmitter) {
+        if (!connectedPeers.containsKey(target)) {
+            throw new AssertionError("notifyTransmitReady called for unconnected peer");
+        }
+        int id = connectedPeers.get(target);
+        connectedPeers.put(target, id+1);
+        NotifyTransmitReadyRequest notifyRequest = new NotifyTransmitReadyRequest(priority, size, target, maxdelay, transmitter);
+        notifyRequest.smrId = id;
+        RequestIdentification rid = new RequestIdentification(notifyRequest.smrId, target);
+        return ntr_requests.addRequest(rid, notifyRequest);
+    }
+
+    /**
+     * Observe outgoing message headers from core.
+     * @param h callback
+     */
+    public void observeOutboundHeaders(HeaderNotify h) {
+        this.notifyOutboundHeaders = h;
+    }
+
+    public void observeInboundHeaders(HeaderNotify h) {
+        this.notifyInboundHeaders = h;
+    }
+
+    public void observeInboundMessages(MessageNotify h) {
+        this.notifyInboundMessages = h;
+    }
+
+    public void observeOutboundMessages(MessageNotify h) {
+        this.notifyOutboundMessages = h;
+    }
+
+    public void observeConnect(ConnectHandler connectHandler) {
+        this.connectHandler = connectHandler;
+    }
+
+    public void observeDisconnect(DisconnectHandler disconnectHandler) {
+        this.disconnectHandler = disconnectHandler;
+    }
+
+    /**
+     * Handle all incoming messages with the specified runabout.
+     * Has to be called before init, as the service has to know which messages we
+     * are interested in.
+     */
+    public void setMessageHandler(Runabout runabout) {
+        if (messageHandler != null) {
+            throw new AssertionError("Core can have only on message handler");
+        }
+        if (client.isConnected()) {
+            // todo: shouldn't we just reconnect?
+            throw new AssertionError("can set message handler only if not yet connected");
+        }
+        messageHandler = runabout;
+        interested = RunaboutUtil.getRunaboutMessageTypes(runabout);
+    }
+
+    /**
+     * Disconnect from the core service. This function can only
+     * be called *after* all pending notifyTransmitReady
+     * requests have been explicitly cancelled.
+     */
+    public void disconnect() {
+        client.disconnect();
+    }
+}
diff --git a/src/main/java/org/gnunet/core/DisconnectHandler.java b/src/main/java/org/gnunet/core/DisconnectHandler.java
new file mode 100644
index 0000000..c7ca407
--- /dev/null
+++ b/src/main/java/org/gnunet/core/DisconnectHandler.java
@@ -0,0 +1,30 @@
+/*
+ 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.util.PeerIdentity;
+
+/**
+ * Called when a peer disconnects from the core.
+ */
+public interface DisconnectHandler {
+    void onDisconnect(PeerIdentity peerIdentity);
+}
diff --git a/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java b/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java
new file mode 100644
index 0000000..e4c3209
--- /dev/null
+++ b/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java
@@ -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;
+
+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.
+ */
+@UnionCase(68)
+public class DisconnectNotifyMessage implements GnunetMessage.Body {
+    /**
+     * Always zero.
+     */
+    @UInt32
+    public int reserved;
+
+    /**
+     * Identity of the connecting peer.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+}
diff --git a/src/main/java/org/gnunet/core/HeaderNotify.java b/src/main/java/org/gnunet/core/HeaderNotify.java
new file mode 100644
index 0000000..4f536e3
--- /dev/null
+++ b/src/main/java/org/gnunet/core/HeaderNotify.java
@@ -0,0 +1,30 @@
+/*
+ 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.util.GnunetMessage;
+
+/**
+ *
+ */
+public interface HeaderNotify {
+    void notify(GnunetMessage.Header header);
+}
diff --git a/src/main/java/org/gnunet/core/InitCallback.java b/src/main/java/org/gnunet/core/InitCallback.java
new file mode 100644
index 0000000..889f8cf
--- /dev/null
+++ b/src/main/java/org/gnunet/core/InitCallback.java
@@ -0,0 +1,30 @@
+/*
+ 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.util.PeerIdentity;
+
+/**
+ * Called once the handshake with core was successful.
+ */
+public interface InitCallback {
+    void onInit(PeerIdentity myIdentity);
+}
diff --git a/src/main/java/org/gnunet/core/InitMessage.java b/src/main/java/org/gnunet/core/InitMessage.java
new file mode 100644
index 0000000..5546088
--- /dev/null
+++ b/src/main/java/org/gnunet/core/InitMessage.java
@@ -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;
+
+import org.gnunet.construct.IntegerFill;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+
+
+@UnionCase(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;
+}
diff --git a/src/main/java/org/gnunet/core/InitReplyMessage.java b/src/main/java/org/gnunet/core/InitReplyMessage.java
new file mode 100644
index 0000000..02e8eef
--- /dev/null
+++ b/src/main/java/org/gnunet/core/InitReplyMessage.java
@@ -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;
+
+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;
+
+
+@UnionCase(65)
+public class InitReplyMessage implements GnunetMessage.Body {
+    @UInt32
+    public int reserved = 0;
+    /**
+     * pubkey of the local peer
+     */
+    @NestedMessage
+    public PeerIdentity myIdentity;
+}
diff --git a/src/main/java/org/gnunet/core/MessageNotify.java b/src/main/java/org/gnunet/core/MessageNotify.java
new file mode 100644
index 0000000..b14ce29
--- /dev/null
+++ b/src/main/java/org/gnunet/core/MessageNotify.java
@@ -0,0 +1,28 @@
+/*
+ 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.util.GnunetMessage;
+
+
+public interface MessageNotify {
+    void notify(GnunetMessage messageBody);
+}
diff --git a/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java b/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
new file mode 100644
index 0000000..2bdd428
--- /dev/null
+++ b/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
@@ -0,0 +1,47 @@
+/*
+ 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;
+
+
+@UnionCase(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;
+}
diff --git a/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java b/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
new file mode 100644
index 0000000..900f8be
--- /dev/null
+++ b/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
@@ -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;
+
+import org.gnunet.construct.*;
+import org.gnunet.util.ATSInformation;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+
+
+@UnionCase(71)
+public class NotifyOutboundTrafficMessage implements GnunetMessage.Body {
+    /**
+     * Number of ATS key-value pairs that follow this struct
+     * (excluding the 0-terminator).
+     */
+    @UInt32
+    public long ats_count;
+
+    /**
+     * Identity of the receiver or sender.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+
+    @VariableSizeArray(lengthField = "ats_count")
+    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;
+
+}
diff --git a/src/main/java/org/gnunet/core/RequestIdentification.java b/src/main/java/org/gnunet/core/RequestIdentification.java
new file mode 100644
index 0000000..4f6a734
--- /dev/null
+++ b/src/main/java/org/gnunet/core/RequestIdentification.java
@@ -0,0 +1,35 @@
+package org.gnunet.core;
+
+import org.gnunet.peerinfo.PeerInfo;
+import org.gnunet.util.PeerIdentity;
+
+
+final class RequestIdentification {
+    public final int requestIdentifier;
+    public final PeerIdentity peerIdentity;
+
+    public RequestIdentification(int requestIdentifier, PeerIdentity peerIdentity) {
+        this.requestIdentifier = requestIdentifier;
+        this.peerIdentity = peerIdentity;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        RequestIdentification that = (RequestIdentification) o;
+
+        if (requestIdentifier != that.requestIdentifier) return false;
+        if (!peerIdentity.equals(that.peerIdentity)) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = requestIdentifier;
+        result = 31 * result + peerIdentity.hashCode();
+        return result;
+    }
+}
diff --git a/src/main/java/org/gnunet/core/SendMessage.java b/src/main/java/org/gnunet/core/SendMessage.java
new file mode 100644
index 0000000..e4c6215
--- /dev/null
+++ b/src/main/java/org/gnunet/core/SendMessage.java
@@ -0,0 +1,71 @@
+/*
+ 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.UInt64;
+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).
+ */
+@UnionCase(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.
+     */
+    @UInt64
+    public int reserved;
+
+    @NestedMessage(newFrame = true)
+    public GnunetMessage payloadMessage;
+
+}
diff --git a/src/main/java/org/gnunet/core/SendMessageReady.java b/src/main/java/org/gnunet/core/SendMessageReady.java
new file mode 100644
index 0000000..aa5bf44
--- /dev/null
+++ b/src/main/java/org/gnunet/core/SendMessageReady.java
@@ -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;
+
+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).
+ */
+@UnionCase(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 request is rejected (will timeout,
+     * peer disconnected, queue full, etc.).
+     */
+    @UInt16
+    public int size;
+
+    /**
+     * smrId from the request.
+     */
+    @UInt16
+    public int smrId;
+
+    /**
+     * Identity of the intended target.
+     */
+    @NestedMessage
+    public PeerIdentity peer;
+}
diff --git a/src/main/java/org/gnunet/core/SendMessageRequest.java b/src/main/java/org/gnunet/core/SendMessageRequest.java
new file mode 100644
index 0000000..7a95127
--- /dev/null
+++ b/src/main/java/org/gnunet/core/SendMessageRequest.java
@@ -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;
+
+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.
+ */
+@UnionCase(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;
+}
diff --git a/src/main/java/org/gnunet/core/package-info.java b/src/main/java/org/gnunet/core/package-info.java
new file mode 100644
index 0000000..64e5d59
--- /dev/null
+++ b/src/main/java/org/gnunet/core/package-info.java
@@ -0,0 +1,24 @@
+/*
+ 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.
+ */
+
+/**
+ * API for the gnunet core service.
+ */
+package org.gnunet.core;