1. Constructors, SetData(), and AppendData() now accept uint8_t*,
int8_t*, and char*. Previously, they accepted void*, meaning that
any kind of pointer was accepted. I think requiring an explicit
cast in cases where the input array isn't already of a byte-sized
type is a better compromise between convenience and safety.
2. data() can now return a uint8_t* instead of a char*, which seems
more appropriate for a byte array, and is harder to mix up with
zero-terminated C strings. data<int8_t>() is also available so
that callers that want that type instead won't have to cast, as
is data<char>() (which remains the default until all existing
callers have been fixed).
3. Constructors, SetData(), and AppendData() now accept arrays
natively, not just decayed to pointers. The advantage of this is
that callers don't have to pass the size separately.
4. There are new constructors that allow setting size and capacity
without initializing the array. Previously, this had to be done
separately after construction.
5. Instead of TransferTo(), Buffer now supports swap(), and move
construction and assignment, and has a Pass() method that works
just like std::move(). (The Pass method is modeled after
scoped_ptr::Pass().)
R=jmarusic@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42989004
Cr-Commit-Position: refs/heads/master@{#9033}
193 lines
6.7 KiB
C++
193 lines
6.7 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "talk/app/webrtc/sctputils.h"
|
|
|
|
#include "webrtc/base/buffer.h"
|
|
#include "webrtc/base/bytebuffer.h"
|
|
#include "webrtc/base/logging.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Format defined at
|
|
// http://tools.ietf.org/html/draft-ietf-rtcweb-data-protocol-01#section
|
|
|
|
static const uint8 DATA_CHANNEL_OPEN_MESSAGE_TYPE = 0x03;
|
|
static const uint8 DATA_CHANNEL_OPEN_ACK_MESSAGE_TYPE = 0x02;
|
|
|
|
enum DataChannelOpenMessageChannelType {
|
|
DCOMCT_ORDERED_RELIABLE = 0x00,
|
|
DCOMCT_ORDERED_PARTIAL_RTXS = 0x01,
|
|
DCOMCT_ORDERED_PARTIAL_TIME = 0x02,
|
|
DCOMCT_UNORDERED_RELIABLE = 0x80,
|
|
DCOMCT_UNORDERED_PARTIAL_RTXS = 0x81,
|
|
DCOMCT_UNORDERED_PARTIAL_TIME = 0x82,
|
|
};
|
|
|
|
bool ParseDataChannelOpenMessage(const rtc::Buffer& payload,
|
|
std::string* label,
|
|
DataChannelInit* config) {
|
|
// Format defined at
|
|
// http://tools.ietf.org/html/draft-jesup-rtcweb-data-protocol-04
|
|
|
|
rtc::ByteBuffer buffer(payload);
|
|
uint8 message_type;
|
|
if (!buffer.ReadUInt8(&message_type)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message type.";
|
|
return false;
|
|
}
|
|
if (message_type != DATA_CHANNEL_OPEN_MESSAGE_TYPE) {
|
|
LOG(LS_WARNING) << "Data Channel OPEN message of unexpected type: "
|
|
<< message_type;
|
|
return false;
|
|
}
|
|
|
|
uint8 channel_type;
|
|
if (!buffer.ReadUInt8(&channel_type)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message channel type.";
|
|
return false;
|
|
}
|
|
|
|
uint16 priority;
|
|
if (!buffer.ReadUInt16(&priority)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message reliabilility prioirty.";
|
|
return false;
|
|
}
|
|
uint32 reliability_param;
|
|
if (!buffer.ReadUInt32(&reliability_param)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message reliabilility param.";
|
|
return false;
|
|
}
|
|
uint16 label_length;
|
|
if (!buffer.ReadUInt16(&label_length)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message label length.";
|
|
return false;
|
|
}
|
|
uint16 protocol_length;
|
|
if (!buffer.ReadUInt16(&protocol_length)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message protocol length.";
|
|
return false;
|
|
}
|
|
if (!buffer.ReadString(label, (size_t) label_length)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message label";
|
|
return false;
|
|
}
|
|
if (!buffer.ReadString(&config->protocol, protocol_length)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN message protocol.";
|
|
return false;
|
|
}
|
|
|
|
config->ordered = true;
|
|
switch (channel_type) {
|
|
case DCOMCT_UNORDERED_RELIABLE:
|
|
case DCOMCT_UNORDERED_PARTIAL_RTXS:
|
|
case DCOMCT_UNORDERED_PARTIAL_TIME:
|
|
config->ordered = false;
|
|
}
|
|
|
|
config->maxRetransmits = -1;
|
|
config->maxRetransmitTime = -1;
|
|
switch (channel_type) {
|
|
case DCOMCT_ORDERED_PARTIAL_RTXS:
|
|
case DCOMCT_UNORDERED_PARTIAL_RTXS:
|
|
config->maxRetransmits = reliability_param;
|
|
break;
|
|
case DCOMCT_ORDERED_PARTIAL_TIME:
|
|
case DCOMCT_UNORDERED_PARTIAL_TIME:
|
|
config->maxRetransmitTime = reliability_param;
|
|
break;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool ParseDataChannelOpenAckMessage(const rtc::Buffer& payload) {
|
|
rtc::ByteBuffer buffer(payload);
|
|
uint8 message_type;
|
|
if (!buffer.ReadUInt8(&message_type)) {
|
|
LOG(LS_WARNING) << "Could not read OPEN_ACK message type.";
|
|
return false;
|
|
}
|
|
if (message_type != DATA_CHANNEL_OPEN_ACK_MESSAGE_TYPE) {
|
|
LOG(LS_WARNING) << "Data Channel OPEN_ACK message of unexpected type: "
|
|
<< message_type;
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool WriteDataChannelOpenMessage(const std::string& label,
|
|
const DataChannelInit& config,
|
|
rtc::Buffer* payload) {
|
|
// Format defined at
|
|
// http://tools.ietf.org/html/draft-ietf-rtcweb-data-protocol-00#section-6.1
|
|
uint8 channel_type = 0;
|
|
uint32 reliability_param = 0;
|
|
uint16 priority = 0;
|
|
if (config.ordered) {
|
|
if (config.maxRetransmits > -1) {
|
|
channel_type = DCOMCT_ORDERED_PARTIAL_RTXS;
|
|
reliability_param = config.maxRetransmits;
|
|
} else if (config.maxRetransmitTime > -1) {
|
|
channel_type = DCOMCT_ORDERED_PARTIAL_TIME;
|
|
reliability_param = config.maxRetransmitTime;
|
|
} else {
|
|
channel_type = DCOMCT_ORDERED_RELIABLE;
|
|
}
|
|
} else {
|
|
if (config.maxRetransmits > -1) {
|
|
channel_type = DCOMCT_UNORDERED_PARTIAL_RTXS;
|
|
reliability_param = config.maxRetransmits;
|
|
} else if (config.maxRetransmitTime > -1) {
|
|
channel_type = DCOMCT_UNORDERED_PARTIAL_TIME;
|
|
reliability_param = config.maxRetransmitTime;
|
|
} else {
|
|
channel_type = DCOMCT_UNORDERED_RELIABLE;
|
|
}
|
|
}
|
|
|
|
rtc::ByteBuffer buffer(
|
|
NULL, 20 + label.length() + config.protocol.length(),
|
|
rtc::ByteBuffer::ORDER_NETWORK);
|
|
buffer.WriteUInt8(DATA_CHANNEL_OPEN_MESSAGE_TYPE);
|
|
buffer.WriteUInt8(channel_type);
|
|
buffer.WriteUInt16(priority);
|
|
buffer.WriteUInt32(reliability_param);
|
|
buffer.WriteUInt16(static_cast<uint16>(label.length()));
|
|
buffer.WriteUInt16(static_cast<uint16>(config.protocol.length()));
|
|
buffer.WriteString(label);
|
|
buffer.WriteString(config.protocol);
|
|
payload->SetData(buffer.Data(), buffer.Length());
|
|
return true;
|
|
}
|
|
|
|
void WriteDataChannelOpenAckMessage(rtc::Buffer* payload) {
|
|
rtc::ByteBuffer buffer(rtc::ByteBuffer::ORDER_NETWORK);
|
|
buffer.WriteUInt8(DATA_CHANNEL_OPEN_ACK_MESSAGE_TYPE);
|
|
payload->SetData(buffer.Data(), buffer.Length());
|
|
}
|
|
} // namespace webrtc
|