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

Исправлено отображение ttl больше 127

Browse Source
This commit is contained in:
serega6531
2021-01-10 05:33:53 +03:00
parent ee7cc00914
commit ba63899af4
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ public class Packet {
private Long tempId; private Long tempId;
@Transient @Transient
private byte ttl; private int ttl;
@ManyToOne @ManyToOne
@JoinColumn(name = "stream_id", nullable = false) @JoinColumn(name = "stream_id", nullable = false)

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

@@ -46,7 +46,8 @@ public class Stream {
private boolean favorite; private boolean favorite;
private byte ttl; @Column(columnDefinition = "smallint")
private int ttl;
@Column(columnDefinition = "char(3)") @Column(columnDefinition = "char(3)")
private String userAgentHash; private String userAgentHash;

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

@@ -15,7 +15,7 @@ public class StreamDto {
private long endTimestamp; private long endTimestamp;
private Set<PatternDto> foundPatterns; private Set<PatternDto> foundPatterns;
private boolean favorite; private boolean favorite;
private byte ttl; private int ttl;
private String userAgentHash; private String userAgentHash;
} }

8
src/main/java/ru/serega6531/packmate/pcap/AbstractPcapWorker.java
View File

@@ -53,7 +53,7 @@ public abstract class AbstractPcapWorker implements PcapWorker, PacketListener {
private final SetMultimap<UnfinishedStream, ImmutablePair<Inet4Address, Integer>> fins = HashMultimap.create(); private final SetMultimap<UnfinishedStream, ImmutablePair<Inet4Address, Integer>> fins = HashMultimap.create();
private final SetMultimap<UnfinishedStream, ImmutablePair<Inet4Address, Integer>> acks = HashMultimap.create(); private final SetMultimap<UnfinishedStream, ImmutablePair<Inet4Address, Integer>> acks = HashMultimap.create();
public AbstractPcapWorker(ServicesService servicesService, protected AbstractPcapWorker(ServicesService servicesService,
StreamService streamService, StreamService streamService,
String localIpString) throws UnknownHostException { String localIpString) throws UnknownHostException {
this.servicesService = servicesService; this.servicesService = servicesService;
@@ -87,7 +87,7 @@ public abstract class AbstractPcapWorker implements PcapWorker, PacketListener {
final IpV4Packet.IpV4Header ipHeader = rawPacket.get(IpV4Packet.class).getHeader(); final IpV4Packet.IpV4Header ipHeader = rawPacket.get(IpV4Packet.class).getHeader();
Inet4Address sourceIp = ipHeader.getSrcAddr(); Inet4Address sourceIp = ipHeader.getSrcAddr();
Inet4Address destIp = ipHeader.getDstAddr(); Inet4Address destIp = ipHeader.getDstAddr();
byte ttl = ipHeader.getTtl(); int ttl = Byte.toUnsignedInt(ipHeader.getTtl());
final TcpPacket packet = rawPacket.get(TcpPacket.class); final TcpPacket packet = rawPacket.get(TcpPacket.class);
final TcpPacket.TcpHeader tcpHeader = packet.getHeader(); final TcpPacket.TcpHeader tcpHeader = packet.getHeader();
@@ -127,7 +127,7 @@ public abstract class AbstractPcapWorker implements PcapWorker, PacketListener {
final IpV4Packet.IpV4Header ipHeader = rawPacket.get(IpV4Packet.class).getHeader(); final IpV4Packet.IpV4Header ipHeader = rawPacket.get(IpV4Packet.class).getHeader();
Inet4Address sourceIp = ipHeader.getSrcAddr(); Inet4Address sourceIp = ipHeader.getSrcAddr();
Inet4Address destIp = ipHeader.getDstAddr(); Inet4Address destIp = ipHeader.getDstAddr();
byte ttl = ipHeader.getTtl(); int ttl = Byte.toUnsignedInt(ipHeader.getTtl());
final UdpPacket packet = rawPacket.get(UdpPacket.class); final UdpPacket packet = rawPacket.get(UdpPacket.class);
final UdpPacket.UdpHeader udpHeader = packet.getHeader(); final UdpPacket.UdpHeader udpHeader = packet.getHeader();
@@ -159,7 +159,7 @@ public abstract class AbstractPcapWorker implements PcapWorker, PacketListener {
} }
private UnfinishedStream addNewPacket(Inet4Address sourceIp, Inet4Address destIp, long time, private UnfinishedStream addNewPacket(Inet4Address sourceIp, Inet4Address destIp, long time,
int sourcePort, int destPort, byte ttl, byte[] content, Protocol protocol) { int sourcePort, int destPort, int ttl, byte[] content, Protocol protocol) {
var incoming = destIp.equals(localIp); var incoming = destIp.equals(localIp);
var stream = new UnfinishedStream(sourceIp, destIp, sourcePort, destPort, protocol); var stream = new UnfinishedStream(sourceIp, destIp, sourcePort, destPort, protocol);

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

@@ -94,7 +94,7 @@ public class StreamService {
final Stream stream = new Stream(); final Stream stream = new Stream();
stream.setProtocol(unfinishedStream.getProtocol()); stream.setProtocol(unfinishedStream.getProtocol());
stream.setTtl(firstIncoming.isPresent() ? firstIncoming.get().getTtl() : 0); stream.setTtl(firstIncoming.map(Packet::getTtl).orElse(0));
stream.setStartTimestamp(packets.get(0).getTimestamp()); stream.setStartTimestamp(packets.get(0).getTimestamp());
stream.setEndTimestamp(packets.get(packets.size() - 1).getTimestamp()); stream.setEndTimestamp(packets.get(packets.size() - 1).getTimestamp());
stream.setService(service.getPort()); stream.setService(service.getPort());