Commits work in progress on relaying through a TURN server using ChannelData messages. The implementation seems to cause Mac OS X Snow Leopard to die so it is committed disabled for the purposes of easy transfer and testing on a more stable operating system.
This commit is contained in:
parent
0bcec0c2f8
commit
dea667e8b5
@ -302,6 +302,7 @@ public class TurnCandidateHarvest
|
|||||||
switch (request.getMessageType())
|
switch (request.getMessageType())
|
||||||
{
|
{
|
||||||
case Message.ALLOCATE_REQUEST:
|
case Message.ALLOCATE_REQUEST:
|
||||||
|
{
|
||||||
RequestedTransportAttribute requestedTransportAttribute
|
RequestedTransportAttribute requestedTransportAttribute
|
||||||
= (RequestedTransportAttribute)
|
= (RequestedTransportAttribute)
|
||||||
request.getAttribute(Attribute.REQUESTED_TRANSPORT);
|
request.getAttribute(Attribute.REQUESTED_TRANSPORT);
|
||||||
@ -320,8 +321,40 @@ public class TurnCandidateHarvest
|
|||||||
MessageFactory.createAllocateRequest(
|
MessageFactory.createAllocateRequest(
|
||||||
(byte) requestedTransport,
|
(byte) requestedTransport,
|
||||||
rFlag);
|
rFlag);
|
||||||
|
}
|
||||||
|
|
||||||
|
case Message.CHANNELBIND_REQUEST:
|
||||||
|
{
|
||||||
|
ChannelNumberAttribute channelNumberAttribute
|
||||||
|
= (ChannelNumberAttribute)
|
||||||
|
request.getAttribute(Attribute.CHANNEL_NUMBER);
|
||||||
|
char channelNumber = channelNumberAttribute.getChannelNumber();
|
||||||
|
XorPeerAddressAttribute peerAddressAttribute
|
||||||
|
= (XorPeerAddressAttribute)
|
||||||
|
request.getAttribute(Attribute.XOR_PEER_ADDRESS);
|
||||||
|
TransportAddress peerAddress
|
||||||
|
= peerAddressAttribute.getAddress(request.getTransactionID());
|
||||||
|
byte[] retryTransactionID
|
||||||
|
= TransactionID.createNewTransactionID().getBytes();
|
||||||
|
Request retryChannelBindRequest
|
||||||
|
= MessageFactory.createChannelBindRequest(
|
||||||
|
channelNumber,
|
||||||
|
peerAddress,
|
||||||
|
retryTransactionID);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
retryChannelBindRequest.setTransactionID(retryTransactionID);
|
||||||
|
}
|
||||||
|
catch (StunException sex)
|
||||||
|
{
|
||||||
|
throw new UndeclaredThrowableException(sex);
|
||||||
|
}
|
||||||
|
return retryChannelBindRequest;
|
||||||
|
}
|
||||||
|
|
||||||
case Message.CREATEPERMISSION_REQUEST:
|
case Message.CREATEPERMISSION_REQUEST:
|
||||||
|
{
|
||||||
XorPeerAddressAttribute peerAddressAttribute
|
XorPeerAddressAttribute peerAddressAttribute
|
||||||
= (XorPeerAddressAttribute)
|
= (XorPeerAddressAttribute)
|
||||||
request.getAttribute(Attribute.XOR_PEER_ADDRESS);
|
request.getAttribute(Attribute.XOR_PEER_ADDRESS);
|
||||||
@ -344,8 +377,10 @@ public class TurnCandidateHarvest
|
|||||||
throw new UndeclaredThrowableException(sex);
|
throw new UndeclaredThrowableException(sex);
|
||||||
}
|
}
|
||||||
return retryCreatePermissionRequest;
|
return retryCreatePermissionRequest;
|
||||||
|
}
|
||||||
|
|
||||||
case Message.REFRESH_REQUEST:
|
case Message.REFRESH_REQUEST:
|
||||||
|
{
|
||||||
LifetimeAttribute lifetimeAttribute
|
LifetimeAttribute lifetimeAttribute
|
||||||
= (LifetimeAttribute) request.getAttribute(Attribute.LIFETIME);
|
= (LifetimeAttribute) request.getAttribute(Attribute.LIFETIME);
|
||||||
|
|
||||||
@ -357,6 +392,7 @@ public class TurnCandidateHarvest
|
|||||||
MessageFactory.createRefreshRequest(
|
MessageFactory.createRefreshRequest(
|
||||||
lifetimeAttribute.getLifetime());
|
lifetimeAttribute.getLifetime());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return super.createRequestToRetry(request);
|
return super.createRequestToRetry(request);
|
||||||
@ -401,10 +437,16 @@ public class TurnCandidateHarvest
|
|||||||
* @param response the error <tt>Response</tt> which has been received for
|
* @param response the error <tt>Response</tt> which has been received for
|
||||||
* <tt>request</tt>
|
* <tt>request</tt>
|
||||||
* @param request the <tt>Request</tt> to which <tt>Response</tt> responds
|
* @param request the <tt>Request</tt> to which <tt>Response</tt> responds
|
||||||
|
* @param transactionID the <tt>TransactionID</tt> of <tt>response</tt> and
|
||||||
|
* <tt>request</tt> because <tt>response</tt> and <tt>request</tt> only have
|
||||||
|
* it as a <tt>byte</tt> array and <tt>TransactionID</tt> is required for
|
||||||
|
* the <tt>applicationData</tt> property value
|
||||||
* @return <tt>true</tt> if the error or failure condition has been
|
* @return <tt>true</tt> if the error or failure condition has been
|
||||||
* processed and this instance can continue its execution (e.g. the
|
* processed and this instance can continue its execution (e.g. the
|
||||||
* resolution of the candidate) as if it was expected; otherwise,
|
* resolution of the candidate) as if it was expected; otherwise,
|
||||||
* <tt>false</tt>
|
* <tt>false</tt>
|
||||||
|
* @see StunCandidateHarvest#processErrorOrFailure(Response, Request,
|
||||||
|
* TransactionID)
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected boolean processErrorOrFailure(
|
protected boolean processErrorOrFailure(
|
||||||
@ -436,7 +478,12 @@ public class TurnCandidateHarvest
|
|||||||
* be handled
|
* be handled
|
||||||
* @param request the STUN <tt>Request</tt> to which <tt>response</tt>
|
* @param request the STUN <tt>Request</tt> to which <tt>response</tt>
|
||||||
* responds
|
* responds
|
||||||
* @see StunCandidateHarvest#processSuccess(Response, Request)
|
* @param transactionID the <tt>TransactionID</tt> of <tt>response</tt> and
|
||||||
|
* <tt>request</tt> because <tt>response</tt> and <tt>request</tt> only have
|
||||||
|
* it as a <tt>byte</tt> array and <tt>TransactionID</tt> is required for
|
||||||
|
* the <tt>applicationData</tt> property value
|
||||||
|
* @see StunCandidateHarvest#processSuccess(Response, Request,
|
||||||
|
* TransactionID)
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void processSuccess(
|
protected void processSuccess(
|
||||||
|
|||||||
@ -42,6 +42,35 @@ public class RelayedCandidateDatagramSocket
|
|||||||
private static final Logger logger
|
private static final Logger logger
|
||||||
= Logger.getLogger(RelayedCandidateDatagramSocket.class.getName());
|
= Logger.getLogger(RelayedCandidateDatagramSocket.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The constant which represents a channel number value signaling that no
|
||||||
|
* channel number has been explicitly specified.
|
||||||
|
*/
|
||||||
|
private static final char CHANNEL_NUMBER_NOT_SPECIFIED = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The length in bytes of the Channel Number field of a TURN ChannelData
|
||||||
|
* message.
|
||||||
|
*/
|
||||||
|
private static final int CHANNELDATA_CHANNELNUMBER_LENGTH = 2;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The length in bytes of the Length field of a TURN ChannelData message.
|
||||||
|
*/
|
||||||
|
private static final int CHANNELDATA_LENGTH_LENGTH = 2;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The maximum channel number which is valid for TURN ChannelBind
|
||||||
|
* <tt>Request</tt>.
|
||||||
|
*/
|
||||||
|
private static final char MAX_CHANNEL_NUMBER = 0x7FFF;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The minimum channel number which is valid for TURN ChannelBind
|
||||||
|
* <tt>Request</tt>s.
|
||||||
|
*/
|
||||||
|
private static final char MIN_CHANNEL_NUMBER = 0x4000;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The lifetime in milliseconds of a TURN permission created using a
|
* The lifetime in milliseconds of a TURN permission created using a
|
||||||
* CreatePermission request.
|
* CreatePermission request.
|
||||||
@ -55,6 +84,19 @@ public class RelayedCandidateDatagramSocket
|
|||||||
private static final long PERMISSION_LIFETIME_LEEWAY
|
private static final long PERMISSION_LIFETIME_LEEWAY
|
||||||
= 60 /* seconds */ * 1000L;
|
= 60 /* seconds */ * 1000L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The <tt>DatagramSocket</tt> through which this
|
||||||
|
* <tt>RelayedCandidateDatagramSocket</tt> actually sends and receives the
|
||||||
|
* data it has been asked to {@link #send(DatagramPacket)} and
|
||||||
|
* {@link #receive(DatagramPacket)}. Since data can be exchanged with a TURN
|
||||||
|
* server using STUN messages (i.e. Send and Data indications),
|
||||||
|
* <tt>RelayedCandidateDatagramSocket</tt> may send and receive data using
|
||||||
|
* the associated <tt>StunStack</tt> and not <tt>channelDataSocket</tt>.
|
||||||
|
* However, using <tt>channelDataSocket</tt> is supposed to be more
|
||||||
|
* efficient than using <tt>StunStack</tt>.
|
||||||
|
*/
|
||||||
|
private final DatagramSocket channelDataSocket;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The list of per-peer <tt>Channel</tt>s through which this
|
* The list of per-peer <tt>Channel</tt>s through which this
|
||||||
* <tt>RelayedCandidateDatagramSocket</tt>s relays data send to it to
|
* <tt>RelayedCandidateDatagramSocket</tt>s relays data send to it to
|
||||||
@ -68,6 +110,23 @@ public class RelayedCandidateDatagramSocket
|
|||||||
*/
|
*/
|
||||||
private boolean closed = false;
|
private boolean closed = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The <tt>DatagramPacketFilter</tt> which is able to determine whether a
|
||||||
|
* specific <tt>DatagramPacket</tt> sent through a
|
||||||
|
* <tt>RelayedCandidateDatagramSocket</tt> is part of the ICE connectivity
|
||||||
|
* checks. The recognizing is necessary because RFC 5245 says that "it is
|
||||||
|
* RECOMMENDED that the agent defer creation of a TURN channel until ICE
|
||||||
|
* completes."
|
||||||
|
*/
|
||||||
|
private static final DatagramPacketFilter connectivityCheckRecognizer
|
||||||
|
= new StunDatagramPacketFilter();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The next free channel number to be returned by
|
||||||
|
* {@link #getNextChannelNumber()} and marked as non-free.
|
||||||
|
*/
|
||||||
|
private char nextChannelNumber = MIN_CHANNEL_NUMBER;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The <tt>DatagramPacket</tt>s which are to be received through this
|
* The <tt>DatagramPacket</tt>s which are to be received through this
|
||||||
* <tt>DatagramSocket</tt> upon calls to its
|
* <tt>DatagramSocket</tt> upon calls to its
|
||||||
@ -86,6 +145,12 @@ public class RelayedCandidateDatagramSocket
|
|||||||
private final List<DatagramPacket> packetsToSend
|
private final List<DatagramPacket> packetsToSend
|
||||||
= new LinkedList<DatagramPacket>();
|
= new LinkedList<DatagramPacket>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The <tt>Thread</tt> which receives <tt>DatagramPacket</tt>s from
|
||||||
|
* {@link #channelDataSocket} and queues them in {@link #packetsToReceive}.
|
||||||
|
*/
|
||||||
|
private Thread receiveChannelDataThread;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The <tt>RelayedCandidate</tt> which uses this instance as the value of
|
* The <tt>RelayedCandidate</tt> which uses this instance as the value of
|
||||||
* its <tt>socket</tt> property.
|
* its <tt>socket</tt> property.
|
||||||
@ -129,6 +194,127 @@ public class RelayedCandidateDatagramSocket
|
|||||||
this.turnCandidateHarvest.harvester.stunStack.addIndicationListener(
|
this.turnCandidateHarvest.harvester.stunStack.addIndicationListener(
|
||||||
this.turnCandidateHarvest.hostCandidate.getTransportAddress(),
|
this.turnCandidateHarvest.hostCandidate.getTransportAddress(),
|
||||||
this);
|
this);
|
||||||
|
|
||||||
|
DatagramSocket hostSocket
|
||||||
|
= this.turnCandidateHarvest.hostCandidate.getSocket();
|
||||||
|
|
||||||
|
if (hostSocket instanceof MultiplexingDatagramSocket)
|
||||||
|
{
|
||||||
|
channelDataSocket
|
||||||
|
= ((MultiplexingDatagramSocket) hostSocket).getSocket(
|
||||||
|
new TurnDatagramPacketFilter(
|
||||||
|
this.turnCandidateHarvest.harvester.stunServer)
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public boolean accept(DatagramPacket p)
|
||||||
|
{
|
||||||
|
return channelDataSocketAccept(p);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean acceptMethod(char method)
|
||||||
|
{
|
||||||
|
return channelDataSocketAcceptMethod(method);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
channelDataSocket = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines whether a specific <tt>DatagramPacket</tt> is accepted by
|
||||||
|
* {@link #channelDataSocket} (i.e. whether <tt>channelDataSocket</tt>
|
||||||
|
* understands <tt>p</tt> and <tt>p</tt> is meant to be received by
|
||||||
|
* <tt>channelDataSocket</tt>).
|
||||||
|
*
|
||||||
|
* @param p the <tt>DatagramPacket</tt> which is to be checked whether it is
|
||||||
|
* accepted by <tt>channelDataSocket</tt>
|
||||||
|
* @return <tt>true</tt> if <tt>channelDataSocket</tt> accepts <tt>p</tt>
|
||||||
|
* (i.e. <tt>channelDataSocket</tt> understands <tt>p</tt> and <tt>p</tt> is
|
||||||
|
* meant to be received by <tt>channelDataSocket</tt>); otherwise,
|
||||||
|
* <tt>false</tt>
|
||||||
|
*/
|
||||||
|
private boolean channelDataSocketAccept(DatagramPacket p)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Is it from our TURN server and, more specifically, via the Allocation
|
||||||
|
* we have created on it?
|
||||||
|
*/
|
||||||
|
if (getLocalSocketAddress().equals(p.getSocketAddress()))
|
||||||
|
{
|
||||||
|
int pLength = p.getLength();
|
||||||
|
|
||||||
|
if (pLength
|
||||||
|
>= (CHANNELDATA_CHANNELNUMBER_LENGTH
|
||||||
|
+ CHANNELDATA_LENGTH_LENGTH))
|
||||||
|
{
|
||||||
|
byte[] pData = p.getData();
|
||||||
|
int pOffset = p.getOffset();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The first two bits should be 0b01 because of the current
|
||||||
|
* channel number range 0x4000 - 0x7FFE. But 0b10 and 0b11 which
|
||||||
|
* are currently reserved and may be used in the future to
|
||||||
|
* extend the range of channel numbers.
|
||||||
|
*/
|
||||||
|
if ((pData[pOffset] & 0xC0) != 0)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Technically, we cannot create a DatagramPacket from a
|
||||||
|
* ChannelData message with a Channel Number we do not know
|
||||||
|
* about. But determining that we know the value of the
|
||||||
|
* Channel Number field may be too much of an unnecessary
|
||||||
|
* performance penalty and it may be unnecessary because the
|
||||||
|
* message comes from our TURN server and it looks like a
|
||||||
|
* ChannelData message already.
|
||||||
|
*/
|
||||||
|
pOffset += CHANNELDATA_CHANNELNUMBER_LENGTH;
|
||||||
|
pLength -= CHANNELDATA_CHANNELNUMBER_LENGTH;
|
||||||
|
|
||||||
|
char length
|
||||||
|
= (char)
|
||||||
|
((pData[pOffset++] << 8)
|
||||||
|
| (pData[pOffset++] & 0xFF));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The Length field specifies the length in bytes of the
|
||||||
|
* Application Data field. The Length field does not include
|
||||||
|
* the padding that is sometimes present in the data of the
|
||||||
|
* DatagramPacket.
|
||||||
|
*/
|
||||||
|
boolean accept
|
||||||
|
= ((CHANNELDATA_LENGTH_LENGTH + length) >= pLength);
|
||||||
|
|
||||||
|
System.err.println(
|
||||||
|
getClass().getSimpleName()
|
||||||
|
+ ".channelDataSocketAccept: "
|
||||||
|
+ accept);
|
||||||
|
return accept;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines whether {@link #channelDataSocket} accepts
|
||||||
|
* <tt>DatagramPacket</tt>s which represent STUN messages with a specific
|
||||||
|
* method.
|
||||||
|
*
|
||||||
|
* @param method the method of the STUN messages represented in
|
||||||
|
* <tt>DatagramPacket</tt>s which is accepted by <tt>channelDataSocket</tt>
|
||||||
|
* @return <tt>true</tt> if <tt>channelDataSocket</tt> accepts
|
||||||
|
* <tt>DatagramPacket</tt>s which represent STUN messages with the specified
|
||||||
|
* <tt>method</tt>; otherwise, <tt>false</tt>
|
||||||
|
*/
|
||||||
|
private boolean channelDataSocketAcceptMethod(char method)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Accept only ChannelData messages for now. ChannelData messages are
|
||||||
|
* not STUN messages so they do not have a method associated with them.
|
||||||
|
*/
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -160,41 +346,88 @@ public class RelayedCandidateDatagramSocket
|
|||||||
turnCandidateHarvest.close(this);
|
turnCandidateHarvest.close(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates {@link #receiveChannelDataThread} which is to receive
|
||||||
|
* <tt>DatagramPacket</tt>s from {@link #channelDataSocket} and queue them
|
||||||
|
* in {@link #packetsToReceive}.
|
||||||
|
*/
|
||||||
|
private void createReceiveChannelDataThread()
|
||||||
|
{
|
||||||
|
receiveChannelDataThread
|
||||||
|
= new Thread()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
boolean done = false;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
runInReceiveChannelDataThread();
|
||||||
|
done = true;
|
||||||
|
}
|
||||||
|
catch (SocketException sex)
|
||||||
|
{
|
||||||
|
done = true;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* If receiveChannelDataThread is dying and this
|
||||||
|
* RelayedCandidateDatagramSocket is not closed, then
|
||||||
|
* spawn a new receiveChannelDataThread.
|
||||||
|
*/
|
||||||
|
synchronized (packetsToReceive)
|
||||||
|
{
|
||||||
|
if (receiveChannelDataThread
|
||||||
|
== Thread.currentThread())
|
||||||
|
receiveChannelDataThread = null;
|
||||||
|
if ((receiveChannelDataThread == null)
|
||||||
|
&& !closed
|
||||||
|
&& !done)
|
||||||
|
createReceiveChannelDataThread();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
receiveChannelDataThread.start();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates {@link #sendThread} which is to send {@link #packetsToSend} to
|
* Creates {@link #sendThread} which is to send {@link #packetsToSend} to
|
||||||
* the associated TURN server.
|
* the associated TURN server.
|
||||||
*/
|
*/
|
||||||
private void createSendThread()
|
private void createSendThread()
|
||||||
{
|
{
|
||||||
synchronized (packetsToSend)
|
sendThread
|
||||||
{
|
= new Thread()
|
||||||
sendThread
|
{
|
||||||
= new Thread()
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
runInSendThread();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* If sendThread is dying and there are packetsToSend,
|
||||||
|
* then spawn a new sendThread.
|
||||||
|
*/
|
||||||
|
synchronized (packetsToSend)
|
||||||
{
|
{
|
||||||
@Override
|
if (sendThread == Thread.currentThread())
|
||||||
public void run()
|
sendThread = null;
|
||||||
{
|
if ((sendThread == null)
|
||||||
try
|
&& !closed
|
||||||
{
|
&& !packetsToSend.isEmpty())
|
||||||
runInSendThread();
|
createSendThread();
|
||||||
}
|
}
|
||||||
finally
|
}
|
||||||
{
|
}
|
||||||
synchronized (packetsToSend)
|
};
|
||||||
{
|
sendThread.start();
|
||||||
if (sendThread
|
|
||||||
== Thread.currentThread())
|
|
||||||
sendThread = null;
|
|
||||||
if ((sendThread == null)
|
|
||||||
&& !closed
|
|
||||||
&& !packetsToSend.isEmpty())
|
|
||||||
createSendThread();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
sendThread.start();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -253,6 +486,27 @@ public class RelayedCandidateDatagramSocket
|
|||||||
return getRelayedCandidate().getTransportAddress();
|
return getRelayedCandidate().getTransportAddress();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the next free channel number to be allocated to a <tt>Channel</tt>
|
||||||
|
* and marked as non-free.
|
||||||
|
*
|
||||||
|
* @return the next free channel number to be allocated to a
|
||||||
|
* <tt>Channel</tt> and marked as non-free.
|
||||||
|
*/
|
||||||
|
private char getNextChannelNumber()
|
||||||
|
{
|
||||||
|
char nextChannelNumber;
|
||||||
|
|
||||||
|
if (this.nextChannelNumber > MAX_CHANNEL_NUMBER)
|
||||||
|
nextChannelNumber = CHANNEL_NUMBER_NOT_SPECIFIED;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nextChannelNumber = this.nextChannelNumber;
|
||||||
|
this.nextChannelNumber++;
|
||||||
|
}
|
||||||
|
return nextChannelNumber;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the <tt>RelayedCandidate</tt> which uses this instance as the value
|
* Gets the <tt>RelayedCandidate</tt> which uses this instance as the value
|
||||||
* of its <tt>socket</tt> property.
|
* of its <tt>socket</tt> property.
|
||||||
@ -360,8 +614,17 @@ public class RelayedCandidateDatagramSocket
|
|||||||
*/
|
*/
|
||||||
public boolean processErrorOrFailure(Response response, Request request)
|
public boolean processErrorOrFailure(Response response, Request request)
|
||||||
{
|
{
|
||||||
if (request.getMessageType() == Message.CREATEPERMISSION_REQUEST)
|
switch (request.getMessageType())
|
||||||
|
{
|
||||||
|
case Message.CHANNELBIND_REQUEST:
|
||||||
|
setChannelNumberIsConfirmed(request, false);
|
||||||
|
break;
|
||||||
|
case Message.CREATEPERMISSION_REQUEST:
|
||||||
setChannelBound(request, false);
|
setChannelBound(request, false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -376,8 +639,17 @@ public class RelayedCandidateDatagramSocket
|
|||||||
*/
|
*/
|
||||||
public void processSuccess(Response response, Request request)
|
public void processSuccess(Response response, Request request)
|
||||||
{
|
{
|
||||||
if (request.getMessageType() == Message.CREATEPERMISSION_REQUEST)
|
switch (request.getMessageType())
|
||||||
|
{
|
||||||
|
case Message.CHANNELBIND_REQUEST:
|
||||||
|
setChannelNumberIsConfirmed(request, true);
|
||||||
|
break;
|
||||||
|
case Message.CREATEPERMISSION_REQUEST:
|
||||||
setChannelBound(request, true);
|
setChannelBound(request, true);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -435,6 +707,143 @@ public class RelayedCandidateDatagramSocket
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Runs in {@link #receiveChannelDataThread} to receive
|
||||||
|
* <tt>DatagramPacket</tt>s from {@link #channelDataSocket} and queue them
|
||||||
|
* in {@link #packetsToReceive}.
|
||||||
|
*
|
||||||
|
* @throws SocketException if anything goes wrong while receiving
|
||||||
|
* <tt>DatagramPacket</tt>s from {@link #channelDataSocket} and
|
||||||
|
* {@link #receiveChannelDataThread} is to no longer exist
|
||||||
|
*/
|
||||||
|
private void runInReceiveChannelDataThread()
|
||||||
|
throws SocketException
|
||||||
|
{
|
||||||
|
DatagramPacket p = null;
|
||||||
|
|
||||||
|
while (!closed)
|
||||||
|
{
|
||||||
|
int receiveBufferSize = channelDataSocket.getReceiveBufferSize();
|
||||||
|
|
||||||
|
if (p == null)
|
||||||
|
{
|
||||||
|
p
|
||||||
|
= new DatagramPacket(
|
||||||
|
new byte[receiveBufferSize],
|
||||||
|
receiveBufferSize);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
byte[] pData = p.getData();
|
||||||
|
|
||||||
|
if ((pData == null) || (pData.length < receiveBufferSize))
|
||||||
|
p.setData(new byte[receiveBufferSize]);
|
||||||
|
else
|
||||||
|
p.setLength(receiveBufferSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
channelDataSocket.receive(p);
|
||||||
|
}
|
||||||
|
catch (Throwable t)
|
||||||
|
{
|
||||||
|
if (t instanceof ThreadDeath)
|
||||||
|
{
|
||||||
|
// Death is the end of life no matter what.
|
||||||
|
throw (ThreadDeath) t;
|
||||||
|
}
|
||||||
|
else if (t instanceof SocketException)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* If the channelDataSocket has gone unusable, put an end to
|
||||||
|
* receiving from it.
|
||||||
|
*/
|
||||||
|
throw (SocketException) t;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (logger.isLoggable(Level.WARNING))
|
||||||
|
{
|
||||||
|
logger.log(
|
||||||
|
Level.WARNING,
|
||||||
|
"Ignoring error while receiving from"
|
||||||
|
+ " ChannelData socket",
|
||||||
|
t);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We've been waiting in #receive so make sure we're still to
|
||||||
|
* continue just in case.
|
||||||
|
*/
|
||||||
|
if (closed)
|
||||||
|
break;
|
||||||
|
|
||||||
|
int channelDataLength = p.getLength();
|
||||||
|
|
||||||
|
if (channelDataLength
|
||||||
|
< (CHANNELDATA_CHANNELNUMBER_LENGTH
|
||||||
|
+ CHANNELDATA_LENGTH_LENGTH))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
byte[] channelData = p.getData();
|
||||||
|
int channelDataOffset = p.getOffset();
|
||||||
|
char channelNumber
|
||||||
|
= (char)
|
||||||
|
((channelData[channelDataOffset++] << 8)
|
||||||
|
| (channelData[channelDataOffset++] & 0xFF));
|
||||||
|
|
||||||
|
channelDataLength -= CHANNELDATA_CHANNELNUMBER_LENGTH;
|
||||||
|
|
||||||
|
char length
|
||||||
|
= (char)
|
||||||
|
((channelData[channelDataOffset++] << 8)
|
||||||
|
| (channelData[channelDataOffset++] & 0xFF));
|
||||||
|
|
||||||
|
channelDataLength -= CHANNELDATA_LENGTH_LENGTH;
|
||||||
|
if (length > channelDataLength)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
TransportAddress peerAddress = null;
|
||||||
|
|
||||||
|
synchronized (packetsToSend)
|
||||||
|
{
|
||||||
|
int channelCount = channels.size();
|
||||||
|
|
||||||
|
for (int channelIndex = 0;
|
||||||
|
channelIndex < channelCount;
|
||||||
|
channelIndex++)
|
||||||
|
{
|
||||||
|
Channel channel = channels.get(channelIndex);
|
||||||
|
|
||||||
|
if (channel.channelNumberEquals(channelNumber))
|
||||||
|
{
|
||||||
|
peerAddress = channel.peerAddress;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (peerAddress == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
byte[] data = new byte[length];
|
||||||
|
|
||||||
|
System.arraycopy(channelData, channelDataOffset, data, 0, length);
|
||||||
|
|
||||||
|
DatagramPacket packetToReceive
|
||||||
|
= new DatagramPacket(data, 0, length, peerAddress);
|
||||||
|
|
||||||
|
synchronized (packetsToReceive)
|
||||||
|
{
|
||||||
|
packetsToReceive.add(packetToReceive);
|
||||||
|
packetsToReceive.notifyAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Runs in {@link #sendThread} to send {@link #packetsToSend} to the
|
* Runs in {@link #sendThread} to send {@link #packetsToSend} to the
|
||||||
* associated TURN server.
|
* associated TURN server.
|
||||||
@ -496,11 +905,31 @@ public class RelayedCandidateDatagramSocket
|
|||||||
channels.add(channel);
|
channels.add(channel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* RFC 5245 says that "it is RECOMMENDED that the agent
|
||||||
|
* defer creation of a TURN channel until ICE completes."
|
||||||
|
* RelayedCandidateDatagramSocket is not explicitly told
|
||||||
|
* from the outside that ICE has completed so it tries to
|
||||||
|
* determine it by assuming that connectivity checks send
|
||||||
|
* only STUN messages and ICE has completed by the time a
|
||||||
|
* non-STUN message is to be sent.
|
||||||
|
*/
|
||||||
|
boolean forceBind = false;
|
||||||
|
|
||||||
|
// if ((channelDataSocket != null)
|
||||||
|
// && !channel.getChannelDataIsPreferred()
|
||||||
|
// && !connectivityCheckRecognizer.accept(
|
||||||
|
// packetToSend))
|
||||||
|
// {
|
||||||
|
// channel.setChannelDataIsPreferred(true);
|
||||||
|
// forceBind = true;
|
||||||
|
// }
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Either bind the channel or send the packetToSend through
|
* Either bind the channel or send the packetToSend through
|
||||||
* it.
|
* it.
|
||||||
*/
|
*/
|
||||||
if (channel.isBound())
|
if (!forceBind && channel.isBound())
|
||||||
{
|
{
|
||||||
packetsToSend.remove(packetToSendIndex);
|
packetsToSend.remove(packetToSendIndex);
|
||||||
try
|
try
|
||||||
@ -522,7 +951,7 @@ public class RelayedCandidateDatagramSocket
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (!channel.isBinding())
|
else if (forceBind || !channel.isBinding())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -551,6 +980,16 @@ public class RelayedCandidateDatagramSocket
|
|||||||
packetsToSend.remove(packetToSendIndex);
|
packetsToSend.remove(packetToSendIndex);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
* If the Channel was bound but #bind() was forced on
|
||||||
|
* it, we cannot continue with the next packetToSend
|
||||||
|
* because it may be for the same Channel and then
|
||||||
|
* #bind() will not be forced and the Channel will be
|
||||||
|
* bound already so the send order of the packetsToSend
|
||||||
|
* will be disrupted.
|
||||||
|
*/
|
||||||
|
if (forceBind)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -645,6 +1084,49 @@ public class RelayedCandidateDatagramSocket
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the <tt>channelNumberIsConfirmed</tt> property of a <tt>Channel</tt>
|
||||||
|
* which has attempted to allocate a specific channel number by sending a
|
||||||
|
* specific ChannelBind <tt>Request</tt>.
|
||||||
|
*
|
||||||
|
* @param request the <tt>Request</tt> which has been sent to allocate a
|
||||||
|
* specific channel number for a <tt>Channel</tt>
|
||||||
|
* @param channelNumberIsConfirmed <tt>true</tt> if the channel number has
|
||||||
|
* been successfully allocated; otherwise, <tt>false</tt>
|
||||||
|
*/
|
||||||
|
private void setChannelNumberIsConfirmed(
|
||||||
|
Request request,
|
||||||
|
boolean channelNumberIsConfirmed)
|
||||||
|
{
|
||||||
|
XorPeerAddressAttribute peerAddressAttribute
|
||||||
|
= (XorPeerAddressAttribute)
|
||||||
|
request.getAttribute(Attribute.XOR_PEER_ADDRESS);
|
||||||
|
byte[] transactionID = request.getTransactionID();
|
||||||
|
TransportAddress peerAddress
|
||||||
|
= peerAddressAttribute.getAddress(transactionID);
|
||||||
|
|
||||||
|
synchronized (packetsToSend)
|
||||||
|
{
|
||||||
|
int channelCount = channels.size();
|
||||||
|
|
||||||
|
for (int channelIndex = 0;
|
||||||
|
channelIndex < channelCount;
|
||||||
|
channelIndex++)
|
||||||
|
{
|
||||||
|
Channel channel = channels.get(channelIndex);
|
||||||
|
|
||||||
|
if (channel.peerAddressEquals(peerAddress))
|
||||||
|
{
|
||||||
|
channel.setChannelNumberIsConfirmed(
|
||||||
|
channelNumberIsConfirmed,
|
||||||
|
transactionID);
|
||||||
|
packetsToSend.notifyAll();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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
|
||||||
@ -671,12 +1153,45 @@ public class RelayedCandidateDatagramSocket
|
|||||||
*/
|
*/
|
||||||
private boolean bound = false;
|
private boolean bound = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The value of the <tt>data</tt> property of
|
||||||
|
* {@link #channelDataPacket}.
|
||||||
|
*/
|
||||||
|
private byte[] channelData;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The indicator which determines whether this <tt>Channel</tt> is set
|
||||||
|
* to prefer sending <tt>DatagramPacket</tt>s using TURN ChannelData
|
||||||
|
* messages instead of Send indications.
|
||||||
|
*/
|
||||||
|
private boolean channelDataIsPreferred = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The <tt>DatagramPacket</tt> in which this <tt>Channel</tt> sends TURN
|
||||||
|
* ChannelData messages through
|
||||||
|
* {@link RelayedCandidateDatagramSocket#channelDataSocket}.
|
||||||
|
*/
|
||||||
|
private DatagramPacket channelDataPacket;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The TURN channel number of this <tt>Channel</tt> which is to be or
|
||||||
|
* has been allocated using a ChannelBind <tt>Request</tt>.
|
||||||
|
*/
|
||||||
|
private char channelNumber = CHANNEL_NUMBER_NOT_SPECIFIED;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The indicator which determines whether the associated TURN server has
|
||||||
|
* confirmed the allocation of {@link #channelNumber} by us receiving a
|
||||||
|
* success <tt>Response</tt> to our ChannelBind <tt>Request</tt>.
|
||||||
|
*/
|
||||||
|
private boolean channelNumberIsConfirmed;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The <tt>TransportAddress</tt> of the peer to which this
|
* The <tt>TransportAddress</tt> of the peer to which this
|
||||||
* <tt>Channel</tt> provides a permission of this
|
* <tt>Channel</tt> provides a permission of this
|
||||||
* <tt>RelayedCandidateDatagramSocket</tt> to send data to.
|
* <tt>RelayedCandidateDatagramSocket</tt> to send data to.
|
||||||
*/
|
*/
|
||||||
private final TransportAddress peerAddress;
|
public final TransportAddress peerAddress;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes a new <tt>Channel</tt> instance which is to provide this
|
* Initializes a new <tt>Channel</tt> instance which is to provide this
|
||||||
@ -703,20 +1218,87 @@ public class RelayedCandidateDatagramSocket
|
|||||||
public void bind()
|
public void bind()
|
||||||
throws StunException
|
throws StunException
|
||||||
{
|
{
|
||||||
byte[] transactionID
|
byte[] createPermissionTransactionID
|
||||||
= TransactionID.createNewTransactionID().getBytes();
|
= TransactionID.createNewTransactionID().getBytes();
|
||||||
Request createPermissionRequest
|
Request createPermissionRequest
|
||||||
= MessageFactory.createCreatePermissionRequest(
|
= MessageFactory.createCreatePermissionRequest(
|
||||||
peerAddress,
|
peerAddress,
|
||||||
transactionID);
|
createPermissionTransactionID);
|
||||||
|
|
||||||
createPermissionRequest.setTransactionID(transactionID);
|
createPermissionRequest.setTransactionID(
|
||||||
|
createPermissionTransactionID);
|
||||||
turnCandidateHarvest.sendRequest(
|
turnCandidateHarvest.sendRequest(
|
||||||
RelayedCandidateDatagramSocket.this,
|
RelayedCandidateDatagramSocket.this,
|
||||||
createPermissionRequest);
|
createPermissionRequest);
|
||||||
|
|
||||||
bindingTransactionID = transactionID;
|
bindingTransactionID = createPermissionTransactionID;
|
||||||
bindingTimeStamp = System.currentTimeMillis();
|
bindingTimeStamp = System.currentTimeMillis();
|
||||||
|
|
||||||
|
if (channelDataIsPreferred)
|
||||||
|
{
|
||||||
|
if (channelNumber == CHANNEL_NUMBER_NOT_SPECIFIED)
|
||||||
|
{
|
||||||
|
channelNumber = getNextChannelNumber();
|
||||||
|
channelNumberIsConfirmed = false;
|
||||||
|
}
|
||||||
|
if (channelNumber != CHANNEL_NUMBER_NOT_SPECIFIED)
|
||||||
|
{
|
||||||
|
byte[] channelBindTransactionID
|
||||||
|
= TransactionID.createNewTransactionID().getBytes();
|
||||||
|
Request channelBindRequest
|
||||||
|
= MessageFactory.createChannelBindRequest(
|
||||||
|
channelNumber,
|
||||||
|
peerAddress,
|
||||||
|
channelBindTransactionID);
|
||||||
|
|
||||||
|
channelBindRequest.setTransactionID(
|
||||||
|
channelBindTransactionID);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We have to be prepared to receive ChannelData messages
|
||||||
|
* from the TURN server as soon as we've sent the
|
||||||
|
* ChannelBind request and before we've received a success
|
||||||
|
* response to it.
|
||||||
|
*/
|
||||||
|
synchronized (packetsToReceive)
|
||||||
|
{
|
||||||
|
if (!closed && (receiveChannelDataThread == null))
|
||||||
|
createReceiveChannelDataThread();
|
||||||
|
}
|
||||||
|
|
||||||
|
turnCandidateHarvest.sendRequest(
|
||||||
|
RelayedCandidateDatagramSocket.this,
|
||||||
|
channelBindRequest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines whether the channel number of this <tt>Channel</tt> is
|
||||||
|
* value equal to a specific channel number.
|
||||||
|
*
|
||||||
|
* @param channelNumber the channel number to be compared to the channel
|
||||||
|
* number of this <tt>Channel</tt> for value equality
|
||||||
|
* @return <tt>true</tt> if the specified <tt>channelNumber</tt> is
|
||||||
|
* equal to the channel number of this <tt>Channel</tt>
|
||||||
|
*/
|
||||||
|
public boolean channelNumberEquals(char channelNumber)
|
||||||
|
{
|
||||||
|
return (this.channelNumber == channelNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the indicator which determines whether this <tt>Channel</tt> is
|
||||||
|
* set to prefer sending <tt>DatagramPacket</tt>s using TURN ChannelData
|
||||||
|
* messages instead of Send indications.
|
||||||
|
*
|
||||||
|
* @return the indicator which determines whether this <tt>Channel</tt>
|
||||||
|
* is set to prefer sending <tt>DatagramPacket</tt>s using TURN
|
||||||
|
* ChannelData messages instead of Send indications
|
||||||
|
*/
|
||||||
|
public boolean getChannelDataIsPreferred()
|
||||||
|
{
|
||||||
|
return channelDataIsPreferred;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -765,8 +1347,22 @@ public class RelayedCandidateDatagramSocket
|
|||||||
*/
|
*/
|
||||||
public boolean peerAddressEquals(TransportAddress peerAddress)
|
public boolean peerAddressEquals(TransportAddress peerAddress)
|
||||||
{
|
{
|
||||||
return
|
/*
|
||||||
this.peerAddress.getAddress().equals(peerAddress.getAddress());
|
* CreatePermission installs a permission for the IP address and the
|
||||||
|
* port is ignored. But ChannelBind creates a channel for the
|
||||||
|
* peerAddress only. So if there is a chance that ChannelBind will
|
||||||
|
* be used, have a Channel instance per peerAddress and
|
||||||
|
* CreatePermission more often than really necessary (as a side
|
||||||
|
* effect).
|
||||||
|
*/
|
||||||
|
if (channelDataSocket != null)
|
||||||
|
return this.peerAddress.equals(peerAddress);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return
|
||||||
|
this.peerAddress.getAddress().equals(
|
||||||
|
peerAddress.getAddress());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -796,19 +1392,78 @@ public class RelayedCandidateDatagramSocket
|
|||||||
System.arraycopy(pData, pOffset, data, 0, pLength);
|
System.arraycopy(pData, pOffset, data, 0, pLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] transactionID
|
if (channelDataIsPreferred
|
||||||
= TransactionID.createNewTransactionID().getBytes();
|
&& (channelNumber != CHANNEL_NUMBER_NOT_SPECIFIED)
|
||||||
Indication sendIndication
|
&& channelNumberIsConfirmed)
|
||||||
= MessageFactory.createSendIndication(
|
{
|
||||||
peerAddress,
|
char length = (char) data.length;
|
||||||
data,
|
int channelDataLength
|
||||||
transactionID);
|
= CHANNELDATA_CHANNELNUMBER_LENGTH
|
||||||
|
+ CHANNELDATA_LENGTH_LENGTH
|
||||||
|
+ length;
|
||||||
|
|
||||||
sendIndication.setTransactionID(transactionID);
|
if ((channelData == null)
|
||||||
turnCandidateHarvest.harvester.stunStack.sendIndication(
|
|| (channelData.length < channelDataLength))
|
||||||
sendIndication,
|
{
|
||||||
turnCandidateHarvest.harvester.stunServer,
|
channelData = new byte[channelDataLength];
|
||||||
turnCandidateHarvest.hostCandidate.getTransportAddress());
|
if (channelDataPacket != null)
|
||||||
|
channelDataPacket.setData(channelData);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Channel Number
|
||||||
|
data[0] = (byte) (channelNumber >> 8);
|
||||||
|
data[1] = (byte) (channelNumber & 0xFF);
|
||||||
|
// Length
|
||||||
|
data[2] = (byte) (length >> 8);
|
||||||
|
data[3] = (byte) (length & 0xFF);
|
||||||
|
// Application Data
|
||||||
|
System.arraycopy(
|
||||||
|
data,
|
||||||
|
0,
|
||||||
|
channelData,
|
||||||
|
CHANNELDATA_CHANNELNUMBER_LENGTH
|
||||||
|
+ CHANNELDATA_LENGTH_LENGTH,
|
||||||
|
length);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (channelDataPacket == null)
|
||||||
|
{
|
||||||
|
channelDataPacket
|
||||||
|
= new DatagramPacket(
|
||||||
|
channelData, 0, channelData.length,
|
||||||
|
getLocalSocketAddress());
|
||||||
|
}
|
||||||
|
channelDataPacket.setLength(channelDataLength);
|
||||||
|
|
||||||
|
channelDataSocket.send(channelDataPacket);
|
||||||
|
}
|
||||||
|
catch (IOException ioex)
|
||||||
|
{
|
||||||
|
throw
|
||||||
|
new StunException(
|
||||||
|
StunException.NETWORK_ERROR,
|
||||||
|
"Failed to send TURN ChannelData message",
|
||||||
|
ioex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
byte[] transactionID
|
||||||
|
= TransactionID.createNewTransactionID().getBytes();
|
||||||
|
Indication sendIndication
|
||||||
|
= MessageFactory.createSendIndication(
|
||||||
|
peerAddress,
|
||||||
|
data,
|
||||||
|
transactionID);
|
||||||
|
|
||||||
|
sendIndication.setTransactionID(transactionID);
|
||||||
|
turnCandidateHarvest.harvester.stunStack.sendIndication(
|
||||||
|
sendIndication,
|
||||||
|
turnCandidateHarvest.harvester.stunServer,
|
||||||
|
turnCandidateHarvest
|
||||||
|
.hostCandidate.getTransportAddress());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -829,5 +1484,40 @@ public class RelayedCandidateDatagramSocket
|
|||||||
this.bound = bound;
|
this.bound = bound;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the indicator which determines whether this <tt>Channel</tt> is
|
||||||
|
* set to prefer sending <tt>DatagramPacket</tt>s using TURN ChannelData
|
||||||
|
* messages instead of Send indications.
|
||||||
|
*
|
||||||
|
* @param channelDataIsPreferred <tt>true</tt> if this <tt>Channel</tt>
|
||||||
|
* is to be set to prefer sending <tt>DatagramPacket</tt>s using TURN
|
||||||
|
* ChannelData messages instead of Send indications
|
||||||
|
*/
|
||||||
|
public void setChannelDataIsPreferred(boolean channelDataIsPreferred)
|
||||||
|
{
|
||||||
|
this.channelDataIsPreferred = channelDataIsPreferred;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the indicator which determines whether the associated TURN
|
||||||
|
* server has confirmed the allocation of the <tt>channelNumber</tt> of
|
||||||
|
* this <tt>Channel</tt> by us receiving a success <tt>Response</tt> to
|
||||||
|
* our ChannelBind <tt>Request</tt>.
|
||||||
|
*
|
||||||
|
* @param channelNumberIsConfirmed <tt>true</tt> if allocation of the
|
||||||
|
* channel number has been confirmed by a success <tt>Response</tt> to
|
||||||
|
* our ChannelBind <tt>Request</tt>
|
||||||
|
* @param channelNumberIsConfirmedTransactionID an array of
|
||||||
|
* <tt>byte</tt>s which represents the ID of the transaction with which
|
||||||
|
* the confirmation about the allocation of the channel number has
|
||||||
|
* arrived
|
||||||
|
*/
|
||||||
|
public void setChannelNumberIsConfirmed(
|
||||||
|
boolean channelNumberIsConfirmed,
|
||||||
|
byte[] channelNumberIsConfirmedTransactionID)
|
||||||
|
{
|
||||||
|
this.channelNumberIsConfirmed = channelNumberIsConfirmed;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,6 +18,8 @@ import org.ice4j.message.*;
|
|||||||
* draft-ietf-behave-turn-16 "Traversal Using Relays around NAT (TURN): Relay
|
* draft-ietf-behave-turn-16 "Traversal Using Relays around NAT (TURN): Relay
|
||||||
* Extensions to Session Traversal Utilities for NAT (STUN)" and which are part
|
* Extensions to Session Traversal Utilities for NAT (STUN)" and which are part
|
||||||
* of the communication with a specific TURN server.
|
* of the communication with a specific TURN server.
|
||||||
|
* <tt>TurnDatagramPacketFilter</tt> does not accept TURN ChannelData messages
|
||||||
|
* because they require knowledge of the value of the "Channel Number" field.
|
||||||
*
|
*
|
||||||
* @author Lubomir Marinov
|
* @author Lubomir Marinov
|
||||||
*/
|
*/
|
||||||
@ -62,17 +64,14 @@ public class TurnDatagramPacketFilter
|
|||||||
*/
|
*/
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if ((stunServer != null)
|
|
||||||
&& stunServer.equals(p.getSocketAddress()))
|
|
||||||
{
|
|
||||||
// TODO Accept ChannelData messages.
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The specified DatagramPacket does not come from or is not being
|
* The specified DatagramPacket does not come from or is not being
|
||||||
* sent to the TURN server associated with this instance.
|
* sent to the TURN server associated with this instance or is a
|
||||||
|
* ChannelData message which is not supported by
|
||||||
|
* TurnDatagramPacketFilter.
|
||||||
*/
|
*/
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -97,6 +96,7 @@ public class TurnDatagramPacketFilter
|
|||||||
if (super.acceptMethod(method))
|
if (super.acceptMethod(method))
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
|
{
|
||||||
switch (method)
|
switch (method)
|
||||||
{
|
{
|
||||||
case Message.TURN_METHOD_ALLOCATE:
|
case Message.TURN_METHOD_ALLOCATE:
|
||||||
@ -109,5 +109,6 @@ public class TurnDatagramPacketFilter
|
|||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user