From db9a4f2deb5241ed0e93659dded6a87544c83923 Mon Sep 17 00:00:00 2001 From: paweldomas Date: Tue, 17 Sep 2013 11:44:21 +0000 Subject: [PATCH] Applies Jakub Adamek fix for recognizing TURN packets. --- .../socket/RelayedCandidateDatagramSocket.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java b/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java index 870f644..1bfdf2a 100644 --- a/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java +++ b/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java @@ -275,10 +275,9 @@ public class RelayedCandidateDatagramSocket pOffset += CHANNELDATA_CHANNELNUMBER_LENGTH; pLength -= CHANNELDATA_CHANNELNUMBER_LENGTH; - char length - = (char) - ((pData[pOffset++] << 8) - | (pData[pOffset++] & 0xFF)); + int length + = ((pData[pOffset++] << 8) + | (pData[pOffset++] & 0xFF)); int padding = ((length % 4) > 0) ? 4 - (length % 4) : 0; @@ -288,8 +287,8 @@ public class RelayedCandidateDatagramSocket * the padding that is sometimes present in the data of the * DatagramPacket. */ - return (length == - (pLength - padding - CHANNELDATA_LENGTH_LENGTH)); + return length == pLength - padding - CHANNELDATA_LENGTH_LENGTH + || length == pLength - CHANNELDATA_LENGTH_LENGTH; } } } @@ -1127,7 +1126,7 @@ public class RelayedCandidateDatagramSocket } } - /** + /** * Represents a channel which relays data sent through this * RelayedCandidateDatagramSocket to a specific * TransportAddress via the TURN server associated with this