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

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>> acks = HashMultimap.create();
public AbstractPcapWorker(ServicesService servicesService,
protected AbstractPcapWorker(ServicesService servicesService,
StreamService streamService,
String localIpString) throws UnknownHostException {
this.servicesService = servicesService;
@@ -87,7 +87,7 @@ public abstract class AbstractPcapWorker implements PcapWorker, PacketListener {
final IpV4Packet.IpV4Header ipHeader = rawPacket.get(IpV4Packet.class).getHeader();
Inet4Address sourceIp = ipHeader.getSrcAddr();
Inet4Address destIp = ipHeader.getDstAddr();
byte ttl = ipHeader.getTtl();
int ttl = Byte.toUnsignedInt(ipHeader.getTtl());
final TcpPacket packet = rawPacket.get(TcpPacket.class);
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();
Inet4Address sourceIp = ipHeader.getSrcAddr();
Inet4Address destIp = ipHeader.getDstAddr();
byte ttl = ipHeader.getTtl();
int ttl = Byte.toUnsignedInt(ipHeader.getTtl());
final UdpPacket packet = rawPacket.get(UdpPacket.class);
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,
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 stream = new UnfinishedStream(sourceIp, destIp, sourcePort, destPort, protocol);