| Index: webrtc/base/socketadapters.cc
|
| diff --git a/webrtc/base/socketadapters.cc b/webrtc/base/socketadapters.cc
|
| index f6029ce964545695e99c93288720922e7ec0338a..5f01b2f1cc78ac8fe01571e1a982dd213e97ed06 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
|
|
|