- use identity in voting

- group certificate tool instead of ca daemon
- consensus api fully implemented, consensus+testbed test
- authorities use consensus
- some progress on transport api

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
index 597be94..6efaf95 100644
--- a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
+++ b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
@@ -62,11 +62,17 @@ public class MessageStreamTokenizer {
         logger.debug("dispatching message");
         if (found) {
             GnunetMessage msg;
+            int oldPos = buffer.position();
             try {
                 msg = Construct.parseAs(buffer, GnunetMessage.class);
             } catch (OutOfMemoryError e) {
                 throw new OutOfMemoryError("oom while parsing " + unionClass);
             }
+            int parsedSize = buffer.position() - oldPos;
+            if (parsedSize != msg.header.messageSize) {
+                throw new AssertionError("mismatch between parsed message and header for " +
+                  msg.body.getClass());
+            }
             mstCalllback.onKnownMessage(msg);
         } else {
             UnknownMessageBody b = new UnknownMessageBody();
@@ -82,14 +88,14 @@ public class MessageStreamTokenizer {
      * @return true if message could be extracted, false if not enough data is available
      */
     public boolean extractOne() {
-        System.out.println("trying to extract message from buffer");
         if (msgh == null && buffer.position() >= 4) {
             // prepare for reading
             buffer.flip();
             msgh = Construct.parseAs(buffer, GnunetMessage.Header.class);
             // undo read
             buffer.position(0);
-            logger.debug("got header in mst, (" + buffer.limit() + "/" + msgh.messageSize + " read)");
+            logger.debug("got header in mst (t: " + msgh.messageType + ", s: " + msgh.messageSize +
+                    " (" + buffer.limit() + "/" + msgh.messageSize + " read)");
             if (buffer.capacity() < msgh.messageSize) {
                 ByteBuffer newBuf = ByteBuffer.allocate(msgh.messageSize);
                 newBuf.put(buffer);
@@ -120,6 +126,7 @@ public class MessageStreamTokenizer {
     public int readFrom(ReadableByteChannel source, boolean oneShot) throws IOException {
         int n;
         n = source.read(buffer);
+        logger.debug("read {} bytes from channel", n);
         if (oneShot) {
             extractOne();
         }