Log http, and https when secure.

include/bitcoin/network/net/proxy.hpp

@@ -82,6 +82,9 @@ class BCT_API proxy
     /// The proxy (socket) is stopped.
     bool stopped() const NOEXCEPT;
 
+    /// Connection is currently secured (TLS or comparable for socket type).
+    bool secure() const NOEXCEPT;
+
     /// The number of bytes in the write backlog.
     uint64_t backlog() const NOEXCEPT;
 

include/bitcoin/network/net/socket.hpp

@@ -169,6 +169,9 @@ class BCT_API socket
     /// The socket was accepted (vs. connected).
     virtual bool inbound() const NOEXCEPT;
 
+    /// The socket upgrades to its secure configuration upon connect.
+    virtual bool secure() const NOEXCEPT;
+
     /// Stop has been signaled, work is stopping.
     virtual bool stopped() const NOEXCEPT;
 
@@ -182,7 +185,6 @@ class BCT_API socket
     virtual asio::context& service() const NOEXCEPT;
 
 protected:
-    // TODO: p2p::socket, zmq::socket.
     using ws_t = std::variant<ref<ws::socket>, ref<ws::ssl::socket>>;
     using tcp_t = std::variant<ref<asio::socket>, ref<asio::ssl::socket>>;
     using socket_t = std::variant<
@@ -198,9 +200,6 @@ class BCT_API socket
     /// Context.
     /// -----------------------------------------------------------------------
 
-    /// Upgrade the socket to its secure configuration.
-    bool secure() const NOEXCEPT;
-
     /// The socket was upgraded to ssl (requires strand).
     bool is_secure() const NOEXCEPT;
 

src/channels/channel_http.cpp

@@ -191,10 +191,11 @@ void channel_http::assign_json_buffer(response& response) NOEXCEPT
 void channel_http::log_message(const request& LOG_ONLY(request),
     size_t LOG_ONLY(bytes)) const NOEXCEPT
 {
+    LOG_ONLY(const auto scheme = secure() ? "https" : "http";)
     LOG_ONLY(const auto version = "http/" + serialize(request.version() / 10) +
         "." + serialize(request.version() % 10);)
-        
-    LOGA("Http [" << request.method_string()
+
+    LOGA(scheme << " [" << request.method_string()
         << "] " << version
         << " (" << (request.chunked() ? "c" : serialize(bytes))
         << ") " << (request.keep_alive() ? "keep" : "drop")
@@ -206,10 +207,11 @@ void channel_http::log_message(const request& LOG_ONLY(request),
 void channel_http::log_message(const response& LOG_ONLY(response),
     size_t LOG_ONLY(bytes)) const NOEXCEPT
 {
+    LOG_ONLY(const auto scheme = secure() ? "https" : "http";)
     LOG_ONLY(const auto version = "http/" + serialize(response.version() / 10)
         + "." + serialize(response.version() % 10);)
-        
-    LOGA("Http [" << status_string(response.result())
+
+    LOGA(scheme << " [" << status_string(response.result())
         << "] " << version
         << " (" << (response.chunked() ? "c" : serialize(bytes))
         << ") " << (response.keep_alive() ? "keep" : "drop")

src/net/proxy.cpp

@@ -365,6 +365,11 @@ bool proxy::stranded() const NOEXCEPT
     return socket_->stranded();
 }
 
+bool proxy::secure() const NOEXCEPT
+{
+    return socket_->secure();
+}
+
 uint64_t proxy::backlog() const NOEXCEPT
 {
     return backlog_.load(std::memory_order_relaxed);