mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-09-02 07:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent data copy in SCTP transport

Browse Source
This commit is contained in:
Paul-Louis Ageneau
2020-07-22 18:02:00 +02:00
parent 726b4c4c33
commit b6ffa13b72
3 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/rtc/message.hpp
View File

@ -37,6 +37,8 @@ struct Message : binary {
Message(Iterator begin_, Iterator end_, Type type_ = Binary) Message(Iterator begin_, Iterator end_, Type type_ = Binary)
: binary(begin_, end_), type(type_) {} : binary(begin_, end_), type(type_) {}
Message(binary &&data, Type type_ = Binary) : binary(std::move(data)), type(type_) {}
Type type; Type type;
unsigned int stream = 0; unsigned int stream = 0;
std::shared_ptr<Reliability> reliability; std::shared_ptr<Reliability> reliability;
@ -68,6 +70,15 @@ inline message_ptr make_message(size_t size, Message::Type type = Message::Binar
return message; return message;
} }
inline message_ptr make_message(binary &&data, Message::Type type = Message::Binary,
unsigned int stream = 0,
std::shared_ptr<Reliability> reliability = nullptr) {
auto message = std::make_shared<Message>(std::move(data), type);
message->stream = stream;
message->reliability = reliability;
return message;
}
} // namespace rtc } // namespace rtc
#endif #endif

60
src/sctptransport.cpp
View File

@ -479,32 +479,22 @@ int SctpTransport::handleRecv(struct socket * /*sock*/, union sctp_sockstore /*a
// therefore partial notifications and messages need to be handled separately. // therefore partial notifications and messages need to be handled separately.
if (flags & MSG_NOTIFICATION) { if (flags & MSG_NOTIFICATION) {
// SCTP event notification // SCTP event notification
mPartialNotification.insert(mPartialNotification.end(), data, data + len);
if (flags & MSG_EOR) { if (flags & MSG_EOR) {
if (!mPartialNotification.empty()) {
mPartialNotification.insert(mPartialNotification.end(), data, data + len);
data = mPartialNotification.data();
len = mPartialNotification.size();
}
// Notification is complete, process it // Notification is complete, process it
processNotification(reinterpret_cast<const union sctp_notification *>(data), len); processNotification(
reinterpret_cast<const union sctp_notification *>(mPartialNotification.data()),
mPartialNotification.size());
mPartialNotification.clear(); mPartialNotification.clear();
} else {
mPartialNotification.insert(mPartialNotification.end(), data, data + len);
} }
} else { } else {
// SCTP message // SCTP message
mPartialMessage.insert(mPartialMessage.end(), data, data + len);
if (flags & MSG_EOR) { if (flags & MSG_EOR) {
if (!mPartialMessage.empty()) {
mPartialMessage.insert(mPartialMessage.end(), data, data + len);
data = mPartialMessage.data();
len = mPartialMessage.size();
}
// Message is complete, process it // Message is complete, process it
processData(data, len, info.rcv_sid, PayloadId(htonl(info.rcv_ppid))); processData(std::move(mPartialMessage), info.rcv_sid,
PayloadId(htonl(info.rcv_ppid)));
mPartialMessage.clear(); mPartialMessage.clear();
} else {
mPartialMessage.insert(mPartialMessage.end(), data, data + len);
} }
} }
@ -539,62 +529,56 @@ int SctpTransport::handleWrite(byte *data, size_t len, uint8_t /*tos*/, uint8_t
return 0; // success return 0; // success
} }
void SctpTransport::processData(const byte *data, size_t len, uint16_t sid, PayloadId ppid) { void SctpTransport::processData(binary &&data, uint16_t sid, PayloadId ppid) {
PLOG_VERBOSE << "Process data, len=" << len; PLOG_VERBOSE << "Process data, size=" << data.size();
// The usage of the PPIDs "WebRTC String Partial" and "WebRTC Binary Partial" is deprecated. // The usage of the PPIDs "WebRTC String Partial" and "WebRTC Binary Partial" is deprecated.
// See https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13#section-6.6 // See https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13#section-6.6
// We handle them at reception for compatibility reasons but should never send them. // We handle them at reception for compatibility reasons but should never send them.
switch (ppid) { switch (ppid) {
case PPID_CONTROL: case PPID_CONTROL:
recv(make_message(data, data + len, Message::Control, sid)); recv(make_message(std::move(data), Message::Control, sid));
break; break;
case PPID_STRING_PARTIAL: // deprecated case PPID_STRING_PARTIAL: // deprecated
mPartialStringData.insert(mPartialStringData.end(), data, data + len); mPartialStringData.insert(mPartialStringData.end(), data.begin(), data.end());
break; break;
case PPID_STRING: case PPID_STRING:
if (mPartialStringData.empty()) { if (mPartialStringData.empty()) {
mBytesReceived += len; mBytesReceived += data.size();
recv(make_message(data, data + len, Message::String, sid)); recv(make_message(std::move(data), Message::String, sid));
} else { } else {
mPartialStringData.insert(mPartialStringData.end(), data, data + len); mPartialStringData.insert(mPartialStringData.end(), data.begin(), data.end());
mBytesReceived += mPartialStringData.size(); mBytesReceived += mPartialStringData.size();
recv(make_message(mPartialStringData.begin(), mPartialStringData.end(), Message::String, recv(make_message(std::move(mPartialStringData), Message::String, sid));
sid));
mPartialStringData.clear(); mPartialStringData.clear();
} }
break; break;
case PPID_STRING_EMPTY: case PPID_STRING_EMPTY:
// This only accounts for when the partial data is empty recv(make_message(std::move(mPartialStringData), Message::String, sid));
recv(make_message(mPartialStringData.begin(), mPartialStringData.end(), Message::String,
sid));
mPartialStringData.clear(); mPartialStringData.clear();
break; break;
case PPID_BINARY_PARTIAL: // deprecated case PPID_BINARY_PARTIAL: // deprecated
mPartialBinaryData.insert(mPartialBinaryData.end(), data, data + len); mPartialBinaryData.insert(mPartialBinaryData.end(), data.begin(), data.end());
break; break;
case PPID_BINARY: case PPID_BINARY:
if (mPartialBinaryData.empty()) { if (mPartialBinaryData.empty()) {
mBytesReceived += len; mBytesReceived += data.size();
recv(make_message(data, data + len, Message::Binary, sid)); recv(make_message(std::move(data), Message::Binary, sid));
} else { } else {
mPartialBinaryData.insert(mPartialBinaryData.end(), data, data + len); mPartialBinaryData.insert(mPartialBinaryData.end(), data.begin(), data.end());
mBytesReceived += mPartialBinaryData.size(); mBytesReceived += mPartialBinaryData.size();
recv(make_message(mPartialBinaryData.begin(), mPartialBinaryData.end(), Message::Binary, recv(make_message(std::move(mPartialBinaryData), Message::Binary, sid));
sid));
mPartialBinaryData.clear(); mPartialBinaryData.clear();
} }
break; break;
case PPID_BINARY_EMPTY: case PPID_BINARY_EMPTY:
// This only accounts for when the partial data is empty recv(make_message(std::move(mPartialBinaryData), Message::Binary, sid));
recv(make_message(mPartialBinaryData.begin(), mPartialBinaryData.end(), Message::Binary,
sid));
mPartialBinaryData.clear(); mPartialBinaryData.clear();
break; break;

2
src/sctptransport.hpp
View File

@ -86,7 +86,7 @@ private:
int handleSend(size_t free); int handleSend(size_t free);
int handleWrite(byte *data, size_t len, uint8_t tos, uint8_t set_df); int handleWrite(byte *data, size_t len, uint8_t tos, uint8_t set_df);
void processData(const byte *data, size_t len, uint16_t streamId, PayloadId ppid); void processData(binary &&data, uint16_t streamId, PayloadId ppid);
void processNotification(const union sctp_notification *notify, size_t len); void processNotification(const union sctp_notification *notify, size_t len);
const uint16_t mPort; const uint16_t mPort;