This is an automated email from the ASF dual-hosted git repository.
maskit 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 9184dbf Make maximum/minimum_quic_packet_size private
9184dbf is described below
commit 9184dbf153d7df8f992306358c7f21f67ee15743
Author: Masakazu Kitajo <mas...@apache.org>
AuthorDate: Thu Feb 14 16:31:19 2019 +0900
Make maximum/minimum_quic_packet_size private
Since nobody use it.
---
iocore/net/P_QUICNetVConnection.h | 4 ++--
iocore/net/QUICNetVConnection.cc | 10 +++++-----
iocore/net/quic/Mock.h | 12 ------------
iocore/net/quic/QUICConnection.h | 15 ---------------
4 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/iocore/net/P_QUICNetVConnection.h
b/iocore/net/P_QUICNetVConnection.h
index 55a4c8a..763fab2 100644
--- a/iocore/net/P_QUICNetVConnection.h
+++ b/iocore/net/P_QUICNetVConnection.h
@@ -205,8 +205,6 @@ public:
QUICConnectionId connection_id() const override;
std::string_view cids() const override;
const QUICFiveTuple five_tuple() const override;
- uint32_t maximum_quic_packet_size() const override;
- uint32_t minimum_quic_packet_size() override;
uint32_t pmtu() const override;
NetVConnectionContext_t direction() const override;
SSLNextProtocolSet *next_protocol_set() const override;
@@ -309,6 +307,8 @@ private:
void _unschedule_ack_manager_periodic();
Event *_ack_manager_periodic = nullptr;
+ uint32_t _maximum_quic_packet_size() const;
+ uint32_t _minimum_quic_packet_size();
uint64_t _maximum_stream_frame_data_size();
void _store_frame(ats_unique_buf &buf, size_t &offset, uint64_t
&max_frame_size, QUICFrame &frame,
std::vector<QUICFrameInfo> &frames);
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index 839f43c..90a5171 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -446,7 +446,7 @@ QUICNetVConnection::direction() const
}
uint32_t
-QUICNetVConnection::minimum_quic_packet_size()
+QUICNetVConnection::_minimum_quic_packet_size()
{
if (netvc_context == NET_VCONNECTION_OUT) {
// FIXME Only the first packet need to be 1200 bytes at least
@@ -459,7 +459,7 @@ QUICNetVConnection::minimum_quic_packet_size()
}
uint32_t
-QUICNetVConnection::maximum_quic_packet_size() const
+QUICNetVConnection::_maximum_quic_packet_size() const
{
if (this->options.ip_family == PF_INET6) {
return this->_pmtu - UDP_HEADER_SIZE - IPV6_HEADER_SIZE;
@@ -471,7 +471,7 @@ QUICNetVConnection::maximum_quic_packet_size() const
uint64_t
QUICNetVConnection::_maximum_stream_frame_data_size()
{
- return this->maximum_quic_packet_size() - MAX_STREAM_FRAME_OVERHEAD -
MAX_PACKET_OVERHEAD;
+ return this->_maximum_quic_packet_size() - MAX_STREAM_FRAME_OVERHEAD -
MAX_PACKET_OVERHEAD;
}
QUICStreamManager *
@@ -1423,7 +1423,7 @@ QUICNetVConnection::_packetize_frames(QUICEncryptionLevel
level, uint64_t max_pa
if (len != 0) {
if (level == QUICEncryptionLevel::INITIAL && this->netvc_context ==
NET_VCONNECTION_OUT) {
// Pad with PADDING frames
- uint64_t min_size = this->minimum_quic_packet_size();
+ uint64_t min_size = this->_minimum_quic_packet_size();
if (this->_av_token) {
min_size = min_size - this->_av_token_len;
}
@@ -1465,7 +1465,7 @@ QUICNetVConnection::_packetize_closing_frame()
uint8_t frame_buf[QUICFrame::MAX_INSTANCE_SIZE];
frame = QUICFrameFactory::create_connection_close_frame(frame_buf,
*this->_connection_error);
- uint32_t max_size = this->maximum_quic_packet_size();
+ uint32_t max_size = this->_maximum_quic_packet_size();
ats_unique_buf buf = ats_unique_malloc(max_size);
size_t len = 0;
diff --git a/iocore/net/quic/Mock.h b/iocore/net/quic/Mock.h
index 7d87b07..4a4bf38 100644
--- a/iocore/net/quic/Mock.h
+++ b/iocore/net/quic/Mock.h
@@ -213,18 +213,6 @@ public:
}
uint32_t
- minimum_quic_packet_size() override
- {
- return 1200;
- }
-
- uint32_t
- maximum_quic_packet_size() const override
- {
- return 1200;
- }
-
- uint32_t
pmtu() const override
{
return 1280;
diff --git a/iocore/net/quic/QUICConnection.h b/iocore/net/quic/QUICConnection.h
index 8af0f24..fbe3b44 100644
--- a/iocore/net/quic/QUICConnection.h
+++ b/iocore/net/quic/QUICConnection.h
@@ -43,21 +43,6 @@ public:
virtual std::string_view cids() const = 0;
virtual const QUICFiveTuple five_tuple() const = 0;
- /*
- * Retruns the maximum packet size at the time called
- *
- * The size depends on PMTU.
- */
- virtual uint32_t maximum_quic_packet_size() const = 0;
-
- /*
- * Returns the mimimum packet size at the time called
- *
- * If the connection is an outgoing connection and you have not sent Client
Initial packet,
- * this return the minimum size for it, which is 1200.
- */
- virtual uint32_t minimum_quic_packet_size() = 0;
-
virtual uint32_t pmtu() const
= 0;
virtual NetVConnectionContext_t direction() const
= 0;
virtual SSLNextProtocolSet *next_protocol_set() const
= 0;
