Merge branch 'master' into quic-latest

* master: Fixes spelling/license formatting in traffic_dump plugin (apache#7047) Fixes spelling in docs (apache#7048) Fixes spelling H3-related code (apache#7046) Cleans up various versions checks (apache#7049) Fix a typo (apache#7043) Conflicts: iocore/net/quic/QUICHandshake.cc iocore/net/quic/QUICLossDetector.cc iocore/net/quic/QUICNewRenoCongestionController.cc iocore/net/quic/test/test_QUICPacketFactory.cc
maskit · Jul 28, 2020 · 50937c0 · 50937c0
2 parents f6e1744 + 9467a2c
commit 50937c0
Show file tree

Hide file tree

Showing 86 changed files with 212 additions and 355 deletions.
diff --git a/configs/strategies.yaml.default b/configs/strategies.yaml.default
@@ -108,7 +108,7 @@
 #         - 404
 #         - 502
 #         - 503
-#       health_check: # specifies the list of healthchecks that should be considered for failover. A list of enums: 'passive' or 'active'
+#       health_check: # specifies the list of health checks that should be considered for failover. A list of enums: 'passive' or 'active'
 #         - passive
 #         - active
 #   - strategy: 'mid-tier-south'

diff --git a/doc/.tx/config b/doc/.tx/config
@@ -1677,11 +1677,6 @@ file_filter = locale/<lang>/LC_MESSAGES/developer-guide/api/types/TSReturnCode.e
 source_file = _build/locale/pot/developer-guide/api/types/TSReturnCode.en.pot
 source_lang = en
 
-[apache-traffic-server-6x.developer-guide--api--types--TSSDKVersion_en]
-file_filter = locale/<lang>/LC_MESSAGES/developer-guide/api/types/TSSDKVersion.en.po
-source_file = _build/locale/pot/developer-guide/api/types/TSSDKVersion.en.pot
-source_lang = en
-
 [apache-traffic-server-6x.developer-guide--api--types--TSServerSessionSharingMatchType_en]
 file_filter = locale/<lang>/LC_MESSAGES/developer-guide/api/types/TSServerSessionSharingMatchType.en.po
 source_file = _build/locale/pot/developer-guide/api/types/TSServerSessionSharingMatchType.en.pot

diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst
@@ -971,7 +971,7 @@ mptcp
 
    The setting must contain at least one of ``ip``, ``host``, ``hostonly`` or ``both``
    for session reuse to operate.  The other values may be used for greater control
-   with TLS sessoin reuse.
+   with TLS session reuse.
 
 .. note::
 
@@ -3475,7 +3475,7 @@ SSL Termination
   Lowering this setting to ``1`` can be interesting when ``proxy.config.ssl.session_cache`` is enabled because
   otherwise for every new TLSv1.3 connection two session IDs will be inserted in the session cache.
   On the other hand, if ``proxy.config.ssl.session_cache``  is disabled, using the default value is recommended.
-  In those scenarios, increasing the number of tickets could be potentially benefitial for clients performing
+  In those scenarios, increasing the number of tickets could be potentially beneficial for clients performing
   multiple requests over concurrent TLS connections as per RFC 8446 clients SHOULDN'T reuse TLS Tickets.
 
   For more information see https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_num_tickets.html

diff --git a/doc/admin-guide/files/volume.config.en.rst b/doc/admin-guide/files/volume.config.en.rst
@@ -81,7 +81,7 @@ occupy span `/dev/disk1` taking each 50% of its space and `volume 3` takes 100%
 storage.config::
 
       /dev/disk1
-      /dev/disk2 volume=3 # <- exclusinve span
+      /dev/disk2 volume=3 # <- exclusive span
 
 volume.config::
 

diff --git a/doc/admin-guide/logging/formatting.en.rst b/doc/admin-guide/logging/formatting.en.rst
@@ -505,7 +505,7 @@ shi   Origin Server  IP address resolved via DNS by |TS| for the origin server.
 shn   Origin Server  Host name of the origin server.
 nhi   Origin Server  Destination IP address of next hop
 nhp   Origin Server  Destination port of next hop
-ppv   Proxy Protocol Proxy Protocol Version used (if any) between the Loadbalancer
+ppv   Proxy Protocol Proxy Protocol Version used (if any) between the Load Balancer
       Version        and |TS|
 pps   Proxy Protocol Source IP received via Proxy Protocol context from the LB to
       Source IP      the |TS|

diff --git a/doc/admin-guide/monitoring/statistics/core/origin.en.rst b/doc/admin-guide/monitoring/statistics/core/origin.en.rst
@@ -114,7 +114,7 @@ Origin Server
    :type counter
    :units bytes
 
-.. ts:stat:: global proxy.process.http.origin_shutdown.release_invalid_repsonse integer
+.. ts:stat:: global proxy.process.http.origin_shutdown.release_invalid_response integer
    :type counter
    :units bytes
 

diff --git a/doc/admin-guide/plugins/maxmind_acl.en.rst b/doc/admin-guide/plugins/maxmind_acl.en.rst
@@ -62,7 +62,7 @@ Rules
 You can mix and match the allow rules and deny rules, however deny rules will always take precedence so in the above case ``127.0.0.1`` would be denied.
 The IP rules can take either single IPs or cidr formatted rules. It will also accept IPv6 IP and ranges.
 
-The regex portion can be added to both the allow and deny sections for creating allowable or denyable regexes. Each regex takes a country code first and a regex second.
+The regex portion can be added to both the allow and deny sections for creating allowable or deniable regexes. Each regex takes a country code first and a regex second.
 In the above example all requests from the US would be allowed except for those on ``txt`` and ``mp3`` files. More rules should be added as pairs, not as additions to existing lists.
 
 Currently the only rules available are ``country``, ``ip``, and ``regex``, though more can easily be added if needed. Each config file does require a top level

diff --git a/doc/admin-guide/plugins/memory_profile.en.rst b/doc/admin-guide/plugins/memory_profile.en.rst
@@ -19,7 +19,7 @@ Memory_profile Plugin
   under the License.
 
 
-This plugin listens for plugin msgs and invokes jemalloc control
+This plugin listens for plugin messages and invokes jemalloc control
 operations.
 
 Installation
@@ -45,7 +45,7 @@ restart to pick up.
 Plugin Messages
 ===============
 
-The plugin responds to the following mesages sent via traffic_ctl.
+The plugin responds to the following messages sent via traffic_ctl.
 
 Message    Action
 ========== ===================================================================================
@@ -89,11 +89,11 @@ to get text output or graphs. Details of how to use jeprof are in the man pages
 You may want to send the dump message periodically to analyze how the |TS| memory allocation changes over time.  This periodic dump can also be achieved by setting the
 ``lg_prof_interval`` option in the run time configuration string.
 
-If the profiling is taking a significating amount of processing time and affecting |TS| performance, send the deactivate message to turn off profiling.::
+If the profiling is taking a significant amount of processing time and affecting |TS| performance, send the deactivate message to turn off profiling.::
 
     traffic_ctl plugin msg memory_profile deactivate
 
-Send the stats message to cause detailed jemalloc stats to be printed in traffic.out.  These stats represent actvitiy since the start of the |TS| process.::
+Send the stats message to cause detailed jemalloc stats to be printed in traffic.out.  These stats represent activity since the start of the |TS| process.::
 
     traffic_ctl plugin msg memory_profile stats
 

diff --git a/doc/admin-guide/plugins/stats_over_http.en.rst b/doc/admin-guide/plugins/stats_over_http.en.rst
@@ -88,7 +88,7 @@ This sets the path value for stats
 
 .. option:: allow_ip=
 
-A comma separated white list of ipv4 addresses allowed to accesss the endpoint
+A comma separated white list of ipv4 addresses allowed to access the endpoint
 
 .. option:: allow_ip6=
 

diff --git a/doc/admin-guide/plugins/traffic_dump.en.rst b/doc/admin-guide/plugins/traffic_dump.en.rst
@@ -48,7 +48,7 @@ Plugin Configuration
 
    .. option:: --sensitive-fields <field1,field2,...,fieldn>
 
-   (`optional`) - a comma seperatated list of HTTP case-insensitive field names whose values are considered sensitive information. Traffic Dump will not dump the incoming field values for any of these fields but will instead dump a generic value for them of the same length as the original. If this option is not used, a default list of "Cookie,Set-Cookie" is used. Providing this option overwrites that default list with whatever values the user provides. Pass a quoted empty string as the argument to specify that no fields are sensitive,
+   (`optional`) - a comma separated list of HTTP case-insensitive field names whose values are considered sensitive information. Traffic Dump will not dump the incoming field values for any of these fields but will instead dump a generic value for them of the same length as the original. If this option is not used, a default list of "Cookie,Set-Cookie" is used. Providing this option overwrites that default list with whatever values the user provides. Pass a quoted empty string as the argument to specify that no fields are sensitive,
 
    .. option:: --sni-filter <SNI_Name>
 

diff --git a/doc/developer-guide/api/functions/TSPluginDSOReloadEnable.en.rst b/doc/developer-guide/api/functions/TSPluginDSOReloadEnable.en.rst
@@ -21,7 +21,7 @@
 TSPluginDSOReloadEnable
 *************************
 
-Control whether this plugin will take part in the remap dynamic reload preocess (remap.config)
+Control whether this plugin will take part in the remap dynamic reload process (remap.config)
 
 Synopsis
 ========

diff --git a/doc/developer-guide/api/types/TSSDKVersion.en.rst b/doc/developer-guide/api/types/TSSDKVersion.en.rst
diff --git a/doc/locale/ja/LC_MESSAGES/developer-guide/api/types/TSSDKVersion.en.po b/doc/locale/ja/LC_MESSAGES/developer-guide/api/types/TSSDKVersion.en.po
diff --git a/example/plugins/c-api/version/version.c b/example/plugins/c-api/version/version.c
@@ -54,14 +54,8 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name   = "Apache Software Foundation";
   info.support_email = "dev@trafficserver.apache.org";
 
-// partial compilation
-#if (TS_VERSION_NUMBER < 3000000)
-  if (TSPluginRegister(TS_SDK_VERSION_2_0, &info) != TS_SUCCESS) {
-#elif (TS_VERSION_NUMBER < 6000000)
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
-#else
+  // partial compilation
   if (TSPluginRegister(&info) != TS_SUCCESS) {
-#endif
     TSError("[%s] Plugin registration failed.", PLUGIN_NAME);
   }
 

diff --git a/iocore/net/P_QUICNet.h b/iocore/net/P_QUICNet.h
@@ -21,8 +21,7 @@
   limitations under the License.
  */
 
-#ifndef __P_QUICNET_H__
-#define __P_QUICNET_H__
+#pragma once
 
 #include <bitset>
 
@@ -77,4 +76,3 @@ get_QUICPollCont(EThread *t)
 }
 
 extern ClassAllocator<QUICPollEvent> quicPollEventAllocator;
-#endif
diff --git a/iocore/net/P_QUICPacketHandler.h b/iocore/net/P_QUICPacketHandler.h
@@ -53,7 +53,7 @@ class QUICPacketHandler
   QUICConnection *_check_stateless_reset(const uint8_t *buf, size_t buf_len);
 
   // FIXME Remove this
-  // QUICPacketHandler could be a continuation, but NetAccept is a contination too.
+  // QUICPacketHandler could be a continuation, but NetAccept is a continuation too.
   virtual Continuation *_get_continuation() = 0;
 
   Event *_collector_event                       = nullptr;
@@ -65,7 +65,7 @@ class QUICPacketHandler
 };
 
 /*
- * @class QUICPacketHanderIn
+ * @class QUICPacketHandlerIn
  * @brief QUIC Packet Handler for incoming connections
  */
 class QUICPacketHandlerIn : public NetAccept, public QUICPacketHandler
@@ -97,7 +97,7 @@ class QUICPacketHandlerIn : public NetAccept, public QUICPacketHandler
 };
 
 /*
- * @class QUICPacketHanderOut
+ * @class QUICPacketHandlerOut
  * @brief QUIC Packet Handler for outgoing connections
  */
 class QUICPacketHandlerOut : public Continuation, public QUICPacketHandler

diff --git a/iocore/net/QUICNetProcessor.cc b/iocore/net/QUICNetProcessor.cc
@@ -43,7 +43,7 @@ QUICNetProcessor::QUICNetProcessor() {}
 
 QUICNetProcessor::~QUICNetProcessor()
 {
-  // TODO: clear all values before destory the table.
+  // TODO: clear all values before destroy the table.
   delete this->_ctable;
 }
 

diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
@@ -543,7 +543,7 @@ void
 QUICNetVConnection::destroy(EThread *t)
 {
   QUICConDebug("Destroy connection");
-  /*  TODO: Uncmment these blocks after refactoring read / write process
+  /*  TODO: Uncomment these blocks after refactoring read / write process
     if (from_accept_thread) {
       quicNetVCAllocator.free(this);
     } else {
@@ -836,7 +836,7 @@ QUICNetVConnection::state_handshake(int event, Event *data)
         // Don't make this error, and discard the packet.
         // Because:
         // - Attacker can terminate connections
-        // - It could be just an errora on lower layer
+        // - It could be just an error on lower layer
         error = nullptr;
       } else if (result == QUICPacketCreationResult::SUCCESS || result == QUICPacketCreationResult::UNSUPPORTED) {
         error = this->_state_handshake_process_packet(*packet);
@@ -1369,7 +1369,7 @@ QUICNetVConnection::_state_connection_established_process_protected_packet(const
     }
   }
 
-  // For Connection Migration excercise
+  // For Connection Migration exercise
   if (this->netvc_context == NET_VCONNECTION_OUT && this->_quic_config->cm_exercise_enabled()) {
     this->_state_connection_established_initiate_connection_migration();
   }
@@ -1392,7 +1392,7 @@ QUICNetVConnection::_state_connection_established_receive_packet()
       // Don't make this error, and discard the packet.
       // Because:
       // - Attacker can terminate connections
-      // - It could be just an errora on lower layer
+      // - It could be just an error on lower layer
       continue;
     } else if (result == QUICPacketCreationResult::NO_PACKET) {
       return error;
@@ -1478,7 +1478,7 @@ QUICNetVConnection::_state_draining_receive_packet()
  * 1. Check congestion window
  * 2. Allocate buffer for UDP Payload
  * 3. Generate QUIC Packet
- * 4. Store data to the paylaod
+ * 4. Store data to the payload
  * 5. Send UDP Packet
  */
 QUICConnectionErrorUPtr
@@ -1832,7 +1832,7 @@ QUICNetVConnection::_build_packet(uint8_t *packet_buf, QUICEncryptionLevel level
     size_t token_len      = 0;
 
     if (this->netvc_context == NET_VCONNECTION_OUT) {
-      // TODO: Add a case of using token which is advertized by NEW_TOKEN frame
+      // TODO: Add a case of using token which is advertised by NEW_TOKEN frame
       if (this->_av_token) {
         token     = ats_unique_malloc(this->_av_token_len);
         token_len = this->_av_token_len;
@@ -2380,7 +2380,7 @@ QUICNetVConnection::_state_connection_established_migrate_connection(const QUICP
 }
 
 /**
- * Connection Migration Excercise from client
+ * Connection Migration Exercise from client
  */
 QUICConnectionErrorUPtr
 QUICNetVConnection::_state_connection_established_initiate_connection_migration()

diff --git a/iocore/net/quic/QUICAckFrameCreator.cc b/iocore/net/quic/QUICAckFrameCreator.cc
@@ -182,7 +182,7 @@ QUICAckFrameManager::QUICAckFrameCreator::push_back(QUICPacketNumber packet_numb
     this->_latest_packet_received_time = Thread::get_hrtime();
   }
 
-  // unorder packet should send ack immediately to accellerate the recovery
+  // unorder packet should send ack immediately to accelerate the recovery
   if (this->_expect_next != packet_number) {
     this->_should_send = true;
   }

diff --git a/iocore/net/quic/QUICAckFrameCreator.h b/iocore/net/quic/QUICAckFrameCreator.h
@@ -69,7 +69,7 @@ class QUICAckFrameManager : public QUICFrameGenerator
     bool _available                         = false; // packet_number has data to sent
     bool _should_send                       = false; // ack frame should be sent immediately
     bool _has_new_data                      = false; // new data after last sent
-    uint32_t _ack_eliciting_count           = 0;     // every two ack-eliciting packet should send ack immediatly
+    uint32_t _ack_eliciting_count           = 0;     // every two ack-eliciting packet should send ack immediately
     uint16_t _max_ack_delay                 = 25;
     QUICPacketNumber _largest_ack_number    = 0;
     QUICPacketNumber _expect_next           = 0;

diff --git a/iocore/net/quic/QUICAltConnectionManager.cc b/iocore/net/quic/QUICAltConnectionManager.cc
@@ -247,7 +247,7 @@ QUICAltConnectionManager::drop_cid(const QUICConnectionId &cid)
 {
   for (auto it = this->_alt_quic_connection_ids_remote.begin(); it != this->_alt_quic_connection_ids_remote.end(); ++it) {
     if (it->id == cid) {
-      QUICACMVDebug("Dropping advertized CID %" PRIx32 " seq# %" PRIu64, it->id.h32(), it->seq_num);
+      QUICACMVDebug("Dropping advertised CID %" PRIx32 " seq# %" PRIu64, it->id.h32(), it->seq_num);
       this->_retired_seq_nums.push(it->seq_num);
       this->_rtable.erase(it->token);
       this->_alt_quic_connection_ids_remote.erase(it);

diff --git a/iocore/net/quic/QUICAltConnectionManager.h b/iocore/net/quic/QUICAltConnectionManager.h
@@ -56,7 +56,7 @@ class QUICAltConnectionManager : public QUICFrameHandler, public QUICFrameGenera
   /**
    * Migrate to new CID
    *
-   * cid need to match with one of alt CID that AltConnnectionManager prepared.
+   * cid need to match with one of alt CID that AltConnectionManager prepared.
    */
   bool migrate_to(const QUICConnectionId &cid, QUICStatelessResetToken &new_reset_token);