diff --git a/frontend b/frontend index 23503a5..2a60cd2 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 23503a5ac768319d7d5f55e18a5a8406767b543c +Subproject commit 2a60cd29cce060baa4edfb5cf6f1fc930375572f diff --git a/src/main/java/ru/serega6531/packmate/model/Stream.java b/src/main/java/ru/serega6531/packmate/model/Stream.java index 9d88a7a..c4f8879 100644 --- a/src/main/java/ru/serega6531/packmate/model/Stream.java +++ b/src/main/java/ru/serega6531/packmate/model/Stream.java @@ -70,6 +70,12 @@ public class Stream { @Column(columnDefinition = "char(3)") private String userAgentHash; + @Column(name = "size_bytes", nullable = false) + private Integer sizeBytes; + + @Column(name = "packets_count", nullable = false) + private Integer packetsCount; + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/src/main/java/ru/serega6531/packmate/model/pojo/StreamDto.java b/src/main/java/ru/serega6531/packmate/model/pojo/StreamDto.java index eb4d2ca..5f0fcb9 100644 --- a/src/main/java/ru/serega6531/packmate/model/pojo/StreamDto.java +++ b/src/main/java/ru/serega6531/packmate/model/pojo/StreamDto.java @@ -17,5 +17,7 @@ public class StreamDto { private boolean favorite; private int ttl; private String userAgentHash; + private int sizeBytes; + private int packetsCount; } diff --git a/src/main/java/ru/serega6531/packmate/service/StreamService.java b/src/main/java/ru/serega6531/packmate/service/StreamService.java index 5bce095..2287481 100644 --- a/src/main/java/ru/serega6531/packmate/service/StreamService.java +++ b/src/main/java/ru/serega6531/packmate/service/StreamService.java @@ -101,6 +101,9 @@ public class StreamService { countingService.countStream(service.getPort(), packets.size()); + int packetsSize = packets.stream().mapToInt(p -> p.getContent().length).sum(); + int packetsCount = packets.size(); + List optimizedPackets = new StreamOptimizer(keysHolder, service, packets).optimizeStream(); if (isStreamIgnored(optimizedPackets, service)) { @@ -122,6 +125,9 @@ public class StreamService { String userAgentHash = getUserAgentHash(optimizedPackets); stream.setUserAgentHash(userAgentHash); + stream.setSizeBytes(packetsSize); + stream.setPacketsCount(packetsCount); + Set foundPatterns = matchPatterns(optimizedPackets, service); stream.setFoundPatterns(foundPatterns); stream.setPackets(optimizedPackets);