nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 08:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

packets stuff

Browse Source
This commit is contained in:
sirjonasxx 2020-12-29 19:19:25 +01:00
parent 690e9c1f2b
commit 4849cb5479
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
G-Earth/src/main/java/gearth/protocol/connection/proxy/unity/UnityCommunicator.java
View File

@ -35,11 +35,13 @@ public class UnityCommunicator {
@OnOpen @OnOpen
public void onOpen(Session session) throws IOException { public void onOpen(Session session) throws IOException {
session.setMaxBinaryMessageBufferSize(1024 * 1024 * 100); session.setMaxBinaryMessageBufferSize(1024 * 1024 * 10);
} }
private int lastType = 2; // 0 = incoming, 1 = outgoing, 2 = expect new
@OnMessage @OnMessage
public void onMessage(byte[] b, Session session) throws IOException { public void onMessage(byte[] b, boolean isLast, Session session) throws IOException {
if (allowedSession != null && !session.getId().equals(allowedSession)) { if (allowedSession != null && !session.getId().equals(allowedSession)) {
return; return;
} }
@ -47,10 +49,15 @@ public class UnityCommunicator {
if (revision == null) { if (revision == null) {
revision = new String(b, StandardCharsets.ISO_8859_1); revision = new String(b, StandardCharsets.ISO_8859_1);
allowedSession = session.getId(); allowedSession = session.getId();
if (!isLast) {
System.out.println("this is bad");
}
return; return;
} }
byte[] packet = Arrays.copyOfRange(b, 1, b.length);
byte[] packet = lastType == 2 ? Arrays.copyOfRange(b, 1, b.length) : b;
if (hProxy == null && b[0] == 1) { if (hProxy == null && b[0] == 1) {
HPacket maybe = new HPacket(packet); HPacket maybe = new HPacket(packet);
@ -67,11 +74,13 @@ public class UnityCommunicator {
} }
if (hProxy != null && b[0] == 0) { if (hProxy != null && ((lastType == 2 && b[0] == 0) || lastType == 0)) {
hProxy.getInHandler().act(packet); hProxy.getInHandler().act(packet);
lastType = isLast ? 2 : 0;
} }
else if (hProxy != null && b[0] == 1) { else if (hProxy != null && ((lastType == 2 && b[0] == 1) || lastType == 1)) {
hProxy.getOutHandler().act(packet); hProxy.getOutHandler().act(packet);
lastType = isLast ? 2 : 1;
} }
else { else {
proxyProvider.abort(); proxyProvider.abort();

4
G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java
View File

@ -25,12 +25,12 @@ public class UnityPacketHandler extends PacketHandler {
@Override @Override
public void sendToStream(byte[] buffer) { public void sendToStream(byte[] buffer) {
// synchronized (session) { synchronized (session) {
byte[] prefix = new byte[]{(direction == HMessage.Direction.TOCLIENT ? ((byte)0) : ((byte)1))}; byte[] prefix = new byte[]{(direction == HMessage.Direction.TOCLIENT ? ((byte)0) : ((byte)1))};
byte[] combined = ByteArrayUtils.combineByteArrays(prefix, buffer); byte[] combined = ByteArrayUtils.combineByteArrays(prefix, buffer);
session.getAsyncRemote().sendBinary(ByteBuffer.wrap(combined)); session.getAsyncRemote().sendBinary(ByteBuffer.wrap(combined));
// } }
} }
@Override @Override

2
G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/uilogger/UiLoggerController.java
View File

@ -125,7 +125,7 @@ public class UiLoggerController implements Initializable {
elements.add(new Element("]", "incoming")); elements.add(new Element("]", "incoming"));
elements.add(new Element(" <- ", "")); elements.add(new Element(" <- ", ""));
if (skiphugepackets && packet.length() > 8000) { if (skiphugepackets && packet.length() > 4000) {
elements.add(new Element("<packet skipped>", "skipped")); elements.add(new Element("<packet skipped>", "skipped"));
} }
else { else {

10
G-Earth/src/main/resources/gearth/services/unity_tools/js_code/unity_code.js
View File

@ -87,6 +87,11 @@ let _g_packet_split = 600;
function inject_out(packet) { function inject_out(packet) {
if (chachas.length > 1) {
packet[5] = _gearth_returnbyte_copy(chachas[0], packet[5], chachaClass);
packet[4] = _gearth_returnbyte_copy(chachas[0], packet[4], chachaClass);
}
let i = 0; let i = 0;
while (i < packet.length) { while (i < packet.length) {
let inject_amount = Math.min(_g_packet_split, packet.length - i); let inject_amount = Math.min(_g_packet_split, packet.length - i);
@ -97,11 +102,6 @@ function inject_out(packet) {
unityInstance.Module.HEAPU8.set(writeLittleEndian(inject_amount), packet_location + 12); unityInstance.Module.HEAPU8.set(writeLittleEndian(inject_amount), packet_location + 12);
unityInstance.Module.HEAPU8.set(packet.slice(i, i + inject_amount), packet_location + 16); unityInstance.Module.HEAPU8.set(packet.slice(i, i + inject_amount), packet_location + 16);
if (i === 0 && chachas.length > 1) {
unityInstance.Module.HEAPU8[packet_location + 16 + 5] = _gearth_returnbyte_copy(chachas[0], unityInstance.Module.HEAPU8[packet_location + 16 + 5], chachaClass);
unityInstance.Module.HEAPU8[packet_location + 16 + 4] = _gearth_returnbyte_copy(chachas[0], unityInstance.Module.HEAPU8[packet_location + 16 + 4], chachaClass);
}
_gearth_outgoing_copy(out_send_param1, packet_location, out_send_param3); _gearth_outgoing_copy(out_send_param1, packet_location, out_send_param3);
_free(packet_location); _free(packet_location);