Applies Jakub Adamek fix for recognizing TURN packets.

This commit is contained in:
paweldomas 2013-09-17 11:44:21 +00:00
parent 25de80c37c
commit db9a4f2deb

View File

@ -275,10 +275,9 @@ public class RelayedCandidateDatagramSocket
pOffset += CHANNELDATA_CHANNELNUMBER_LENGTH; pOffset += CHANNELDATA_CHANNELNUMBER_LENGTH;
pLength -= CHANNELDATA_CHANNELNUMBER_LENGTH; pLength -= CHANNELDATA_CHANNELNUMBER_LENGTH;
char length int length
= (char) = ((pData[pOffset++] << 8)
((pData[pOffset++] << 8) | (pData[pOffset++] & 0xFF));
| (pData[pOffset++] & 0xFF));
int padding = ((length % 4) > 0) ? 4 - (length % 4) : 0; 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 * the padding that is sometimes present in the data of the
* DatagramPacket. * DatagramPacket.
*/ */
return (length == return length == pLength - padding - CHANNELDATA_LENGTH_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 * Represents a channel which relays data sent through this
* <tt>RelayedCandidateDatagramSocket</tt> to a specific * <tt>RelayedCandidateDatagramSocket</tt> to a specific
* <tt>TransportAddress</tt> via the TURN server associated with this * <tt>TransportAddress</tt> via the TURN server associated with this