diff options
-rw-r--r-- | src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java (renamed from src/main/java/org/gnunet/core/ConnectNotifyMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java (renamed from src/main/java/org/gnunet/core/DisconnectNotifyMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/InitMessage.java (renamed from src/main/java/org/gnunet/core/InitMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/InitReplyMessage.java (renamed from src/main/java/org/gnunet/core/InitReplyMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java (renamed from src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java (renamed from src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/SendMessage.java (renamed from src/main/java/org/gnunet/core/SendMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/SendMessageReady.java (renamed from src/main/java/org/gnunet/core/SendMessageReady.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/core/messages/SendMessageRequest.java (renamed from src/main/java/org/gnunet/core/SendMessageRequest.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/ClientGetMessage.java (renamed from src/main/java/org/gnunet/dht/ClientGetMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java (renamed from src/main/java/org/gnunet/dht/ClientGetStopMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java (renamed from src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/ClientPutMessage.java (renamed from src/main/java/org/gnunet/dht/ClientPutMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/ClientResultMessage.java (renamed from src/main/java/org/gnunet/dht/ClientResultMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java (renamed from src/main/java/org/gnunet/dht/MonitorGetMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java (renamed from src/main/java/org/gnunet/dht/MonitorGetRespMessage.java) | 8 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java (renamed from src/main/java/org/gnunet/dht/MonitorPutMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/dht/messages/MonitorStartStop.java (renamed from src/main/java/org/gnunet/dht/MonitorStartStop.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/gns/GNS.java | 150 | ||||
-rw-r--r-- | src/main/java/org/gnunet/mesh/ChannelEndHandler.java (renamed from src/main/java/org/gnunet/mesh/TunnelEndHandler.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java (renamed from src/main/java/org/gnunet/peerinfo/InfoEnd.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java (renamed from src/main/java/org/gnunet/peerinfo/InfoMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java (renamed from src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java (renamed from src/main/java/org/gnunet/peerinfo/ListPeerMessage.java) | 2 |
24 files changed, 26 insertions, 176 deletions
diff --git a/src/main/java/org/gnunet/core/ConnectNotifyMessage.java b/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java index 4eafe02..52e576a 100644 --- a/src/main/java/org/gnunet/core/ConnectNotifyMessage.java +++ b/src/main/java/org/gnunet/core/messages/ConnectNotifyMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.*; | 23 | import org.gnunet.construct.*; |
24 | import org.gnunet.util.GnunetMessage; | 24 | import org.gnunet.util.GnunetMessage; |
diff --git a/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java b/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java index e4c3209..0c40b7e 100644 --- a/src/main/java/org/gnunet/core/DisconnectNotifyMessage.java +++ b/src/main/java/org/gnunet/core/messages/DisconnectNotifyMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |
diff --git a/src/main/java/org/gnunet/core/InitMessage.java b/src/main/java/org/gnunet/core/messages/InitMessage.java index 5546088..007d000 100644 --- a/src/main/java/org/gnunet/core/InitMessage.java +++ b/src/main/java/org/gnunet/core/messages/InitMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.IntegerFill; | 23 | import org.gnunet.construct.IntegerFill; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |
diff --git a/src/main/java/org/gnunet/core/InitReplyMessage.java b/src/main/java/org/gnunet/core/messages/InitReplyMessage.java index 02e8eef..c1252f5 100644 --- a/src/main/java/org/gnunet/core/InitReplyMessage.java +++ b/src/main/java/org/gnunet/core/messages/InitReplyMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |
diff --git a/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java b/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java index b00bd49..a63c17a 100644 --- a/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java +++ b/src/main/java/org/gnunet/core/messages/NotifyInboundTrafficMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.FillWith; | 23 | import org.gnunet.construct.FillWith; |
24 | import org.gnunet.construct.NestedMessage; | 24 | import org.gnunet.construct.NestedMessage; |
diff --git a/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java b/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java index 379578a..b474a62 100644 --- a/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java +++ b/src/main/java/org/gnunet/core/messages/NotifyOutboundTrafficMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.*; | 23 | import org.gnunet.construct.*; |
24 | import org.gnunet.util.ATSInformation; | 24 | import org.gnunet.util.ATSInformation; |
diff --git a/src/main/java/org/gnunet/core/SendMessage.java b/src/main/java/org/gnunet/core/messages/SendMessage.java index c3306ae..a62c422 100644 --- a/src/main/java/org/gnunet/core/SendMessage.java +++ b/src/main/java/org/gnunet/core/messages/SendMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |
diff --git a/src/main/java/org/gnunet/core/SendMessageReady.java b/src/main/java/org/gnunet/core/messages/SendMessageReady.java index ba28da8..fbedaec 100644 --- a/src/main/java/org/gnunet/core/SendMessageReady.java +++ b/src/main/java/org/gnunet/core/messages/SendMessageReady.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt16; | 24 | import org.gnunet.construct.UInt16; |
diff --git a/src/main/java/org/gnunet/core/SendMessageRequest.java b/src/main/java/org/gnunet/core/messages/SendMessageRequest.java index 7a95127..36fe004 100644 --- a/src/main/java/org/gnunet/core/SendMessageRequest.java +++ b/src/main/java/org/gnunet/core/messages/SendMessageRequest.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.core; | 21 | package org.gnunet.core.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt16; | 24 | import org.gnunet.construct.UInt16; |
diff --git a/src/main/java/org/gnunet/dht/ClientGetMessage.java b/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java index 71f26bc..75745ae 100644 --- a/src/main/java/org/gnunet/dht/ClientGetMessage.java +++ b/src/main/java/org/gnunet/dht/messages/ClientGetMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.*; | 23 | import org.gnunet.construct.*; |
24 | import org.gnunet.util.GnunetMessage; | 24 | import org.gnunet.util.GnunetMessage; |
diff --git a/src/main/java/org/gnunet/dht/ClientGetStopMessage.java b/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java index 5aa5cc4..101905a 100644 --- a/src/main/java/org/gnunet/dht/ClientGetStopMessage.java +++ b/src/main/java/org/gnunet/dht/messages/ClientGetStopMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |
diff --git a/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java b/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java index abf6051..91d1954 100644 --- a/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java +++ b/src/main/java/org/gnunet/dht/messages/ClientPutConfirmationMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.UInt32; | 23 | import org.gnunet.construct.UInt32; |
24 | import org.gnunet.construct.UInt64; | 24 | import org.gnunet.construct.UInt64; |
diff --git a/src/main/java/org/gnunet/dht/ClientPutMessage.java b/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java index 1d01be4..ac12aed 100644 --- a/src/main/java/org/gnunet/dht/ClientPutMessage.java +++ b/src/main/java/org/gnunet/dht/messages/ClientPutMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.*; | 23 | import org.gnunet.construct.*; |
24 | import org.gnunet.util.AbsoluteTimeMessage; | 24 | import org.gnunet.util.AbsoluteTimeMessage; |
diff --git a/src/main/java/org/gnunet/dht/ClientResultMessage.java b/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java index 3a4ac96..c955f1b 100644 --- a/src/main/java/org/gnunet/dht/ClientResultMessage.java +++ b/src/main/java/org/gnunet/dht/messages/ClientResultMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.*; | 23 | import org.gnunet.construct.*; |
24 | import org.gnunet.util.AbsoluteTimeMessage; | 24 | import org.gnunet.util.AbsoluteTimeMessage; |
diff --git a/src/main/java/org/gnunet/dht/MonitorGetMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java index ba9bf44..c8f6426 100644 --- a/src/main/java/org/gnunet/dht/MonitorGetMessage.java +++ b/src/main/java/org/gnunet/dht/messages/MonitorGetMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |
diff --git a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java index c298328..9761e85 100644 --- a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java +++ b/src/main/java/org/gnunet/dht/messages/MonitorGetRespMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.*; | 23 | import org.gnunet.construct.*; |
24 | import org.gnunet.util.AbsoluteTimeMessage; | 24 | import org.gnunet.util.AbsoluteTimeMessage; |
@@ -35,19 +35,19 @@ public class MonitorGetRespMessage implements GnunetMessage.Body { | |||
35 | * Content type. | 35 | * Content type. |
36 | */ | 36 | */ |
37 | @UInt32 | 37 | @UInt32 |
38 | int type; | 38 | public int type; |
39 | 39 | ||
40 | /** | 40 | /** |
41 | * Length of the PUT path that follows (if tracked). | 41 | * Length of the PUT path that follows (if tracked). |
42 | */ | 42 | */ |
43 | @UInt32 | 43 | @UInt32 |
44 | int putPathLength; | 44 | public int putPathLength; |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * Length of the GET path that follows (if tracked). | 47 | * Length of the GET path that follows (if tracked). |
48 | */ | 48 | */ |
49 | @UInt32 | 49 | @UInt32 |
50 | int getPathLength; | 50 | public int getPathLength; |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * When does the content expire? | 53 | * When does the content expire? |
diff --git a/src/main/java/org/gnunet/dht/MonitorPutMessage.java b/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java index 7e242c7..84180fb 100644 --- a/src/main/java/org/gnunet/dht/MonitorPutMessage.java +++ b/src/main/java/org/gnunet/dht/messages/MonitorPutMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.*; | 23 | import org.gnunet.construct.*; |
24 | import org.gnunet.util.AbsoluteTimeMessage; | 24 | import org.gnunet.util.AbsoluteTimeMessage; |
diff --git a/src/main/java/org/gnunet/dht/MonitorStartStop.java b/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java index ffe5c9a..137f635 100644 --- a/src/main/java/org/gnunet/dht/MonitorStartStop.java +++ b/src/main/java/org/gnunet/dht/messages/MonitorStartStop.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.dht; | 21 | package org.gnunet.dht.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt16; | 24 | import org.gnunet.construct.UInt16; |
diff --git a/src/main/java/org/gnunet/gns/GNS.java b/src/main/java/org/gnunet/gns/GNS.java deleted file mode 100644 index 63cd750..0000000 --- a/src/main/java/org/gnunet/gns/GNS.java +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2012, 2013 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | package org.gnunet.gns; | ||
22 | |||
23 | import org.gnunet.gns.messages.ClientLookupMessage; | ||
24 | import org.gnunet.gns.messages.ClientLookupResultMessage; | ||
25 | import org.gnunet.mq.Envelope; | ||
26 | import org.gnunet.requests.MatchingRequestContainer; | ||
27 | import org.gnunet.requests.Request; | ||
28 | import org.gnunet.requests.RequestIdentifier; | ||
29 | import org.gnunet.util.Cancelable; | ||
30 | import org.gnunet.util.Client; | ||
31 | import org.gnunet.util.Configuration; | ||
32 | import org.gnunet.util.RunaboutMessageReceiver; | ||
33 | import org.gnunet.util.crypto.EcdsaPrivateKey; | ||
34 | import org.gnunet.util.crypto.EcdsaPublicKey; | ||
35 | import org.slf4j.Logger; | ||
36 | import org.slf4j.LoggerFactory; | ||
37 | |||
38 | /** | ||
39 | * API to the GNUnet name system. | ||
40 | */ | ||
41 | public class GNS { | ||
42 | private static final Logger logger = LoggerFactory | ||
43 | .getLogger(GNS.class); | ||
44 | /** | ||
45 | * All pending and active lookup requests. | ||
46 | */ | ||
47 | private MatchingRequestContainer<Long, LookupRequest> lookupRequests; | ||
48 | |||
49 | private class LookupRequest extends Request { | ||
50 | long uid; | ||
51 | String name; | ||
52 | EcdsaPublicKey zone; | ||
53 | int type; | ||
54 | boolean onlyCached; | ||
55 | EcdsaPrivateKey shortenZoneKey; | ||
56 | LookupResultProcessor proc; | ||
57 | |||
58 | public LookupRequest(String name, | ||
59 | EcdsaPublicKey zone, | ||
60 | int type, | ||
61 | boolean onlyCached, | ||
62 | EcdsaPrivateKey shortenZoneKey, | ||
63 | LookupResultProcessor proc) { | ||
64 | this.uid = nextUID++; | ||
65 | this.name = name; | ||
66 | this.zone = zone; | ||
67 | this.type = type; | ||
68 | this.onlyCached = onlyCached; | ||
69 | this.shortenZoneKey = shortenZoneKey; | ||
70 | this.proc = proc; | ||
71 | } | ||
72 | |||
73 | @Override | ||
74 | public Envelope assembleRequest() { | ||
75 | ClientLookupMessage m = new ClientLookupMessage(); | ||
76 | if (null != shortenZoneKey) { | ||
77 | m.haveKey = 1; | ||
78 | } else { | ||
79 | m.shortenKey = shortenZoneKey; | ||
80 | } | ||
81 | m.id = uid; | ||
82 | m.name = name; | ||
83 | m.onlyCached = onlyCached ? 1 : 0; | ||
84 | m.type = type; | ||
85 | m.zone = zone; | ||
86 | return new Envelope(m); | ||
87 | } | ||
88 | } | ||
89 | |||
90 | public class GNSMessageReceiver extends RunaboutMessageReceiver { | ||
91 | public void visit(ClientLookupResultMessage m) { | ||
92 | RequestIdentifier<LookupRequest> r = lookupRequests.getRequestIdentifier(m.id); | ||
93 | if (null == r) { | ||
94 | logger.warn("no matching getRequestIdentifier for lookup result"); | ||
95 | return; | ||
96 | } | ||
97 | r.getRequest().proc.process(m.records); | ||
98 | r.retire(); | ||
99 | } | ||
100 | |||
101 | @Override | ||
102 | public void handleError() { | ||
103 | } | ||
104 | } | ||
105 | |||
106 | /** | ||
107 | * Request ID for lookup requests. | ||
108 | */ | ||
109 | private long nextUID = 1; | ||
110 | |||
111 | /** | ||
112 | * Client connected to the GNS service. | ||
113 | */ | ||
114 | private Client client; | ||
115 | |||
116 | /** | ||
117 | * Connect to the GNS service | ||
118 | * | ||
119 | * @param cfg configuration to use | ||
120 | */ | ||
121 | public GNS(Configuration cfg) { | ||
122 | client = new Client("gns", cfg); | ||
123 | lookupRequests = new MatchingRequestContainer<Long, LookupRequest>(client); | ||
124 | client.installReceiver(new GNSMessageReceiver()); | ||
125 | } | ||
126 | |||
127 | /** | ||
128 | * Perform an asynchronous lookup operation on the GNS. | ||
129 | * | ||
130 | * @param name the name to look up | ||
131 | * @param zone zone to look in | ||
132 | * @param type the GNS record type to look for | ||
133 | * @param onlyCached true to only check locally (not in the DHT) | ||
134 | * @param shortenZoneKey the private key of the shorten zone (can be NULL); | ||
135 | * specify to enable automatic shortening (given a PSEU | ||
136 | * record, if a given pseudonym is not yet used in the | ||
137 | * shorten zone, we automatically add the respective zone | ||
138 | * under that name) | ||
139 | * @param proc function to call on result | ||
140 | * @return handle to the queued getRequestIdentifier | ||
141 | */ | ||
142 | public Cancelable lookup(String name, | ||
143 | EcdsaPublicKey zone, | ||
144 | int type, boolean onlyCached, | ||
145 | EcdsaPrivateKey shortenZoneKey, | ||
146 | LookupResultProcessor proc) { | ||
147 | LookupRequest r = new LookupRequest(name, zone, type, onlyCached, shortenZoneKey, proc); | ||
148 | return lookupRequests.addRequest(r.uid, r); | ||
149 | } | ||
150 | } | ||
diff --git a/src/main/java/org/gnunet/mesh/TunnelEndHandler.java b/src/main/java/org/gnunet/mesh/ChannelEndHandler.java index 5b89a2f..a9622e1 100644 --- a/src/main/java/org/gnunet/mesh/TunnelEndHandler.java +++ b/src/main/java/org/gnunet/mesh/ChannelEndHandler.java | |||
@@ -5,7 +5,7 @@ package org.gnunet.mesh; | |||
5 | * | 5 | * |
6 | * @author Florian Dold | 6 | * @author Florian Dold |
7 | */ | 7 | */ |
8 | public interface TunnelEndHandler { | 8 | public interface ChannelEndHandler { |
9 | /** | 9 | /** |
10 | * Called once a channel has been destroyed. | 10 | * Called once a channel has been destroyed. |
11 | * The given channel can not be used anymore, and is only provided | 11 | * The given channel can not be used anymore, and is only provided |
diff --git a/src/main/java/org/gnunet/peerinfo/InfoEnd.java b/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java index b59e194..43bb99b 100644 --- a/src/main/java/org/gnunet/peerinfo/InfoEnd.java +++ b/src/main/java/org/gnunet/peerinfo/messages/InfoEnd.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.gnunet.peerinfo; | 1 | package org.gnunet.peerinfo.messages; |
2 | 2 | ||
3 | import org.gnunet.construct.UnionCase; | 3 | import org.gnunet.construct.UnionCase; |
4 | import org.gnunet.util.GnunetMessage; | 4 | import org.gnunet.util.GnunetMessage; |
diff --git a/src/main/java/org/gnunet/peerinfo/InfoMessage.java b/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java index d8d7daa..1c3cddb 100644 --- a/src/main/java/org/gnunet/peerinfo/InfoMessage.java +++ b/src/main/java/org/gnunet/peerinfo/messages/InfoMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.peerinfo; | 21 | package org.gnunet.peerinfo.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |
diff --git a/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java b/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java index f1cbd7e..10a2149 100644 --- a/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java +++ b/src/main/java/org/gnunet/peerinfo/messages/ListAllPeersMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.peerinfo; | 21 | package org.gnunet.peerinfo.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.UInt32; | 23 | import org.gnunet.construct.UInt32; |
24 | import org.gnunet.construct.UnionCase; | 24 | import org.gnunet.construct.UnionCase; |
diff --git a/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java b/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java index 56e6b5d..8a158b9 100644 --- a/src/main/java/org/gnunet/peerinfo/ListPeerMessage.java +++ b/src/main/java/org/gnunet/peerinfo/messages/ListPeerMessage.java | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | package org.gnunet.peerinfo; | 21 | package org.gnunet.peerinfo.messages; |
22 | 22 | ||
23 | import org.gnunet.construct.NestedMessage; | 23 | import org.gnunet.construct.NestedMessage; |
24 | import org.gnunet.construct.UInt32; | 24 | import org.gnunet.construct.UInt32; |