svn commit: r20924 - in /release/trafficserver: trafficserver-6.2.2.tar.bz2 trafficserver-6.2.2.tar.bz2.asc trafficserver-6.2.2.tar.bz2.md5 trafficserver-6.2.2.tar.bz2.sha1
Author: sorber Date: Thu Aug 10 19:05:22 2017 New Revision: 20924 Log: Add 6.2.2 release Added: release/trafficserver/trafficserver-6.2.2.tar.bz2 (with props) release/trafficserver/trafficserver-6.2.2.tar.bz2.asc release/trafficserver/trafficserver-6.2.2.tar.bz2.md5 release/trafficserver/trafficserver-6.2.2.tar.bz2.sha1 Added: release/trafficserver/trafficserver-6.2.2.tar.bz2 == Binary file - no diff available. Propchange: release/trafficserver/trafficserver-6.2.2.tar.bz2 -- svn:mime-type = application/x-bzip2 Added: release/trafficserver/trafficserver-6.2.2.tar.bz2.asc == --- release/trafficserver/trafficserver-6.2.2.tar.bz2.asc (added) +++ release/trafficserver/trafficserver-6.2.2.tar.bz2.asc Thu Aug 10 19:05:22 2017 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJZgVIxAAoJEBrszija4f4rcZUP/1CyQ2fW27wmgqbbrYms9EV6 +5efV+qO5TALH6RR0QOL7Mqpi4GhDYvq/WpmP79tkjAe65GCg+3Eia9gso5s8vuxT +F9kw+BZisAL408gu2kM2vFZtlwHraWi9cMUqdzk0jqm9SVRjYuD1AM6rF7NUrtA7 +2k3Xa6MQqVfdovyoCqwxbIISEiswehG0u67uu2R/tmIEsilIaBpUbSvrNy9ke1Fy +36eNBsSWIPjeXwC6YAZSeJvA5pCobSjbYLo5LicDKtN9LK1ViSfrZD42HX0iPsyG +cb9Iy8HtfGQV7VvzxUNw6jhSqGhJAmqEjKBITBJYnM8qgbFyZ+pMBmir/P5ZRCy6 +d3VchP/7xArkt9G0qUxui6f5ye/AXkU3AS6hjhqgfbbZWwErE9zHlFdiFp0JgT9L +8BdpUMd/0E+rMWxOEiA8mNXrvsTWxsAYYVFDHBm6Zujvf/scRGeUUzM4+VlMMZw1 +yWo7Pb1wLbVFCOYGDVnSSxGFT8A0YHJyvLe1qc9hvaYSfIO/D5AO+ocJDKoVupRb +PRuyBz5SRWaymkXJV1uD6/QMEGK372VGuvQ4WnOBWt+sBhdEg2nLxiQbZKtHQEP5 +7pq4IKWqjZbNYq+SntFeYyhBCyg/zcIJa/B9KlQ/5YGe0y6UxjXqcEYDKIbLQnxk +UlkdZgwLFnAnXi8fTG2l +=rU8j +-END PGP SIGNATURE- Added: release/trafficserver/trafficserver-6.2.2.tar.bz2.md5 == --- release/trafficserver/trafficserver-6.2.2.tar.bz2.md5 (added) +++ release/trafficserver/trafficserver-6.2.2.tar.bz2.md5 Thu Aug 10 19:05:22 2017 @@ -0,0 +1 @@ +4562fbe46fa34a2597b61eacb2d3062a *trafficserver-6.2.2.tar.bz2 Added: release/trafficserver/trafficserver-6.2.2.tar.bz2.sha1 == --- release/trafficserver/trafficserver-6.2.2.tar.bz2.sha1 (added) +++ release/trafficserver/trafficserver-6.2.2.tar.bz2.sha1 Thu Aug 10 19:05:22 2017 @@ -0,0 +1 @@ +a18097159b39edf4c24d783888af477dca064775 *trafficserver-6.2.2.tar.bz2
[trafficserver] 02/02: cqtq, cqtn, cqtd, cqtt timestamp blog format to be INT again
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git commit 3d0d0f3eda175eaf498405e7770bb9f4bcfdc002 Author: Gancho TenevAuthorDate: Tue Aug 8 09:29:32 2017 -0700 cqtq,cqtn,cqtd,cqtt timestamp blog format to be INT again marshal : cqtq (ms), cqtn (s), cqtd(s), cqtt(s) unmarshal: cqtq (s in floating point with ms resolution), cqtn (s), cqtd(s), cqtt(s) (cherry picked from commit 49b4eee2eb7dd1bb22ffdc052d743abfadf022bd) --- proxy/logging/Log.cc | 16 proxy/logging/LogAccess.cc | 52 +--- proxy/logging/LogAccess.h | 8 ++-- proxy/logging/LogAccessHttp.cc | 90 -- proxy/logging/LogAccessHttp.h | 10 + 5 files changed, 69 insertions(+), 107 deletions(-) diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc index 58871c1..4cddd99 100644 --- a/proxy/logging/Log.cc +++ b/proxy/logging/Log.cc @@ -388,23 +388,23 @@ Log::init_fields() global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "cqth", field); - field = new LogField("client_req_timestamp_squid", "cqtq", LogField::STRING, ::marshal_client_req_timestamp_squid, - (LogField::UnmarshalFunc)::unmarshal_str); + field = new LogField("client_req_timestamp_squid", "cqtq", LogField::sINT, ::marshal_client_req_timestamp_ms, + ::unmarshal_ttmsf); global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "cqtq", field); - field = new LogField("client_req_timestamp_netscape", "cqtn", LogField::STRING, ::marshal_client_req_timestamp_netscape, - (LogField::UnmarshalFunc)::unmarshal_str); + field = new LogField("client_req_timestamp_netscape", "cqtn", LogField::sINT, ::marshal_client_req_timestamp_sec, + ::unmarshal_int_to_netscape_str); global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "cqtn", field); - field = new LogField("client_req_timestamp_date", "cqtd", LogField::STRING, ::marshal_client_req_timestamp_date, - (LogField::UnmarshalFunc)::unmarshal_str); + field = new LogField("client_req_timestamp_date", "cqtd", LogField::sINT, ::marshal_client_req_timestamp_sec, + ::unmarshal_int_to_date_str); global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "cqtd", field); - field = new LogField("client_req_timestamp_time", "cqtt", LogField::STRING, ::marshal_client_req_timestamp_time, - (LogField::UnmarshalFunc)::unmarshal_str); + field = new LogField("client_req_timestamp_time", "cqtt", LogField::sINT, ::marshal_client_req_timestamp_sec, + ::unmarshal_int_to_time_str); global_field_list.add(field, false); ink_hash_table_insert(field_symbol_hash, "cqtt", field); diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc index 9c33352..5ede23e 100644 --- a/proxy/logging/LogAccess.cc +++ b/proxy/logging/LogAccess.cc @@ -214,10 +214,7 @@ LOG_ACCESS_DEFAULT_FIELD(marshal_client_req_uuid, DEFAULT_STR_FIELD) -*/ LOG_ACCESS_DEFAULT_FIELD(marshal_client_req_timestamp_sec, DEFAULT_INT_FIELD) -LOG_ACCESS_DEFAULT_FIELD(marshal_client_req_timestamp_squid, DEFAULT_STR_FIELD) -LOG_ACCESS_DEFAULT_FIELD(marshal_client_req_timestamp_netscape, DEFAULT_STR_FIELD) -LOG_ACCESS_DEFAULT_FIELD(marshal_client_req_timestamp_date, DEFAULT_STR_FIELD) -LOG_ACCESS_DEFAULT_FIELD(marshal_client_req_timestamp_time, DEFAULT_STR_FIELD) +LOG_ACCESS_DEFAULT_FIELD(marshal_client_req_timestamp_ms, DEFAULT_INT_FIELD) /*- -*/ @@ -1021,11 +1018,56 @@ LogAccess::unmarshal_ttmsf(char **buf, char *dest, int len) ink_assert(dest != nullptr); int64_t val = unmarshal_int(buf); - float secs = (float)val / 1000; + double secs = (double)val / 1000; int val_len = snprintf(dest, len, "%.3f", secs); return val_len; } +int +LogAccess::unmarshal_int_to_date_str(char **buf, char *dest, int len) +{ + ink_assert(buf != nullptr); + ink_assert(*buf != nullptr); + ink_assert(dest != nullptr); + + int64_t value = unmarshal_int(buf); + char *strval = LogUtils::timestamp_to_date_str(value); + int strlen= LogAccess::strlen(strval); + + memcpy(dest, strval, strlen); + return strlen; +} + +int +LogAccess::unmarshal_int_to_time_str(char **buf, char *dest, int len) +{ + ink_assert(buf != nullptr); + ink_assert(*buf != nullptr); + ink_assert(dest != nullptr); + + int64_t value = unmarshal_int(buf); + char *strval = LogUtils::timestamp_to_time_str(value); + int strlen=
[trafficserver] branch quic-latest updated: Add QUICConfig and proxy.config.quic.no_activity_timeout_in
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 e8c6b97 Add QUICConfig and proxy.config.quic.no_activity_timeout_in e8c6b97 is described below commit e8c6b978ed02ea96b80901f662a47a07d89c34ef Author: Masaori KoshibaAuthorDate: Thu Aug 10 15:34:56 2017 +0900 Add QUICConfig and proxy.config.quic.no_activity_timeout_in Add QUICConfig class to load configs related to QUIC. "proxy.config.quic.no_activity_timeout_in" is also added. Default value is 30 seconds. --- iocore/net/QUICNetProcessor.cc | 6 ++-- iocore/net/QUICNetVConnection.cc | 8 +++-- iocore/net/quic/Makefile.am | 1 + iocore/net/quic/QUICConfig.cc| 74 iocore/net/quic/QUICConfig.h | 51 +++ mgmt/RecordsConfig.cc| 8 + 6 files changed, 141 insertions(+), 7 deletions(-) diff --git a/iocore/net/QUICNetProcessor.cc b/iocore/net/QUICNetProcessor.cc index 40eb37e..7500ab1 100644 --- a/iocore/net/QUICNetProcessor.cc +++ b/iocore/net/QUICNetProcessor.cc @@ -24,6 +24,7 @@ #include "P_Net.h" #include "ts/I_Layout.h" #include "I_RecHttp.h" +#include "QUICConfig.h" // #include "P_QUICUtils.h" // @@ -52,10 +53,7 @@ QUICNetProcessor::start(int, size_t stacksize) { // This initialization order matters ... // QUICInitializeLibrary(); - // QUICConfig::startup(); - - // if (!QUICCertificateConfig::startup()) - // return -1; + QUICConfig::startup(); // Acquire a QUICConfigParams instance *after* we start QUIC up. // QUICConfig::scoped_config params; diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc index 5eb4130..9898712 100644 --- a/iocore/net/QUICNetVConnection.cc +++ b/iocore/net/QUICNetVConnection.cc @@ -36,6 +36,7 @@ #include "QUICEchoApp.h" #include "QUICDebugNames.h" #include "QUICEvents.h" +#include "QUICConfig.h" #define STATE_FROM_VIO(_x) ((NetState *)(((char *)(_x)) - STATE_VIO_OFFSET)) #define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio) @@ -267,9 +268,10 @@ QUICNetVConnection::state_handshake(int event, Event *data) this->_state = QUICConnectionState::Established; SET_HANDLER((NetVConnHandler)::state_connection_established); -// TODO: switch waiting for a CONNECTION_CLOSE frame for first implementation -// TODO: read idle_timeout from Transport Prameters -ink_hrtime idle_timeout = HRTIME_SECONDS(3); +QUICConfig::scoped_config params; + +// TODO: use idle_timeout from negotiated Transport Prameters +ink_hrtime idle_timeout = HRTIME_SECONDS(params->no_activity_timeout_in()); this->set_inactivity_timeout(idle_timeout); this->add_to_active_queue(); } diff --git a/iocore/net/quic/Makefile.am b/iocore/net/quic/Makefile.am index b0b799a..714874c 100644 --- a/iocore/net/quic/Makefile.am +++ b/iocore/net/quic/Makefile.am @@ -56,6 +56,7 @@ libquic_a_SOURCES = \ QUICCrypto.cc \ $(QUICCrypto_impl) \ QUICAckFrameCreator.cc \ + QUICConfig.cc \ QUICDebugNames.cc \ QUICApplication.cc \ QUICEchoApp.cc diff --git a/iocore/net/quic/QUICConfig.cc b/iocore/net/quic/QUICConfig.cc new file mode 100644 index 000..64b8e90 --- /dev/null +++ b/iocore/net/quic/QUICConfig.cc @@ -0,0 +1,74 @@ +/** @file + * + * A brief file description + * + * @section license License + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "QUICConfig.h" + +#include + +int QUICConfig::_config_id = 0; + +// +// QUICConfigParams +// +void +QUICConfigParams::initialize() +{ + REC_EstablishStaticConfigInt32U(this->_no_activity_timeout_in, "proxy.config.quic.no_activity_timeout_in"); +} + +uint32_t +QUICConfigParams::no_activity_timeout_in() const +{ + return this->_no_activity_timeout_in; +} + +// +// QUICConfig +// +void +QUICConfig::startup() +{ + reconfigure(); +} + +void +QUICConfig::reconfigure() +{ + QUICConfigParams *params; + params = new QUICConfigParams; + // re-read configuration +
[trafficserver] branch quic-latest updated: Fix an runtime error on Fedora 26
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 43a9f9e Fix an runtime error on Fedora 26 43a9f9e is described below commit 43a9f9ec1f639ef7dc9d9de6e37daf252d617bbd Author: Masakazu KitajoAuthorDate: Thu Aug 10 15:58:46 2017 +0900 Fix an runtime error on Fedora 26 Make sure that all information are extracted from a packet before std::move release it when passing the infomation and the packet at the same time. --- iocore/net/quic/QUICLossDetector.cc | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/iocore/net/quic/QUICLossDetector.cc b/iocore/net/quic/QUICLossDetector.cc index f30d69a..4c10314 100644 --- a/iocore/net/quic/QUICLossDetector.cc +++ b/iocore/net/quic/QUICLossDetector.cc @@ -135,8 +135,11 @@ QUICLossDetector::on_packet_sent(std::unique_ptr packet) type != QUICPacketType::ONE_RTT_PROTECTED_KEY_PHASE_1) { is_handshake = true; } - return this->_on_packet_sent(packet->packet_number(), packet->is_retransmittable(), is_handshake, packet->size(), - std::move(packet)); + + QUICPacketNumber packet_number = packet->packet_number(); + bool is_retransmittable= packet->is_retransmittable(); + size_t sent_bytes = packet->size(); + return this->_on_packet_sent(packet_number, is_retransmittable, is_handshake, sent_bytes, std::move(packet)); } void -- To stop receiving notification emails like this one, please contact ['"commits@trafficserver.apache.org" '].