Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1809755 - Dispatch TCPSocket.ActivateTLS() to the socket thread. r=keeler

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D168125
This commit is contained in:
Kai Engert 2023-02-08 22:19:57 +00:00
parent a8f8b6f751
commit 4ca8cc8ef0
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom/network/TCPSocket.cpp
View File

@ -10,6 +10,7 @@
#include "TCPSocketParent.h"
#include "mozilla/BasePrincipal.h"
#include "mozilla/ErrorResult.h"
#include "mozilla/SyncRunnable.h"
#include "mozilla/dom/RootedDictionary.h"
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/dom/TCPSocketBinding.h"
@ -455,6 +456,33 @@ void TCPSocket::NotifyCopyComplete(nsresult aStatus) {
}
void TCPSocket::ActivateTLS() {
nsresult rv;
nsCOMPtr<nsIEventTarget> socketThread =
do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv)) {
return;
}
bool alreadyOnSTST = false;
if (NS_FAILED(socketThread->IsOnCurrentThread(&alreadyOnSTST))) {
return;
}
if (alreadyOnSTST) {
ActivateTLSHelper();
return;
}
auto CallActivateTLS = [sock = RefPtr{this}]() mutable {
sock->ActivateTLSHelper();
};
mozilla::SyncRunnable::DispatchToThread(
socketThread,
NS_NewRunnableFunction("TCPSocket::UpgradeToSecure->ActivateTLSHelper",
CallActivateTLS));
}
void TCPSocket::ActivateTLSHelper() {
nsCOMPtr<nsITLSSocketControl> tlsSocketControl;
mTransport->GetTlsSocketControl(getter_AddRefs(tlsSocketControl));
if (tlsSocketControl) {

4
dom/network/TCPSocket.h
View File

@ -166,7 +166,9 @@ class TCPSocket final : public DOMEventTargetHelper,
nsresult EnsureCopying();
// Re-calculate buffered amount.
void CalculateBufferedAmount();
// Enable TLS on this socket.
// Helper function, should be called by ActivateTLS(), only.
void ActivateTLSHelper();
// Enable TLS on this socket, dispatch to STSThread if necessary.
void ActivateTLS();
// Dispatch an error event if necessary, then dispatch a "close" event.
nsresult MaybeReportErrorAndCloseIfOpen(nsresult status);