[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30388 - in gnunet-java/src: main/java/org/gnunet/consensus
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30388 - in gnunet-java/src: main/java/org/gnunet/consensus main/java/org/gnunet/consensus/messages main/java/org/gnunet/construct main/java/org/gnunet/core main/java/org/gnunet/dht main/java/org/gnunet/mesh main/java/org/gnunet/mq main/java/org/gnunet/peerinfo main/java/org/gnunet/statistics main/java/org/gnunet/testbed main/java/org/gnunet/testbed/messages main/java/org/gnunet/transport main/java/org/gnunet/transport/messages main/java/org/gnunet/util main/java/org/gnunet/voting test/java/org/gnunet/dht |
|
Date: |
Mon, 21 Oct 2013 21:13:51 +0200 |
Author: dold
Date: 2013-10-21 21:13:51 +0200 (Mon, 21 Oct 2013)
New Revision: 30388
Modified:
gnunet-java/src/main/java/org/gnunet/consensus/Consensus.java
gnunet-java/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java
gnunet-java/src/main/java/org/gnunet/construct/Construct.java
gnunet-java/src/main/java/org/gnunet/core/Core.java
gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java
gnunet-java/src/main/java/org/gnunet/dht/MonitorGetHandler.java
gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java
gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java
gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java
gnunet-java/src/main/java/org/gnunet/mesh/ClientConnectMessage.java
gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java
gnunet-java/src/main/java/org/gnunet/mesh/TunnelCreateMessage.java
gnunet-java/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java
gnunet-java/src/main/java/org/gnunet/mesh/TunnelNotificationMessage.java
gnunet-java/src/main/java/org/gnunet/mq/Envelope.java
gnunet-java/src/main/java/org/gnunet/mq/MessageQueue.java
gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java
gnunet-java/src/main/java/org/gnunet/statistics/Statistics.java
gnunet-java/src/main/java/org/gnunet/testbed/CompressedConfig.java
gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
gnunet-java/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateMessage.java
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java
gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
gnunet-java/src/main/java/org/gnunet/transport/Transport.java
gnunet-java/src/main/java/org/gnunet/transport/messages/BlacklistReplyMessage.java
gnunet-java/src/main/java/org/gnunet/util/AbsoluteTime.java
gnunet-java/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java
gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java
Log:
- use java naming conventions (no underscores in non-capitalized identifiers)
consistently
Modified: gnunet-java/src/main/java/org/gnunet/consensus/Consensus.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/consensus/Consensus.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/consensus/Consensus.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -111,8 +111,8 @@
*/
public void insertElement(ConsensusElement element, final
InsertDoneCallback idc) {
InsertElementMessage m = new InsertElementMessage();
- m.element_data = element.data;
- m.element_type = element.elementType;
+ m.elementData = element.data;
+ m.elementType = element.elementType;
Envelope ev = new Envelope(m);
if (null != idc) {
ev.notifySent(new NotifySentHandler() {
Modified:
gnunet-java/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java
===================================================================
---
gnunet-java/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++
gnunet-java/src/main/java/org/gnunet/consensus/messages/InsertElementMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -36,8 +36,8 @@
@UnionCase(521)
public class InsertElementMessage implements GnunetMessage.Body {
@UInt16
- public int element_type;
+ public int elementType;
@FillWith
@UInt8
- public byte[] element_data;
+ public byte[] elementData;
}
\ No newline at end of file
Modified: gnunet-java/src/main/java/org/gnunet/construct/Construct.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/construct/Construct.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/construct/Construct.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -275,18 +275,18 @@
parser = new NestedParser(p, n.optional(), nestedField, true);
} else {
- Field old_f = field;
- List<Field> old_path = new ArrayList<Field>(path);
- Class old_c = c;
+ Field oldField = field;
+ List<Field> oldPath = new ArrayList<Field>(path);
+ Class oldClass = c;
path.add(field);
Parser p = getParser((Class<Message>) nestedField.getType(),
this);
- path = old_path;
- c = old_c;
+ path = oldPath;
+ c = oldClass;
- parser = new NestedParser(p, n.optional(), old_f, false);
+ parser = new NestedParser(p, n.optional(), oldField, false);
}
}
Modified: gnunet-java/src/main/java/org/gnunet/core/Core.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/Core.java 2013-10-21 18:48:51 UTC
(rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/core/Core.java 2013-10-21 19:13:51 UTC
(rev 30388)
@@ -106,7 +106,7 @@
/**
* Request container for notify transmit requests.
*/
- private MatchingRequestContainer<RequestIdentification,
NotifyTransmitReadyRequest> ntr_requests;
+ private MatchingRequestContainer<RequestIdentification,
NotifyTransmitReadyRequest> ntrRequests;
public static class NotifyTransmitReadyRequest extends
RequestContainer.Request {
private final int size;
@@ -198,7 +198,7 @@
public void visit(SendMessageReady m) {
RequestIdentification rid = new RequestIdentification(m.smrId,
m.peer);
- NotifyTransmitReadyRequest req = ntr_requests.getRequest(rid);
+ NotifyTransmitReadyRequest req = ntrRequests.getRequest(rid);
final SendMessage sm = new SendMessage();
sm.cork = 0;
@@ -244,7 +244,7 @@
public Core(Configuration cfg) {
client = new Client("core", cfg);
client.installReceiver(new CoreReceiver());
- ntr_requests = new MatchingRequestContainer<RequestIdentification,
NotifyTransmitReadyRequest>(client);
+ ntrRequests = new MatchingRequestContainer<RequestIdentification,
NotifyTransmitReadyRequest>(client);
}
/**
@@ -288,7 +288,7 @@
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);
+ return ntrRequests.addRequest(rid, notifyRequest);
}
/**
Modified:
gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/core/NotifyOutboundTrafficMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -33,7 +33,7 @@
* (excluding the 0-terminator).
*/
@UInt32
- public long ats_count;
+ public long atsCount;
/**
* Identity of the receiver or sender.
@@ -41,7 +41,7 @@
@NestedMessage
public PeerIdentity peer;
- @VariableSizeArray(lengthField = "ats_count")
+ @VariableSizeArray(lengthField = "atsCount")
public ATSInformation[] atsRest;
@NestedMessage(newFrame = true)
Modified: gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/dht/ClientGetStopMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -39,7 +39,7 @@
@UInt32
public int reserved = 0;
@UInt64
- public long unique_id;
+ public long uniqueId;
@NestedMessage
public HashCode key;
}
Modified: gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/dht/DistributedHashTable.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -122,7 +122,7 @@
public Envelope assembleRequest() {
MonitorStartStop mss = new MonitorStartStop();
if (key != null) {
- mss.filter_key = 1;
+ mss.filterKey = 1;
mss.key = key;
} else {
mss.key = new HashCode();
@@ -177,14 +177,14 @@
public void visit(MonitorGetMessage monitorGetMessage) {
for (MonitorRequest monitorRequest : monitorRequests.iter()) {
- boolean type_ok = (monitorGetMessage.type == BlockType.ANY.val)
+ boolean typeOk = (monitorGetMessage.type == BlockType.ANY.val)
|| (monitorGetMessage.type ==
monitorRequest.blockType);
- boolean key_ok = monitorGetMessage.key.isAllZero()
+ boolean keyOk = monitorGetMessage.key.isAllZero()
|| monitorGetMessage.key.equals(monitorRequest.key);
- if (key_ok && type_ok && monitorRequest.getHandler != null) {
+ if (keyOk && typeOk && monitorRequest.getHandler != null) {
monitorRequest.getHandler.onGet(monitorGetMessage.options,
monitorGetMessage.type,
- monitorGetMessage.hop_count,
monitorGetMessage.desired_replication_level, monitorGetMessage.getPath,
+ monitorGetMessage.hopCount,
monitorGetMessage.desiredReplicationLevel, monitorGetMessage.getPath,
monitorGetMessage.key);
}
}
@@ -192,12 +192,12 @@
public void visit(MonitorGetRespMessage monitorGetRespMessage) {
for (MonitorRequest monitorRequest : monitorRequests.iter()) {
- boolean type_ok = (monitorGetRespMessage.type ==
BlockType.ANY.val)
+ boolean typeOk = (monitorGetRespMessage.type ==
BlockType.ANY.val)
|| (monitorGetRespMessage.type ==
monitorRequest.blockType);
- boolean key_ok = monitorGetRespMessage.key.isAllZero()
+ boolean keyOk = monitorGetRespMessage.key.isAllZero()
||
monitorGetRespMessage.key.equals(monitorRequest.key);
- if (key_ok && type_ok && monitorRequest.getResponseHandler !=
null) {
+ if (keyOk && typeOk && monitorRequest.getResponseHandler !=
null) {
monitorRequest.getResponseHandler.onGetResponse(
monitorGetRespMessage.type,
monitorGetRespMessage.getPath,
@@ -212,14 +212,14 @@
public void visit(MonitorPutMessage monitorPutMessage) {
for (MonitorRequest monitorRequest : monitorRequests.iter()) {
- boolean type_ok = (monitorPutMessage.type == BlockType.ANY.val)
+ boolean typeOk = (monitorPutMessage.type == BlockType.ANY.val)
|| (monitorPutMessage.type ==
monitorRequest.blockType);
- boolean key_ok = monitorPutMessage.key.isAllZero()
+ boolean keyOk = monitorPutMessage.key.isAllZero()
|| monitorPutMessage.key.equals(monitorRequest.key);
- if (key_ok && type_ok && monitorRequest.putHandler != null) {
+ if (keyOk && typeOk && monitorRequest.putHandler != null) {
monitorRequest.putHandler.onPut(monitorPutMessage.options,
monitorPutMessage.type,
- monitorPutMessage.hop_count,
monitorPutMessage.expirationTime,
+ monitorPutMessage.hopCount,
monitorPutMessage.expirationTime,
monitorPutMessage.putPath, monitorPutMessage.key,
monitorPutMessage.data);
}
}
@@ -402,8 +402,8 @@
dht.startMonitor(BlockType.TEST.val, null,
new MonitorGetHandler() {
@Override
- public void onGet(int options, int type, int
hop_count,
- int
desired_replication_level, PeerIdentity[] getPath, HashCode key) {
+ public void onGet(int options, int type, int
hopCount,
+ int desiredReplicationLevel,
PeerIdentity[] getPath, HashCode key) {
System.out.println("get monitored");
}
},
Modified: gnunet-java/src/main/java/org/gnunet/dht/MonitorGetHandler.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorGetHandler.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorGetHandler.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -25,6 +25,6 @@
public interface MonitorGetHandler {
- void onGet(int options, int type, int hop_count, int
desired_replication_level, PeerIdentity[] getPath,
+ void onGet(int options, int type, int hopCount, int
desiredReplicationLevel, PeerIdentity[] getPath,
HashCode key);
}
Modified: gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorGetMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -49,20 +49,20 @@
* Hop count
*/
@UInt32
- public int hop_count;
+ public int hopCount;
/**
* Replication level for this message
*/
@UInt32
- public int desired_replication_level;
+ public int desiredReplicationLevel;
/**
* Number of peers recorded in the outgoing path from source to the
* storage location of this message.
*/
@UInt32
- public int get_path_length;
+ public int getPathLength;
/**
* The key to store the value under.
@@ -70,6 +70,6 @@
@NestedMessage
public HashCode key;
- @VariableSizeArray(lengthField = "get_path_length")
+ @VariableSizeArray(lengthField = "getPathLength")
public PeerIdentity[] getPath;
}
Modified: gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -41,13 +41,13 @@
* Length of the PUT path that follows (if tracked).
*/
@UInt32
- int put_path_length;
+ int putPathLength;
/**
* Length of the GET path that follows (if tracked).
*/
@UInt32
- int get_path_length;
+ int getPathLength;
/**
* When does the content expire?
@@ -61,10 +61,10 @@
@NestedMessage
public HashCode key;
- @VariableSizeArray(lengthField = "put_path_length")
+ @VariableSizeArray(lengthField = "putPathLength")
public PeerIdentity[] putPath;
- @VariableSizeArray(lengthField = "get_path_length")
+ @VariableSizeArray(lengthField = "getPathLength")
public PeerIdentity[] getPath;
@FillWith @UInt8
Modified: gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorPutMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -47,20 +47,20 @@
* Hop count so far.
*/
@UInt32
- public int hop_count;
+ public int hopCount;
/**
* Replication level for this message
*/
@UInt32
- public int desired_replication_level;
+ public int desiredReplicationLevel;
/**
* Number of peers recorded in the outgoing path from source to the
* storage location of this message.
*/
@UInt32
- public int put_path_length;
+ public int putPathLength;
/**
* How long should this data persist?
@@ -74,7 +74,7 @@
@NestedMessage
public HashCode key;
- @VariableSizeArray(lengthField = "put_path_length")
+ @VariableSizeArray(lengthField = "putPathLength")
public PeerIdentity[] putPath;
@FillWith @UInt8
Modified: gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/dht/MonitorStartStop.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -60,7 +60,7 @@
* Flag whether to use the provided key to filter messages.
*/
@UInt16
- public int filter_key;
+ public int filterKey;
/*
The key to filter messages by.
Modified: gnunet-java/src/main/java/org/gnunet/mesh/ClientConnectMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/ClientConnectMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/mesh/ClientConnectMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -13,5 +13,5 @@
@UnionCase(272)
public class ClientConnectMessage implements GnunetMessage.Body {
@IntegerFill(signed = false, bitSize = 32)
- public int[] apps_list;
+ public int[] applicationList;
}
Modified: gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java 2013-10-21 18:48:51 UTC
(rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/mesh/Mesh.java 2013-10-21 19:13:51 UTC
(rev 30388)
@@ -102,7 +102,7 @@
* Counter for generating fresh tunnel ID's
* when creating new tunnels.
*/
- private long next_tid = 1;
+ private long nextTid = 1;
/**
* A tunnel to a remote peer.
@@ -140,7 +140,7 @@
tcm.otherEnd = peer;
tcm.opt = opt;
tcm.port = port;
- tcm.tunnel_id = tunnelId;
+ tcm.tunnelId = tunnelId;
client.send(tcm);
}
@@ -155,13 +155,13 @@
* @param reliable
*/
public Tunnel(PeerIdentity peer, long tunnelId, int port, boolean
nobuffer, boolean reliable) {
- int my_opt = 0;
+ int myOpt = 0;
if (reliable)
- my_opt |= OPTION_RELIABLE;
+ myOpt |= OPTION_RELIABLE;
if (nobuffer)
- my_opt |= OPTION_NOBUFFER;
+ myOpt |= OPTION_NOBUFFER;
if (0 == tunnelId) {
- this.tunnelId = next_tid++;
+ this.tunnelId = nextTid++;
this.tunnelId &= ~TUNNEL_ID_SERV;
this.tunnelId |= TUNNEL_ID_CLI;
}
@@ -170,7 +170,7 @@
}
this.peer = peer;
this.port = port;
- this.opt = my_opt;
+ this.opt = myOpt;
logger.debug("registering tunnel {}", this.tunnelId);
tunnelMap.put(this.tunnelId, this);
}
@@ -187,7 +187,7 @@
public void destroy() {
if (!destroyedByService) {
TunnelDestroyMessage m = new TunnelDestroyMessage();
- m.tunnel_id = tunnelId;
+ m.tunnelId = tunnelId;
m.reserved = new byte[64];
client.send(m);
}
@@ -202,15 +202,16 @@
DataMessage m = new DataMessage();
m.payload = Construct.toBinary(GnunetMessage.fromBody(ev.message));
m.tid = tunnelId;
- Envelope mesh_ev = new Envelope(m);
- mesh_ev.notifySent(new NotifySentHandler() {
+ Envelope meshEv = new Envelope(m);
+ meshEv.notifySent(new NotifySentHandler() {
@Override
public void onSent() {
- envelopeCanceler = null; reportMessageSent();
+ envelopeCanceler = null;
+ reportMessageSent();
}
});
- client.send(mesh_ev);
- envelopeCanceler = mesh_ev;
+ client.send(meshEv);
+ envelopeCanceler = meshEv;
ackCount -= 1;
}
@@ -241,9 +242,9 @@
private class MeshMessageReceiver extends RunaboutMessageReceiver {
public void visit(TunnelCreateMessage m) {
- Tunnel t = new Tunnel(m.otherEnd, m.tunnel_id, m.port,
+ Tunnel t = new Tunnel(m.otherEnd, m.tunnelId, m.port,
(m.opt & OPTION_NOBUFFER) != 0, (m.opt & OPTION_NOBUFFER)
!= 0);
- logger.debug("inbound tunnel {}", m.tunnel_id);
+ logger.debug("inbound tunnel {}", m.tunnelId);
if (inboundTunnelHandler != null) {
inboundTunnelHandler.onInboundTunnel(t, m.otherEnd);
}
@@ -273,7 +274,7 @@
}
public void visit(TunnelDestroyMessage m) {
- Tunnel t = tunnelMap.get(m.tunnel_id);
+ Tunnel t = tunnelMap.get(m.tunnelId);
if (null == t) {
logger.warn("server got confused with tunnel IDs on destroy,
ignoring message");
return;
@@ -296,7 +297,7 @@
tunnelMap.clear();
client.reconnect();
ClientConnectMessage ccm = new ClientConnectMessage();
- ccm.apps_list = ports;
+ ccm.applicationList = ports;
client.send(ccm);
}
}
@@ -324,7 +325,7 @@
client = new Client("mesh", cfg);
client.installReceiver(new MeshMessageReceiver());
ClientConnectMessage ccm = new ClientConnectMessage();
- ccm.apps_list = ports;
+ ccm.applicationList = ports;
client.send(ccm);
}
Modified: gnunet-java/src/main/java/org/gnunet/mesh/TunnelCreateMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/TunnelCreateMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/mesh/TunnelCreateMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -14,7 +14,7 @@
@UnionCase(273)
public class TunnelCreateMessage implements GnunetMessage.Body {
@UInt32
- public long tunnel_id;
+ public long tunnelId;
@NestedMessage(optional = false)
public PeerIdentity otherEnd;
Modified: gnunet-java/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -15,7 +15,7 @@
@UnionCase(274)
public class TunnelDestroyMessage implements GnunetMessage.Body {
@UInt32
- public long tunnel_id;
+ public long tunnelId;
@FixedSizeIntegerArray(bitSize = 8, signed = false, length = 64)
public byte[] reserved;
Modified:
gnunet-java/src/main/java/org/gnunet/mesh/TunnelNotificationMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mesh/TunnelNotificationMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/mesh/TunnelNotificationMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -12,7 +12,7 @@
*/
public class TunnelNotificationMessage implements GnunetMessage.Body {
@UInt32
- public int tunnel_id;
+ public int tunnelId;
/**
* Peer at the other end, if any
* TODO: ask bart what 'if any' means here
Modified: gnunet-java/src/main/java/org/gnunet/mq/Envelope.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mq/Envelope.java 2013-10-21
18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/mq/Envelope.java 2013-10-21
19:13:51 UTC (rev 30388)
@@ -8,29 +8,29 @@
*/
public class Envelope implements Cancelable {
public final GnunetMessage.Body message;
- private MessageQueue parent_queue;
- private NotifySentHandler notify_sent_handler;
+ private MessageQueue parentQueue;
+ private NotifySentHandler notifySentHandler;
public Envelope(GnunetMessage.Body message) {
this.message = message;
}
public void notifySent(NotifySentHandler h) {
- this.notify_sent_handler = h;
+ this.notifySentHandler = h;
}
public void injectSent() {
- if (notify_sent_handler != null)
- notify_sent_handler.onSent();
+ if (notifySentHandler != null)
+ notifySentHandler.onSent();
}
public void cancel() {
- if (parent_queue == null)
+ if (parentQueue == null)
throw new AssertionError("can not cancel an unqueued message");
}
/* pkg-private */ void invokeSentNotification() {
- if (null != notify_sent_handler)
- notify_sent_handler.onSent();
+ if (null != notifySentHandler)
+ notifySentHandler.onSent();
}
}
Modified: gnunet-java/src/main/java/org/gnunet/mq/MessageQueue.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mq/MessageQueue.java 2013-10-21
18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/mq/MessageQueue.java 2013-10-21
19:13:51 UTC (rev 30388)
@@ -9,8 +9,8 @@
* General-purpose message queue
*/
public abstract class MessageQueue {
- private LinkedList<Envelope> queued_envelopes = new LinkedList<Envelope>();
- private LinkedList<Envelope> prefered_queued_envelopes = new
LinkedList<Envelope>();
+ private LinkedList<Envelope> queuedEnvelopes = new LinkedList<Envelope>();
+ private LinkedList<Envelope> preferedQueuedEnvelopes = new
LinkedList<Envelope>();
protected Envelope currentEnvelope;
private boolean readyForSubmit;
@@ -35,20 +35,20 @@
}
public void send(Envelope ev) {
- queued_envelopes.addLast(ev);
+ queuedEnvelopes.addLast(ev);
trySubmitNext();
}
public void sendPrefered(Envelope ev) {
- prefered_queued_envelopes.addLast(ev);
+ preferedQueuedEnvelopes.addLast(ev);
trySubmitNext();
}
private Envelope pollNextEnvelope() {
- if (!prefered_queued_envelopes.isEmpty())
- return prefered_queued_envelopes.removeFirst();
- if (!queued_envelopes.isEmpty())
- return queued_envelopes.removeFirst();
+ if (!preferedQueuedEnvelopes.isEmpty())
+ return preferedQueuedEnvelopes.removeFirst();
+ if (!queuedEnvelopes.isEmpty())
+ return queuedEnvelopes.removeFirst();
return null;
}
@@ -97,8 +97,8 @@
retract();
trySubmitNext();
} else {
- queued_envelopes.remove(ev);
- prefered_queued_envelopes.remove(ev);
+ queuedEnvelopes.remove(ev);
+ preferedQueuedEnvelopes.remove(ev);
}
}
}
Modified: gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -35,5 +35,5 @@
@UnionCase(331)
public class ListAllPeersMessage implements GnunetMessage.Body {
@UInt32
- public int include_friend_only;
+ public int includeFriendOnly;
}
Modified: gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java 2013-10-21
18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java 2013-10-21
19:13:51 UTC (rev 30388)
@@ -22,7 +22,6 @@
import org.gnunet.hello.HelloMessage;
import org.gnunet.mq.Envelope;
-import org.gnunet.mq.MessageQueue;
import org.gnunet.requests.RequestContainer;
import org.gnunet.requests.SequentialRequestContainer;
import org.gnunet.util.*;
@@ -46,25 +45,25 @@
/**
* All currently active iterate requests.
*/
- private SequentialRequestContainer<PeerIterateRequest> iterate_requests;
+ private SequentialRequestContainer<PeerIterateRequest> iterateRequests;
private class PeerIterateRequest extends RequestContainer.Request {
public PeerIdentity peer;
public PeerProcessor peerProcessor;
- public boolean friend_only;
+ public boolean friendOnly;
public boolean canceled;
- public PeerIterateRequest(PeerIdentity peer, boolean friend_only,
PeerProcessor peerProcessor) {
+ public PeerIterateRequest(PeerIdentity peer, boolean friendOnly,
PeerProcessor peerProcessor) {
this.peer = peer;
this.peerProcessor = peerProcessor;
- this.friend_only = friend_only;
+ this.friendOnly = friendOnly;
}
@Override
public Envelope assembleRequest() {
if (peer == null) {
ListAllPeersMessage m = new ListAllPeersMessage();
- m.include_friend_only = friend_only ? 1 : 0;
+ m.includeFriendOnly = friendOnly ? 1 : 0;
return new Envelope(m);
} else {
ListPeerMessage m = new ListPeerMessage();
@@ -80,13 +79,13 @@
private class PeerInfoMessageReceiver extends RunaboutMessageReceiver {
public void visit(InfoEnd infoEnd) {
- PeerIterateRequest r = iterate_requests.getRequest();
+ PeerIterateRequest r = iterateRequests.getRequest();
if (!r.canceled)
r.peerProcessor.onEnd();
- iterate_requests.next();
+ iterateRequests.next();
}
public void visit(InfoMessage infoMessage) {
- PeerIterateRequest r = iterate_requests.getRequest();
+ PeerIterateRequest r = iterateRequests.getRequest();
if (!r.canceled)
r.peerProcessor.onPeer(infoMessage.peerIdentity,
infoMessage.hello);
}
@@ -94,7 +93,7 @@
@Override
public void handleError() {
client.reconnect();
- iterate_requests.restart();
+ iterateRequests.restart();
}
}
@@ -102,10 +101,10 @@
public PeerInfo(Configuration cfg) {
client = new Client("peerinfo", cfg);
client.installReceiver(new PeerInfoMessageReceiver());
- iterate_requests = new
SequentialRequestContainer<PeerIterateRequest>(client);
+ iterateRequests = new
SequentialRequestContainer<PeerIterateRequest>(client);
// Make sure that new requests are only sent once the old request has
finished.
// Otherwise, the peerinfo service would send the answers interleaved.
- iterate_requests.setOverlap(false);
+ iterateRequests.setOverlap(false);
}
/**
@@ -115,8 +114,8 @@
* @param processor
* @return
*/
- public Cancelable iterate(RelativeTime timeout, boolean friend_only,
PeerProcessor processor) {
- return iterate(timeout, null, friend_only, processor);
+ public Cancelable iterate(RelativeTime timeout, boolean friendOnly,
PeerProcessor processor) {
+ return iterate(timeout, null, friendOnly, processor);
}
/**
@@ -127,9 +126,9 @@
* @param processor
* @return
*/
- public Cancelable iterate(RelativeTime timeout, PeerIdentity peer, boolean
friend_only, PeerProcessor processor) {
- PeerIterateRequest r = new PeerIterateRequest(peer, friend_only,
processor);
- return iterate_requests.addRequest(r);
+ public Cancelable iterate(RelativeTime timeout, PeerIdentity peer, boolean
friendOnly, PeerProcessor processor) {
+ PeerIterateRequest r = new PeerIterateRequest(peer, friendOnly,
processor);
+ return iterateRequests.addRequest(r);
}
public void disconnect() {
Modified: gnunet-java/src/main/java/org/gnunet/statistics/Statistics.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/Statistics.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/statistics/Statistics.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -50,28 +50,28 @@
*/
private final Client client;
- SequentialRequestContainer<SetRequest> set_requests;
- SequentialRequestContainer<GetRequest> get_requests;
- MatchingRequestContainer<Long,WatchRequest> watch_requests;
+ SequentialRequestContainer<SetRequest> setRequests;
+ SequentialRequestContainer<GetRequest> getRequests;
+ MatchingRequestContainer<Long,WatchRequest> watchRequests;
- private boolean destroy_requested;
+ private boolean destroyRequested;
private long wid = 0;
public class StatisticsMessageReceiver extends RunaboutMessageReceiver {
public void visit(GetResponseMessage m) {
- GetRequest r = get_requests.getRequest();
+ GetRequest r = getRequests.getRequest();
if (r != null)
r.receiver.onReceive(m.subsystemName, m.statisticName,
m.value);
}
public void visit(GetResponseEndMessage m) {
- GetRequest r = get_requests.getRequest();
+ GetRequest r = getRequests.getRequest();
if (r != null)
r.receiver.onDone();
//noinspection ConstantConditions
- if (get_requests != null)
- get_requests.next();
+ if (getRequests != null)
+ getRequests.next();
}
public void visit(TestMessage m) {
@@ -80,7 +80,7 @@
}
public void visit(WatchResponseMessage wrm) {
- WatchRequest r = watch_requests.getRequest((long) wrm.wid);
+ WatchRequest r = watchRequests.getRequest((long) wrm.wid);
if (r != null) {
r.watcher.onReceive(r.subsystem, r.name, wrm.value);
}
@@ -88,11 +88,11 @@
@Override
public void handleError() {
- if (!destroy_requested) {
+ if (!destroyRequested) {
client.reconnect();
- get_requests.restart();
- set_requests.restart();
- watch_requests.restart();
+ getRequests.restart();
+ setRequests.restart();
+ watchRequests.restart();
}
}
}
@@ -100,9 +100,9 @@
public Statistics(Configuration cfg) {
client = new Client("statistics", cfg);
client.installReceiver(new StatisticsMessageReceiver());
- get_requests = new SequentialRequestContainer<GetRequest>(client);
- set_requests = new SequentialRequestContainer<SetRequest>(client);
- watch_requests = new MatchingRequestContainer<Long,
WatchRequest>(client);
+ getRequests = new SequentialRequestContainer<GetRequest>(client);
+ setRequests = new SequentialRequestContainer<SetRequest>(client);
+ watchRequests = new MatchingRequestContainer<Long,
WatchRequest>(client);
}
/**
@@ -118,9 +118,9 @@
*/
public Cancelable get(RelativeTime timeout, final String subsystem, final
String name,
final StatisticsReceiver receiver) {
- if (destroy_requested)
+ if (destroyRequested)
throw new AssertionError("already destroyed");
- return get_requests.addRequest(new GetRequest(subsystem, name,
receiver));
+ return getRequests.addRequest(new GetRequest(subsystem, name,
receiver));
}
/**
@@ -132,9 +132,9 @@
* @return a handle to cancel the request
*/
public Cancelable set(final String subsystem, final String name, final
long value, boolean persist) {
- if (destroy_requested)
+ if (destroyRequested)
throw new AssertionError("already destroyed");
- return set_requests.addRequest(new SetRequest(subsystem, name, value,
false, persist));
+ return setRequests.addRequest(new SetRequest(subsystem, name, value,
false, persist));
}
/**
@@ -146,9 +146,9 @@
* @return a handle to cancel the request
*/
public Cancelable update(final String subsystem, final String name, final
long delta, boolean persist) {
- if (destroy_requested)
+ if (destroyRequested)
throw new AssertionError("already destroyed");
- return set_requests.addRequest(new SetRequest(subsystem, name, delta,
true, persist));
+ return setRequests.addRequest(new SetRequest(subsystem, name, delta,
true, persist));
}
/**
@@ -160,17 +160,17 @@
* @return a handle to cancel the request
*/
public Cancelable watch(final String subsystem, final String name,
StatisticsWatcher watcher) {
- if (destroy_requested)
+ if (destroyRequested)
throw new AssertionError("already destroyed");
WatchRequest r = new WatchRequest(subsystem, name, watcher);
- return watch_requests.addRequest(wid++, r);
+ return watchRequests.addRequest(wid++, r);
}
/**
* Destroy handle to the statistics service. Always finishes writing
pending values.
*/
public void destroy() {
- destroy_requested = true;
+ destroyRequested = true;
client.send(new TestMessage());
// wait until the service responds
// TODO: or timeout
Modified: gnunet-java/src/main/java/org/gnunet/testbed/CompressedConfig.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/CompressedConfig.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/testbed/CompressedConfig.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -31,19 +31,19 @@
* A configuration stored in compressed form.
*/
public class CompressedConfig {
- final public byte[] compressed_data;
+ final public byte[] compressedData;
- private int uncompressed_size;
+ private int uncompressedSize;
/**
* Create a compressed configuration from an uncompressed configuration.
* @param cfg the uncompressed configuration
*/
public CompressedConfig(Configuration cfg) {
- byte[] serialized_config = cfg.serialize().getBytes();
+ byte[] serializedConfig = cfg.serialize().getBytes();
Deflater compresser = new Deflater();
- compresser.setInput(serialized_config);
+ compresser.setInput(serializedConfig);
compresser.finish();
ByteArrayOutputStream s = new ByteArrayOutputStream();
@@ -52,17 +52,17 @@
int n = compresser.deflate(buf);
s.write(buf, 0, n);
}
- compressed_data = s.toByteArray();
- uncompressed_size = serialized_config.length;
+ compressedData = s.toByteArray();
+ uncompressedSize = serializedConfig.length;
}
/**
* Create a compressed configuration from already compressed data.
- * @param compressed_data the compressed config data
+ * @param compressedData the compressed config data
*/
- public CompressedConfig(byte[] compressed_data) {
- this.compressed_data = compressed_data;
- this.uncompressed_size = -1;
+ public CompressedConfig(byte[] compressedData) {
+ this.compressedData = compressedData;
+ this.uncompressedSize = -1;
}
/**
@@ -72,7 +72,7 @@
*/
public Configuration decompress() {
Inflater inflater = new Inflater();
- inflater.setInput(compressed_data);
+ inflater.setInput(compressedData);
ByteArrayOutputStream s = new ByteArrayOutputStream();
byte[] buf = new byte[1024];
while (!inflater.finished()) {
@@ -91,9 +91,9 @@
}
public int getUncompressedSize() {
- if (uncompressed_size == -1) {
- uncompressed_size = decompress().serialize().getBytes().length;
+ if (uncompressedSize == -1) {
+ uncompressedSize = decompress().serialize().getBytes().length;
}
- return uncompressed_size;
+ return uncompressedSize;
}
}
Modified: gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -103,25 +103,25 @@
final Host host;
final Configuration cfg;
final PeerCreateCallback cb;
- final int peer_id;
+ final int peerId;
public PeerCreateRequest(Host host, Configuration cfg,
PeerCreateCallback cb) {
this.host = host;
this.cfg = cfg;
this.cb = cb;
- this.peer_id = peerCounter++;
+ this.peerId = peerCounter++;
}
@Override
public Envelope assembleRequest() {
CompressedConfig ccfg = new CompressedConfig(cfg);
PeerCreateMessage m = new PeerCreateMessage();
- m.host_id = host.id;
- m.operation_id = operationId;
- m.peer_id = peer_id;
- m.compressed_config = ccfg.compressed_data;
- m.config_size = ccfg.getUncompressedSize();
- System.out.println("create request with opid " + m.operation_id);
+ m.hostId = host.id;
+ m.operationId = operationId;
+ m.peerId = peerId;
+ m.compressedConfig = ccfg.compressedData;
+ m.configSize = ccfg.getUncompressedSize();
+ System.out.println("create request with opid " + m.operationId);
return new Envelope(m);
}
}
@@ -136,10 +136,10 @@
@Override
public Envelope assembleRequest() {
PeerDestroyMessage m = new PeerDestroyMessage();
- m.operation_id = operationId;
- m.peer_id = peerId;
+ m.operationId = operationId;
+ m.peerId = peerId;
- System.out.println("destroy request with opid " + m.operation_id);
+ System.out.println("destroy request with opid " + m.operationId);
return new Envelope(m);
}
}
@@ -177,7 +177,7 @@
m.peerId = peerId;
CompressedConfig ccfg = new CompressedConfig(cfg);
m.uncompressedConfigSize = ccfg.getUncompressedSize();
- m.compressedConfig = ccfg.compressed_data;
+ m.compressedConfig = ccfg.compressedData;
System.out.println("compressed config size "
+m.compressedConfig.length);
return new Envelope(m);
@@ -216,8 +216,8 @@
@Override
public Envelope assembleRequest() {
PeerStartMessage m = new PeerStartMessage();
- m.operation_id = operationId;
- m.peer_id = peer.peerId;
+ m.operationId = operationId;
+ m.peerId = peer.peerId;
return new Envelope(m);
}
}
@@ -234,8 +234,8 @@
@Override
public Envelope assembleRequest() {
PeerStopMessage m = new PeerStopMessage();
- m.operation_id = operationId;
- m.peer_id = peer.peerId;
+ m.operationId = operationId;
+ m.peerId = peer.peerId;
return new Envelope(m);
}
}
@@ -286,7 +286,7 @@
return;
}
PeerCreateRequest pcr = (PeerCreateRequest) r;
- Peer p = new Peer(pcr.peer_id);
+ Peer p = new Peer(pcr.peerId);
pcr.cb.onPeerCreated(p);
}
public void visit(PeerInformationMessage m) {
@@ -358,9 +358,9 @@
ControllerInitMessage m = new ControllerInitMessage();
// we are interested in all events
- m.event_mask = 1 | 2 | 4 | 8 | 16;
- m.controler_hostname = (host.hostname == null) ? "127.0.0.1" :
host.hostname;
- m.host_id = host.id;
+ m.eventMask = 1 | 2 | 4 | 8 | 16;
+ m.controlerHostname = (host.hostname == null) ? "127.0.0.1" :
host.hostname;
+ m.hostId = host.id;
client.send(m);
}
Modified: gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -9,10 +9,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.zip.Deflater;
/**
* A controller process.
@@ -104,7 +102,7 @@
m.trusted_ip = trustedIP;
CompressedConfig ccfg = new CompressedConfig(host.cfg);
- m.compressed_config = ccfg.compressed_data;
+ m.compressed_config = ccfg.compressedData;
m.config_size = ccfg.getUncompressedSize();
return m;
Modified:
gnunet-java/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
===================================================================
---
gnunet-java/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++
gnunet-java/src/main/java/org/gnunet/testbed/messages/ControllerInitMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -38,18 +38,18 @@
* connections make consistent claims...
*/
@UInt32
- public int host_id;
+ public int hostId;
/**
* Event mask that specifies which events this client is interested in.
*/
@UInt64
- public long event_mask;
+ public long eventMask;
/**
* 0-terminated hostname of the controller.
*/
@ZeroTerminatedString
- public String controler_hostname;
+ public String controlerHostname;
}
Modified:
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateMessage.java
===================================================================
---
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -7,18 +7,18 @@
@UnionCase(464)
public class PeerCreateMessage implements GnunetMessage.Body {
@UInt32
- public int host_id;
+ public int hostId;
@UInt64
- public long operation_id;
+ public long operationId;
@UInt32
- public int peer_id;
+ public int peerId;
/**
* The size of the uncompressed configuration
*/
@UInt16
- public int config_size;
+ public int configSize;
@FillWith @UInt8
- public byte[] compressed_config;
+ public byte[] compressedConfig;
}
Modified:
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java
===================================================================
---
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerCreateSuccessMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -11,7 +11,7 @@
@UnionCase(474)
public class PeerCreateSuccessMessage implements GnunetMessage.Body {
@UInt32
- public int peer_id;
+ public int peerId;
@UInt64
public long operationId;
}
Modified:
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java
===================================================================
---
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerDestroyMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -9,7 +9,7 @@
@UnionCase(468)
public class PeerDestroyMessage implements GnunetMessage.Body {
@UInt32
- public int peer_id;
+ public int peerId;
@UInt64
- public long operation_id;
+ public long operationId;
}
Modified:
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStartMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -9,7 +9,7 @@
@UnionCase(466)
public class PeerStartMessage implements GnunetMessage.Body {
@UInt32
- public int peer_id;
+ public int peerId;
@UInt64
- public long operation_id;
+ public long operationId;
}
Modified:
gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/testbed/messages/PeerStopMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -9,7 +9,7 @@
@UnionCase(467)
public class PeerStopMessage implements GnunetMessage.Body {
@UInt32
- public int peer_id;
+ public int peerId;
@UInt64
- public long operation_id;
+ public long operationId;
}
Modified: gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -25,7 +25,7 @@
void visit(BlacklistQueryMessage m) {
boolean allowed = blacklistCallback.checkAllowed(m.peer);
BlacklistReplyMessage mr = new BlacklistReplyMessage();
- mr.is_allowed = allowed;
+ mr.isAllowed = allowed;
mr.peer = m.peer;
client.send(mr);
}
Modified: gnunet-java/src/main/java/org/gnunet/transport/Transport.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/Transport.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/transport/Transport.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -120,13 +120,13 @@
* longer be explicitly canceled.
*
* @param peer peer identity to look up the addresses
of, CHANGE: allow NULL for all (connected) peers
- * @param one_shot GNUNET_YES to return the current state
and then end (with NULL+NULL),
+ * @param oneShot GNUNET_YES to return the current state
and then end (with NULL+NULL),
* GNUNET_NO to monitor the set of
addresses used (continuously, must be explicitly canceled)
* @param timeout how long is the lookup allowed to take
at most (irrelevant if oneShot is set to GNUNET_NO)
- * @param peer_address_callback function to call with the results
+ * @param peerAddressCallback function to call with the results
*/
- Cancelable getActiveAddresses(PeerIdentity peer, int one_shot,
- RelativeTime timeout, PeerIterateCallback
peer_address_callback) {
+ Cancelable getActiveAddresses(PeerIdentity peer, int oneShot,
+ RelativeTime timeout, PeerIterateCallback
peerAddressCallback) {
throw new UnsupportedOperationException();
}
}
Modified:
gnunet-java/src/main/java/org/gnunet/transport/messages/BlacklistReplyMessage.java
===================================================================
---
gnunet-java/src/main/java/org/gnunet/transport/messages/BlacklistReplyMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++
gnunet-java/src/main/java/org/gnunet/transport/messages/BlacklistReplyMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -9,7 +9,7 @@
@UnionCase(371)
public class BlacklistReplyMessage implements GnunetMessage.Body {
@UInt32
- public boolean is_allowed;
+ public boolean isAllowed;
@NestedMessage
public PeerIdentity peer;
Modified: gnunet-java/src/main/java/org/gnunet/util/AbsoluteTime.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/util/AbsoluteTime.java 2013-10-21
18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/util/AbsoluteTime.java 2013-10-21
19:13:51 UTC (rev 30388)
@@ -25,9 +25,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
/**
* A specific point in time.
@@ -47,7 +45,7 @@
/**
* Absolute time value in microseconds.
*/
- private final long abs_value_us;
+ private final long absValueUs;
/**
* Gets the current time.
@@ -58,8 +56,8 @@
return new AbsoluteTime(System.currentTimeMillis() * 1000);
}
- public AbsoluteTime(final long abs_value_us) {
- this.abs_value_us = abs_value_us;
+ public AbsoluteTime(final long absValueUs) {
+ this.absValueUs = absValueUs;
}
/**
@@ -69,14 +67,14 @@
* @return address@hidden this + duration}
*/
public AbsoluteTime add(RelativeTime duration) {
- if (abs_value_us == Long.MAX_VALUE
+ if (absValueUs == Long.MAX_VALUE
|| duration.isForever()) {
return AbsoluteTime.FOREVER;
}
- if (abs_value_us + duration.getMicroseconds() < abs_value_us) {
+ if (absValueUs + duration.getMicroseconds() < absValueUs) {
return AbsoluteTime.FOREVER;
}
- return new AbsoluteTime(abs_value_us + duration.getMicroseconds());
+ return new AbsoluteTime(absValueUs + duration.getMicroseconds());
}
/**
@@ -119,7 +117,7 @@
*/
@Override
public int hashCode() {
- return (int) this.abs_value_us;
+ return (int) this.absValueUs;
}
/**
@@ -127,10 +125,10 @@
*/
@Override
public int compareTo(AbsoluteTime other) {
- if (this.abs_value_us < other.abs_value_us) {
+ if (this.absValueUs < other.absValueUs) {
return -1;
}
- if (this.abs_value_us > other.abs_value_us) {
+ if (this.absValueUs > other.absValueUs) {
return 1;
}
return 0;
@@ -144,7 +142,7 @@
if (this.isForever()) {
return "AbsoluteTime(FOREVER)";
}
- return "AbsoluteTime("+this.abs_value_us +")";
+ return "AbsoluteTime("+this.absValueUs +")";
}
@@ -153,7 +151,7 @@
* @return true if NOW is greater than the given time, false otherwise
*/
public boolean isDue() {
- return this.abs_value_us < now().abs_value_us;
+ return this.absValueUs < now().absValueUs;
}
/**
@@ -162,7 +160,7 @@
* @return this==FOREVER
*/
public boolean isForever() {
- return this.abs_value_us == Long.MAX_VALUE;
+ return this.absValueUs == Long.MAX_VALUE;
}
/**
@@ -172,10 +170,10 @@
* @return this - other
*/
public RelativeTime getDifference(final AbsoluteTime other) {
- if (other.abs_value_us == Long.MAX_VALUE) {
+ if (other.absValueUs == Long.MAX_VALUE) {
return RelativeTime.FOREVER;
}
- return new RelativeTime(abs_value_us - other.abs_value_us);
+ return new RelativeTime(absValueUs - other.absValueUs);
}
/**
@@ -185,7 +183,7 @@
* @return this - now
*/
public RelativeTime getDuration() {
- assert abs_value_us != Long.MAX_VALUE;
+ assert absValueUs != Long.MAX_VALUE;
return getDifference(AbsoluteTime.now());
}
@@ -195,7 +193,7 @@
* @return the absolute time in milliseconds
*/
public long getMicroseconds() {
- return abs_value_us;
+ return absValueUs;
}
/**
@@ -204,7 +202,7 @@
* @return this - now
*/
public RelativeTime getRemaining() {
- if (abs_value_us == Long.MAX_VALUE) {
+ if (absValueUs == Long.MAX_VALUE) {
return RelativeTime.FOREVER;
}
return getDifference(AbsoluteTime.now());
@@ -217,7 +215,7 @@
* @return max(this,other)
*/
public AbsoluteTime max(final AbsoluteTime other) {
- return abs_value_us >= other.abs_value_us ? this : other;
+ return absValueUs >= other.absValueUs ? this : other;
}
@@ -228,7 +226,7 @@
* @return min(this,other)
*/
public AbsoluteTime min(final AbsoluteTime other) {
- return abs_value_us <= other.abs_value_us ? this : other;
+ return absValueUs <= other.absValueUs ? this : other;
}
/**
@@ -238,13 +236,13 @@
* @return this - duration
*/
public AbsoluteTime subtract(final RelativeTime duration) {
- if (abs_value_us <= duration.getMicroseconds()) {
+ if (absValueUs <= duration.getMicroseconds()) {
return AbsoluteTime.ZERO;
}
- if (abs_value_us == Long.MAX_VALUE) {
+ if (absValueUs == Long.MAX_VALUE) {
return this;
}
- return new AbsoluteTime(abs_value_us - duration.getMicroseconds());
+ return new AbsoluteTime(absValueUs - duration.getMicroseconds());
}
/**
@@ -264,15 +262,15 @@
* @return the real AbsoluteTime associated with m
*/
public static AbsoluteTime fromNetwork(AbsoluteTimeMessage m) {
- return m.value__ < 0 ? AbsoluteTime.FOREVER : new
AbsoluteTime(m.value__);
+ return m.value < 0 ? AbsoluteTime.FOREVER : new AbsoluteTime(m.value);
}
public Date toDate() {
- return new Date(abs_value_us / 1000);
+ return new Date(absValueUs / 1000);
}
public long getSeconds() {
- return abs_value_us / (1000 * 1000);
+ return absValueUs / (1000 * 1000);
}
public static AbsoluteTime fromSeconds(long stamp) {
@@ -285,7 +283,7 @@
}
private long getMilliseconds() {
- return abs_value_us / 1000;
+ return absValueUs / 1000;
}
public static AbsoluteTime fromString(String s) {
Modified: gnunet-java/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
2013-10-21 18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
2013-10-21 19:13:51 UTC (rev 30388)
@@ -30,7 +30,7 @@
*/
public class AbsoluteTimeMessage implements Message {
@UInt64
- public long value__;
+ public long value;
public AbsoluteTimeMessage() {
@@ -39,9 +39,9 @@
public AbsoluteTimeMessage(final AbsoluteTime t) {
if (t.equals(AbsoluteTime.FOREVER)) {
- this.value__ = -1;
+ this.value = -1;
} else {
- this.value__ = t.getMicroseconds();
+ this.value = t.getMicroseconds();
}
}
}
Modified: gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java 2013-10-21
18:48:51 UTC (rev 30387)
+++ gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java 2013-10-21
19:13:51 UTC (rev 30388)
@@ -31,11 +31,9 @@
import org.gnunet.mesh.MeshRunabout;
import org.gnunet.mesh.TunnelEndHandler;
import org.gnunet.testbed.CompressedConfig;
-import org.gnunet.util.AbsoluteTime;
import org.gnunet.util.Configuration;
import org.gnunet.util.PeerIdentity;
import org.gnunet.util.Program;
-import org.gnunet.util.crypto.EddsaSignature;
import org.gnunet.util.getopt.Argument;
import org.gnunet.util.getopt.ArgumentAction;
import org.gnunet.voting.messages.*;
@@ -246,7 +244,7 @@
tunnel = mesh.createTunnel(currentAuthority,
TallyAuthorityDaemon.MESH_PORT, true, true, null);
BallotRegisterRequestMessage m = new
BallotRegisterRequestMessage();
CompressedConfig ccfg = new
CompressedConfig(ballot.toConfiguration());
- m.compressedBallotConfig = ccfg.compressed_data;
+ m.compressedBallotConfig = ccfg.compressedData;
tunnel.send(m);
return;
}
Modified: gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java 2013-10-21
18:48:51 UTC (rev 30387)
+++ gnunet-java/src/test/java/org/gnunet/dht/DHTTest.java 2013-10-21
19:13:51 UTC (rev 30388)
@@ -146,7 +146,7 @@
dht1.startMonitor(BlockType.TEST.val, hash, new MonitorGetHandler() {
@Override
- public void onGet(int options, int type, int hop_count, int
desired_replication_level, PeerIdentity[] getPath, HashCode key) {
+ public void onGet(int options, int type, int hopCount, int
desiredReplicationLevel, PeerIdentity[] getPath, HashCode key) {
System.out.println("here!");
ok.set(true);
dht2.destroy();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30388 - in gnunet-java/src: main/java/org/gnunet/consensus main/java/org/gnunet/consensus/messages main/java/org/gnunet/construct main/java/org/gnunet/core main/java/org/gnunet/dht main/java/org/gnunet/mesh main/java/org/gnunet/mq main/java/org/gnunet/peerinfo main/java/org/gnunet/statistics main/java/org/gnunet/testbed main/java/org/gnunet/testbed/messages main/java/org/gnunet/transport main/java/org/gnunet/transport/messages main/java/org/gnunet/util main/java/org/gnunet/voting test/java/org/gnunet/dht,
gnunet <=