You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2018/05/31 05:43:33 UTC
[trafficserver] branch quic-latest updated: Cleanup: remove
NetVConnectionContext_t if it could be referred by
QUICConnectionInfoProvider::direction()
This is an automated email from the ASF dual-hosted git repository.
masaori pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/quic-latest by this push:
new 93edda2 Cleanup: remove NetVConnectionContext_t if it could be referred by QUICConnectionInfoProvider::direction()
93edda2 is described below
commit 93edda2ab4d5e99780d812550a6fed0e320a1a50
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Thu May 31 14:41:46 2018 +0900
Cleanup: remove NetVConnectionContext_t if it could be referred by QUICConnectionInfoProvider::direction()
---
iocore/net/QUICNetVConnection.cc | 2 +-
iocore/net/quic/QUICHandshake.cc | 5 ++---
iocore/net/quic/QUICHandshake.h | 1 -
iocore/net/quic/QUICStreamManager.cc | 7 +++----
iocore/net/quic/QUICStreamManager.h | 4 +---
iocore/net/quic/test/test_QUICStreamManager.cc | 8 ++++----
6 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index 2c1f1a5..7550123 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -210,7 +210,7 @@ QUICNetVConnection::start()
this->_remote_flow_controller = new QUICRemoteConnectionFlowController(UINT64_MAX);
this->_local_flow_controller = new QUICLocalConnectionFlowController(this->_loss_detector, UINT64_MAX);
this->_path_validator = new QUICPathValidator();
- this->_stream_manager = new QUICStreamManager(this->_loss_detector, this, this->_application_map, this->netvc_context);
+ this->_stream_manager = new QUICStreamManager(this, this->_loss_detector, this->_application_map);
this->_frame_dispatcher->add_handler(this);
this->_frame_dispatcher->add_handler(this->_stream_manager);
diff --git a/iocore/net/quic/QUICHandshake.cc b/iocore/net/quic/QUICHandshake.cc
index e765e67..57f00f1 100644
--- a/iocore/net/quic/QUICHandshake.cc
+++ b/iocore/net/quic/QUICHandshake.cc
@@ -94,7 +94,6 @@ QUICHandshake::QUICHandshake(QUICConnection *qc, SSL_CTX *ssl_ctx, QUICStateless
_ssl(SSL_new(ssl_ctx)),
_hs_protocol(new QUICTLS(this->_ssl, qc->direction(), stateless_retry)),
_version_negotiator(new QUICVersionNegotiator()),
- _netvc_context(qc->direction()),
_reset_token(token),
_stateless_retry(stateless_retry)
{
@@ -102,7 +101,7 @@ QUICHandshake::QUICHandshake(QUICConnection *qc, SSL_CTX *ssl_ctx, QUICStateless
SSL_set_ex_data(this->_ssl, QUIC::ssl_quic_hs_index, this);
this->_hs_protocol->initialize_key_materials(this->_qc->original_connection_id());
- if (this->_netvc_context == NET_VCONNECTION_OUT) {
+ if (this->_qc->direction() == NET_VCONNECTION_OUT) {
this->_initial = true;
}
@@ -156,7 +155,7 @@ QUICErrorUPtr
QUICHandshake::negotiate_version(const QUICPacket *vn, QUICPacketFactory *packet_factory)
{
// Client side only
- ink_assert(this->_netvc_context == NET_VCONNECTION_OUT);
+ ink_assert(this->_qc->direction() == NET_VCONNECTION_OUT);
// If already negotiated, just ignore it
if (this->_version_negotiator->status() == QUICVersionNegotiationStatus::NEGOTIATED ||
diff --git a/iocore/net/quic/QUICHandshake.h b/iocore/net/quic/QUICHandshake.h
index 5274a66..95820c2 100644
--- a/iocore/net/quic/QUICHandshake.h
+++ b/iocore/net/quic/QUICHandshake.h
@@ -90,7 +90,6 @@ private:
std::shared_ptr<QUICTransportParameters> _remote_transport_parameters = nullptr;
QUICVersionNegotiator *_version_negotiator = nullptr;
- NetVConnectionContext_t _netvc_context = NET_VCONNECTION_UNSET;
QUICStatelessResetToken _reset_token;
bool _initial = false;
bool _stateless_retry = false;
diff --git a/iocore/net/quic/QUICStreamManager.cc b/iocore/net/quic/QUICStreamManager.cc
index b5cd442..4bb1d7b 100644
--- a/iocore/net/quic/QUICStreamManager.cc
+++ b/iocore/net/quic/QUICStreamManager.cc
@@ -32,11 +32,10 @@ static constexpr char tag[] = "quic_stream_manager";
ClassAllocator<QUICStreamManager> quicStreamManagerAllocator("quicStreamManagerAllocator");
ClassAllocator<QUICStream> quicStreamAllocator("quicStreamAllocator");
-QUICStreamManager::QUICStreamManager(QUICRTTProvider *rtt_provider, QUICConnectionInfoProvider *info, QUICApplicationMap *app_map,
- NetVConnectionContext_t context)
- : _info(info), _rtt_provider(rtt_provider), _app_map(app_map), _netvc_context(context)
+QUICStreamManager::QUICStreamManager(QUICConnectionInfoProvider *info, QUICRTTProvider *rtt_provider, QUICApplicationMap *app_map)
+ : _info(info), _rtt_provider(rtt_provider), _app_map(app_map)
{
- if (this->_netvc_context == NET_VCONNECTION_OUT) {
+ if (this->_info->direction() == NET_VCONNECTION_OUT) {
// stream 0 is for handshake, smallest client bidi stream id is 4
this->_next_stream_id_bidi = static_cast<uint32_t>(QUICStreamType::CLIENT_BIDI) + 4;
this->_next_stream_id_uni = static_cast<uint32_t>(QUICStreamType::CLIENT_UNI);
diff --git a/iocore/net/quic/QUICStreamManager.h b/iocore/net/quic/QUICStreamManager.h
index 88ae800..8ca79d5 100644
--- a/iocore/net/quic/QUICStreamManager.h
+++ b/iocore/net/quic/QUICStreamManager.h
@@ -38,8 +38,7 @@ class QUICStreamManager : public QUICFrameHandler, public QUICFrameGenerator
{
public:
QUICStreamManager(){};
- QUICStreamManager(QUICRTTProvider *rtt_provider, QUICConnectionInfoProvider *info, QUICApplicationMap *app_map,
- NetVConnectionContext_t context);
+ QUICStreamManager(QUICConnectionInfoProvider *info, QUICRTTProvider *rtt_provider, QUICApplicationMap *app_map);
void init_flow_control_params(const std::shared_ptr<const QUICTransportParameters> &local_tp,
const std::shared_ptr<const QUICTransportParameters> &remote_tp);
@@ -80,7 +79,6 @@ private:
QUICConnectionInfoProvider *_info = nullptr;
QUICRTTProvider *_rtt_provider = nullptr;
QUICApplicationMap *_app_map = nullptr;
- NetVConnectionContext_t _netvc_context = NET_VCONNECTION_UNSET;
std::shared_ptr<const QUICTransportParameters> _local_tp = nullptr;
std::shared_ptr<const QUICTransportParameters> _remote_tp = nullptr;
QUICStreamId _local_maximum_stream_id_bidi = 0;
diff --git a/iocore/net/quic/test/test_QUICStreamManager.cc b/iocore/net/quic/test/test_QUICStreamManager.cc
index 4ee6f10..269cd36 100644
--- a/iocore/net/quic/test/test_QUICStreamManager.cc
+++ b/iocore/net/quic/test/test_QUICStreamManager.cc
@@ -34,7 +34,7 @@ TEST_CASE("QUICStreamManager_NewStream", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(new MockQUICRTTProvider(), new MockQUICConnectionInfoProvider(), &app_map, NET_VCONNECTION_IN);
+ QUICStreamManager sm(new MockQUICConnectionInfoProvider(), new MockQUICRTTProvider(), &app_map);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
std::shared_ptr<QUICTransportParameters> remote_tp =
@@ -80,7 +80,7 @@ TEST_CASE("QUICStreamManager_first_initial_map", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(new MockQUICRTTProvider(), new MockQUICConnectionInfoProvider(), &app_map, NET_VCONNECTION_IN);
+ QUICStreamManager sm(new MockQUICConnectionInfoProvider(), new MockQUICRTTProvider(), &app_map);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
std::shared_ptr<QUICTransportParameters> remote_tp =
@@ -100,7 +100,7 @@ TEST_CASE("QUICStreamManager_total_offset_received", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(new MockQUICRTTProvider(), new MockQUICConnectionInfoProvider(), &app_map, NET_VCONNECTION_IN);
+ QUICStreamManager sm(new MockQUICConnectionInfoProvider(), new MockQUICRTTProvider(), &app_map);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
local_tp->set(QUICTransportParameterId::INITIAL_MAX_STREAM_DATA, UINT32_C(4096));
@@ -133,7 +133,7 @@ TEST_CASE("QUICStreamManager_total_offset_sent", "[quic]")
QUICApplicationMap app_map;
MockQUICApplication mock_app;
app_map.set_default(&mock_app);
- QUICStreamManager sm(new MockQUICRTTProvider(), new MockQUICConnectionInfoProvider(), &app_map, NET_VCONNECTION_IN);
+ QUICStreamManager sm(new MockQUICConnectionInfoProvider(), new MockQUICRTTProvider(), &app_map);
std::shared_ptr<QUICTransportParameters> local_tp =
std::make_shared<QUICTransportParametersInEncryptedExtensions>(static_cast<QUICVersion>(0));
local_tp->set(QUICTransportParameterId::INITIAL_MAX_STREAM_DATA, UINT32_C(4096));
--
To stop receiving notification emails like this one, please contact
masaori@apache.org.