From c653133f9326976ab90c89c3dbaeb64f97fa7f5d Mon Sep 17 00:00:00 2001 From: Yang Chi Date: Wed, 29 Apr 2020 20:35:04 -0700 Subject: [PATCH] Remove setContinueOnNetworkUnreachable API from IoBufQuicBatch Summary: this API isn't necessary Reviewed By: mjoras Differential Revision: D21005961 fbshipit-source-id: e1be324102b3f9ff2a2d7ef2228711dea3119ebc --- quic/api/IoBufQuicBatch.cpp | 8 ++------ quic/api/IoBufQuicBatch.h | 3 --- quic/api/QuicTransportFunctions.cpp | 2 -- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/quic/api/IoBufQuicBatch.cpp b/quic/api/IoBufQuicBatch.cpp index 9547a134e..f8a84361f 100644 --- a/quic/api/IoBufQuicBatch.cpp +++ b/quic/api/IoBufQuicBatch.cpp @@ -60,11 +60,6 @@ bool IOBufQuicBatch::flush(FlushType flushType) { return ret; } -void IOBufQuicBatch::setContinueOnNetworkUnreachable( - bool continueOnNetworkUnreachable) { - continueOnNetworkUnreachable_ = continueOnNetworkUnreachable; -} - void IOBufQuicBatch::reset() { batchWriter_->reset(); } @@ -79,7 +74,8 @@ bool IOBufQuicBatch::isRetriableError(int err) { return true; } auto now = Clock::now(); - if (continueOnNetworkUnreachable_ && isNetworkUnreachable(err)) { + if (conn_.transportSettings.continueOnNetworkUnreachable && + isNetworkUnreachable(err)) { if (!conn_.continueOnNetworkUnreachableDeadline) { conn_.continueOnNetworkUnreachableDeadline = now + conn_.transportSettings.continueOnNetworkUnreachableDuration; diff --git a/quic/api/IoBufQuicBatch.h b/quic/api/IoBufQuicBatch.h index 3b8a8320a..cd06b1ba2 100644 --- a/quic/api/IoBufQuicBatch.h +++ b/quic/api/IoBufQuicBatch.h @@ -39,8 +39,6 @@ class IOBufQuicBatch { return pktSent_; } - void setContinueOnNetworkUnreachable(bool continueOnNetworkUnreachable); - private: void reset(); @@ -61,7 +59,6 @@ class IOBufQuicBatch { QuicConnectionStateBase& conn_; QuicConnectionStateBase::HappyEyeballsState& happyEyeballsState_; uint64_t pktSent_{0}; - bool continueOnNetworkUnreachable_{false}; }; } // namespace quic diff --git a/quic/api/QuicTransportFunctions.cpp b/quic/api/QuicTransportFunctions.cpp index 48cb72752..a1f478acf 100644 --- a/quic/api/QuicTransportFunctions.cpp +++ b/quic/api/QuicTransportFunctions.cpp @@ -988,8 +988,6 @@ uint64_t writeConnectionDataToSocket( connection.peerAddress, connection, connection.happyEyeballsState); - ioBufBatch.setContinueOnNetworkUnreachable( - connection.transportSettings.continueOnNetworkUnreachable); if (connection.loopDetectorCallback) { connection.writeDebugState.schedulerName = scheduler.name();