ad/packmate
1
0
Fork 0
mirror of https://github.com/Av0idD4rk/packmate.git synced 2026-10-23 16:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'display-stream-size' into 'master'

Browse Source 
Display stream size

See merge request packmate/Packmate!20
This commit is contained in:
Sergey 2023-04-30 22:22:01 +00:00
commit 15206188a2
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend

@ -1 +1 @@
Subproject commit 23503a5ac768319d7d5f55e18a5a8406767b543c
Subproject commit 2a60cd29cce060baa4edfb5cf6f1fc930375572f

6
src/main/java/ru/serega6531/packmate/model/Stream.java
View File

@ -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;

2
src/main/java/ru/serega6531/packmate/model/pojo/StreamDto.java
View File

@ -17,5 +17,7 @@ public class StreamDto {
private boolean favorite;
private int ttl;
private String userAgentHash;
private int sizeBytes;
private int packetsCount;
}

6
src/main/java/ru/serega6531/packmate/service/StreamService.java
View File

@ -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<Packet> 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<Pattern> foundPatterns = matchPatterns(optimizedPackets, service);
stream.setFoundPatterns(foundPatterns);
stream.setPackets(optimizedPackets);