trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mas...@apache.org
Subject [trafficserver] branch quic-latest updated: Fix build issues
Date Fri, 13 Jul 2018 07:21:46 GMT
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 9e23ea5  Fix build issues
9e23ea5 is described below

commit 9e23ea5a69bd00ab136ac31a12667c5b219b9a61
Author: Masakazu Kitajo <maskit@apache.org>
AuthorDate: Fri Jul 13 16:21:14 2018 +0900

    Fix build issues
---
 iocore/net/QUICNetVConnection.cc | 1 +
 iocore/net/quic/QUICConfig.cc    | 6 ++++++
 iocore/net/quic/QUICPacket.cc    | 1 +
 iocore/net/quic/QUICTypes.h      | 5 -----
 src/traffic_quic/Makefile.inc    | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index 60daf02..f1cca34 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -42,6 +42,7 @@
 #define STATE_FROM_VIO(_x) ((NetState *)(((char *)(_x)) - STATE_VIO_OFFSET))
 #define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
 
+using namespace std::literals;
 static constexpr std::string_view QUIC_DEBUG_TAG = "quic_net"sv;
 
 #define QUICConDebug(fmt, ...) Debug(QUIC_DEBUG_TAG.data(), "[%s] " fmt, this->cids().data(),
##__VA_ARGS__)
diff --git a/iocore/net/quic/QUICConfig.cc b/iocore/net/quic/QUICConfig.cc
index b03d1bb..0e941c6 100644
--- a/iocore/net/quic/QUICConfig.cc
+++ b/iocore/net/quic/QUICConfig.cc
@@ -33,6 +33,12 @@
 #include "QUICTransportParameters.h"
 #include "QUICStatelessRetry.h"
 
+// OpenSSL protocol-lists format (vector of 8-bit length-prefixed, byte strings)
+// https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_alpn_protos.html
+// Should be integrate with IP_PROTO_TAG_HTTP_QUIC in ts/ink_inet.h ?
+using namespace std::literals;
+static constexpr std::string_view QUIC_ALPN_PROTO_LIST("\5hq-12"sv);
+
 int QUICConfig::_config_id                   = 0;
 int QUICConfigParams::_connection_table_size = 65521;
 
diff --git a/iocore/net/quic/QUICPacket.cc b/iocore/net/quic/QUICPacket.cc
index 6678eb7..e143181 100644
--- a/iocore/net/quic/QUICPacket.cc
+++ b/iocore/net/quic/QUICPacket.cc
@@ -30,6 +30,7 @@
 #include "QUICDebugNames.h"
 #include "QUICConfig.h"
 
+using namespace std::literals;
 static constexpr std::string_view tag  = "quic_packet"sv;
 static constexpr uint64_t aead_tag_len = 16;
 
diff --git a/iocore/net/quic/QUICTypes.h b/iocore/net/quic/QUICTypes.h
index c7b3f42..bc88d1a 100644
--- a/iocore/net/quic/QUICTypes.h
+++ b/iocore/net/quic/QUICTypes.h
@@ -53,11 +53,6 @@ constexpr QUICVersion QUIC_EXERCISE_VERSIONS = 0x1a2a3a4a;
 
 constexpr QUICStreamId STREAM_ID_FOR_HANDSHAKE = 0;
 
-// OpenSSL protocol-lists format (vector of 8-bit length-prefixed, byte strings)
-// https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_alpn_protos.html
-// Should be integrate with IP_PROTO_TAG_HTTP_QUIC in ts/ink_inet.h ?
-constexpr std::string_view QUIC_ALPN_PROTO_LIST("\5hq-12"sv);
-
 enum class QUICHandshakeMsgType {
   NONE = 0,
   INITIAL,
diff --git a/src/traffic_quic/Makefile.inc b/src/traffic_quic/Makefile.inc
index be83416..8a6e9f6 100644
--- a/src/traffic_quic/Makefile.inc
+++ b/src/traffic_quic/Makefile.inc
@@ -52,5 +52,5 @@ traffic_quic_traffic_quic_LDADD = \
   $(top_builddir)/proxy/ParentSelectionStrategy.o \
   @LIBTCL@ \
   @HWLOC_LIBS@ \
-	@LIB_YAMLCPP@ \
+	@YAMLCPP_LIBS@ \
   @OPENSSL_LIBS@


Mime
View raw message