Skip to content

CBL-8515: Add a timeout to C4WebSocket::waitForTLSHandshake() #2512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jianminzhao merged 1 commit into from
Jun 23, 2026
+4 −3
Merged

CBL-8515: Add a timeout to C4WebSocket::waitForTLSHandshake() #2512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Networking/WebSockets/c4WebSocket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,10 @@ namespace litecore::repl {
catchAndWarn() return false;
}

bool C4WebSocket::waitForTLSHandshake() {
bool C4WebSocket::waitForTLSHandshake(unsigned timeoutSecs) {
unique_lock lock(_mutex);
_tlsHandshakeCondition.wait(lock, [this] { return _peerCertData != nullslice || _closed; });
_tlsHandshakeCondition.wait_for(lock, chrono::seconds(timeoutSecs),
[this] { return _peerCertData != nullslice || _closed; });
return _peerCertData != nullslice && !_closed;
}

Expand Down
2 changes: 1 addition & 1 deletion Networking/WebSockets/c4WebSocket.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace litecore::repl {
void closeWithException();

/** Blocks until the TLS handshake completes or the socket closes. Returns true on success. */
[[nodiscard]] bool waitForTLSHandshake();
[[nodiscard]] bool waitForTLSHandshake(unsigned timeoutSecs);

// WebSocket public API:
void connect() override;
Expand Down
Loading