Use 74 byte payload for udp discovery (#2413)

* Use 74 byte payload for udp discovery * Bump to 4.4.1
discord-jda · Mar 1, 2023 · 39ba0c2 · 39ba0c2
1 parent c2d16c8
commit 39ba0c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "5.1.0"
 }
 
-val versionObj = Version(major = "4", minor = "4", revision = "0")
+val versionObj = Version(major = "4", minor = "4", revision = "1")
 
 project.group = "net.dv8tion"
 project.version = "$versionObj"

diff --git a/src/main/java/net/dv8tion/jda/internal/audio/AudioWebSocket.java b/src/main/java/net/dv8tion/jda/internal/audio/AudioWebSocket.java
@@ -583,8 +583,8 @@ private InetSocketAddress handleUdpDiscovery(InetSocketAddress address, int ssrc
             //Create new UDP socket for communication
             audioConnection.udpSocket = new DatagramSocket();
 
-            //Create a byte array of length 70 containing our ssrc.
-            ByteBuffer buffer = ByteBuffer.allocate(70);    //70 taken from documentation
+            //Create a byte array of length 74 containing our ssrc.
+            ByteBuffer buffer = ByteBuffer.allocate(74);    //74 taken from documentation
             buffer.putShort((short) 1);                     // 1 = send (receive will be 2)
             buffer.putShort((short) 70);                    // length = 70 bytes (required)
             buffer.putInt(ssrc);                            // Put the ssrc that we were given into the packet to send back to discord.
@@ -595,7 +595,7 @@ private InetSocketAddress handleUdpDiscovery(InetSocketAddress address, int ssrc
             audioConnection.udpSocket.send(discoveryPacket);
 
             //Discord responds to our packet, returning a packet containing our external ip and the port we connected through.
-            DatagramPacket receivedPacket = new DatagramPacket(new byte[70], 70);   //Give a buffer the same size as the one we sent.
+            DatagramPacket receivedPacket = new DatagramPacket(new byte[74], 74);   //Give a buffer the same size as the one we sent.
             audioConnection.udpSocket.setSoTimeout(1000);
             audioConnection.udpSocket.receive(receivedPacket);
 
@@ -609,7 +609,7 @@ private InetSocketAddress handleUdpDiscovery(InetSocketAddress address, int ssrc
 
             //Take bytes between SSRC and PORT and put them into a string
             // null bytes at the beginning are skipped and the rest are appended to the end of the string
-            String ourIP = new String(received, 4, received.length - 6);
+            String ourIP = new String(received, 8, received.length - 10);
             // Removes the extra nulls attached to the end of the IP string
             ourIP = ourIP.trim();