m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules
diff options
context:
space:
mode:
authorMagdalena GrodziƄska <mag.grodzinska@gmail.com>2020-01-10 23:21:22 +0100
committerGitHub <noreply@github.com>2020-01-10 23:21:22 +0100
commit19ec8b17e48955218087edc51a1a5092938100c1 (patch)
treeb23a9aeb25c0889e8162da2fb63ebd6a204ea640 /src/main/java/pl/edu/mimuw/cloudatlas/agent/modules
parentf943acc55cfc133ad93801f3498b7662ccbe3a92 (diff)
parente2cfe0d9643c3a02223a9e9c4f7d6ed29f0e363a (diff)
Merge branch 'master' into gossipgirl_strategies_2
Diffstat (limited to 'src/main/java/pl/edu/mimuw/cloudatlas/agent/modules')
-rw-r--r--src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUPServer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUPServer.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUPServer.java
index 94882e4..0c5bc86 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUPServer.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUPServer.java
@@ -59,7 +59,6 @@ public class UDUPServer implements Runnable {
if (packetNo == 1 && packet.getLength() < this.bufSize) {
msg = this.serializer.deserialize(packetData);
- msg.getContent().setReceivedTimestamp(ValueUtils.currentTime());
System.out.println("UDP received message " + msg.getContent().getMessageId());
} else {
System.out.println("UDP received partial message with transmission id " + transmissionID + " packet no " + packetNo);
@@ -67,6 +66,8 @@ public class UDUPServer implements Runnable {
}
if (msg != null) {
+ msg.getContent().setReceivedTimestamp(ValueUtils.currentTime());
+ msg.getContent().setSenderAddress(packet.getAddress());
sendMessageFurther(msg);
}
}
@@ -137,7 +138,6 @@ public class UDUPServer implements Runnable {
try {
byte[] allPacketData = concatPacketData(transmissionID, newPacketNo, packetData);
msg = this.serializer.deserialize(allPacketData);
- msg.getContent().setReceivedTimestamp(ValueUtils.currentTime());
this.partialPackets.remove(transmissionID);
System.out.println("Kryo put together whole transmission for msg " + msg.getContent().getMessageId());
} catch (Error | Exception e) {