--- netwerk/base/ARefBase.h | 2 ++ netwerk/base/CaptivePortalService.cpp | 1 + netwerk/base/CaptivePortalService.h | 1 + netwerk/base/EventTokenBucket.cpp | 4 +++- netwerk/base/LoadContextInfo.cpp | 3 +++ netwerk/base/LoadInfo.cpp | 3 +++ netwerk/base/MemoryDownloader.cpp | 1 + netwerk/base/Predictor.cpp | 1 + netwerk/base/RedirectChannelRegistrar.h | 1 + netwerk/base/nsBaseChannel.cpp | 1 + netwerk/base/nsChannelClassifier.cpp | 1 + netwerk/base/nsDirectoryIndexStream.cpp | 3 ++- netwerk/base/nsDownloader.cpp | 1 + netwerk/base/nsIOService.cpp | 1 + netwerk/base/nsIncrementalDownload.cpp | 3 +++ netwerk/base/nsNetUtil.cpp | 4 ++++ netwerk/base/nsNetUtil.h | 1 + netwerk/base/nsProtocolProxyService.cpp | 1 + netwerk/base/nsSecCheckWrapChannel.cpp | 2 ++ netwerk/base/nsUDPSocket.cpp | 4 +++- netwerk/cache/nsDiskCacheBinding.cpp | 2 +- netwerk/cache/nsDiskCacheDeviceSQL.cpp | 2 ++ netwerk/cache/nsMemoryCacheDevice.cpp | 2 +- netwerk/cache2/CacheFileUtils.cpp | 2 ++ netwerk/cache2/CacheStorageService.h | 1 + netwerk/ipc/NeckoParent.cpp | 1 + netwerk/ipc/RemoteOpenFileChild.cpp | 1 + netwerk/protocol/about/nsAboutBloat.cpp | 1 + netwerk/protocol/about/nsAboutCacheEntry.cpp | 1 + netwerk/protocol/about/nsAboutProtocolHandler.cpp | 1 + netwerk/protocol/data/DataChannelParent.cpp | 1 + netwerk/protocol/file/nsFileProtocolHandler.cpp | 1 + netwerk/protocol/ftp/FTPChannelParent.cpp | 2 ++ netwerk/protocol/ftp/FTPChannelParent.h | 1 + netwerk/protocol/ftp/nsFtpConnectionThread.cpp | 1 + netwerk/protocol/ftp/nsFtpProtocolHandler.h | 1 + netwerk/protocol/http/Http2Compression.cpp | 1 + netwerk/protocol/http/Http2Session.cpp | 1 + netwerk/protocol/http/Http2Stream.h | 2 ++ netwerk/protocol/http/HttpBaseChannel.cpp | 4 ++++ netwerk/protocol/http/HttpBaseChannel.h | 1 + netwerk/protocol/http/HttpChannelChild.cpp | 25 ++-------------------- netwerk/protocol/http/HttpChannelChild.h | 24 +++++++++++++++++++++ netwerk/protocol/http/HttpChannelParent.cpp | 1 + netwerk/protocol/http/HttpChannelParent.h | 1 + .../protocol/http/HttpChannelParentListener.cpp | 1 + netwerk/protocol/http/HttpChannelParentListener.h | 1 + netwerk/protocol/http/InterceptedChannel.cpp | 1 + netwerk/protocol/http/NullHttpChannel.cpp | 1 + netwerk/protocol/http/NullHttpTransaction.cpp | 1 + netwerk/protocol/http/PackagedAppService.cpp | 14 ++++++++++-- netwerk/protocol/http/PackagedAppService.h | 4 +++- netwerk/protocol/http/PackagedAppVerifier.cpp | 1 + netwerk/protocol/http/nsCORSListenerProxy.cpp | 2 +- netwerk/protocol/http/nsHttpBasicAuth.cpp | 1 + netwerk/protocol/http/nsHttpChannel.cpp | 2 ++ netwerk/protocol/http/nsHttpChunkedDecoder.cpp | 1 + netwerk/protocol/http/nsHttpConnectionInfo.cpp | 2 ++ netwerk/protocol/http/nsHttpConnectionMgr.cpp | 1 + netwerk/protocol/http/nsHttpDigestAuth.cpp | 1 + netwerk/protocol/viewsource/nsViewSourceHandler.h | 4 ++++ .../protocol/websocket/BaseWebSocketChannel.cpp | 1 + .../websocket/WebSocketEventListenerParent.cpp | 1 + .../protocol/websocket/WebSocketEventService.cpp | 3 +++ netwerk/protocol/websocket/WebSocketFrame.cpp | 2 ++ netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp | 1 + .../protocol/wyciwyg/nsWyciwygProtocolHandler.cpp | 1 + netwerk/streamconv/converters/mozTXTToHTMLConv.cpp | 1 + .../streamconv/converters/nsFTPDirListingConv.cpp | 1 + .../streamconv/converters/nsHTTPCompressConv.cpp | 2 ++ netwerk/streamconv/converters/nsHTTPCompressConv.h | 1 + netwerk/streamconv/converters/nsIndexedToHTML.cpp | 1 + netwerk/streamconv/converters/nsMultiMixedConv.cpp | 2 ++ netwerk/streamconv/converters/nsTXTToHTMLConv.cpp | 2 ++ netwerk/streamconv/converters/nsUnknownDecoder.cpp | 2 ++ 75 files changed, 147 insertions(+), 32 deletions(-)
170 lines
4.9 KiB
C++
170 lines
4.9 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=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 "WebSocketFrame.h"
|
|
|
|
#include "WebSocketChannel.h"
|
|
#include "nsSocketTransportService2.h"
|
|
#include "nsThreadUtils.h" // for NS_IsMainThread
|
|
#include "ipc/IPCMessageUtils.h"
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
NS_INTERFACE_MAP_BEGIN(WebSocketFrame)
|
|
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebSocketFrame)
|
|
NS_INTERFACE_MAP_ENTRY(nsIWebSocketFrame)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_ADDREF(WebSocketFrame)
|
|
NS_IMPL_RELEASE(WebSocketFrame)
|
|
|
|
WebSocketFrame::WebSocketFrame(const WebSocketFrameData& aData)
|
|
: mData(aData)
|
|
{}
|
|
|
|
WebSocketFrame::WebSocketFrame(bool aFinBit, bool aRsvBit1, bool aRsvBit2,
|
|
bool aRsvBit3, uint8_t aOpCode, bool aMaskBit,
|
|
uint32_t aMask, const nsCString& aPayload)
|
|
: mData(PR_Now(), aFinBit, aRsvBit1, aRsvBit2, aRsvBit3, aOpCode, aMaskBit,
|
|
aMask, aPayload)
|
|
{
|
|
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
|
|
mData.mTimeStamp = PR_Now();
|
|
}
|
|
|
|
WebSocketFrame::~WebSocketFrame()
|
|
{}
|
|
|
|
#define WSF_GETTER( method, value , type ) \
|
|
NS_IMETHODIMP \
|
|
WebSocketFrame::method(type* aValue) \
|
|
{ \
|
|
MOZ_ASSERT(NS_IsMainThread()); \
|
|
if (!aValue) { \
|
|
return NS_ERROR_FAILURE; \
|
|
} \
|
|
*aValue = value; \
|
|
return NS_OK; \
|
|
}
|
|
|
|
WSF_GETTER(GetTimeStamp, mData.mTimeStamp, DOMHighResTimeStamp);
|
|
WSF_GETTER(GetFinBit, mData.mFinBit, bool);
|
|
WSF_GETTER(GetRsvBit1, mData.mRsvBit1, bool);
|
|
WSF_GETTER(GetRsvBit2, mData.mRsvBit2, bool);
|
|
WSF_GETTER(GetRsvBit3, mData.mRsvBit3, bool);
|
|
WSF_GETTER(GetOpCode, mData.mOpCode, uint16_t);
|
|
WSF_GETTER(GetMaskBit, mData.mMaskBit, bool);
|
|
WSF_GETTER(GetMask, mData.mMask, uint32_t);
|
|
|
|
#undef WSF_GETTER
|
|
|
|
NS_IMETHODIMP
|
|
WebSocketFrame::GetPayload(nsACString& aValue)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
aValue = mData.mPayload;
|
|
return NS_OK;
|
|
}
|
|
|
|
WebSocketFrameData::WebSocketFrameData()
|
|
: mTimeStamp(0)
|
|
, mFinBit(false)
|
|
, mRsvBit1(false)
|
|
, mRsvBit2(false)
|
|
, mRsvBit3(false)
|
|
, mMaskBit(false)
|
|
, mOpCode(0)
|
|
, mMask(0)
|
|
{
|
|
MOZ_COUNT_CTOR(WebSocketFrameData);
|
|
}
|
|
|
|
WebSocketFrameData::WebSocketFrameData(DOMHighResTimeStamp aTimeStamp,
|
|
bool aFinBit, bool aRsvBit1,
|
|
bool aRsvBit2, bool aRsvBit3,
|
|
uint8_t aOpCode, bool aMaskBit,
|
|
uint32_t aMask,
|
|
const nsCString& aPayload)
|
|
: mTimeStamp(aTimeStamp)
|
|
, mFinBit(aFinBit)
|
|
, mRsvBit1(aRsvBit1)
|
|
, mRsvBit2(aRsvBit2)
|
|
, mRsvBit3(aRsvBit3)
|
|
, mMaskBit(aMaskBit)
|
|
, mOpCode(aOpCode)
|
|
, mMask(aMask)
|
|
, mPayload(aPayload)
|
|
{
|
|
MOZ_COUNT_CTOR(WebSocketFrameData);
|
|
}
|
|
|
|
WebSocketFrameData::WebSocketFrameData(const WebSocketFrameData& aData)
|
|
: mTimeStamp(aData.mTimeStamp)
|
|
, mFinBit(aData.mFinBit)
|
|
, mRsvBit1(aData.mRsvBit1)
|
|
, mRsvBit2(aData.mRsvBit2)
|
|
, mRsvBit3(aData.mRsvBit3)
|
|
, mMaskBit(aData.mMaskBit)
|
|
, mOpCode(aData.mOpCode)
|
|
, mMask(aData.mMask)
|
|
, mPayload(aData.mPayload)
|
|
{
|
|
MOZ_COUNT_CTOR(WebSocketFrameData);
|
|
}
|
|
|
|
WebSocketFrameData::~WebSocketFrameData()
|
|
{
|
|
MOZ_COUNT_DTOR(WebSocketFrameData);
|
|
}
|
|
|
|
void
|
|
WebSocketFrameData::WriteIPCParams(IPC::Message* aMessage) const
|
|
{
|
|
WriteParam(aMessage, mTimeStamp);
|
|
WriteParam(aMessage, mFinBit);
|
|
WriteParam(aMessage, mRsvBit1);
|
|
WriteParam(aMessage, mRsvBit2);
|
|
WriteParam(aMessage, mRsvBit3);
|
|
WriteParam(aMessage, mOpCode);
|
|
WriteParam(aMessage, mMaskBit);
|
|
WriteParam(aMessage, mMask);
|
|
WriteParam(aMessage, mPayload);
|
|
}
|
|
|
|
bool
|
|
WebSocketFrameData::ReadIPCParams(const IPC::Message* aMessage,
|
|
void** aIter)
|
|
{
|
|
if (!ReadParam(aMessage, aIter, &mTimeStamp)) {
|
|
return false;
|
|
}
|
|
|
|
#define ReadParamHelper(x) \
|
|
{ \
|
|
bool bit; \
|
|
if (!ReadParam(aMessage, aIter, &bit)) { \
|
|
return false; \
|
|
} \
|
|
x = bit; \
|
|
}
|
|
|
|
ReadParamHelper(mFinBit);
|
|
ReadParamHelper(mRsvBit1);
|
|
ReadParamHelper(mRsvBit2);
|
|
ReadParamHelper(mRsvBit3);
|
|
ReadParamHelper(mMaskBit);
|
|
|
|
#undef ReadParamHelper
|
|
|
|
return ReadParam(aMessage, aIter, &mOpCode) &&
|
|
ReadParam(aMessage, aIter, &mMask) &&
|
|
ReadParam(aMessage, aIter, &mPayload);
|
|
}
|
|
|
|
} // net namespace
|
|
} // mozilla namespace
|