From 26e273f2b551d5ddceab51b588cfff7fd5026050 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Mon, 26 Apr 2021 00:47:22 +0200 Subject: [PATCH] packet info sources --- .../java/gearth/misc/packet_info/PacketInfo.java | 9 ++++++++- .../gearth/misc/packet_info/PacketInfoManager.java | 13 ++++--------- .../implementations/HarblePacketInfoProvider.java | 5 +---- .../implementations/SulekPacketInfoProvider.java | 2 +- .../implementations/UnityPacketInfoProvider.java | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfo.java b/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfo.java index 7e2206d..df0400f 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfo.java +++ b/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfo.java @@ -9,12 +9,15 @@ public class PacketInfo { private final String name; private final String structure; - public PacketInfo(HMessage.Direction destination, int headerId, String hash, String name, String structure) { + private final String source; + + public PacketInfo(HMessage.Direction destination, int headerId, String hash, String name, String structure, String source) { this.destination = destination; this.headerId = headerId; this.hash = hash; this.name = name; this.structure = structure; + this.source = source; } public String getName() { @@ -37,6 +40,10 @@ public class PacketInfo { return structure; } + public String getSource() { + return source; + } + public String toString() { return headerId + ": " + "[" + name + "][" + structure + "]"; } diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfoManager.java b/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfoManager.java index da7b629..530f5ce 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfoManager.java +++ b/G-Earth/src/main/java/gearth/misc/packet_info/PacketInfoManager.java @@ -1,6 +1,5 @@ package gearth.misc.packet_info; -import gearth.misc.Cacher; import gearth.misc.packet_info.providers.RemotePacketInfoProvider; import gearth.misc.packet_info.providers.implementations.HarblePacketInfoProvider; import gearth.misc.packet_info.providers.implementations.SulekPacketInfoProvider; @@ -8,13 +7,7 @@ import gearth.misc.packet_info.providers.implementations.UnityPacketInfoProvider import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.connection.HClient; -import org.fxmisc.undo.impl.ChangeQueue; -import org.json.JSONArray; -import org.json.JSONObject; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; import java.util.*; import java.util.concurrent.Semaphore; @@ -160,14 +153,15 @@ public class PacketInfoManager { String name = hPacket.readString(); String structure = hPacket.readString(); boolean isOutgoing = hPacket.readBoolean(); + String source = hPacket.readString(); packetInfoList.add(new PacketInfo( isOutgoing ? HMessage.Direction.TOSERVER : HMessage.Direction.TOCLIENT, headerId, hash.equals("NULL") ? null : hash, name.equals("NULL") ? null : name, - structure.equals("NULL") ? null : structure - )); + structure.equals("NULL") ? null : structure, + source)); } return new PacketInfoManager(packetInfoList); @@ -181,6 +175,7 @@ public class PacketInfoManager { hPacket.appendString(packetInfo.getName() == null ? "NULL" : packetInfo.getName()); hPacket.appendString(packetInfo.getStructure() == null ? "NULL" : packetInfo.getStructure()); hPacket.appendBoolean(packetInfo.getDestination() == HMessage.Direction.TOSERVER); + hPacket.appendString(packetInfo.getSource()); } } diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/HarblePacketInfoProvider.java b/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/HarblePacketInfoProvider.java index f7aeb39..583e185 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/HarblePacketInfoProvider.java +++ b/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/HarblePacketInfoProvider.java @@ -1,14 +1,11 @@ package gearth.misc.packet_info.providers.implementations; -import gearth.misc.Cacher; import gearth.misc.packet_info.PacketInfo; -import gearth.misc.packet_info.providers.PacketInfoProvider; import gearth.misc.packet_info.providers.RemotePacketInfoProvider; import gearth.protocol.HMessage; import org.json.JSONArray; import org.json.JSONObject; -import java.io.File; import java.util.ArrayList; import java.util.List; @@ -50,7 +47,7 @@ public class HarblePacketInfoProvider extends RemotePacketInfoProvider { try {headerId = object.getInt("Id"); } catch (Exception e) { headerId = Integer.parseInt(object.getString("Id")); } - return new PacketInfo(destination, headerId, hash, name, structure); + return new PacketInfo(destination, headerId, hash, name, structure, "Harble"); } @Override diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/SulekPacketInfoProvider.java b/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/SulekPacketInfoProvider.java index 9336c9c..972c0cc 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/SulekPacketInfoProvider.java +++ b/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/SulekPacketInfoProvider.java @@ -33,7 +33,7 @@ public class SulekPacketInfoProvider extends RemotePacketInfoProvider { String name = object.getString("name") .replaceAll("(((Message)?Composer)|((Message)?Event))$", ""); - return new PacketInfo(destination, headerId, null, name, null); + return new PacketInfo(destination, headerId, null, name, null, "Sulek"); } @Override diff --git a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/UnityPacketInfoProvider.java b/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/UnityPacketInfoProvider.java index 672baa9..517a102 100644 --- a/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/UnityPacketInfoProvider.java +++ b/G-Earth/src/main/java/gearth/misc/packet_info/providers/implementations/UnityPacketInfoProvider.java @@ -32,7 +32,7 @@ public class UnityPacketInfoProvider extends PacketInfoProvider { private PacketInfo jsonToPacketInfo(JSONObject object, HMessage.Direction destination) { String name = object.getString("Name"); int headerId = object.getInt("Id"); - return new PacketInfo(destination, headerId, null, name, null); + return new PacketInfo(destination, headerId, null, name, null, "Unity_local"); } @Override