mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 23:06:52 +00:00
c2bcdec5c9
- Bug 1261009 - Remove the Data Store API, r=fabrice (b22e580107) - Bug 1268393 - Some compilation issues in ServiceWorker code, r=ehsan (d9c2f2554b) - Bug 1209095 - Accept opaqueredirection fetch results if the request redirection type is manual. r=bkelly (6fe92d1368) - Bug 1267733 P2 Pass ServiceWorkerRegistrationInfo down to CancelChannelRunnable. r=jdm (0ec51f09ef) - Bug 1267733 P3 Trigger service worker update after failed interception. r=jdm (f89a7998d4) - Bug 1267733 P4 Add a wpt test that verifies a service worker update can recover from a broken navigation interception. r=jdm (9dc0ce97bd) - Bug 1267691: Assert on failed attempts to shutdown a thread from itself r=froyd (0cbd1e458c) - Bug 1180533 - Disable BackgroundHangMonitor on gonk (a2d666e741) - Bug 1121216 - disable BackgroundHangMonitor for TSan builds; r=jchen (ef15d1016f) - Bug 1265621 - Use StaticRefPtr in Omnijar.cpp; r=froydnj (81bc32836e) - Bug 1265621 - Expose outer zip readers in Omnijar::GetReader; r=froydnj (ce3f82929e) - Bug 1267021 - Use fallible allocation and move semantics for Push events. r=wchen (3a1ae23d8d) - Bug 1222899 - Handle geolocation-device-events callback. r=kchen (a33bcf4297) - Bug 1237831 - Update GonkGPSGeolocationProvider.cpp to use B2G-style. r=jst (d389eedf47) - Bug 1245033 - Build break in dom/system/gonk/GonkGPSGeolocationProvider.cpp:541:126: error: format '%d' expects argument of type 'int', but argument 5 has type 'nsresult'. r=fabrice (ecde789edf) - Bug 1264287: Convert Wifi to use |UniquePtr|, r=nfroyd (9bad7792bf) - Bug 1267577 - Move nsRunnable to mozilla::Runnable. r=gsvelto (f58e2161f2) - Bug 1210370 - Close wpa_supplicant before we shutdown nsIWifiProxyService. r=mrbkap (5cd4dce58f) - Bug 1218629 - Save audio volume for each device to setting db r=alwu (2f1847dd6f) - Bug 1249437 - Remove workaround of volume control r=alwu (13cd144a89) - Bug 1268432: Replace |Task| with |Runnable| in B2G code r=fabrice (bcc768e9cb) - Bug 1226483 - Add ASSERT check to AudioManager::SelectDeviceFromDevices() r=alwu (446e8f634e) - Bug 1229234 - Enable audio_is_output_device() on ICS r=alwu (84aae07f23) - Bug 1267369 - Only generate typelib data for scriptable interfaces; r=khuey (e49b44c9ce) - Bug 1155969 - Make runtests.py flake8 compliant. r=ted (1de456b206) - Bug 1266569 - Avoid including the ChromeUtils binding in Base64.h. r=froydnj (7ba39a7687)
203 lines
5.1 KiB
C++
203 lines
5.1 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 "ConnectionOrientedSocket.h"
|
|
#include "nsISupportsImpl.h" // for MOZ_COUNT_CTOR, MOZ_COUNT_DTOR
|
|
#include "UnixSocketConnector.h"
|
|
|
|
namespace mozilla {
|
|
namespace ipc {
|
|
|
|
//
|
|
// ConnectionOrientedSocketIO
|
|
//
|
|
|
|
ConnectionOrientedSocketIO::ConnectionOrientedSocketIO(
|
|
MessageLoop* aConsumerLoop,
|
|
MessageLoop* aIOLoop,
|
|
int aFd, ConnectionStatus aConnectionStatus,
|
|
UnixSocketConnector* aConnector)
|
|
: DataSocketIO(aConsumerLoop)
|
|
, UnixSocketWatcher(aIOLoop, aFd, aConnectionStatus)
|
|
, mConnector(aConnector)
|
|
, mPeerAddressLength(0)
|
|
{
|
|
MOZ_ASSERT(mConnector);
|
|
|
|
MOZ_COUNT_CTOR_INHERITED(ConnectionOrientedSocketIO, DataSocketIO);
|
|
}
|
|
|
|
ConnectionOrientedSocketIO::ConnectionOrientedSocketIO(
|
|
MessageLoop* aConsumerLoop,
|
|
MessageLoop* aIOLoop,
|
|
UnixSocketConnector* aConnector)
|
|
: DataSocketIO(aConsumerLoop)
|
|
, UnixSocketWatcher(aIOLoop)
|
|
, mConnector(aConnector)
|
|
, mPeerAddressLength(0)
|
|
{
|
|
MOZ_ASSERT(mConnector);
|
|
|
|
MOZ_COUNT_CTOR_INHERITED(ConnectionOrientedSocketIO, DataSocketIO);
|
|
}
|
|
|
|
ConnectionOrientedSocketIO::~ConnectionOrientedSocketIO()
|
|
{
|
|
MOZ_COUNT_DTOR_INHERITED(ConnectionOrientedSocketIO, DataSocketIO);
|
|
}
|
|
|
|
nsresult
|
|
ConnectionOrientedSocketIO::Accept(int aFd,
|
|
const struct sockaddr* aPeerAddress,
|
|
socklen_t aPeerAddressLength)
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTING);
|
|
|
|
SetSocket(aFd, SOCKET_IS_CONNECTED);
|
|
|
|
// Address setup
|
|
mPeerAddressLength = aPeerAddressLength;
|
|
memcpy(&mPeerAddress, aPeerAddress, mPeerAddressLength);
|
|
|
|
// Signal success and start data transfer
|
|
OnConnected();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
ConnectionOrientedSocketIO::Connect()
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
MOZ_ASSERT(!IsOpen());
|
|
|
|
struct sockaddr* peerAddress =
|
|
reinterpret_cast<struct sockaddr*>(&mPeerAddress);
|
|
mPeerAddressLength = sizeof(mPeerAddress);
|
|
|
|
int fd;
|
|
nsresult rv = mConnector->CreateStreamSocket(peerAddress,
|
|
&mPeerAddressLength,
|
|
fd);
|
|
if (NS_FAILED(rv)) {
|
|
// Tell the consumer thread we've errored
|
|
GetConsumerThread()->PostTask(
|
|
MakeAndAddRef<SocketEventTask>(this, SocketEventTask::CONNECT_ERROR));
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
SetFd(fd);
|
|
|
|
// calls OnConnected() on success, or OnError() otherwise
|
|
rv = UnixSocketWatcher::Connect(peerAddress, mPeerAddressLength);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
ConnectionOrientedSocketIO::Send(UnixSocketIOBuffer* aBuffer)
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
|
|
EnqueueData(aBuffer);
|
|
AddWatchers(WRITE_WATCHER, false);
|
|
}
|
|
|
|
// |UnixSocketWatcher|
|
|
|
|
void
|
|
ConnectionOrientedSocketIO::OnSocketCanReceiveWithoutBlocking()
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTED); // see bug 990984
|
|
|
|
ssize_t res = ReceiveData(GetFd());
|
|
if (res < 0) {
|
|
/* I/O error */
|
|
RemoveWatchers(READ_WATCHER|WRITE_WATCHER);
|
|
} else if (!res) {
|
|
/* EOF or peer shutdown */
|
|
RemoveWatchers(READ_WATCHER);
|
|
}
|
|
}
|
|
|
|
void
|
|
ConnectionOrientedSocketIO::OnSocketCanSendWithoutBlocking()
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTED); // see bug 990984
|
|
MOZ_ASSERT(!IsShutdownOnIOThread());
|
|
|
|
nsresult rv = SendPendingData(GetFd());
|
|
if (NS_FAILED(rv)) {
|
|
return;
|
|
}
|
|
|
|
if (HasPendingData()) {
|
|
AddWatchers(WRITE_WATCHER, false);
|
|
}
|
|
}
|
|
|
|
void
|
|
ConnectionOrientedSocketIO::OnConnected()
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTED);
|
|
|
|
GetConsumerThread()->PostTask(
|
|
MakeAndAddRef<SocketEventTask>(this, SocketEventTask::CONNECT_SUCCESS));
|
|
|
|
AddWatchers(READ_WATCHER, true);
|
|
if (HasPendingData()) {
|
|
AddWatchers(WRITE_WATCHER, false);
|
|
}
|
|
}
|
|
|
|
void
|
|
ConnectionOrientedSocketIO::OnListening()
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
|
|
NS_NOTREACHED("Invalid call to |ConnectionOrientedSocketIO::OnListening|");
|
|
}
|
|
|
|
void
|
|
ConnectionOrientedSocketIO::OnError(const char* aFunction, int aErrno)
|
|
{
|
|
MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop());
|
|
|
|
UnixFdWatcher::OnError(aFunction, aErrno);
|
|
|
|
// Clean up watchers, status, fd
|
|
Close();
|
|
|
|
// Tell the consumer thread we've errored
|
|
GetConsumerThread()->PostTask(
|
|
MakeAndAddRef<SocketEventTask>(this, SocketEventTask::CONNECT_ERROR));
|
|
}
|
|
|
|
//
|
|
// ConnectionOrientedSocket
|
|
//
|
|
|
|
ConnectionOrientedSocket::ConnectionOrientedSocket()
|
|
{
|
|
MOZ_COUNT_CTOR_INHERITED(ConnectionOrientedSocket, DataSocket);
|
|
}
|
|
|
|
ConnectionOrientedSocket::~ConnectionOrientedSocket()
|
|
{
|
|
MOZ_COUNT_DTOR_INHERITED(ConnectionOrientedSocket, DataSocket);
|
|
}
|
|
|
|
}
|
|
}
|