Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(925)

Unified Diff: webrtc/base/openssladapter.cc

Issue 1944683002: Read recv timestamps from socket (posix only). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/openssladapter.h ('k') | webrtc/base/physicalsocketserver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/openssladapter.cc
diff --git a/webrtc/base/openssladapter.cc b/webrtc/base/openssladapter.cc
index 40c352d6436ef11a4cf2cb5fa6bd2bd83f278cce..d1cbaa811b89d65a2930ba9dab82a7d21ee31f95 100644
--- a/webrtc/base/openssladapter.cc
+++ b/webrtc/base/openssladapter.cc
@@ -119,7 +119,7 @@ static int socket_read(BIO* b, char* out, int outl) {
return -1;
rtc::AsyncSocket* socket = static_cast<rtc::AsyncSocket*>(b->ptr);
BIO_clear_retry_flags(b);
- int result = socket->Recv(out, outl);
+ int result = socket->Recv(out, outl, nullptr);
if (result > 0) {
return result;
} else if (result == 0) {
@@ -524,13 +524,12 @@ OpenSSLAdapter::SendTo(const void* pv, size_t cb, const SocketAddress& addr) {
return SOCKET_ERROR;
}
-int
-OpenSSLAdapter::Recv(void* pv, size_t cb) {
+int OpenSSLAdapter::Recv(void* pv, size_t cb, int64_t* timestamp) {
//LOG(LS_INFO) << "OpenSSLAdapter::Recv(" << cb << ")";
switch (state_) {
case SSL_NONE:
- return AsyncSocketAdapter::Recv(pv, cb);
+ return AsyncSocketAdapter::Recv(pv, cb, timestamp);
case SSL_WAIT:
case SSL_CONNECTING:
@@ -579,10 +578,12 @@ OpenSSLAdapter::Recv(void* pv, size_t cb) {
return SOCKET_ERROR;
}
-int
-OpenSSLAdapter::RecvFrom(void* pv, size_t cb, SocketAddress* paddr) {
+int OpenSSLAdapter::RecvFrom(void* pv,
+ size_t cb,
+ SocketAddress* paddr,
+ int64_t* timestamp) {
if (socket_->GetState() == Socket::CS_CONNECTED) {
- int ret = Recv(pv, cb);
+ int ret = Recv(pv, cb, timestamp);
*paddr = GetRemoteAddress();
« no previous file with comments | « webrtc/base/openssladapter.h ('k') | webrtc/base/physicalsocketserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698