0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

В модель пакета добавлена информация, исходящий ли он

Browse Source
This commit is contained in:
serega6531
2019-05-11 23:32:13 +03:00
parent a935fca410
commit 3ce16c5bd3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ru/serega6531/packmate/PcapWorker.java
View File

@@ -149,15 +149,17 @@ public class PcapWorker {
String sourceIpAndPort = sourceIpString + ":" + sourcePort;
String destIpAndPort = destIpString + ":" + destPort;
boolean incoming = destIpString.equals(localIp);
UnfinishedStream stream = new UnfinishedStream(sourceIp, destIp, sourcePort, destPort, protocol);
ru.serega6531.packmate.model.Packet packet = ru.serega6531.packmate.model.Packet.builder()
.tempId(packetIdCounter++)
.timestamp(System.currentTimeMillis())
.incoming(incoming)
.content(content)
.build();
if (unfinishedStreams.containsKey(stream)) {
unfinishedStreams.get(stream).add(packet);
} else {
@@ -211,9 +213,9 @@ public class PcapWorker {
final Map.Entry<UnfinishedStream, List<ru.serega6531.packmate.model.Packet>> entry = iterator.next();
final UnfinishedStream stream = entry.getKey();
if(stream.getProtocol() == Protocol.UDP) {
if (stream.getProtocol() == Protocol.UDP) {
final List<ru.serega6531.packmate.model.Packet> packets = entry.getValue();
if(System.currentTimeMillis() - packets.get(packets.size() - 1).getTimestamp() > TimeUnit.SECONDS.toMillis(udpStreamTimeout)) {
if (System.currentTimeMillis() - packets.get(packets.size() - 1).getTimestamp() > TimeUnit.SECONDS.toMillis(udpStreamTimeout)) {
iterator.remove();
streamService.saveNewStream(stream, packets);
streamsClosed++;