Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 18:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to mozilla-inbound. a=merge on a CLOSED TREE

Browse Source
This commit is contained in:
Razvan Maries 2019-02-12 23:59:47 +02:00
commit 35355d29bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netwerk/sctp/datachannel/DataChannel.cpp
View File

@ -265,7 +265,6 @@ static DataChannelConnection *GetConnectionFromSocket(struct socket *sock) {
static int threshold_event(struct socket *sock, uint32_t sb_free) {
DataChannelConnection *connection = GetConnectionFromSocket(sock);
if (connection) {
MutexAutoLock lock(connection->mLock);
connection->SendDeferredMessages();
} else {
LOG(("Can't find connection for socket %p", sock));
@ -842,6 +841,7 @@ void DataChannelConnection::SctpDtlsInput(const std::string &aTransportId,
}
}
// Pass the data to SCTP
MutexAutoLock lock(mLock);
usrsctp_conninput(static_cast<void *>(this), packet.data(), packet.len(), 0);
}
@ -2313,7 +2313,7 @@ int DataChannelConnection::ReceiveCallback(struct socket *sock, void *data,
if (!data) {
LOG(("ReceiveCallback: SCTP has finished shutting down"));
} else {
MutexAutoLock lock(mLock);
mLock.AssertCurrentThreadOwns();
if (flags & MSG_NOTIFICATION) {
HandleNotification(static_cast<union sctp_notification *>(data), datalen);
} else {