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 3c27f60 Ran clang-format
3c27f60 is described below
commit 3c27f603b86a1d8ddf851a767b5b30762b86ec12
Author: Masaori Koshiba <[email protected]>
AuthorDate: Wed Apr 10 13:59:18 2019 +0900
Ran clang-format
---
iocore/net/QUICNetVConnection.cc | 3 +--
iocore/net/quic/QUICConfig.cc | 1 -
iocore/net/quic/QUICTLS_openssl.cc | 3 ++-
iocore/net/quic/test/test_QUICLossDetector.cc | 4 ++--
proxy/http3/Http3App.cc | 4 ++--
proxy/http3/Http3App.h | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index bcc581d..6a23128 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -2236,8 +2236,7 @@ QUICNetVConnection::_setup_handshake_protocol(SSL_CTX
*ctx)
{
// Initialize handshake protocol specific stuff
// For QUICv1 TLS is the only option
- QUICTLS *tls =
- new QUICTLS(this->_pp_key_info, ctx, this->direction(), this->options,
this->_quic_config->session_file());
+ QUICTLS *tls = new QUICTLS(this->_pp_key_info, ctx, this->direction(),
this->options, this->_quic_config->session_file());
SSL_set_ex_data(tls->ssl_handle(), QUIC::ssl_quic_qc_index,
static_cast<QUICConnection *>(this));
return tls;
}
diff --git a/iocore/net/quic/QUICConfig.cc b/iocore/net/quic/QUICConfig.cc
index 4314caa..0213cee 100644
--- a/iocore/net/quic/QUICConfig.cc
+++ b/iocore/net/quic/QUICConfig.cc
@@ -35,7 +35,6 @@
#define QUICConfDebug(fmt, ...) Debug("quic_conf", fmt, ##__VA_ARGS__)
-
int QUICConfig::_config_id = 0;
int QUICConfigParams::_connection_table_size = 65521;
int QUICCertConfig::_config_id = 0;
diff --git a/iocore/net/quic/QUICTLS_openssl.cc
b/iocore/net/quic/QUICTLS_openssl.cc
index d6d9842..94e1867 100644
--- a/iocore/net/quic/QUICTLS_openssl.cc
+++ b/iocore/net/quic/QUICTLS_openssl.cc
@@ -337,7 +337,8 @@ QUICTLS::QUICTLS(QUICPacketProtectionKeyInfo &pp_key_info,
SSL_CTX *ssl_ctx, Net
if (this->_netvc_context == NET_VCONNECTION_OUT) {
SSL_set_connect_state(this->_ssl);
- SSL_set_alpn_protos(this->_ssl, reinterpret_cast<const unsigned char
*>(netvc_options.alpn_protos.data()), netvc_options.alpn_protos.size());
+ SSL_set_alpn_protos(this->_ssl, reinterpret_cast<const unsigned char
*>(netvc_options.alpn_protos.data()),
+ netvc_options.alpn_protos.size());
SSL_set_tlsext_host_name(this->_ssl, netvc_options.sni_servername.get());
} else {
SSL_set_accept_state(this->_ssl);
diff --git a/iocore/net/quic/test/test_QUICLossDetector.cc
b/iocore/net/quic/test/test_QUICLossDetector.cc
index c0c2b29..9c5dbb0 100644
--- a/iocore/net/quic/test/test_QUICLossDetector.cc
+++ b/iocore/net/quic/test/test_QUICLossDetector.cc
@@ -95,8 +95,8 @@ TEST_CASE("QUICLossDetector_Loss", "[quic]")
SECTION("1-RTT")
{
// Send packet (1) to (7)
- payload = ats_unique_malloc(payload_len);
- QUICPacketUPtr packet1 = pf.create_protected_packet(connection_id,
detector.largest_acked_packet_number(), std::move(payload),
+ payload = ats_unique_malloc(payload_len);
+ QUICPacketUPtr packet1 = pf.create_protected_packet(connection_id,
detector.largest_acked_packet_number(), std::move(payload),
payload_len, true,
false);
REQUIRE(packet1 != nullptr);
payload = ats_unique_malloc(payload_len);
diff --git a/proxy/http3/Http3App.cc b/proxy/http3/Http3App.cc
index 1174e39..9d4b1f7 100644
--- a/proxy/http3/Http3App.cc
+++ b/proxy/http3/Http3App.cc
@@ -371,8 +371,8 @@ Http3SettingsFramer::generate_frame(uint16_t max_size)
// Server side only
if (this->_context == NET_VCONNECTION_IN) {
- if (params->num_placeholders() != HTTP3_DEFAULT_NUM_PLACEHOLDERS) {
- frame->set(Http3SettingsId::NUM_PLACEHOLDERS, params->num_placeholders());
+ if (params->num_placeholders() != HTTP3_DEFAULT_NUM_PLACEHOLDERS) {
+ frame->set(Http3SettingsId::NUM_PLACEHOLDERS,
params->num_placeholders());
}
}
diff --git a/proxy/http3/Http3App.h b/proxy/http3/Http3App.h
index e4a31c0..67bd7f0 100644
--- a/proxy/http3/Http3App.h
+++ b/proxy/http3/Http3App.h
@@ -97,7 +97,7 @@ private:
class Http3SettingsFramer : public Http3FrameGenerator
{
public:
- Http3SettingsFramer(NetVConnectionContext_t context) : _context(context) {};
+ Http3SettingsFramer(NetVConnectionContext_t context) : _context(context){};
// Http3FrameGenerator
Http3FrameUPtr generate_frame(uint16_t max_size) override;
