Add some future use fields to RequestPunchOpen

Gaming32 · Oct 23, 2024 · cdb7a4c · cdb7a4c
1 parent 5daf35a
commit cdb7a4c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/io/github/gaming32/worldhost/protocol/ProtocolClient.java b/src/main/java/io/github/gaming32/worldhost/protocol/ProtocolClient.java
@@ -381,8 +381,14 @@ public void requestDirectJoin(long connectionId) {
         enqueue(new WorldHostC2SMessage.RequestDirectJoin(connectionId));
     }
 
-    public void requestPunchOpen(long targetConnection, String purpose, UUID punchId, String myHost, int myPort) {
-        enqueue(new WorldHostC2SMessage.RequestPunchOpen(targetConnection, purpose, punchId, myHost, myPort));
+    public void requestPunchOpen(
+        long targetConnection, String purpose, UUID punchId,
+        String myHost, int myPort, String myLocalHost, int myLocalPort
+    ) {
+        enqueue(new WorldHostC2SMessage.RequestPunchOpen(
+            targetConnection, purpose, punchId,
+            myHost, myPort, myLocalHost, myLocalPort
+        ));
     }
 
     public void punchFailed(long targetConnection, UUID punchId) {

diff --git a/src/main/java/io/github/gaming32/worldhost/protocol/WorldHostC2SMessage.java b/src/main/java/io/github/gaming32/worldhost/protocol/WorldHostC2SMessage.java
@@ -177,7 +177,8 @@ public void encode(DataOutputStream dos) throws IOException {
     }
 
     record RequestPunchOpen(
-        long targetConnection, String purpose, UUID punchId, String myHost, int myPort
+        long targetConnection, String purpose, UUID punchId,
+        String myHost, int myPort, String myLocalHost, int myLocalPort
     ) implements WorldHostC2SMessage {
         @Override
         public byte typeId() {
@@ -191,6 +192,8 @@ public void encode(DataOutputStream dos) throws IOException {
             writeUuid(dos, punchId);
             writeString(dos, myHost);
             dos.writeShort(myPort);
+            writeString(dos, myLocalHost);
+            dos.writeShort(myLocalPort);
         }
     }
 

diff --git a/src/main/java/io/github/gaming32/worldhost/protocol/punch/PunchManager.java b/src/main/java/io/github/gaming32/worldhost/protocol/punch/PunchManager.java
@@ -52,7 +52,9 @@ public static void punch(
             PENDING_CLIENT_PUNCHES.put(punchId, new PendingClientPunch(successAction, cancelledAction));
             if (WorldHost.protoClient != null) {
                 WorldHost.protoClient.requestPunchOpen(
-                    connectionId, reason.id(), punchId, myHostAndPort.getHost(), myHostAndPort.getPort()
+                    connectionId, reason.id(), punchId,
+                    myHostAndPort.getHost(), myHostAndPort.getPort(),
+                    "", 0
                 );
             }
         }, cancelledAction);