Commit 0b0f023
committed
tls: add memory tracking support to SSLWrap
PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>1 parent 30a4f68 commit 0b0f023
3 files changed
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -144,6 +144,7 @@ template void SSLWrap<TLSWrap>::AddMethods(Environment* env, | |||
| 144 | 144 | template void SSLWrap<TLSWrap>::ConfigureSecureContext(SecureContext* sc); | |
| 145 | 145 | template void SSLWrap<TLSWrap>::SetSNIContext(SecureContext* sc); | |
| 146 | 146 | template int SSLWrap<TLSWrap>::SetCACerts(SecureContext* sc); | |
| 147 | + template void SSLWrap<TLSWrap>::MemoryInfo(MemoryTracker* tracker) const; | ||
| 147 | 148 | template SSL_SESSION* SSLWrap<TLSWrap>::GetSessionCallback( | |
| 148 | 149 | SSL* s, | |
| 149 | 150 | const unsigned char* key, | |
@@ -3074,6 +3075,12 @@ int SSLWrap<Base>::SetCACerts(SecureContext* sc) { | |||
| 3074 | 3075 | return 1; | |
| 3075 | 3076 | } | |
| 3076 | 3077 | ||
| 3078 | + template <class Base> | ||
| 3079 | + void SSLWrap<Base>::MemoryInfo(MemoryTracker* tracker) const { | ||
| 3080 | + tracker->TrackField("ocsp_response", ocsp_response_); | ||
| 3081 | + tracker->TrackField("sni_context", sni_context_); | ||
| 3082 | + } | ||
| 3083 | + | ||
| 3077 | 3084 | int VerifyCallback(int preverify_ok, X509_STORE_CTX* ctx) { | |
| 3078 | 3085 | // From https://www.openssl.org/docs/man1.1.1/man3/SSL_verify_cb: | |
| 3079 | 3086 | // | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -222,6 +222,8 @@ class SSLWrap { | |||
| 222 | 222 | inline bool is_awaiting_new_session() const { return awaiting_new_session_; } | |
| 223 | 223 | inline bool is_waiting_cert_cb() const { return cert_cb_ != nullptr; } | |
| 224 | 224 | ||
| 225 | + void MemoryInfo(MemoryTracker* tracker) const; | ||
| 226 | + | ||
| 225 | 227 | protected: | |
| 226 | 228 | typedef void (*CertCb)(void* arg); | |
| 227 | 229 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1089,6 +1089,7 @@ void TLSWrap::GetWriteQueueSize(const FunctionCallbackInfo<Value>& info) { | |||
| 1089 | 1089 | ||
| 1090 | 1090 | ||
| 1091 | 1091 | void TLSWrap::MemoryInfo(MemoryTracker* tracker) const { | |
| 1092 | + SSLWrap<TLSWrap>::MemoryInfo(tracker); | ||
| 1092 | 1093 | tracker->TrackField("error", error_); | |
| 1093 | 1094 | tracker->TrackFieldWithSize("pending_cleartext_input", | |
| 1094 | 1095 | pending_cleartext_input_.size(), | |
0 commit comments