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
2020-04-08 17:50:37 +03:00
parent 897aa30b9b
commit c1979b04a3
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,6 @@ public class CtfService {
private boolean mergeAdjacentPackets; private boolean mergeAdjacentPackets;
private boolean inflateWebSockets; private boolean parseWebSockets;
} }

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

@@ -52,7 +52,7 @@ public class Packet {
private boolean ungzipped; private boolean ungzipped;
private boolean webSocketInflated; private boolean webSocketParsed;
private byte[] content; private byte[] content;

12
src/main/java/ru/serega6531/packmate/service/StreamOptimizer.java
View File

@@ -36,8 +36,8 @@ public class StreamOptimizer {
unpackGzip(); unpackGzip();
} }
if (service.isInflateWebSockets()) { if (service.isParseWebSockets()) {
inflateWebSocket(); parseWebSockets();
} }
if (service.isUrldecodeHttpRequests()) { if (service.isUrldecodeHttpRequests()) {
@@ -89,7 +89,7 @@ public class StreamOptimizer {
final List<Packet> cut = packets.subList(start, end); final List<Packet> cut = packets.subList(start, end);
final long timestamp = cut.get(0).getTimestamp(); final long timestamp = cut.get(0).getTimestamp();
final boolean ungzipped = cut.stream().anyMatch(Packet::isUngzipped); final boolean ungzipped = cut.stream().anyMatch(Packet::isUngzipped);
final boolean webSocketInflated = cut.stream().anyMatch(Packet::isWebSocketInflated); final boolean webSocketParsed = cut.stream().anyMatch(Packet::isWebSocketParsed);
boolean incoming = cut.get(0).isIncoming(); boolean incoming = cut.get(0).isIncoming();
//noinspection OptionalGetWithoutIsPresent //noinspection OptionalGetWithoutIsPresent
final byte[] content = cut.stream() final byte[] content = cut.stream()
@@ -102,7 +102,7 @@ public class StreamOptimizer {
.incoming(incoming) .incoming(incoming)
.timestamp(timestamp) .timestamp(timestamp)
.ungzipped(ungzipped) .ungzipped(ungzipped)
.webSocketInflated(webSocketInflated) .webSocketParsed(webSocketParsed)
.content(content) .content(content)
.build()); .build());
} }
@@ -223,7 +223,7 @@ public class StreamOptimizer {
.incoming(false) .incoming(false)
.timestamp(cut.get(0).getTimestamp()) .timestamp(cut.get(0).getTimestamp())
.ungzipped(true) .ungzipped(true)
.webSocketInflated(false) .webSocketParsed(false)
.content(newContent) .content(newContent)
.build(); .build();
} catch (ZipException e) { } catch (ZipException e) {
@@ -235,7 +235,7 @@ public class StreamOptimizer {
return null; return null;
} }
private void inflateWebSocket() { private void parseWebSockets() {
if (!packets.get(0).getContentString().contains("HTTP/")) { if (!packets.get(0).getContentString().contains("HTTP/")) {
return; return;
} }

2
src/main/java/ru/serega6531/packmate/service/WebSocketsParser.java
View File

@@ -133,7 +133,7 @@ public class WebSocketsParser {
.timestamp(lastPacket.getTimestamp()) .timestamp(lastPacket.getTimestamp())
.ttl(lastPacket.getTtl()) .ttl(lastPacket.getTtl())
.ungzipped(lastPacket.isUngzipped()) .ungzipped(lastPacket.isUngzipped())
.webSocketInflated(true) .webSocketParsed(true)
.build() .build()
); );
} }