mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-27 21:39:15 +00:00
36b2354fd4
- Bug 1186307 - StructuredCloneHelper in workers.postMessage(), r=smaug (0d3c817afa) - Bug 1183824 - Remove NS_ENSURE_TRUE(mCallback, NS_ERROR_NOT_INITIALIZED) warning from nsFrameMessageManager::DispatchAsyncMessageInternal. r=smaug (64dfd50f7f) - Bug 1167189: Use a size annotation on the OOM abort. r=bholley (5e7fb331a0) - missing crash reporter (47f183fab4) - Bug 1137151: Marked destructor of |nsClipboard| as protected, r=mwu (5655bf8862) - Bug 1194497 - Convert a few remaining PRUnichar to char16_t. r=roc (1554ffcec2) - Bug 952456 - Part 1: Implement gonk/nsClipboard for rich text and raw image. r=fabrice (419381f7af) - Bug 1198795 - ipc/StructuredCloneUtils should be merged with StructuredCloneHelper, r=smaug (02183262bd) - Bug 1201806 - part 1 - Remove OwningSerializedStructuredCloneBuffer and use StructuredCloneIPCHelper everywhere in IPC code, r=smaug (6dc69151b4) - Bug 1201806 - part 2 - nsStructuredCloneContainer should use StructuredCloneIPCHelper, r=smaug (b6ebaa8e95) - Bug 1202028 - Implement range based for loops for SavedFrame stacks. r=terrence (57c198910c) - missing bit of Bug 1106264 (fa67f8ab56) - Bug 1168806: Configurable I/O thread for socket IPC classes, r=kmachulis (213a8fb2b9) - Bug 1159209: Remove template parameters from |DataSocketIO|, r=kmachulis (0d658c5cf8) - Bug 1168806: Configurable consumer thread for socket IPC classes, r=kmachulis (ee054dd6b0) - Bug 1167207: Add |BluetoothDaemonConnectionConsumer|, r=shuang (b8b89290df) - Bug 1154281: Remove |UnixSocketConsumer| and its helpers, r=kmachulis (d40430b10f) - Bug 1166638: Add |StreamSocketConsumer|, r=kmachulis (59b5c1abf3) - Bug 1166638: Add |ListenSocketConsumer|, r=kmachulis (d119bcaa2a) - Bug 1168806: Use 'consumer thread' in socket interface, r=kmachulis (65d232d21c) - Bug 1170466: Inherit |ConnectionOrientedSocketIO| from |UnixSocketWatcher|, r=kmachulis (b91d0c624a) - Bug 1170466: Share socket I/O methods in |ConnectionOrientedSocketIO|, r=kmachulis (108fb6696e) - Bug 1170466: Implement accept and connect in |ConnectionOrientedSocketIO|, r=kmachulis (590b3b4617) - Bug 1172479: Replace |nsIThread| by |MessageLoop| in socket I/O code, r=kmachulis (618073dcef) - Bug 1203426 - Rename StructuredCloneIPCHelper to StructuredCloneData, r=smaug (dc31124113) - Bug 1167392 - Change nsFrameMessageManager::mParentManager to a smart pointer. r=ehsan (98d60c0398) - Bug 1186843 - Always cache delayed scripts in message manager (b0ab501959) - Bug 1189550 - In parent process, cpmm.initialProcessData should be same as ppmm.initialProcessData (r=smaug) (7a8ab62432) - Bug 1196057 - Use channel->Open2() in dom/base/nsFrameMessageManager.cpp (r=sicking) (a032d483d6) - missing parts of Bug 1132072 - Tab switch refactoring (r=mconley) (e6fbbb722a) - Bug 1175736 - Implement the iframe referrer attribute. r=ckerschb, r=bz (a5fc4e683b) - Bug 1171017: Rename |BluetoothDaemonConnectionConsumer| to |DaemonSocketConsumer|, r=shuang (0af5957609) - Bug 1170993: Manage socket buffers in sub-classes of |UnixSocketBuffer|, r=kmachulis (960de8be45) - Bug 1171017: Rename |BluetoothDaemonPDUConsumer| to |DaemonSocketIOConsumer|, r=shuang (eea1681ab8) - Bug 1171100 - Fix incorrect logic of handling Bluetooth Gatt Responses in daemon backend. r=tzimmermann (c385364d1e) - Bug 1171866 - Remove ReversedUuidToString; f=tzimmermann, r=jocelyn (9b58176c39) - Bug 1171017: Rename |BluetoothSocketPDU| to |DaemonSocketPDU|, r=shuang (ce1bbd9d4a) - Bug 1171017: Rename |BluetoothDaemonConnectionIO| to |DaemonSocketIO|, r=shuang (00f2a38220) - Bug 1171017: Rename |BluetoothDaemonConnection| to |DaemonSocket|, r=shuang (b3c3522719) - Bug 1171017: Move classes from ipc/bluetooth to ipc/hal, r=shuang (047714aee4) - Bug 1171994: Add |RilSocket| and |RilSocketConsumer|, r=htsai (276211bbb7) - Bug 1171994: Forward received RIL socket I/O via |WorkerCrossThreadDispatcher|, r=htsai (7825d1c837) - Bug 1185478: Add leak checks to socket I/O classes (40e2c01ce4) - Bug 1185478: Remove strong references from socket I/O class to socket classes (6fa94f34ff) - Bug 1163912: Set |Type| property of BluetoothDevice a initial value during LeScan; f=elin, r=jocelyn (bda66689ed) - Bug 1166215 - Cast 'BluetoothTypeOfDevice' to uint32_t before the BT signal is distributed to BluetoothAdapter. r=joliu (d38ad4e55f) - Bug 1170086 - Fix the parameter type of DispatchReplyError() in StartLeScan result handler. r=joliu (a24e23e02f) - Bug 1161956 - Fix crashes while using GATT client functions. r=jocelyn (cebfb8c700) - Bug 1171868 - Remove GeneratePathFromGattId(aId, aPath, aUuidStr); r=jocelyn (0eac291b3c) - Bug 1161945 - Fix empty characteristics and descriptors after searching services. f=elin, r=jocelyn (a0d816fee4) - Bug 1164387 - Use |btgatt_client_interface_t.get_device_type| to get the device type. r=jocelyn (c7b5c97a00) - Bug 1173139 - Reorder global creation on workers, r=khuey. (acb79ae54e) - Bug 1170071 - Part 1: Revise BluetoothGattInterface, result handler, and interface helper for daemon support of gatt server. r=shuang (0ad0c9244e) - Bug 1170071 - Part 2: Add helpers for Bluetooth daemon GATT server support. r=shuang (46a4062579) - Bug 1170071 - Part 3: Add gatt server support to GATT module for Bluetooth daemon. r=shuang (71d80aabea) - Bug 1170071 - Part 4: Add Gatt server interfaces for Bluetooth daemon. r=shuang (a556aaf048) - Bug 1187230: Convert Bluetooth to use daemon runnables, r=shuang (9be6501225) - Bug 1204382: Add #include for nsIInputStream.h to MediaParent.cpp, to fix a build error in --disable-webrtc builds. r=jib (8b20e934)
435 lines
8.6 KiB
C++
435 lines
8.6 KiB
C++
/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
|
|
/* 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/.
|
|
*/
|
|
|
|
#include "SocketBase.h"
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include "nsISupportsImpl.h" // for MOZ_COUNT_CTOR, MOZ_COUNT_DTOR
|
|
|
|
namespace mozilla {
|
|
namespace ipc {
|
|
|
|
//
|
|
// UnixSocketIOBuffer
|
|
//
|
|
|
|
UnixSocketBuffer::UnixSocketBuffer()
|
|
: mSize(0)
|
|
, mOffset(0)
|
|
, mAvailableSpace(0)
|
|
, mData(nullptr)
|
|
{
|
|
MOZ_COUNT_CTOR(UnixSocketBuffer);
|
|
}
|
|
|
|
UnixSocketBuffer::~UnixSocketBuffer()
|
|
{
|
|
MOZ_COUNT_DTOR(UnixSocketBuffer);
|
|
|
|
// Make sure that the caller released the buffer's memory.
|
|
MOZ_ASSERT(!GetBuffer());
|
|
}
|
|
|
|
const uint8_t*
|
|
UnixSocketBuffer::Consume(size_t aLen)
|
|
{
|
|
if (NS_WARN_IF(GetSize() < aLen)) {
|
|
return nullptr;
|
|
}
|
|
uint8_t* data = mData + mOffset;
|
|
mOffset += aLen;
|
|
return data;
|
|
}
|
|
|
|
nsresult
|
|
UnixSocketBuffer::Read(void* aValue, size_t aLen)
|
|
{
|
|
const uint8_t* data = Consume(aLen);
|
|
if (!data) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
memcpy(aValue, data, aLen);
|
|
return NS_OK;
|
|
}
|
|
|
|
uint8_t*
|
|
UnixSocketBuffer::Append(size_t aLen)
|
|
{
|
|
if (((mAvailableSpace - mSize) < aLen)) {
|
|
size_t availableSpace = mAvailableSpace + std::max(mAvailableSpace, aLen);
|
|
uint8_t* data = new uint8_t[availableSpace];
|
|
memcpy(data, mData, mSize);
|
|
mData = data;
|
|
mAvailableSpace = availableSpace;
|
|
}
|
|
uint8_t* data = mData + mSize;
|
|
mSize += aLen;
|
|
return data;
|
|
}
|
|
|
|
nsresult
|
|
UnixSocketBuffer::Write(const void* aValue, size_t aLen)
|
|
{
|
|
uint8_t* data = Append(aLen);
|
|
if (!data) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
memcpy(data, aValue, aLen);
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
UnixSocketBuffer::CleanupLeadingSpace()
|
|
{
|
|
if (GetLeadingSpace()) {
|
|
if (GetSize() <= GetLeadingSpace()) {
|
|
memcpy(mData, GetData(), GetSize());
|
|
} else {
|
|
memmove(mData, GetData(), GetSize());
|
|
}
|
|
mOffset = 0;
|
|
}
|
|
}
|
|
|
|
//
|
|
// UnixSocketIOBuffer
|
|
//
|
|
|
|
UnixSocketIOBuffer::UnixSocketIOBuffer()
|
|
{
|
|
MOZ_COUNT_CTOR_INHERITED(UnixSocketIOBuffer, UnixSocketBuffer);
|
|
}
|
|
|
|
UnixSocketIOBuffer::~UnixSocketIOBuffer()
|
|
{
|
|
MOZ_COUNT_DTOR_INHERITED(UnixSocketIOBuffer, UnixSocketBuffer);
|
|
}
|
|
|
|
//
|
|
// UnixSocketRawData
|
|
//
|
|
|
|
UnixSocketRawData::UnixSocketRawData(const void* aData, size_t aSize)
|
|
{
|
|
MOZ_ASSERT(aData || !aSize);
|
|
|
|
MOZ_COUNT_CTOR_INHERITED(UnixSocketRawData, UnixSocketIOBuffer);
|
|
|
|
ResetBuffer(static_cast<uint8_t*>(memcpy(new uint8_t[aSize], aData, aSize)),
|
|
0, aSize, aSize);
|
|
}
|
|
|
|
UnixSocketRawData::UnixSocketRawData(size_t aSize)
|
|
{
|
|
MOZ_COUNT_CTOR_INHERITED(UnixSocketRawData, UnixSocketIOBuffer);
|
|
|
|
ResetBuffer(new uint8_t[aSize], 0, 0, aSize);
|
|
}
|
|
|
|
UnixSocketRawData::~UnixSocketRawData()
|
|
{
|
|
MOZ_COUNT_DTOR_INHERITED(UnixSocketRawData, UnixSocketIOBuffer);
|
|
|
|
nsAutoArrayPtr<uint8_t> data(GetBuffer());
|
|
ResetBuffer(nullptr, 0, 0, 0);
|
|
}
|
|
|
|
ssize_t
|
|
UnixSocketRawData::Receive(int aFd)
|
|
{
|
|
if (!GetTrailingSpace()) {
|
|
if (!GetLeadingSpace()) {
|
|
return -1; /* buffer is full */
|
|
}
|
|
/* free up space at the end of data buffer */
|
|
CleanupLeadingSpace();
|
|
}
|
|
|
|
ssize_t res =
|
|
TEMP_FAILURE_RETRY(read(aFd, GetTrailingBytes(), GetTrailingSpace()));
|
|
|
|
if (res < 0) {
|
|
/* I/O error */
|
|
return -1;
|
|
} else if (!res) {
|
|
/* EOF or peer shutdown sending */
|
|
return 0;
|
|
}
|
|
|
|
Append(res); /* mark read data as 'valid' */
|
|
|
|
return res;
|
|
}
|
|
|
|
ssize_t
|
|
UnixSocketRawData::Send(int aFd)
|
|
{
|
|
if (!GetSize()) {
|
|
return 0;
|
|
}
|
|
|
|
ssize_t res = TEMP_FAILURE_RETRY(write(aFd, GetData(), GetSize()));
|
|
|
|
if (res < 0) {
|
|
if (errno == EAGAIN || errno == EWOULDBLOCK) {
|
|
return 0; /* socket is blocked; try again later */
|
|
}
|
|
return -1;
|
|
} else if (!res) {
|
|
/* nothing written */
|
|
return 0;
|
|
}
|
|
|
|
Consume(res);
|
|
|
|
return res;
|
|
}
|
|
|
|
//
|
|
// SocketBase
|
|
//
|
|
|
|
SocketConnectionStatus
|
|
SocketBase::GetConnectionStatus() const
|
|
{
|
|
return mConnectionStatus;
|
|
}
|
|
|
|
int
|
|
SocketBase::GetSuggestedConnectDelayMs() const
|
|
{
|
|
return mConnectDelayMs;
|
|
}
|
|
|
|
void
|
|
SocketBase::NotifySuccess()
|
|
{
|
|
mConnectionStatus = SOCKET_CONNECTED;
|
|
mConnectTimestamp = PR_IntervalNow();
|
|
OnConnectSuccess();
|
|
}
|
|
|
|
void
|
|
SocketBase::NotifyError()
|
|
{
|
|
mConnectionStatus = SOCKET_DISCONNECTED;
|
|
mConnectDelayMs = CalculateConnectDelayMs();
|
|
mConnectTimestamp = 0;
|
|
OnConnectError();
|
|
}
|
|
|
|
void
|
|
SocketBase::NotifyDisconnect()
|
|
{
|
|
mConnectionStatus = SOCKET_DISCONNECTED;
|
|
mConnectDelayMs = CalculateConnectDelayMs();
|
|
mConnectTimestamp = 0;
|
|
OnDisconnect();
|
|
}
|
|
|
|
uint32_t
|
|
SocketBase::CalculateConnectDelayMs() const
|
|
{
|
|
uint32_t connectDelayMs = mConnectDelayMs;
|
|
|
|
if (mConnectTimestamp && (PR_IntervalNow()-mConnectTimestamp) > connectDelayMs) {
|
|
// reset delay if connection has been opened for a while, or...
|
|
connectDelayMs = 0;
|
|
} else if (!connectDelayMs) {
|
|
// ...start with a delay of ~1 sec, or...
|
|
connectDelayMs = 1<<10;
|
|
} else if (connectDelayMs < (1<<16)) {
|
|
// ...otherwise increase delay by a factor of 2
|
|
connectDelayMs <<= 1;
|
|
}
|
|
return connectDelayMs;
|
|
}
|
|
|
|
SocketBase::SocketBase()
|
|
: mConnectionStatus(SOCKET_DISCONNECTED)
|
|
, mConnectTimestamp(0)
|
|
, mConnectDelayMs(0)
|
|
{
|
|
MOZ_COUNT_CTOR(SocketBase);
|
|
}
|
|
|
|
SocketBase::~SocketBase()
|
|
{
|
|
MOZ_ASSERT(mConnectionStatus == SOCKET_DISCONNECTED);
|
|
|
|
MOZ_COUNT_DTOR(SocketBase);
|
|
}
|
|
|
|
void
|
|
SocketBase::SetConnectionStatus(SocketConnectionStatus aConnectionStatus)
|
|
{
|
|
mConnectionStatus = aConnectionStatus;
|
|
}
|
|
|
|
//
|
|
// SocketIOBase
|
|
//
|
|
|
|
SocketIOBase::SocketIOBase(MessageLoop* aConsumerLoop)
|
|
: mConsumerLoop(aConsumerLoop)
|
|
{
|
|
MOZ_ASSERT(mConsumerLoop);
|
|
|
|
MOZ_COUNT_CTOR(SocketIOBase);
|
|
}
|
|
|
|
SocketIOBase::~SocketIOBase()
|
|
{
|
|
MOZ_COUNT_DTOR(SocketIOBase);
|
|
}
|
|
|
|
MessageLoop*
|
|
SocketIOBase::GetConsumerThread() const
|
|
{
|
|
return mConsumerLoop;
|
|
}
|
|
|
|
bool
|
|
SocketIOBase::IsConsumerThread() const
|
|
{
|
|
return GetConsumerThread() == MessageLoop::current();
|
|
}
|
|
|
|
//
|
|
// SocketEventTask
|
|
//
|
|
|
|
SocketEventTask::SocketEventTask(SocketIOBase* aIO, SocketEvent aEvent)
|
|
: SocketTask<SocketIOBase>(aIO)
|
|
, mEvent(aEvent)
|
|
{
|
|
MOZ_COUNT_CTOR(SocketEventTask);
|
|
}
|
|
|
|
SocketEventTask::~SocketEventTask()
|
|
{
|
|
MOZ_COUNT_DTOR(SocketEventTask);
|
|
}
|
|
|
|
void
|
|
SocketEventTask::Run()
|
|
{
|
|
SocketIOBase* io = SocketTask<SocketIOBase>::GetIO();
|
|
|
|
MOZ_ASSERT(io->IsConsumerThread());
|
|
|
|
if (NS_WARN_IF(io->IsShutdownOnConsumerThread())) {
|
|
// Since we've already explicitly closed and the close
|
|
// happened before this, this isn't really an error.
|
|
return;
|
|
}
|
|
|
|
SocketBase* socketBase = io->GetSocketBase();
|
|
MOZ_ASSERT(socketBase);
|
|
|
|
if (mEvent == CONNECT_SUCCESS) {
|
|
socketBase->NotifySuccess();
|
|
} else if (mEvent == CONNECT_ERROR) {
|
|
socketBase->NotifyError();
|
|
} else if (mEvent == DISCONNECT) {
|
|
socketBase->NotifyDisconnect();
|
|
}
|
|
}
|
|
|
|
//
|
|
// SocketRequestClosingTask
|
|
//
|
|
|
|
SocketRequestClosingTask::SocketRequestClosingTask(SocketIOBase* aIO)
|
|
: SocketTask<SocketIOBase>(aIO)
|
|
{
|
|
MOZ_COUNT_CTOR(SocketRequestClosingTask);
|
|
}
|
|
|
|
SocketRequestClosingTask::~SocketRequestClosingTask()
|
|
{
|
|
MOZ_COUNT_DTOR(SocketRequestClosingTask);
|
|
}
|
|
|
|
void
|
|
SocketRequestClosingTask::Run()
|
|
{
|
|
SocketIOBase* io = SocketTask<SocketIOBase>::GetIO();
|
|
|
|
MOZ_ASSERT(io->IsConsumerThread());
|
|
|
|
if (NS_WARN_IF(io->IsShutdownOnConsumerThread())) {
|
|
// Since we've already explicitly closed and the close
|
|
// happened before this, this isn't really an error.
|
|
return;
|
|
}
|
|
|
|
SocketBase* socketBase = io->GetSocketBase();
|
|
MOZ_ASSERT(socketBase);
|
|
|
|
socketBase->Close();
|
|
}
|
|
|
|
//
|
|
// SocketDeleteInstanceTask
|
|
//
|
|
|
|
SocketDeleteInstanceTask::SocketDeleteInstanceTask(SocketIOBase* aIO)
|
|
: mIO(aIO)
|
|
{
|
|
MOZ_COUNT_CTOR(SocketDeleteInstanceTask);
|
|
}
|
|
|
|
SocketDeleteInstanceTask::~SocketDeleteInstanceTask()
|
|
{
|
|
MOZ_COUNT_DTOR(SocketDeleteInstanceTask);
|
|
}
|
|
|
|
void
|
|
SocketDeleteInstanceTask::Run()
|
|
{
|
|
mIO = nullptr; // delete instance
|
|
}
|
|
|
|
//
|
|
// SocketIOShutdownTask
|
|
//
|
|
|
|
SocketIOShutdownTask::SocketIOShutdownTask(SocketIOBase* aIO)
|
|
: SocketIOTask<SocketIOBase>(aIO)
|
|
{
|
|
MOZ_COUNT_CTOR(SocketIOShutdownTask);
|
|
}
|
|
|
|
SocketIOShutdownTask::~SocketIOShutdownTask()
|
|
{
|
|
MOZ_COUNT_DTOR(SocketIOShutdownTask);
|
|
}
|
|
|
|
void
|
|
SocketIOShutdownTask::Run()
|
|
{
|
|
SocketIOBase* io = SocketIOTask<SocketIOBase>::GetIO();
|
|
|
|
MOZ_ASSERT(!io->IsConsumerThread());
|
|
MOZ_ASSERT(!io->IsShutdownOnIOThread());
|
|
|
|
// At this point, there should be no new events on the I/O thread
|
|
// after this one with the possible exception of an accept task,
|
|
// which ShutdownOnIOThread will cancel for us. We are now fully
|
|
// shut down, so we can send a message to the consumer thread to
|
|
// delete |io| safely knowing that it's not reference any longer.
|
|
io->ShutdownOnIOThread();
|
|
io->GetConsumerThread()->PostTask(FROM_HERE,
|
|
new SocketDeleteInstanceTask(io));
|
|
}
|
|
|
|
}
|
|
}
|