mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:07:36 +00:00
Userland: Convert TLS::TLSv12 to a Core::Stream::Socket
This commit converts TLS::TLSv12 to a Core::Stream object, and in the process allows TLS to now wrap other Core::Stream::Socket objects. As a large part of LibHTTP and LibGemini depend on LibTLS's interface, this also converts those to support Core::Stream, which leads to a simplification of LibHTTP (as there's no need to care about the underlying socket type anymore). Note that RequestServer now controls the TLS socket options, which is a better place anyway, as RS is the first receiver of the user-requested options (though this is currently not particularly useful).
This commit is contained in:
parent
7a95c451a3
commit
aafc451016
47 changed files with 841 additions and 1157 deletions
|
@ -60,7 +60,6 @@ public:
|
|||
Function<void(ResponseData&&)> unrequested_response_callback;
|
||||
|
||||
private:
|
||||
Client(StringView host, u16 port, NonnullRefPtr<TLS::TLSv12>);
|
||||
Client(StringView host, u16 port, NonnullOwnPtr<Core::Stream::Socket>);
|
||||
void setup_callbacks();
|
||||
|
||||
|
@ -73,11 +72,7 @@ private:
|
|||
StringView m_host;
|
||||
u16 m_port;
|
||||
|
||||
bool m_tls;
|
||||
// FIXME: Convert this to a single `NonnullOwnPtr<Core::Stream::Socket>`
|
||||
// once `TLS::TLSv12` is converted to a `Socket` as well.
|
||||
OwnPtr<Core::Stream::Socket> m_socket;
|
||||
RefPtr<TLS::TLSv12> m_tls_socket;
|
||||
NonnullOwnPtr<Core::Stream::Socket> m_socket;
|
||||
RefPtr<Promise<Empty>> m_connect_pending {};
|
||||
|
||||
int m_current_command = 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue