Bug 729512: DataChannel protocol rollup r=mcmanus

This commit is contained in:
Randell Jesup 2012-10-03 19:51:23 -04:00
Родитель a8506615f8
Коммит 84d45ba81d
7 изменённых файлов: 2609 добавлений и 0 удалений

Просмотреть файл

@ -34,6 +34,7 @@ endif
ifdef MOZ_SCTP
PARALLEL_DIRS += \
sctp/src \
sctp/datachannel \
$(NULL)
endif

Просмотреть файл

@ -45,6 +45,7 @@ endif
ifdef MOZ_SCTP
SHARED_LIBRARY_LIBS += \
../sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX) \
../sctp/datachannel/$(LIB_PREFIX)nkdatachan_s.$(LIB_SUFFIX) \
$(NULL)
endif

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -0,0 +1,456 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef NETWERK_SCTP_DATACHANNEL_DATACHANNEL_H_
#define NETWERK_SCTP_DATACHANNEL_DATACHANNEL_H_
#include <string>
#include "nsISupports.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsThreadUtils.h"
#include "nsTArray.h"
#include "nsDeque.h"
#include "nsIInputStream.h"
#include "nsITimer.h"
#include "mozilla/Mutex.h"
#include "DataChannelProtocol.h"
#ifdef SCTP_DTLS_SUPPORTED
#include "talk/base/sigslot.h"
#include "mtransport/transportflow.h"
#include "mtransport/transportlayer.h"
#include "mtransport/transportlayerprsock.h"
#endif
extern "C" {
struct socket;
struct sctp_rcvinfo;
}
namespace mozilla {
class DTLSConnection;
class DataChannelConnection;
class DataChannel;
class DataChannelOnMessageAvailable;
class BufferedMsg
{
public:
BufferedMsg(struct sctp_sendv_spa &spa,const char *data,
uint32_t length);
~BufferedMsg();
struct sctp_sendv_spa *mSpa;
const char *mData;
uint32_t mLength;
};
// Implemented by consumers of a Channel to receive messages.
// Can't nest it in DataChannelConnection because C++ doesn't allow forward
// refs to embedded classes
class DataChannelListener {
public:
virtual ~DataChannelListener() {}
// Called when a DOMString message is received.
virtual nsresult OnMessageAvailable(nsISupports *aContext,
const nsACString& message) = 0;
// Called when a binary message is received.
virtual nsresult OnBinaryMessageAvailable(nsISupports *aContext,
const nsACString& message) = 0;
// Called when the channel is connected
virtual nsresult OnChannelConnected(nsISupports *aContext) = 0;
// Called when the channel is closed
virtual nsresult OnChannelClosed(nsISupports *aContext) = 0;
};
// One per PeerConnection
class DataChannelConnection: public nsITimerCallback
#ifdef SCTP_DTLS_SUPPORTED
, public sigslot::has_slots<>
#endif
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSITIMERCALLBACK
class DataConnectionListener {
public:
virtual ~DataConnectionListener() {}
// Called when a the connection is open
virtual void NotifyConnection() = 0;
// Called when a the connection is lost/closed
virtual void NotifyClosedConnection() = 0;
// Called when a new DataChannel has been opened by the other side.
virtual void NotifyDataChannel(DataChannel *channel) = 0;
};
DataChannelConnection(DataConnectionListener *listener);
virtual ~DataChannelConnection();
bool Init(unsigned short aPort, uint16_t aNumStreams, bool aUsingDtls);
// 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);
#ifdef SCTP_DTLS_SUPPORTED
// Connect using a TransportFlow (DTLS) channel
bool ConnectDTLS(TransportFlow *aFlow, uint16_t localport, uint16_t remoteport);
#endif
typedef enum {
RELIABLE=0,
PARTIAL_RELIABLE_REXMIT = 1,
PARTIAL_RELIABLE_TIMED = 2
} Type;
DataChannel *Open(const nsACString& label,
Type type, bool inOrder,
uint32_t prValue, DataChannelListener *aListener,
nsISupports *aContext);
void Close(uint16_t stream);
void CloseAll();
int32_t SendMsg(uint16_t stream, const nsACString &aMsg)
{
return SendMsgCommon(stream, aMsg, false);
}
int32_t SendBinaryMsg(uint16_t stream, const nsACString &aMsg)
{
return SendMsgCommon(stream, aMsg, true);
}
int32_t SendBlob(uint16_t stream, nsIInputStream *aBlob);
// Called on data reception from the SCTP library
// must(?) be public so my c->c++ tramploine can call it
int ReceiveCallback(struct socket* sock, void *data, size_t datalen,
struct sctp_rcvinfo rcv, int32_t flags);
// Find out state
enum {
CONNECTING = 0U,
OPEN = 1U,
CLOSING = 2U,
CLOSED = 3U
};
uint16_t GetReadyState() { return mState; }
friend class DataChannel;
Mutex mLock;
protected:
friend class DataChannelOnMessageAvailable;
DataConnectionListener *mListener;
private:
#ifdef SCTP_DTLS_SUPPORTED
static void DTLSConnectThread(void *data);
int SendPacket(const unsigned char* data, size_t len);
void PacketReceived(TransportFlow *flow, const unsigned char *data, size_t len);
static int SctpDtlsOutput(void *addr, void *buffer, size_t length, uint8_t tos, uint8_t set_df);
#endif
DataChannel* FindChannelByStreamIn(uint16_t streamIn);
DataChannel* FindChannelByStreamOut(uint16_t streamOut);
uint16_t FindFreeStreamOut();
bool RequestMoreStreamsOut(int32_t aNeeded = 16);
int32_t SendControlMessage(void *msg, uint32_t len, uint16_t streamOut);
int32_t SendOpenRequestMessage(const nsACString& label,uint16_t streamOut,
bool unordered, uint16_t prPolicy, uint32_t prValue);
int32_t SendOpenResponseMessage(uint16_t streamOut, uint16_t streamIn);
int32_t SendOpenAckMessage(uint16_t streamOut);
int32_t SendMsgInternal(DataChannel *channel, const char *data,
uint32_t length, uint32_t ppid);
int32_t SendBinary(DataChannel *channel, const char *data,
uint32_t len);
int32_t SendMsgCommon(uint16_t stream, const nsACString &aMsg, bool isBinary);
DataChannel *OpenFinish(DataChannel *channel);
void SendOrQueue(DataChannel *aChannel, DataChannelOnMessageAvailable *aMessage);
void StartDefer();
bool SendDeferredMessages();
void SendOutgoingStreamReset();
void ResetOutgoingStream(uint16_t streamOut);
void HandleOpenRequestMessage(const struct rtcweb_datachannel_open_request *req,
size_t length,
uint16_t streamIn);
void OpenResponseFinish(DataChannel *channel);
void HandleOpenResponseMessage(const struct rtcweb_datachannel_open_response *rsp,
size_t length, uint16_t streamIn);
void HandleOpenAckMessage(const struct rtcweb_datachannel_ack *ack,
size_t length, uint16_t streamIn);
void HandleUnknownMessage(uint32_t ppid, size_t length, uint16_t streamIn);
void HandleDataMessage(uint32_t ppid, const void *buffer, size_t length, uint16_t streamIn);
void HandleMessage(const void *buffer, size_t length, uint32_t ppid, uint16_t streamIn);
void HandleAssociationChangeEvent(const struct sctp_assoc_change *sac);
void HandlePeerAddressChangeEvent(const struct sctp_paddr_change *spc);
void HandleRemoteErrorEvent(const struct sctp_remote_error *sre);
void HandleShutdownEvent(const struct sctp_shutdown_event *sse);
void HandleAdaptationIndication(const struct sctp_adaptation_event *sai);
void HandleSendFailedEvent(const struct sctp_send_failed_event *ssfe);
void HandleStreamResetEvent(const struct sctp_stream_reset_event *strrst);
void HandleStreamChangeEvent(const struct sctp_stream_change_event *strchg);
void HandleNotification(const union sctp_notification *notif, size_t n);
// NOTE: while these arrays will auto-expand, increases in the number of
// channels available from the stack must be negotiated!
nsAutoTArray<DataChannel*,16> mStreamsOut;
nsAutoTArray<DataChannel*,16> mStreamsIn;
nsDeque mPending; // Holds DataChannels
// Streams pending reset
nsAutoTArray<uint16_t,4> mStreamsResetting;
struct socket *mMasterSocket;
struct socket *mSocket;
uint16_t mState;
#ifdef SCTP_DTLS_SUPPORTED
nsRefPtr<TransportFlow> mTransportFlow;
#endif
uint16_t mLocalPort;
uint16_t mRemotePort;
// Timer to control when we try to resend blocked messages
nsCOMPtr<nsITimer> mDeferredTimer;
uint32_t mDeferTimeout; // in ms
bool mTimerRunning;
};
class DataChannel {
public:
enum {
CONNECTING = 0U,
OPEN = 1U,
CLOSING = 2U,
CLOSED = 3U,
WAITING_TO_OPEN = 4U
};
DataChannel(DataChannelConnection *connection,
uint16_t streamOut, uint16_t streamIn,
uint16_t state,
const nsACString& label,
uint16_t policy, uint32_t value,
uint32_t flags,
DataChannelListener *aListener,
nsISupports *aContext)
: mListener(aListener)
, mConnection(connection)
, mLabel(label)
, mState(state)
, mReady(false)
, mStreamOut(streamOut)
, mStreamIn(streamIn)
, mPrPolicy(policy)
, mPrValue(value)
, mFlags(0)
, mContext(aContext)
{
NS_ASSERTION(mConnection,"NULL connection");
}
~DataChannel()
{
Close();
}
// Close this DataChannel. Can be called multiple times.
void Close();
// Set the listener (especially for channels created from the other side)
// Note: The Listener and Context should only be set once
void SetListener(DataChannelListener *aListener, nsISupports *aContext);
// Send a string
bool SendMsg(const nsACString &aMsg)
{
if (mStreamOut != INVALID_STREAM)
return (mConnection->SendMsg(mStreamOut, aMsg) > 0);
else
return false;
}
// Send a binary message (TypedArray)
bool SendBinaryMsg(const nsACString &aMsg)
{
if (mStreamOut != INVALID_STREAM)
return (mConnection->SendBinaryMsg(mStreamOut, aMsg) > 0);
else
return false;
}
// Send a binary blob
bool SendBinaryStream(nsIInputStream *aBlob, uint32_t msgLen)
{
if (mStreamOut != INVALID_STREAM)
return (mConnection->SendBlob(mStreamOut, aBlob) > 0);
else
return false;
}
uint16_t GetType() { return mPrPolicy; }
bool GetOrdered() { return !(mFlags & DATA_CHANNEL_FLAG_OUT_OF_ORDER_ALLOWED); }
// Amount of data buffered to send
uint32_t GetBufferedAmount();
// Find out state
uint16_t GetReadyState()
{
if (mState == WAITING_TO_OPEN)
return CONNECTING;
return mState;
}
void SetReadyState(uint16_t aState) { mState = aState; }
void GetLabel(nsAString& aLabel) { CopyUTF8toUTF16(mLabel, aLabel); }
void AppReady();
protected:
DataChannelListener *mListener;
private:
friend class DataChannelOnMessageAvailable;
friend class DataChannelConnection;
nsresult AddDataToBinaryMsg(const char *data, uint32_t size);
nsRefPtr<DataChannelConnection> mConnection;
nsCString mLabel;
uint16_t mState;
bool mReady;
uint16_t mStreamOut;
uint16_t mStreamIn;
uint16_t mPrPolicy;
uint32_t mPrValue;
uint32_t mFlags;
uint32_t mId;
nsCOMPtr<nsISupports> mContext;
nsCString mBinaryBuffer;
nsTArray<nsAutoPtr<BufferedMsg> > mBufferedData;
nsTArray<nsCOMPtr<nsIRunnable> > mQueuedMessages;
};
// used to dispatch notifications of incoming data to the main thread
// Patterned on CallOnMessageAvailable in WebSockets
// Also used to proxy other items to MainThread
class DataChannelOnMessageAvailable : public nsRunnable
{
public:
enum {
ON_CONNECTION,
ON_DISCONNECTED,
ON_CHANNEL_CREATED,
ON_CHANNEL_OPEN,
ON_CHANNEL_CLOSED,
ON_DATA,
START_DEFER,
}; /* types */
DataChannelOnMessageAvailable(int32_t aType,
DataChannelConnection *aConnection,
DataChannel *aChannel,
nsCString &aData, // XXX this causes inefficiency
int32_t aLen)
: mType(aType),
mChannel(aChannel),
mConnection(aConnection),
mData(aData),
mLen(aLen) {}
DataChannelOnMessageAvailable(int32_t aType,
DataChannel *aChannel)
: mType(aType),
mChannel(aChannel) {}
// XXX is it safe to leave mData/mLen uninitialized? This should only be
// used for notifications that don't use them, but I'd like more
// bulletproof compile-time checking.
DataChannelOnMessageAvailable(int32_t aType,
DataChannelConnection *aConnection,
DataChannel *aChannel)
: mType(aType),
mChannel(aChannel),
mConnection(aConnection) {}
NS_IMETHOD Run()
{
switch (mType) {
case ON_DATA:
case ON_CHANNEL_OPEN:
case ON_CHANNEL_CLOSED:
if (!mChannel->mListener)
return NS_OK;
break;
case ON_CHANNEL_CREATED:
case ON_CONNECTION:
case ON_DISCONNECTED:
if (!mConnection->mListener)
return NS_OK;
break;
case START_DEFER:
break;
}
switch (mType) {
case ON_DATA:
if (mLen < 0) {
mChannel->mListener->OnMessageAvailable(mChannel->mContext, mData);
} else {
mChannel->mListener->OnBinaryMessageAvailable(mChannel->mContext, mData);
}
break;
case ON_CHANNEL_OPEN:
mChannel->mListener->OnChannelConnected(mChannel->mContext);
break;
case ON_CHANNEL_CLOSED:
mChannel->mListener->OnChannelClosed(mChannel->mContext);
break;
case ON_CHANNEL_CREATED:
mConnection->mListener->NotifyDataChannel(mChannel);
break;
case ON_CONNECTION:
mConnection->mListener->NotifyConnection();
break;
case ON_DISCONNECTED:
mConnection->mListener->NotifyClosedConnection();
break;
case START_DEFER:
mConnection->StartDefer();
break;
}
return NS_OK;
}
private:
~DataChannelOnMessageAvailable() {}
int32_t mType;
// XXX should use union
DataChannel *mChannel; // XXX careful of ownership!
nsRefPtr<DataChannelConnection> mConnection;
nsCString mData;
int32_t mLen;
};
}
#endif // NETWERK_SCTP_DATACHANNEL_DATACHANNEL_H_

Просмотреть файл

@ -0,0 +1,28 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef DataChannelLog_h
#define DataChannelLog_h
#ifdef MOZ_LOGGING
#define FORCE_PR_LOG
#endif
#if defined(PR_LOG)
#error "This file must be #included before any IPDL-generated files or other files that #include prlog.h"
#endif
#include "base/basictypes.h"
#include "prlog.h"
#ifdef PR_LOGGING
extern PRLogModuleInfo* dataChannelLog;
#endif
#undef LOG
#define LOG(args) PR_LOG(dataChannelLog, PR_LOG_DEBUG, args)
#endif

Просмотреть файл

@ -0,0 +1,81 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef NETWERK_SCTP_DATACHANNEL_DATACHANNELPROTOCOL_H_
#define NETWERK_SCTP_DATACHANNEL_DATACHANNELPROTOCOL_H_
#if defined(__GNUC__)
#define SCTP_PACKED __attribute__((packed))
#elif defined(_MSC_VER)
#pragma pack (push, 1)
#define SCTP_PACKED
#else
#error "Unsupported compiler"
#endif
#define DATA_CHANNEL_PPID_CONTROL 50
#define DATA_CHANNEL_PPID_DOMSTRING 51
#define DATA_CHANNEL_PPID_BINARY 52
#define DATA_CHANNEL_PPID_BINARY_LAST 53
#define DATA_CHANNEL_MAX_BINARY_FRAGMENT 0x4000
#define DATA_CHANNEL_FLAGS_SEND_REQ 0x00000001
#define DATA_CHANNEL_FLAGS_SEND_RSP 0x00000002
#define DATA_CHANNEL_FLAGS_SEND_ACK 0x00000004
#define DATA_CHANNEL_FLAGS_OUT_OF_ORDER_ALLOWED 0x00000008
#define DATA_CHANNEL_FLAGS_SEND_DATA 0x00000010
#define DATA_CHANNEL_FLAGS_FINISH_OPEN 0x00000020
#define DATA_CHANNEL_FLAGS_FINISH_RSP 0x00000040
#define INVALID_STREAM (0xFFFF)
// max is 0xFFFF: Streams 0 to 0xFFFE = 0xFFFF streams
#define MAX_NUM_STREAMS (2048)
struct rtcweb_datachannel_open_request {
uint8_t msg_type; // DATA_CHANNEL_OPEN
uint8_t channel_type;
uint16_t flags;
uint16_t reliability_params;
int16_t priority;
char label[1]; // keep VC++ happy... UTF8 null-terminated string
} SCTP_PACKED;
struct rtcweb_datachannel_open_response {
uint8_t msg_type; // DATA_CHANNEL_OPEN_RESPONSE
uint8_t error; // 0 == no error
uint16_t flags;
uint16_t reverse_stream;
} SCTP_PACKED;
struct rtcweb_datachannel_ack {
uint8_t msg_type; // DATA_CHANNEL_ACK
} SCTP_PACKED;
/* msg_type values: */
#define DATA_CHANNEL_OPEN_REQUEST 0
#define DATA_CHANNEL_OPEN_RESPONSE 1
#define DATA_CHANNEL_ACK 2
/* channel_type values: */
#define DATA_CHANNEL_RELIABLE 0
#define DATA_CHANNEL_PARTIAL_RELIABLE_REXMIT 1
#define DATA_CHANNEL_PARTIAL_RELIABLE_TIMED 2
/* flags values: */
#define DATA_CHANNEL_FLAG_OUT_OF_ORDER_ALLOWED 0x0001
/* all other bits reserved and should be set to 0 */
#define ERR_DATA_CHANNEL_ALREADY_OPEN 1
#define ERR_DATA_CHANNEL_NONE_AVAILABLE 2
#if defined(_MSC_VER)
#pragma pack (pop)
#undef SCTP_PACKED
#endif
#endif

Просмотреть файл

@ -0,0 +1,69 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkdatachan_s
LIBXUL_LIBRARY = 1
XPIDL_MODULE = necko_datachan
GRE_MODULE = 1
FORCE_STATIC_LIB = 1
EXPORTS_NAMESPACES = mozilla/net
CPPSRCS = \
DataChannel.cpp \
$(NULL)
EXPORTS_mozilla/net = \
DataChannel.h \
DataChannelProtocol.h \
$(NULL)
LOCAL_INCLUDES = \
-I$(topsrcdir)/xpcom/ds \
-I$(srcdir)/../src \
-I$(DEPTH)/dist/include/mozilla/net \
-I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source \
-I$(topsrcdir)/media/mtransport \
$(NULL)
DEFINES = \
-DINET=1 \
-DINET6=1 \
-DSCTP_DEBUG=1 \
$(NULL)
ifeq ($(OS_TARGET),WINNT)
DEFINES += -D__Userspace_os_Windows=1
else
ifeq ($(OS_TARGET),Darwin)
DEFINES += -D__Userspace_os_Darwin=1
else
ifeq ($(OS_TARGET),Linux)
DEFINES += -D__Userspace_os_Linux=1
else
ifeq ($(OS_TARGET),FreeBSD)
DEFINES += -D__Userspace_os_FreeBSD=1
else
#default_fallback; probably doesn't work
DEFINES += -D__Userspace_os_$(OS_TARGET)=1
endif
endif
endif
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET