зеркало из https://github.com/mozilla/gecko-dev.git
Bug 855623: Set even/odd streams via DTLS role, change Connect threading, defer connect until DTLS is connected r=ekr
This commit is contained in:
Randell Jesup
Родитель
7ad683d382
Коммит
e47aedf513
|
|
@ -676,7 +676,7 @@ PeerConnectionImpl::InitializeDataChannel(uint16_t aLocalport,
|
|||
nsRefPtr<TransportFlow> flow = mMedia->GetTransportFlow(i,false).get();
|
||||
CSFLogDebug(logTag, "Transportflow[%d] = %p", i, flow.get());
|
||||
if (flow) {
|
||||
if (!mDataConnection->ConnectDTLS(flow, aLocalport, aRemoteport, aLocalport > aRemoteport)) {
|
||||
if (!mDataConnection->ConnectViaTransportFlow(flow, aLocalport, aRemoteport)) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ debug_printf(const char *format, ...)
|
|||
}
|
||||
#endif
|
||||
|
||||
DataChannelConnection::DataChannelConnection(DataConnectionListener *listener) :
|
||||
DataChannelConnection::DataChannelConnection(DataConnectionListener *listener) :
|
||||
mLock("netwerk::sctp::DataChannelConnection")
|
||||
{
|
||||
mState = CLOSED;
|
||||
|
|
@ -217,13 +217,14 @@ DataChannelConnection::Destroy()
|
|||
ASSERT_WEBRTC(NS_IsMainThread());
|
||||
CloseAll();
|
||||
|
||||
MutexAutoLock lock(mLock);
|
||||
if (mSocket && mSocket != mMasterSocket)
|
||||
usrsctp_close(mSocket);
|
||||
if (mMasterSocket)
|
||||
usrsctp_close(mMasterSocket);
|
||||
|
||||
mSocket = nullptr;
|
||||
mMasterSocket = nullptr;
|
||||
mMasterSocket = nullptr; // also a flag that we've Destroyed this connection
|
||||
|
||||
if (mUsingDtls) {
|
||||
usrsctp_deregister_address(static_cast<void *>(this));
|
||||
|
|
@ -484,22 +485,60 @@ DataChannelConnection::Notify(nsITimer *timer)
|
|||
}
|
||||
|
||||
#ifdef MOZ_PEERCONNECTION
|
||||
bool
|
||||
DataChannelConnection::ConnectDTLS(TransportFlow *aFlow, uint16_t localport, uint16_t remoteport,
|
||||
bool even)
|
||||
void
|
||||
DataChannelConnection::SetEvenOdd()
|
||||
{
|
||||
LOG(("Connect DTLS local %d, remote %d, %s", localport, remoteport, even ? "Even" : "Odd"));
|
||||
ASSERT_WEBRTC(IsSTSThread());
|
||||
|
||||
NS_PRECONDITION(mMasterSocket, "SCTP wasn't initialized before ConnectDTLS!");
|
||||
TransportLayerDtls *dtls = static_cast<TransportLayerDtls *>(
|
||||
mTransportFlow->GetLayer(TransportLayerDtls::ID()));
|
||||
MOZ_ASSERT(dtls); // DTLS is mandatory
|
||||
mAllocateEven = (dtls->role() == TransportLayerDtls::CLIENT);
|
||||
}
|
||||
|
||||
bool
|
||||
DataChannelConnection::ConnectViaTransportFlow(TransportFlow *aFlow, uint16_t localport, uint16_t remoteport)
|
||||
{
|
||||
LOG(("Connect DTLS local %u, remote %u", localport, remoteport));
|
||||
|
||||
NS_PRECONDITION(mMasterSocket, "SCTP wasn't initialized before ConnectViaTransportFlow!");
|
||||
NS_ENSURE_TRUE(aFlow, false);
|
||||
|
||||
mTransportFlow = aFlow;
|
||||
mTransportFlow->SignalPacketReceived.connect(this, &DataChannelConnection::SctpDtlsInput);
|
||||
mLocalPort = localport;
|
||||
mRemotePort = remoteport;
|
||||
mAllocateEven = even;
|
||||
mState = CONNECTING;
|
||||
|
||||
RUN_ON_THREAD(mSTS, WrapRunnable(nsRefPtr<DataChannelConnection>(this),
|
||||
&DataChannelConnection::SetSignals),
|
||||
NS_DISPATCH_NORMAL);
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
DataChannelConnection::SetSignals()
|
||||
{
|
||||
ASSERT_WEBRTC(IsSTSThread());
|
||||
ASSERT_WEBRTC(mTransportFlow);
|
||||
LOG(("Setting transport signals, state: %d", mTransportFlow->state()));
|
||||
mTransportFlow->SignalPacketReceived.connect(this, &DataChannelConnection::SctpDtlsInput);
|
||||
// SignalStateChange() doesn't call you with the initial state
|
||||
mTransportFlow->SignalStateChange.connect(this, &DataChannelConnection::CompleteConnect);
|
||||
CompleteConnect(mTransportFlow, mTransportFlow->state());
|
||||
}
|
||||
|
||||
void
|
||||
DataChannelConnection::CompleteConnect(TransportFlow *flow, TransportLayer::State state)
|
||||
{
|
||||
LOG(("Data transport state: %d", state));
|
||||
MutexAutoLock lock(mLock);
|
||||
ASSERT_WEBRTC(IsSTSThread());
|
||||
// We should abort connection on TS_ERROR.
|
||||
// Note however that the association will also fail (perhaps with a delay) and
|
||||
// notify us in that way
|
||||
if (state != TransportLayer::TS_OPEN || !mMasterSocket)
|
||||
return;
|
||||
|
||||
struct sockaddr_conn addr;
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.sconn_family = AF_CONN;
|
||||
|
|
@ -523,33 +562,22 @@ DataChannelConnection::ConnectDTLS(TransportFlow *aFlow, uint16_t localport, uin
|
|||
if (r < 0) {
|
||||
if (errno == EINPROGRESS) {
|
||||
// non-blocking
|
||||
return true;
|
||||
return;
|
||||
} else {
|
||||
LOG(("usrsctp_connect failed: %d", errno));
|
||||
mState = CLOSED;
|
||||
}
|
||||
} else {
|
||||
// Notify Connection open
|
||||
LOG(("%s: sending ON_CONNECTION for %p", __FUNCTION__, this));
|
||||
mSocket = mMasterSocket;
|
||||
mState = OPEN;
|
||||
LOG(("DTLS connect() succeeded! Entering connected mode"));
|
||||
|
||||
NS_DispatchToMainThread(new DataChannelOnMessageAvailable(
|
||||
DataChannelOnMessageAvailable::ON_CONNECTION,
|
||||
this, true));
|
||||
|
||||
// Open any streams pending...
|
||||
MutexAutoLock lock(mLock); // OpenFinish assumes this
|
||||
ProcessQueuedOpens();
|
||||
return true;
|
||||
// We set Even/Odd and fire ON_CONNECTION via SCTP_COMM_UP when we get that
|
||||
// This also avoids issues with calling TransportFlow stuff on Mainthread
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Note: currently this doesn't actually notify the application
|
||||
NS_DispatchToMainThread(new DataChannelOnMessageAvailable(
|
||||
DataChannelOnMessageAvailable::ON_CONNECTION,
|
||||
this, false));
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
|
||||
// Process any pending Opens
|
||||
|
|
@ -572,8 +600,8 @@ DataChannelConnection::ProcessQueuedOpens()
|
|||
OpenFinish(channel.forget()); // may reset the flag and re-push
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
void
|
||||
DataChannelConnection::SctpDtlsInput(TransportFlow *flow,
|
||||
const unsigned char *data, size_t len)
|
||||
|
|
@ -645,8 +673,12 @@ DataChannelConnection::SctpDtlsOutput(void *addr, void *buffer, size_t length,
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef ALLOW_DIRECT_SCTP_LISTEN_CONNECT
|
||||
// listen for incoming associations
|
||||
// Blocks! - Don't call this from main thread!
|
||||
|
||||
#error This code will not work as-is since SetEvenOdd() runs on Mainthread
|
||||
|
||||
bool
|
||||
DataChannelConnection::Listen(unsigned short port)
|
||||
{
|
||||
|
|
@ -690,6 +722,8 @@ DataChannelConnection::Listen(unsigned short port)
|
|||
LOG(("Couldn't set SO_LINGER on SCTP socket"));
|
||||
}
|
||||
|
||||
SetEvenOdd();
|
||||
|
||||
// Notify Connection open
|
||||
// XXX We need to make sure connection sticks around until the message is delivered
|
||||
LOG(("%s: sending ON_CONNECTION for %p", __FUNCTION__, this));
|
||||
|
|
@ -766,6 +800,8 @@ DataChannelConnection::Connect(const char *addr, unsigned short port)
|
|||
LOG(("connect() succeeded! Entering connected mode"));
|
||||
mState = OPEN;
|
||||
|
||||
SetEvenOdd();
|
||||
|
||||
// Notify Connection open
|
||||
// XXX We need to make sure connection sticks around until the message is delivered
|
||||
LOG(("%s: sending ON_CONNECTION for %p", __FUNCTION__, this));
|
||||
|
|
@ -774,6 +810,7 @@ DataChannelConnection::Connect(const char *addr, unsigned short port)
|
|||
this, (DataChannel *) nullptr));
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
DataChannel *
|
||||
DataChannelConnection::FindChannelByStream(uint16_t streamOut)
|
||||
|
|
@ -1270,6 +1307,8 @@ DataChannelConnection::HandleAssociationChangeEvent(const struct sctp_assoc_chan
|
|||
mSocket = mMasterSocket;
|
||||
mState = OPEN;
|
||||
|
||||
SetEvenOdd();
|
||||
|
||||
NS_DispatchToMainThread(new DataChannelOnMessageAvailable(
|
||||
DataChannelOnMessageAvailable::ON_CONNECTION,
|
||||
this, true));
|
||||
|
|
@ -1806,13 +1845,9 @@ DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
|
|||
mLock.AssertCurrentThreadOwns();
|
||||
|
||||
if (stream == INVALID_STREAM || mState != OPEN) {
|
||||
if (stream == INVALID_STREAM) {
|
||||
stream = FindFreeStream(); // may be INVALID_STREAM!
|
||||
}
|
||||
|
||||
LOG(("Finishing open: channel %p, stream = %u", channel.get(), stream));
|
||||
|
||||
if (stream == INVALID_STREAM || mState != OPEN) {
|
||||
if (mState == OPEN) { // implies INVALID_STREAM
|
||||
// Don't try to find a stream if not open - mAllocateEven isn't set yet
|
||||
stream = FindFreeStream(); // may be INVALID_STREAM if we need more
|
||||
if (stream == INVALID_STREAM) {
|
||||
if (!RequestMoreStreams()) {
|
||||
channel->mState = CLOSED;
|
||||
|
|
@ -1829,10 +1864,19 @@ DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
|
|||
// Dispatch it to ourselves
|
||||
return nullptr;
|
||||
}
|
||||
} else if (mState != OPEN) {
|
||||
mStreams[stream] = channel;
|
||||
channel->mStream = stream;
|
||||
}
|
||||
// if INVALID here, we need to queue
|
||||
}
|
||||
if (stream != INVALID_STREAM) {
|
||||
// just allocated (& OPEN), or externally negotiated
|
||||
mStreams[stream] = channel;
|
||||
channel->mStream = stream;
|
||||
}
|
||||
|
||||
LOG(("Finishing open: channel %p, stream = %u", channel.get(), stream));
|
||||
|
||||
if (stream == INVALID_STREAM || mState != OPEN) {
|
||||
// we're going to queue
|
||||
|
||||
LOG(("Queuing channel %p (%u) to finish open", channel.get(), stream));
|
||||
// Also serves to mark we told the app
|
||||
|
|
@ -1840,14 +1884,10 @@ DataChannelConnection::OpenFinish(already_AddRefed<DataChannel> aChannel)
|
|||
channel->AddRef(); // we need a ref for the nsDeQue and one to return
|
||||
mPending.Push(channel);
|
||||
return channel.forget();
|
||||
}
|
||||
channel->mStream = stream;
|
||||
}
|
||||
if (!mStreams[stream]) {
|
||||
mStreams[stream] = channel;
|
||||
} // else OPEN and we selected a stream
|
||||
} else {
|
||||
// externally negotiated before connection
|
||||
MOZ_ASSERT(mStreams[stream] == channel);
|
||||
// OPEN and externally negotiated stream
|
||||
mStreams[stream] = channel;
|
||||
}
|
||||
|
||||
#ifdef TEST_QUEUED_DATA
|
||||
|
|
@ -2125,7 +2165,10 @@ void DataChannelConnection::CloseAll()
|
|||
// Don't need to lock here
|
||||
|
||||
// Make sure no more channels will be opened
|
||||
mState = CLOSED;
|
||||
{
|
||||
MutexAutoLock lock(mLock);
|
||||
mState = CLOSED;
|
||||
}
|
||||
|
||||
// Close current channels
|
||||
// If there are runnables, they hold a strong ref and keep the channel
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "mtransport/sigslot.h"
|
||||
#include "mtransport/transportflow.h"
|
||||
#include "mtransport/transportlayer.h"
|
||||
#include "mtransport/transportlayerdtls.h"
|
||||
#include "mtransport/transportlayerprsock.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -144,16 +145,20 @@ public:
|
|||
bool Init(unsigned short aPort, uint16_t aNumStreams, bool aUsingDtls);
|
||||
void Destroy(); // So we can spawn refs tied to runnables in shutdown
|
||||
|
||||
#ifdef ALLOW_DIRECT_SCTP_LISTEN_CONNECT
|
||||
// These block; they require something to decide on listener/connector
|
||||
// (though you can do simultaneous Connect()). Do not call these from
|
||||
// the main thread!
|
||||
bool Listen(unsigned short port);
|
||||
bool Connect(const char *addr, unsigned short port);
|
||||
#endif
|
||||
|
||||
#ifdef SCTP_DTLS_SUPPORTED
|
||||
// Connect using a TransportFlow (DTLS) channel
|
||||
bool ConnectDTLS(TransportFlow *aFlow, uint16_t localport, uint16_t remoteport,
|
||||
bool even);
|
||||
void SetEvenOdd();
|
||||
bool ConnectViaTransportFlow(TransportFlow *aFlow, uint16_t localport, uint16_t remoteport);
|
||||
void CompleteConnect(TransportFlow *flow, TransportLayer::State state);
|
||||
void SetSignals();
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
|
|
@ -198,7 +203,7 @@ public:
|
|||
CLOSING = 2U,
|
||||
CLOSED = 3U
|
||||
};
|
||||
uint16_t GetReadyState() { return mState; }
|
||||
uint16_t GetReadyState() { MutexAutoLock lock(mLock); return mState; }
|
||||
|
||||
friend class DataChannel;
|
||||
Mutex mLock;
|
||||
|
|
@ -281,9 +286,9 @@ private:
|
|||
// Streams pending reset
|
||||
nsAutoTArray<uint16_t,4> mStreamsResetting;
|
||||
|
||||
struct socket *mMasterSocket; // accessed from connect thread
|
||||
struct socket *mSocket; // cloned from mMasterSocket on successful Connect on connect thread
|
||||
uint16_t mState; // modified on connect thread (to OPEN)
|
||||
struct socket *mMasterSocket; // accessed from STS thread
|
||||
struct socket *mSocket; // cloned from mMasterSocket on successful Connect on STS thread
|
||||
uint16_t mState; // Protected with mLock
|
||||
|
||||
#ifdef SCTP_DTLS_SUPPORTED
|
||||
nsRefPtr<TransportFlow> mTransportFlow;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче