[trafficserver] branch quic-latest updated: Print lower 64 bits of source CID at maximum
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 041f420 Print lower 64 bits of source CID at maximum 041f420 is described below commit 041f420e53290181e841fbbb61e09610d8f40c44 Author: Masakazu KitajoAuthorDate: Wed May 16 17:35:13 2018 +0900 Print lower 64 bits of source CID at maximum --- iocore/net/P_QUICNetVConnection.h | 4 +-- iocore/net/QUICNetVConnection.cc| 49 + iocore/net/QUICPacketHandler.cc | 14 - iocore/net/quic/QUICApplication.cc | 2 +- iocore/net/quic/QUICCongestionController.cc | 24 +++--- iocore/net/quic/QUICConnection.h| 14 - iocore/net/quic/QUICHandshake.cc| 6 ++-- iocore/net/quic/QUICLossDetector.cc | 3 +- iocore/net/quic/QUICStream.cc | 12 +++ iocore/net/quic/QUICTypes.cc| 14 + iocore/net/quic/QUICTypes.h | 5 +++ 11 files changed, 78 insertions(+), 69 deletions(-) diff --git a/iocore/net/P_QUICNetVConnection.h b/iocore/net/P_QUICNetVConnection.h index a327772..c64e072 100644 --- a/iocore/net/P_QUICNetVConnection.h +++ b/iocore/net/P_QUICNetVConnection.h @@ -231,8 +231,8 @@ private: QUICConnectionId _quic_connection_id; QUICFiveTuple _five_tuple; - UDPConnection *_udp_con = nullptr; - QUICPacketHandler *_packet_handler = nullptr; + UDPConnection *_udp_con= nullptr; + QUICPacketHandler *_packet_handler = nullptr; QUICPacketFactory _packet_factory; QUICFrameFactory _frame_factory; QUICAckFrameCreator _ack_frame_creator; diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc index a924e74..d0f6bef 100644 --- a/iocore/net/QUICNetVConnection.cc +++ b/iocore/net/QUICNetVConnection.cc @@ -43,15 +43,13 @@ #define STATE_FROM_VIO(_x) ((NetState *)(((char *)(_x)) - STATE_VIO_OFFSET)) #define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio) -#define QUICConDebug(fmt, ...) \ - Debug("quic_net", "[%" PRIx64 "] " fmt, static_cast(this->_quic_connection_id), ##__VA_ARGS__) +#define QUICConDebug(fmt, ...) Debug("quic_net", "[%" PRIx64 "] " fmt, this->_peer_quic_connection_id.l64(), ##__VA_ARGS__) -#define QUICConVDebug(fmt, ...) \ - Debug("v_quic_net", "[%" PRIx64 "] " fmt, static_cast(this->_quic_connection_id), ##__VA_ARGS__) +#define QUICConVDebug(fmt, ...) Debug("v_quic_net", "[%" PRIx64 "] " fmt, this->_peer_quic_connection_id.l64(), ##__VA_ARGS__) -#define QUICError(fmt, ...) \ - Debug("quic_net", "[%" PRIx64 "] " fmt, static_cast(this->_quic_connection_id), ##__VA_ARGS__); \ - Error("quic_net [%" PRIx64 "] " fmt, static_cast(this->_quic_connection_id), ##__VA_ARGS__) +#define QUICError(fmt, ...) \ + Debug("quic_net", "[%" PRIx64 "] " fmt, this->_peer_quic_connection_id.l64(), ##__VA_ARGS__); \ + Error("quic_net [%" PRIx64 "] " fmt, this->_peer_quic_connection_id.l64(), ##__VA_ARGS__) static constexpr uint32_t IPV4_HEADER_SIZE= 20; static constexpr uint32_t IPV6_HEADER_SIZE= 40; @@ -87,8 +85,8 @@ QUICNetVConnection::init(QUICConnectionId peer_cid, QUICConnectionId original_ci this->_ctable->insert(this->_original_quic_connection_id, this); } - QUICConDebug("Connection ID %" PRIx64 " has been changed to %" PRIx64, static_cast(this->_original_quic_connection_id), - static_cast(this->_quic_connection_id)); + QUICConDebug("Connection ID %" PRIx64 " has been changed to %" PRIx64, this->_original_quic_connection_id.l64(), + this->_quic_connection_id.l64()); } bool @@ -203,13 +201,13 @@ QUICNetVConnection::start() this->_packet_factory.set_hs_protocol(this->_hs_protocol); // Create frame handlers - this->_congestion_controller = new QUICCongestionController(this->connection_id()); + this->_congestion_controller = new QUICCongestionController(this->peer_connection_id()); this->_loss_detector = new QUICLossDetector(this, this->_congestion_controller); 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->connection_id(), this->_application_map, this->netvc_context); +new QUICStreamManager(this->_loss_detector, this->peer_connection_id(), this->_application_map, this->netvc_context);
[trafficserver] branch master updated: Add the flipped equality/inequality operators with raw pointers to Ptr<>.
This is an automated email from the ASF dual-hosted git repository. amc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new ebd186e Add the flipped equality/inequality operators with raw pointers to Ptr<>. ebd186e is described below commit ebd186ed99ad12468f6e427ae2510b61f0b315c1 Author: Alan M. CarrollAuthorDate: Tue May 15 14:49:08 2018 -0500 Add the flipped equality/inequality operators with raw pointers to Ptr<>. --- lib/ts/Ptr.h | 33 + 1 file changed, 33 insertions(+) diff --git a/lib/ts/Ptr.h b/lib/ts/Ptr.h index da358b6..b78ee36 100644 --- a/lib/ts/Ptr.h +++ b/lib/ts/Ptr.h @@ -248,3 +248,36 @@ Ptr::operator=(const Ptr ) { return (operator=(src.m_ptr)); } + +// Bit of subtly here for the flipped version of equality checks +// With only the template versions, the compiler will try to substitute @c nullptr_t +// for @c T and fail, because that's not the type and no operator will be found. +// Therefore there needs to be specific overrides for @c nullptr_t. + +template +inline bool +operator==(std::nullptr_t, Ptr const ) +{ + return rhs.get() == nullptr; +} + +template +inline bool +operator!=(std::nullptr_t, Ptr const ) +{ + return rhs.get() != nullptr; +} + +template +inline bool +operator==(T const *lhs, Ptr const ) +{ + return rhs.get() == lhs; +} + +template +inline bool +operator!=(T const *lhs, Ptr const ) +{ + return rhs.get() != lhs; +} -- To stop receiving notification emails like this one, please contact a...@apache.org.
[trafficserver] branch master updated: BufferWriter: Formatting tweaks, updated documentation.
This is an automated email from the ASF dual-hosted git repository. amc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 172888f BufferWriter: Formatting tweaks, updated documentation. 172888f is described below commit 172888ff63b2199d5ca1269c37e2d9522d44600d Author: Alan M. CarrollAuthorDate: Thu Apr 5 21:26:18 2018 -0500 BufferWriter: Formatting tweaks, updated documentation. --- CMakeLists.txt | 1 + doc/conf.py| 10 +- doc/developer-guide/api/types/CoreTypes.en.rst | 8 + .../internal-libraries/buffer-writer.en.rst| 847 + iocore/eventsystem/IOBuffer.cc | 74 ++ iocore/eventsystem/I_MIOBufferWriter.h | 72 +- iocore/eventsystem/Makefile.am | 9 +- .../eventsystem/unit-tests/test_MIOBufferWriter.cc | 110 +-- lib/ts/BufferWriter.h | 227 -- lib/ts/BufferWriterFormat.cc | 124 ++- lib/ts/BufferWriterForward.h | 61 +- lib/ts/Makefile.am | 2 + lib/ts/bwf_std_format.h| 36 + lib/ts/ink_inet.cc | 250 ++ lib/ts/ink_inet.h | 13 + lib/ts/unit-tests/test_BufferWriter.cc | 12 +- lib/ts/unit-tests/test_BufferWriterFormat.cc | 58 +- lib/ts/unit-tests/test_ink_inet.cc | 102 +++ proxy/http/HttpDebugNames.h| 41 + proxy/http/HttpProxyServerMain.cc | 22 + 20 files changed, 1686 insertions(+), 393 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 523b643..f8cd5b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1150,6 +1150,7 @@ add_library(libtsutil SHARED lib/ts/BaseLogFile.h lib/ts/Bitops.cc lib/ts/Bitops.h +lib/ts/bwf_std_format.h lib/ts/BufferWriter.h lib/ts/BufferWriterForward.h lib/ts/BufferWriterFormat.cc diff --git a/doc/conf.py b/doc/conf.py index 55e5f5c..322769d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -169,7 +169,15 @@ pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. #modindex_common_prefix = [] -nitpicky = 1 +nitpicky = True +nitpick_ignore = [ ('cpp:typeOrConcept', 'std') + , ('cpp:typeOrConcept', 'std::shared_ptr') + , ('cpp:typeOrConcept', 'std::ostream') + , ('cpp:typeOrConcept', 'std::string') + , ('cpp:typeOrConcept', 'std::tuple') + , ('cpp:typeOrConcept', 'V') # template arguments which should be matched but aren't. + , ('cpp:typeOrConcept', 'Args') + ] # Autolink issue references. # See Customizing the Parser in the docutils.parsers.rst module. diff --git a/doc/developer-guide/api/types/CoreTypes.en.rst b/doc/developer-guide/api/types/CoreTypes.en.rst index 9badf57..613bc51 100644 --- a/doc/developer-guide/api/types/CoreTypes.en.rst +++ b/doc/developer-guide/api/types/CoreTypes.en.rst @@ -34,3 +34,11 @@ Description These types are provided by the compiler ("built-in") or from a required operating system, POSIX, or package header. .. cpp:type:: uint24_t + +.. cpp:class:: IpEndpoint + + A wrapper for :code:`sockaddr` types. + +.. cpp:class:: IpAddr + + Storage for an IP address. diff --git a/doc/developer-guide/internal-libraries/buffer-writer.en.rst b/doc/developer-guide/internal-libraries/buffer-writer.en.rst index 7e05547..aa76fa0 100644 --- a/doc/developer-guide/internal-libraries/buffer-writer.en.rst +++ b/doc/developer-guide/internal-libraries/buffer-writer.en.rst @@ -16,7 +16,6 @@ under the License. .. include:: ../../common.defs - .. highlight:: cpp .. default-domain:: cpp @@ -30,21 +29,87 @@ Synopsis .. code-block:: cpp - #include + #include // Custom formatter support only. + #include // General usage. Description +++ -:class:`BufferWriter` is designed to make writing text to a buffer fast, convenient, and safe. It is -easier and less error-prone than using a combination of :code:`sprintf` and :code:`memcpy` as is -done in many places in the code.. A :class:`BufferWriter` can have a size and will prevent writing -past the end, while tracking the theoretical output to enable buffer resizing after the fact. This -also lets a :class:`BufferWriter` instance write into the middle of a larger buffer, making nested -output logic easy to build. +:class:`BufferWriter` is intended to increase code reliability and reduce complexity in the common +circumstance of generating formatted output strings in fixed buffers. Current usage is a mixture of +:code:`snprintf` and :code:`memcpy` which
[trafficserver] branch master updated: CMakelists.txt: Remove traffic_cop remnants.
This is an automated email from the ASF dual-hosted git repository. amc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 5042109 CMakelists.txt: Remove traffic_cop remnants. 5042109 is described below commit 5042109cdd74ba5f48c436c903777f9d9240a13e Author: Alan M. CarrollAuthorDate: Wed May 16 12:39:59 2018 -0500 CMakelists.txt: Remove traffic_cop remnants. --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8cd5b4..4b083bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,8 +86,6 @@ add_executable(traffic_manager cmd/traffic_manager/AddConfigFilesHere.cc cmd/traffic_manager/metrics.cc cmd/traffic_manager/metrics.h -cmd/traffic_manager/MgmtHandlers.cc -cmd/traffic_manager/MgmtHandlers.h cmd/traffic_manager/test_metrics.cc cmd/traffic_manager/traffic_manager.cc ) -- To stop receiving notification emails like this one, please contact a...@apache.org.
[trafficserver] branch master updated: CID 1383925: Fix null check
This is an automated email from the ASF dual-hosted git repository. masaori pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new 5873d80 CID 1383925: Fix null check 5873d80 is described below commit 5873d806af7dba5e61bde2e28d60d212c3150ddc Author: Masaori KoshibaAuthorDate: Thu May 10 12:46:27 2018 +0100 CID 1383925: Fix null check --- proxy/http/HttpSM.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index e409a19..8197a36 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -5480,11 +5480,12 @@ HttpSM::handle_server_setup_error(int event, void *data) // In case of TIMEOUT, the iocore sends back // server_entry->read_vio instead of the write_vio // if (vio->op == VIO::WRITE && vio->ndone == 0) { -if (server_entry->write_vio && server_entry->write_vio->nbytes > 0 && server_entry->write_vio->ndone == 0) { +if (server_entry && server_entry->write_vio && server_entry->write_vio->nbytes > 0 && server_entry->write_vio->ndone == 0) { t_state.current.state = HttpTransact::CONNECTION_ERROR; } else { t_state.current.state = HttpTransact::INACTIVE_TIMEOUT; } + // Clean up the vc_table entry so any events in play to the timed out server vio // don't get handled. The connection isn't there. if (server_entry) { -- To stop receiving notification emails like this one, please contact masa...@apache.org.
[trafficserver] branch quic-latest updated: Fix nullptr dereference
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 4b3d127 Fix nullptr dereference 4b3d127 is described below commit 4b3d12790c5866abe2eba0772bb9441a0aec8e6f Author: Masaori KoshibaAuthorDate: Thu May 17 11:29:16 2018 +0900 Fix nullptr dereference --- iocore/net/QUICNetVConnection.cc | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc index d0f6bef..5b03dcb 100644 --- a/iocore/net/QUICNetVConnection.cc +++ b/iocore/net/QUICNetVConnection.cc @@ -1404,18 +1404,18 @@ QUICNetVConnection::_dequeue_recv_packet(QUICPacketCreationResult ) { QUICPacketUPtr packet = this->_packet_recv_queue.dequeue(result); - if (this->direction() == NET_VCONNECTION_OUT) { -// Reset CID if a server sent back a new CID -// FIXME This should happen only once -QUICConnectionId cid = packet->destination_cid(); -if (cid.length()) { - if (this->_quic_connection_id != cid) { -this->_quic_connection_id = cid; + if (result == QUICPacketCreationResult::SUCCESS) { +if (this->direction() == NET_VCONNECTION_OUT) { + // Reset CID if a server sent back a new CID + // FIXME This should happen only once + QUICConnectionId cid = packet->destination_cid(); + if (cid.length()) { +if (this->_quic_connection_id != cid) { + this->_quic_connection_id = cid; +} } } - } - if (result == QUICPacketCreationResult::SUCCESS) { this->_last_received_packet_type = packet->type(); this->_packet_factory.set_dcil(packet->destination_cid().length()); } -- To stop receiving notification emails like this one, please contact masa...@apache.org.
[trafficserver] 02/02: Add AL header
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 commit ba77c64514e9d585ed68c7c3251fe131af8c56c8 Author: Masakazu KitajoAuthorDate: Thu May 17 10:28:14 2018 +0900 Add AL header --- iocore/net/quic/QUICPacketReceiveQueue.cc | 23 +++ 1 file changed, 23 insertions(+) diff --git a/iocore/net/quic/QUICPacketReceiveQueue.cc b/iocore/net/quic/QUICPacketReceiveQueue.cc index 9dec772..ded0453 100644 --- a/iocore/net/quic/QUICPacketReceiveQueue.cc +++ b/iocore/net/quic/QUICPacketReceiveQueue.cc @@ -1,3 +1,26 @@ +/** @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 "QUICPacketReceiveQueue.h" QUICPacketReceiveQueue::QUICPacketReceiveQueue(QUICPacketFactory _factory) : _packet_factory(packet_factory) {} -- To stop receiving notification emails like this one, please contact mas...@apache.org.
[trafficserver] branch quic-latest updated (041f420 -> ba77c64)
This is an automated email from the ASF dual-hosted git repository. maskit pushed a change to branch quic-latest in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 041f420 Print lower 64 bits of source CID at maximum new df23d49 Update largest received packet number new ba77c64 Add AL header The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: iocore/net/quic/QUICPacketReceiveQueue.cc | 27 +++ 1 file changed, 27 insertions(+) -- To stop receiving notification emails like this one, please contact mas...@apache.org.
[trafficserver] 01/02: Update largest received packet number
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 commit df23d49602dbef944a22a4a67147648b8ba3dff9 Author: Masakazu KitajoAuthorDate: Thu May 17 10:25:20 2018 +0900 Update largest received packet number The update logic was accidentally lost with 7cb18b38d88fd6af13eed65867701117cbc890ae --- iocore/net/quic/QUICPacketReceiveQueue.cc | 4 1 file changed, 4 insertions(+) diff --git a/iocore/net/quic/QUICPacketReceiveQueue.cc b/iocore/net/quic/QUICPacketReceiveQueue.cc index 640dcaa..9dec772 100644 --- a/iocore/net/quic/QUICPacketReceiveQueue.cc +++ b/iocore/net/quic/QUICPacketReceiveQueue.cc @@ -39,6 +39,10 @@ QUICPacketReceiveQueue::dequeue(QUICPacketCreationResult ) } } + if (quic_packet->packet_number() > this->_largest_received_packet_number) { +this->_largest_received_packet_number = quic_packet->packet_number(); + } + return quic_packet; } -- To stop receiving notification emails like this one, please contact mas...@apache.org.
[trafficserver] branch master updated: More fixes to the CI builds for C++17
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git The following commit(s) were added to refs/heads/master by this push: new b969b22 More fixes to the CI builds for C++17 b969b22 is described below commit b969b22bc67795fbaf677579c93b10a94f7128e9 Author: Leif HedstromAuthorDate: Wed May 16 16:25:55 2018 -0600 More fixes to the CI builds for C++17 --- ci/jenkins/bin/autest.sh | 4 +++- ci/jenkins/bin/clang-analyzer.sh | 1 + ci/jenkins/bin/coverity.sh | 3 ++- ci/jenkins/bin/environment.sh| 6 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/bin/autest.sh b/ci/jenkins/bin/autest.sh index 1df5fa4..786ace7 100755 --- a/ci/jenkins/bin/autest.sh +++ b/ci/jenkins/bin/autest.sh @@ -17,7 +17,6 @@ # limitations under the License. set +x -[ -d tests ] || exit 0 INSTALL="${WORKSPACE}/${BUILD_NUMBER}/install" URL="https://ci.trafficserver.apache.org/autest; @@ -37,6 +36,9 @@ WCCP="" mkdir -p ${INSTALL} cd src +# The tests directory must exist (i.e. for older branches we don't run this) +[ -d tests ] || exit 0 + echo "CCACHE: $CCACHE" echo "WERROR: $WERROR" echo "DEBUG: $DEBUG" diff --git a/ci/jenkins/bin/clang-analyzer.sh b/ci/jenkins/bin/clang-analyzer.sh index 8f462f8..f01955d 100755 --- a/ci/jenkins/bin/clang-analyzer.sh +++ b/ci/jenkins/bin/clang-analyzer.sh @@ -27,6 +27,7 @@ NOCLEAN=${NOCLEAN:-} OUTPUT_BASE=${OUTPUT_BASE:-/home/jenkins/clang-analyzer} # Options +#options="--status-bugs --keep-empty" options="--keep-empty" configure="--enable-experimental-plugins" diff --git a/ci/jenkins/bin/coverity.sh b/ci/jenkins/bin/coverity.sh index 3fc98b0..b7a19ad 100755 --- a/ci/jenkins/bin/coverity.sh +++ b/ci/jenkins/bin/coverity.sh @@ -19,6 +19,7 @@ cd "${WORKSPACE}/src" # Get the Coverity tools into our path +source /opt/rh/devtoolset-7/enable export PATH=/home/coverity/bin:${PATH} COV_TARBALL=/tmp/trafficserver-${TODAY}.tgz @@ -27,7 +28,7 @@ COV_VERSION=$(git rev-parse --short HEAD) autoreconf -fi ./configure --enable-experimental-plugins --enable-wccp -cov-build --dir cov-int ${ATS_MAKE} -j4 +cov-build --dir cov-int ${ATS_MAKE} -j4 V=1 tar czvf ${COV_TARBALL} cov-int # Now submit this artifact diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh index 8aa0c97..d48b8d2 100755 --- a/ci/jenkins/bin/environment.sh +++ b/ci/jenkins/bin/environment.sh @@ -61,8 +61,13 @@ test "${JOB_NAME#*compiler=clang}" != "${JOB_NAME}" && enable_clang=1 if [ "1" == "$enable_clang" ]; then if [ -x "/usr/local/bin/clang++50" ]; then + # For FreeBSD export CC="/usr/local/bin/clang50" export CXX="/usr/local/bin/clang++50" + elif [ -x "/usr/bin/clang++-5.0" ]; then + # For Ubuntu 17.x + export CC="/usr/bin/clang-5.0" + export CXX="/usr/bin/clang++-5.0" else export CC="clang" export CXX="clang++" @@ -70,6 +75,7 @@ if [ "1" == "$enable_clang" ]; then export CXXFLAGS="-Qunused-arguments" export WITH_LIBCPLUSPLUS="yes" elif [ "1" == "$enable_icc" ]; then + source /opt/rh/devtoolset-7/enable source /opt/intel/bin/iccvars.sh intel64 export CC=icc export CXX=icpc -- To stop receiving notification emails like this one, please contact zw...@apache.org.
[trafficserver] branch quic-latest updated: QUIC Client: Set peer connection id
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 5624d23 QUIC Client: Set peer connection id 5624d23 is described below commit 5624d2365f2d2b301086826d6f84c0db815a7e16 Author: Masaori KoshibaAuthorDate: Thu May 17 14:10:50 2018 +0900 QUIC Client: Set peer connection id --- iocore/net/QUICNetVConnection.cc | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc index 5b03dcb..8c0867b 100644 --- a/iocore/net/QUICNetVConnection.cc +++ b/iocore/net/QUICNetVConnection.cc @@ -1315,7 +1315,7 @@ QUICNetVConnection::_build_packet(ats_unique_buf buf, size_t len, bool retransmi switch (type) { case QUICPacketType::INITIAL: ink_assert(this->get_context() == NET_VCONNECTION_OUT); -packet = this->_packet_factory.create_initial_packet(this->_original_quic_connection_id, this->_original_quic_connection_id, +packet = this->_packet_factory.create_initial_packet(this->_original_quic_connection_id, this->_quic_connection_id, this->largest_acked_packet_number(), std::move(buf), len); this->_handshake_handler->handleEvent(QUIC_EVENT_HANDSHAKE_PACKET_WRITE_COMPLETE, nullptr); @@ -1408,10 +1408,10 @@ QUICNetVConnection::_dequeue_recv_packet(QUICPacketCreationResult ) if (this->direction() == NET_VCONNECTION_OUT) { // Reset CID if a server sent back a new CID // FIXME This should happen only once - QUICConnectionId cid = packet->destination_cid(); - if (cid.length()) { -if (this->_quic_connection_id != cid) { - this->_quic_connection_id = cid; + QUICConnectionId src_cid = packet->source_cid(); + if (src_cid.length()) { +if (this->_peer_quic_connection_id != src_cid) { + this->_peer_quic_connection_id = src_cid; } } } -- To stop receiving notification emails like this one, please contact masa...@apache.org.
[trafficserver] branch quic-latest updated: Add nullptr check in QUICPacketReceiveQueue::dequeue()
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 7268ee4 Add nullptr check in QUICPacketReceiveQueue::dequeue() 7268ee4 is described below commit 7268ee4916a7508f9ced4a81185ae1326ca79739 Author: Masaori KoshibaAuthorDate: Thu May 17 14:12:24 2018 +0900 Add nullptr check in QUICPacketReceiveQueue::dequeue() --- iocore/net/quic/QUICPacketReceiveQueue.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iocore/net/quic/QUICPacketReceiveQueue.cc b/iocore/net/quic/QUICPacketReceiveQueue.cc index ded0453..c6292c4 100644 --- a/iocore/net/quic/QUICPacketReceiveQueue.cc +++ b/iocore/net/quic/QUICPacketReceiveQueue.cc @@ -62,7 +62,7 @@ QUICPacketReceiveQueue::dequeue(QUICPacketCreationResult ) } } - if (quic_packet->packet_number() > this->_largest_received_packet_number) { + if (quic_packet && quic_packet->packet_number() > this->_largest_received_packet_number) { this->_largest_received_packet_number = quic_packet->packet_number(); } -- To stop receiving notification emails like this one, please contact masa...@apache.org.