[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26872 - in gnunet-java: . bin src/org/gnunet/construct src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26872 - in gnunet-java: . bin src/org/gnunet/construct src/org/gnunet/construct/parsers src/org/gnunet/core src/org/gnunet/peerinfo src/org/gnunet/util test/org/gnunet/peerinfo |
Date: |
Sun, 14 Apr 2013 21:10:22 +0200 |
Author: dold
Date: 2013-04-14 21:10:22 +0200 (Sun, 14 Apr 2013)
New Revision: 26872
Added:
gnunet-java/bin/gnunet-peerinfo
Removed:
gnunet-java/consensus/
Modified:
gnunet-java/ISSUES
gnunet-java/README
gnunet-java/build.gradle
gnunet-java/src/org/gnunet/construct/Construct.java
gnunet-java/src/org/gnunet/construct/MsgMap.txt
gnunet-java/src/org/gnunet/construct/ProtocolViolationException.java
gnunet-java/src/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java
gnunet-java/src/org/gnunet/construct/parsers/NestedParser.java
gnunet-java/src/org/gnunet/construct/parsers/SequenceParser.java
gnunet-java/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java
gnunet-java/src/org/gnunet/core/NotifyInboundTrafficMessage.java
gnunet-java/src/org/gnunet/peerinfo/ListAllPeersMessage.java
gnunet-java/src/org/gnunet/peerinfo/PeerInfo.java
gnunet-java/src/org/gnunet/util/Connection.java
gnunet-java/src/org/gnunet/util/Scheduler.java
gnunet-java/src/org/gnunet/util/Service.java
gnunet-java/test/org/gnunet/peerinfo/PeerInfoTest.java
Log:
fixes
Modified: gnunet-java/ISSUES
===================================================================
--- gnunet-java/ISSUES 2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/ISSUES 2013-04-14 19:10:22 UTC (rev 26872)
@@ -1,48 +1,3 @@
-general problem with consensus:
-current approach with exchange/inventory/completion does not really work,
-because malicious peers can lie, it is hard to have a threshold for the
completion set.
-
-some very basic description of the first two rounds here:
-https://bitbucket.org/dold/consensus-doc/src/
-(probably shoud be on sam / using git)
-
-* consensus implementation is quite complicated / a lot is being rewritten
right now
-=> not working right now at all
-
-review consensus api
- * something a GNUNET_CONSENSUS_listen?
- * element api (akin to block api)
- * who determines the right/allowed element plugin(s) for consensus?
- * add plugin(s) to consensus_create
-
-discuss element validation api w.r.t. voting
- * checks voter certificate
- * what to do if cert does not check out?
- * use BF for users, should have access to elements
- * stores double-voters, only accepts first two votes to prove
- double voting
- * better: only store the two lexically smallest votes
-
-* review way of storing inventory
- * bitmap per element
-
-review message queue
- * currently doesn't do much
- * used for both client-service and peer-peer
-
-problem in inventory round:
- * no redundancy in the sense of exp-rounds, we need
- to check for IBF_Key collisions
- * retry with another mapping on failure
-
-maximum number of different ibf-to-hashcode mappings:
-sizeof (ElementHash) / sizeof(IBF_Key)
-
-* current method of storage:
- * 8 maps IBF_Key -> 2^(HashCode-ptr}
- * 1 map HashCode -> ElementInfo
-
-* actually way much overhead, as IBF_Keys are used as HashCode in the hashmap.
-
-any improvements / more efficient ways / fancy data structures to do this?
-
+* error-reporting in construct is really bad
+ * add information to exception while bubbling up the parser tree
+ * only expensive on error
Modified: gnunet-java/README
===================================================================
--- gnunet-java/README 2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/README 2013-04-14 19:10:22 UTC (rev 26872)
@@ -1,7 +1,7 @@
Building gnunet-java
====================
-For building gnunet-java, gradle-1.2 is required, see http://gradle.org/.
+For building gnunet-java, gradle>=1.5 is required, see http://gradle.org/.
Extending gnunet-java
Added: gnunet-java/bin/gnunet-peerinfo
===================================================================
--- gnunet-java/bin/gnunet-peerinfo (rev 0)
+++ gnunet-java/bin/gnunet-peerinfo 2013-04-14 19:10:22 UTC (rev 26872)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "%GNJ_INSTALLED" = "true" ];
+then
+ export CLASSPATH="%INSTALL_PATH/share/java/*"
+else
+ DIR=`dirname $0`
+ # if we are in the development environment use class files directly
instead of jar
+ export
CLASSPATH="$DIR/../build-gradle/classes/main/:$DIR/../build-gradle/resources/main/:$DIR/../lib/*"
+fi
+
+java -ea org.gnunet.peerinfo.PeerInfo "$@"
Property changes on: gnunet-java/bin/gnunet-peerinfo
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: gnunet-java/build.gradle
===================================================================
--- gnunet-java/build.gradle 2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/build.gradle 2013-04-14 19:10:22 UTC (rev 26872)
@@ -6,12 +6,20 @@
buildDir = "$projectDir/build-gradle"
+repositories {
+ flatDir {
+ dirs 'lib'
+ }
+}
+
dependencies {
- compile fileTree(dir: 'lib', include: '*.jar')
+ compile name: 'guava', version: '12.0'
+ compile name: 'junit', version: '4.10'
+ compile name: 'log4j', version: '1.2.16'
+ compile name: 'slf4j-api', version: '1.6.4'
+ compile name: 'slf4j-log4j12', version: '1.6.4'
}
-
-
sourceSets {
main {
java {
Modified: gnunet-java/src/org/gnunet/construct/Construct.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/Construct.java 2013-04-14 19:09:51 UTC
(rev 26871)
+++ gnunet-java/src/org/gnunet/construct/Construct.java 2013-04-14 19:10:22 UTC
(rev 26872)
@@ -86,7 +86,11 @@
public static <T extends Message> T parseAs(ByteBuffer srcBuf, Class<T> c)
{
T m = ReflectUtil.justInstantiate(c);
- getParser(c).parse(srcBuf, 0, m, m, null);
+ try {
+ getParser(c).parse(srcBuf, 0, m, m, null);
+ } catch (ProtocolViolationException e) {
+ e.augmentPath("on " + c);
+ }
return m;
}
@@ -324,9 +328,6 @@
}
parser = r.p;
}
-
-
-
}
public void visit(VariableSizeArray vsa) {
Modified: gnunet-java/src/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java/src/org/gnunet/construct/MsgMap.txt 2013-04-14 19:09:51 UTC
(rev 26871)
+++ gnunet-java/src/org/gnunet/construct/MsgMap.txt 2013-04-14 19:10:22 UTC
(rev 26872)
@@ -4,19 +4,19 @@
org.gnunet.util.GnunetMessage$Body|275=org.gnunet.mesh.PeerAddMessage
org.gnunet.util.GnunetMessage$Body|274=org.gnunet.mesh.TunnelDestroyMessage
org.gnunet.util.GnunetMessage$Body|1=org.gnunet.util.TestMessage
+org.gnunet.util.GnunetMessage$Body|70=org.gnunet.core.NotifyInboundTrafficMessage
org.gnunet.util.GnunetMessage$Body|273=org.gnunet.mesh.TunnelCreateMessage
-org.gnunet.util.GnunetMessage$Body|70=org.gnunet.core.NotifyInboundTrafficMessage
+org.gnunet.util.GnunetMessage$Body|71=org.gnunet.core.NotifyOutboundTrafficMessage
org.gnunet.util.GnunetMessage$Body|272=org.gnunet.mesh.ClientConnectMessage
-org.gnunet.util.GnunetMessage$Body|71=org.gnunet.core.NotifyOutboundTrafficMessage
+org.gnunet.util.GnunetMessage$Body|64=org.gnunet.core.InitMessage
org.gnunet.util.GnunetMessage$Body|4=org.gnunet.util.Resolver$GetMessage
-org.gnunet.util.GnunetMessage$Body|64=org.gnunet.core.InitMessage
+org.gnunet.util.GnunetMessage$Body|65=org.gnunet.core.InitReplyMessage
org.gnunet.util.GnunetMessage$Body|5=org.gnunet.util.Resolver$ResolverResponse
-org.gnunet.util.GnunetMessage$Body|65=org.gnunet.core.InitReplyMessage
+org.gnunet.util.GnunetMessage$Body|277=org.gnunet.mesh.ConnectPeerByTypeMessage
org.gnunet.util.GnunetMessage$Body|143=org.gnunet.dht.ClientGetMessage
-org.gnunet.util.GnunetMessage$Body|277=org.gnunet.mesh.ConnectPeerByTypeMessage
+org.gnunet.util.GnunetMessage$Body|67=org.gnunet.core.ConnectNotifyMessage
+org.gnunet.util.GnunetMessage$Body|276=org.gnunet.mesh.PeerDeleteMessage
org.gnunet.util.GnunetMessage$Body|142=org.gnunet.dht.ClientPutMessage
-org.gnunet.util.GnunetMessage$Body|276=org.gnunet.mesh.PeerDeleteMessage
-org.gnunet.util.GnunetMessage$Body|67=org.gnunet.core.ConnectNotifyMessage
org.gnunet.util.GnunetMessage$Body|76=org.gnunet.core.SendMessage
org.gnunet.util.GnunetMessage$Body|286=org.gnunet.mesh.LocalAckMessage
org.gnunet.util.GnunetMessage$Body|74=org.gnunet.core.SendMessageRequest
@@ -26,8 +26,8 @@
org.gnunet.util.GnunetMessage$Body|262=org.gnunet.mesh.OriginMessage
org.gnunet.util.GnunetMessage$Body|323=org.gnunet.nse.UpdateMessage
org.gnunet.util.GnunetMessage$Body|260=org.gnunet.mesh.UnicastMessage
+org.gnunet.util.GnunetMessage$Body|261=org.gnunet.mesh.MulticastMessage
org.gnunet.util.GnunetMessage$Body|321=org.gnunet.nse.StartMessage
-org.gnunet.util.GnunetMessage$Body|261=org.gnunet.mesh.MulticastMessage
org.gnunet.util.GnunetMessage$Body|144=org.gnunet.dht.ClientGetStopMessage
org.gnunet.util.GnunetMessage$Body|145=org.gnunet.dht.ClientResultMessage
org.gnunet.util.GnunetMessage$Body|332=org.gnunet.peerinfo.InfoMessage
@@ -40,6 +40,8 @@
org.gnunet.util.GnunetMessage$Body|170=org.gnunet.statistics.GetResponseMessage
org.gnunet.util.GnunetMessage$Body|169=org.gnunet.statistics.GetMessage
org.gnunet.util.GnunetMessage$Body|168=org.gnunet.statistics.SetMessage
+org.gnunet.util.GnunetMessage$Body|374=org.gnunet.transport.RequestConnectMessage
org.gnunet.util.GnunetMessage$Body|173=org.gnunet.statistics.WatchResponseMessage
org.gnunet.util.GnunetMessage$Body|172=org.gnunet.statistics.WatchMessage
-# generated 2012/11/04 16:46:57
+org.gnunet.util.GnunetMessage$Body|360=org.gnunet.transport.StartMessage
+# generated 2013/04/13 15:16:04
Modified: gnunet-java/src/org/gnunet/construct/ProtocolViolationException.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/ProtocolViolationException.java
2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/src/org/gnunet/construct/ProtocolViolationException.java
2013-04-14 19:10:22 UTC (rev 26872)
@@ -21,6 +21,8 @@
package org.gnunet.construct;
+import java.util.LinkedList;
+
/**
* Thrown when a received message is invalid.
*
@@ -28,8 +30,11 @@
*
*/
public class ProtocolViolationException extends RuntimeException {
-
public ProtocolViolationException(String s) {
super(s);
}
+
+ public ProtocolViolationException augmentPath(String pathMessage) {
+ return new ProtocolViolationException(this.getMessage() + "\n" +
pathMessage);
+ }
}
Modified:
gnunet-java/src/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java
===================================================================
---
gnunet-java/src/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java
2013-04-14 19:09:51 UTC (rev 26871)
+++
gnunet-java/src/org/gnunet/construct/parsers/FixedSizeIntegerArrayParser.java
2013-04-14 19:10:22 UTC (rev 26872)
@@ -21,10 +21,12 @@
package org.gnunet.construct.parsers;
import org.gnunet.construct.Message;
+import org.gnunet.construct.ProtocolViolationException;
import org.gnunet.construct.ReflectUtil;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
+import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.util.List;
@@ -65,7 +67,12 @@
ReflectUtil.justSet(dstObj, targetField, arr);
for (int i = 0; i < elemNumber; ++i) {
- long v = IntegerUtil.readLong(srcBuf, signed, byteSize);
+ long v;
+ try {
+ v = IntegerUtil.readLong(srcBuf, signed, byteSize);
+ } catch (BufferUnderflowException e) {
+ throw new ProtocolViolationException("fixed size array
underflow: " + targetField.toString());
+ }
ReflectUtil.justSetArray(arr, i, v);
}
Modified: gnunet-java/src/org/gnunet/construct/parsers/NestedParser.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/parsers/NestedParser.java
2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/src/org/gnunet/construct/parsers/NestedParser.java
2013-04-14 19:10:22 UTC (rev 26872)
@@ -63,7 +63,6 @@
frameOffset = 0;
}
-
if (optional) {
if (frameSizePath == null) {
throw new AssertionError("optional nested message needs
@FrameSize");
@@ -84,8 +83,12 @@
ReflectUtil.justSet(dstObj, targetField,
ReflectUtil.justInstantiate(targetField.getType()));
- return nestedParser.parse(srcBuf, frameOffset,
- frameObj, (Message) ReflectUtil.justGet(dstObj, targetField),
frameSizePath);
+ try {
+ return nestedParser.parse(srcBuf, frameOffset,
+ frameObj, (Message) ReflectUtil.justGet(dstObj, targetField),
frameSizePath);
+ } catch (ProtocolViolationException e) {
+ throw e.augmentPath("nested parser on " + targetField.toString());
+ }
}
@Override
Modified: gnunet-java/src/org/gnunet/construct/parsers/SequenceParser.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/parsers/SequenceParser.java
2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/src/org/gnunet/construct/parsers/SequenceParser.java
2013-04-14 19:10:22 UTC (rev 26872)
@@ -21,6 +21,7 @@
package org.gnunet.construct.parsers;
import org.gnunet.construct.Message;
+import org.gnunet.construct.ProtocolViolationException;
import org.gnunet.construct.ReflectUtil;
import java.lang.reflect.Field;
@@ -59,8 +60,12 @@
Message frameObj, final Message dst, List<Field>
frameSizePath) {
int size = 0;
for (final Parser p : childParsers) {
- size += p.parse(srcBuf, frameOffset, frameObj, dst,
- frameSizePath == null ? myFrameSizePath : frameSizePath);
+ try {
+ size += p.parse(srcBuf, frameOffset, frameObj, dst,
+ frameSizePath == null ? myFrameSizePath :
frameSizePath);
+ } catch (ProtocolViolationException e) {
+ throw e.augmentPath("(sequence parser)");
+ }
}
return size;
}
Modified:
gnunet-java/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java
===================================================================
--- gnunet-java/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java
2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/src/org/gnunet/construct/parsers/VariableSizeArrayParser.java
2013-04-14 19:10:22 UTC (rev 26872)
@@ -21,6 +21,7 @@
package org.gnunet.construct.parsers;
import org.gnunet.construct.Message;
+import org.gnunet.construct.ProtocolViolationException;
import org.gnunet.construct.ReflectUtil;
import java.lang.reflect.Array;
@@ -59,6 +60,7 @@
public int parse(final ByteBuffer srcBuf, int frameOffset, Message
frameObj, final Message dstObj, List<Field>
frameSizePath) {
final int elemNumber = (int) sizeField.get(dstObj);
+
@SuppressWarnings("unchecked")
final Class<Message> arrayElementType = (Class<Message>)
targetField.getType().getComponentType();
@@ -72,7 +74,6 @@
elemObj = ReflectUtil.justInstantiate(arrayElementType);
-
Array.set(arr, i, elemObj);
size += elemParser.parse(srcBuf, frameOffset - size, null,
elemObj, null);
Modified: gnunet-java/src/org/gnunet/core/NotifyInboundTrafficMessage.java
===================================================================
--- gnunet-java/src/org/gnunet/core/NotifyInboundTrafficMessage.java
2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/src/org/gnunet/core/NotifyInboundTrafficMessage.java
2013-04-14 19:10:22 UTC (rev 26872)
@@ -29,22 +29,11 @@
@UnionCase(70)
public class NotifyInboundTrafficMessage 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;
Modified: gnunet-java/src/org/gnunet/peerinfo/ListAllPeersMessage.java
===================================================================
--- gnunet-java/src/org/gnunet/peerinfo/ListAllPeersMessage.java
2013-04-14 19:09:51 UTC (rev 26871)
+++ gnunet-java/src/org/gnunet/peerinfo/ListAllPeersMessage.java
2013-04-14 19:10:22 UTC (rev 26872)
@@ -34,4 +34,6 @@
*/
@UnionCase(331)
public class ListAllPeersMessage implements GnunetMessage.Body {
+ @UInt32
+ public int include_friend_only;
}
Modified: gnunet-java/src/org/gnunet/peerinfo/PeerInfo.java
===================================================================
--- gnunet-java/src/org/gnunet/peerinfo/PeerInfo.java 2013-04-14 19:09:51 UTC
(rev 26871)
+++ gnunet-java/src/org/gnunet/peerinfo/PeerInfo.java 2013-04-14 19:10:22 UTC
(rev 26872)
@@ -37,11 +37,9 @@
private static final Logger logger = LoggerFactory
.getLogger(AbsoluteTime.class);
-
private final RequestQueue requests;
private PeerIterateRequest activeRequest;
-
private class PeerIterateRequest extends Request {
public PeerIdentity peer;
public PeerProcessor peerProcessor;
@@ -84,14 +82,14 @@
requests = new RequestQueue(client, new PeerInfoMessageReceiver());
}
- public Cancelable iterate(RelativeTime timeout, PeerProcessor iterator) {
- return iterate(timeout, null, iterator);
+ public Cancelable iterate(RelativeTime timeout, PeerProcessor processor) {
+ return iterate(timeout, null, processor);
}
- public Cancelable iterate(RelativeTime timeout, PeerIdentity peer,
PeerProcessor iterator) {
+ public Cancelable iterate(RelativeTime timeout, PeerIdentity peer,
PeerProcessor processor) {
PeerIterateRequest peerIterateRequest = new PeerIterateRequest();
peerIterateRequest.peer = peer;
- peerIterateRequest.peerProcessor = iterator;
+ peerIterateRequest.peerProcessor = processor;
peerIterateRequest.setDeadline(timeout.toAbsolute());
return requests.add(peerIterateRequest);
}
@@ -109,7 +107,7 @@
peerInfo.iterate(RelativeTime.FOREVER, new PeerProcessor() {
@Override
public void onPeer(PeerIdentity peerIdentity, HelloMessage
hello) {
- System.out.println("got peer");
+ System.out.println("peer " + peerIdentity.toString());
}
@Override
Modified: gnunet-java/src/org/gnunet/util/Connection.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Connection.java 2013-04-14 19:09:51 UTC
(rev 26871)
+++ gnunet-java/src/org/gnunet/util/Connection.java 2013-04-14 19:10:22 UTC
(rev 26872)
@@ -174,15 +174,22 @@
boolean found = true;
+ Class unionClass = null;
+
try {
- MessageLoader.getUnionClass(GnunetMessage.Body.class,
msgh.messageType);
+ unionClass =
MessageLoader.getUnionClass(GnunetMessage.Body.class, msgh.messageType);
} catch (ProtocolViolationException e) {
found = false;
}
logger.debug("dispatching received message");
if (found) {
- GnunetMessage msg = Construct.parseAs(recvBuffer,
GnunetMessage.class);
+ GnunetMessage msg;
+ try {
+ msg = Construct.parseAs(recvBuffer, GnunetMessage.class);
+ } catch (OutOfMemoryError e) {
+ throw new OutOfMemoryError("oom while parsing " +
unionClass);
+ }
receiver.process(msg.body);
} else {
UnknownMessageBody b = new UnknownMessageBody();
Modified: gnunet-java/src/org/gnunet/util/Scheduler.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Scheduler.java 2013-04-14 19:09:51 UTC
(rev 26871)
+++ gnunet-java/src/org/gnunet/util/Scheduler.java 2013-04-14 19:10:22 UTC
(rev 26872)
@@ -454,7 +454,6 @@
run(null);
}
-
/**
* Initialize and run scheduler. This function will return when all tasks
* have completed.
@@ -466,7 +465,29 @@
throw new AssertionError("Scheduler already running");
}
scheduler_running = true;
+ try {
+ run_unchecked(initialTask);
+ } finally {
+ // ensure that after run returns, the scheduler is in its initial
state,
+ // even though there was an exception (e.g. after a test case that
expects an exception)
+ scheduler_running = false;
+ readyCount = 0;
+ activeTask = null;
+ for (int i = 0; i < Priority.numberOfPriorities; ++i) {
+ readyLists[i] = new LinkedList<TaskConfiguration>();
+ }
+ pending.clear();
+ }
+ }
+
+ /**
+ * Initialize and run scheduler. This function will return when all tasks
+ * have completed. Don't check if the scheduler is already running or not.
+ *
+ * @param initialTask the initial task to run immediately
+ */
+ private static void run_unchecked(Task initialTask) {
if (initialTask != null) {
addContinuation(initialTask, EnumSet.of(Reason.STARTUP));
}
@@ -510,9 +531,6 @@
if (activeTask != null) {
throw new AssertionError("active task after scheduler ran");
}
-
-
- scheduler_running = false;
}
Modified: gnunet-java/src/org/gnunet/util/Service.java
===================================================================
--- gnunet-java/src/org/gnunet/util/Service.java 2013-04-14 19:09:51 UTC
(rev 26871)
+++ gnunet-java/src/org/gnunet/util/Service.java 2013-04-14 19:10:22 UTC
(rev 26872)
@@ -79,8 +79,8 @@
}
public void runHook() {
- String ip4AddrList = getConfiguration().getValueString(serviceName,
"ACCEPT_FROM").get();
- String ip6AddrList = getConfiguration().getValueString(serviceName,
"ACCEPT_FROM6").get();
+ String ip4AddrList = getConfiguration().getValueString(serviceName,
"ACCEPT_FROM").orNull();
+ String ip6AddrList = getConfiguration().getValueString(serviceName,
"ACCEPT_FROM6").orNull();
int port = getConfiguration().getValueNumber(serviceName,
"PORT").get().intValue();
LinkedList<SocketAddress> addrs = new LinkedList<SocketAddress>();
Modified: gnunet-java/test/org/gnunet/peerinfo/PeerInfoTest.java
===================================================================
--- gnunet-java/test/org/gnunet/peerinfo/PeerInfoTest.java 2013-04-14
19:09:51 UTC (rev 26871)
+++ gnunet-java/test/org/gnunet/peerinfo/PeerInfoTest.java 2013-04-14
19:10:22 UTC (rev 26872)
@@ -14,8 +14,9 @@
* @author Florian Dold
*/
public class PeerInfoTest {
+
@Test
- public void test_nse() {
+ public void test_peerinfo() {
Program.configureLogging("debug");
final Wrapper<Boolean> ended = new Wrapper<Boolean>(false);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26872 - in gnunet-java: . bin src/org/gnunet/construct src/org/gnunet/construct/parsers src/org/gnunet/core src/org/gnunet/peerinfo src/org/gnunet/util test/org/gnunet/peerinfo,
gnunet <=