summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2014-08-04 18:05:05 +0000
committerFlorian Dold <florian.dold@gmail.com>2014-08-04 18:05:05 +0000
commit78f5dc56bc9c3a515e39aaed6b97a9975fe6aa8c (patch)
treefd02544bdd58b6e07dd599cf0b313b9dc1bfae30
parent75cdec0268bc255bb3e22b0e0b65965ac7964874 (diff)
missing message types in transport
-rw-r--r--ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jarbin509810 -> 511509 bytes
-rw-r--r--ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar.sha12
-rw-r--r--ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml2
-rw-r--r--ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml.sha12
-rw-r--r--src/main/java/org/gnunet/transport/Transport.java12
-rw-r--r--src/main/resources/org/gnunet/construct/MsgMap.txt9
6 files changed, 19 insertions, 8 deletions
diff --git a/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar b/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar
index 2ee05f5..8cbc0d3 100644
--- a/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar
+++ b/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar
Binary files differ
diff --git a/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar.sha1 b/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar.sha1
index 705525b..c5f6f56 100644
--- a/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar.sha1
+++ b/ivy-repo/org.gnunet/gnunet-java/svn/gnunet-java-svn.jar.sha1
@@ -1 +1 @@
-5a2d583a43e0a2c37658cc859692bd372ae4ec7d \ No newline at end of file
+b8e9271c7f6e62d80fa3410ab733e8ebf56c9fa0 \ No newline at end of file
diff --git a/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml b/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml
index b305d48..eb4ab62 100644
--- a/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml
+++ b/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="2.0">
- <info organisation="org.gnunet" module="gnunet-java" revision="svn" status="integration" publication="20140804185816"/>
+ <info organisation="org.gnunet" module="gnunet-java" revision="svn" status="integration" publication="20140804200423"/>
<configurations>
<conf name="default" visibility="public" extends="runtime"/>
<conf name="runtime" visibility="public"/>
diff --git a/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml.sha1 b/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml.sha1
index db66644..48d00f2 100644
--- a/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml.sha1
+++ b/ivy-repo/org.gnunet/gnunet-java/svn/ivy-svn.xml.sha1
@@ -1 +1 @@
-4e15d2dd0fa71876b8db242b9fb05d83bee471f3 \ No newline at end of file
+59b7b0666ebd7b1a8abed90333ada649c88b89d1 \ No newline at end of file
diff --git a/src/main/java/org/gnunet/transport/Transport.java b/src/main/java/org/gnunet/transport/Transport.java
index 40d654d..8409ec8 100644
--- a/src/main/java/org/gnunet/transport/Transport.java
+++ b/src/main/java/org/gnunet/transport/Transport.java
@@ -3,8 +3,7 @@ package org.gnunet.transport;
import org.gnunet.hello.HelloMessage;
import org.gnunet.mq.Envelope;
import org.gnunet.mq.NotifySentHandler;
-import org.gnunet.transport.messages.RequestConnectMessage;
-import org.gnunet.transport.messages.StartMessage;
+import org.gnunet.transport.messages.*;
import org.gnunet.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +51,15 @@ public class Transport {
h.cb.onHello(m);
}
}
+ public void visit(ConnectMessage m) {
+ // FIXME: implement
+ }
+ public void visit(DisconnectMessage m) {
+ // FIXME: implement
+ }
+ public void visit(RecvMessage m) {
+ // FIXME: implement
+ }
@Override
public void handleError() {
logger.warn("Error receiving from the transport service, reconnecting.");
diff --git a/src/main/resources/org/gnunet/construct/MsgMap.txt b/src/main/resources/org/gnunet/construct/MsgMap.txt
index 6923feb..6e1aacf 100644
--- a/src/main/resources/org/gnunet/construct/MsgMap.txt
+++ b/src/main/resources/org/gnunet/construct/MsgMap.txt
@@ -1,7 +1,7 @@
org.gnunet.util.Resolver$Address|0=org.gnunet.util.Resolver$TextualAddress
org.gnunet.util.Resolver$Address|1=org.gnunet.util.Resolver$NumericAddress
-org.gnunet.util.GnunetMessage$Body|1=org.gnunet.util.TestMessage
org.gnunet.util.GnunetMessage$Body|274=org.gnunet.cadet.messages.TunnelDestroyMessage
+org.gnunet.util.GnunetMessage$Body|1=org.gnunet.util.TestMessage
org.gnunet.util.GnunetMessage$Body|273=org.gnunet.cadet.messages.TunnelCreateMessage
org.gnunet.util.GnunetMessage$Body|272=org.gnunet.cadet.messages.ClientConnectMessage
org.gnunet.util.GnunetMessage$Body|4=org.gnunet.util.Resolver$GetMessage
@@ -9,8 +9,8 @@ org.gnunet.util.GnunetMessage$Body|5=org.gnunet.util.Resolver$ResolverResponse
org.gnunet.util.GnunetMessage$Body|276=org.gnunet.cadet.RejectMessage
org.gnunet.util.GnunetMessage$Body|10=org.gnunet.arm.messages.ResultMessage
org.gnunet.util.GnunetMessage$Body|11=org.gnunet.arm.messages.StatusMessage
-org.gnunet.util.GnunetMessage$Body|13=org.gnunet.arm.messages.ListResultMessage
org.gnunet.util.GnunetMessage$Body|286=org.gnunet.cadet.messages.LocalAckMessage
+org.gnunet.util.GnunetMessage$Body|13=org.gnunet.arm.messages.ListResultMessage
org.gnunet.util.GnunetMessage$Body|285=org.gnunet.cadet.DataMessage
org.gnunet.util.GnunetMessage$Body|17=org.gnunet.hello.HelloMessage
org.gnunet.util.GnunetMessage$Body|42002=org.gnunet.voting.messages.BallotRegisterFailureMessage
@@ -62,8 +62,11 @@ org.gnunet.util.GnunetMessage$Body|371=org.gnunet.transport.messages.BlacklistRe
org.gnunet.util.GnunetMessage$Body|370=org.gnunet.transport.messages.BlacklistQueryMessage
org.gnunet.util.GnunetMessage$Body|380=org.gnunet.transport.messages.AddressIterateMessage
org.gnunet.util.GnunetMessage$Body|383=org.gnunet.transport.messages.AddressIterateResponseMessage
+org.gnunet.util.GnunetMessage$Body|365=org.gnunet.transport.messages.RecvMessage
org.gnunet.util.GnunetMessage$Body|366=org.gnunet.transport.messages.SetQuotaMessage
org.gnunet.util.GnunetMessage$Body|360=org.gnunet.transport.messages.StartMessage
+org.gnunet.util.GnunetMessage$Body|361=org.gnunet.transport.messages.ConnectMessage
+org.gnunet.util.GnunetMessage$Body|362=org.gnunet.transport.messages.DisconnectMessage
org.gnunet.util.GnunetMessage$Body|143=org.gnunet.dht.messages.ClientGetMessage
org.gnunet.util.GnunetMessage$Body|142=org.gnunet.dht.messages.ClientPutMessage
org.gnunet.util.GnunetMessage$Body|153=org.gnunet.dht.messages.MonitorStartStop
@@ -100,4 +103,4 @@ org.gnunet.util.GnunetMessage$Body|495=org.gnunet.testbed.messages.HelperInitMes
org.gnunet.util.GnunetMessage$Body|483=org.gnunet.testbed.messages.ManagePeerServiceMessage
org.gnunet.gns.records.RecordData|1=org.gnunet.gns.records.ARecordData
org.gnunet.gns.records.RecordData|65536=org.gnunet.gns.records.PkeyRecordData
-# generated 2014/06/04 23:12:55
+# generated 2014/08/04 20:04:04