zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete LoggingSocketAdapter (unused) and AsyncHttpsProxyServerSocket (unimplemented).

Browse Source 
BUG=webrtc:6424

Review-Url: https://codereview.webrtc.org/2695593012
Cr-Commit-Position: refs/heads/master@{#16708}
This commit is contained in:
nisse
2017-02-20 00:29:55 -08:00
committed by Commit bot
parent 683ecca8d3
commit e29dfb7e36
2 changed files with 0 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
webrtc/base/socketadapters.cc
View File

@ -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

43
webrtc/base/socketadapters.h
View File

@ -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_