diff --git a/webrtc/base/socketadapters.cc b/webrtc/base/socketadapters.cc index f6029ce964..5f01b2f1cc 100644 --- a/webrtc/base/socketadapters.cc +++ b/webrtc/base/socketadapters.cc @@ -845,68 +845,4 @@ void AsyncSocksProxyServerSocket::Error(int error) { SignalCloseEvent(this, error); } -/////////////////////////////////////////////////////////////////////////////// - -LoggingSocketAdapter::LoggingSocketAdapter(AsyncSocket* socket, - LoggingSeverity level, - const char * label, bool hex_mode) - : AsyncSocketAdapter(socket), level_(level), hex_mode_(hex_mode) { - label_.append("["); - label_.append(label); - label_.append("]"); -} - -int LoggingSocketAdapter::Send(const void *pv, size_t cb) { - int res = AsyncSocketAdapter::Send(pv, cb); - if (res > 0) - LogMultiline(level_, label_.c_str(), false, pv, res, hex_mode_, &lms_); - return res; -} - -int LoggingSocketAdapter::SendTo(const void *pv, size_t cb, - const SocketAddress& addr) { - int res = AsyncSocketAdapter::SendTo(pv, cb, addr); - if (res > 0) - LogMultiline(level_, label_.c_str(), false, pv, res, hex_mode_, &lms_); - return res; -} - -int LoggingSocketAdapter::Recv(void* pv, size_t cb, int64_t* timestamp) { - int res = AsyncSocketAdapter::Recv(pv, cb, timestamp); - if (res > 0) - LogMultiline(level_, label_.c_str(), true, pv, res, hex_mode_, &lms_); - return res; -} - -int LoggingSocketAdapter::RecvFrom(void* pv, - size_t cb, - SocketAddress* paddr, - int64_t* timestamp) { - int res = AsyncSocketAdapter::RecvFrom(pv, cb, paddr, timestamp); - if (res > 0) - LogMultiline(level_, label_.c_str(), true, pv, res, hex_mode_, &lms_); - return res; -} - -int LoggingSocketAdapter::Close() { - LogMultiline(level_, label_.c_str(), false, NULL, 0, hex_mode_, &lms_); - LogMultiline(level_, label_.c_str(), true, NULL, 0, hex_mode_, &lms_); - LOG_V(level_) << label_ << " Closed locally"; - return socket_->Close(); -} - -void LoggingSocketAdapter::OnConnectEvent(AsyncSocket * socket) { - LOG_V(level_) << label_ << " Connected"; - AsyncSocketAdapter::OnConnectEvent(socket); -} - -void LoggingSocketAdapter::OnCloseEvent(AsyncSocket * socket, int err) { - LogMultiline(level_, label_.c_str(), false, NULL, 0, hex_mode_, &lms_); - LogMultiline(level_, label_.c_str(), true, NULL, 0, hex_mode_, &lms_); - LOG_V(level_) << label_ << " Closed with error: " << err; - AsyncSocketAdapter::OnCloseEvent(socket, err); -} - -/////////////////////////////////////////////////////////////////////////////// - } // namespace rtc diff --git a/webrtc/base/socketadapters.h b/webrtc/base/socketadapters.h index 02f6bca3c9..3b5be10c61 100644 --- a/webrtc/base/socketadapters.h +++ b/webrtc/base/socketadapters.h @@ -142,18 +142,6 @@ class AsyncHttpsProxySocket : public BufferedReadAdapter { RTC_DISALLOW_COPY_AND_ASSIGN(AsyncHttpsProxySocket); }; -/* TODO: Implement this. -class AsyncHttpsProxyServerSocket : public AsyncProxyServerSocket { - public: - explicit AsyncHttpsProxyServerSocket(AsyncSocket* socket); - - private: - virtual void ProcessInput(char * data, size_t& len); - void Error(int error); - RTC_DISALLOW_COPY_AND_ASSIGN(AsyncHttpsProxyServerSocket); -}; -*/ - /////////////////////////////////////////////////////////////////////////////// // Implements a socket adapter that speaks the SOCKS proxy protocol. @@ -214,37 +202,6 @@ class AsyncSocksProxyServerSocket : public AsyncProxyServerSocket { RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSocksProxyServerSocket); }; -/////////////////////////////////////////////////////////////////////////////// - -// Implements a socket adapter that logs everything that it sends and receives. -class LoggingSocketAdapter : public AsyncSocketAdapter { - public: - LoggingSocketAdapter(AsyncSocket* socket, LoggingSeverity level, - const char * label, bool hex_mode = false); - - int Send(const void* pv, size_t cb) override; - int SendTo(const void* pv, size_t cb, const SocketAddress& addr) override; - int Recv(void* pv, size_t cb, int64_t* timestamp) override; - int RecvFrom(void* pv, - size_t cb, - SocketAddress* paddr, - int64_t* timestamp) override; - int Close() override; - - protected: - void OnConnectEvent(AsyncSocket* socket) override; - void OnCloseEvent(AsyncSocket* socket, int err) override; - - private: - LoggingSeverity level_; - std::string label_; - bool hex_mode_; - LogMultilineState lms_; - RTC_DISALLOW_COPY_AND_ASSIGN(LoggingSocketAdapter); -}; - -/////////////////////////////////////////////////////////////////////////////// - } // namespace rtc #endif // WEBRTC_BASE_SOCKETADAPTERS_H_