diff options
Diffstat (limited to '')
| -rw-r--r-- | src/http3.h | 86 |
1 files changed, 21 insertions, 65 deletions
diff --git a/src/http3.h b/src/http3.h index 81ee0d7..cd68922 100644 --- a/src/http3.h +++ b/src/http3.h @@ -40,82 +40,38 @@ namespace nghttp2 { namespace http3 { -// Creates nghttp3_nv using |name| and |value| and returns it. The -// returned value only references the data pointer to name.c_str() and -// value.c_str(). If |no_index| is true, nghttp3_nv flags member has -// NGHTTP3_NV_FLAG_NEVER_INDEX flag set. -nghttp3_nv make_nv(const std::string &name, const std::string &value, - bool never_index = false); - -nghttp3_nv make_nv(const StringRef &name, const StringRef &value, - bool never_index = false); - -nghttp3_nv make_nv_nocopy(const std::string &name, const std::string &value, - bool never_index = false); - -nghttp3_nv make_nv_nocopy(const StringRef &name, const StringRef &value, - bool never_index = false); - -// Create nghttp3_nv from string literal |name| and |value|. -template <size_t N, size_t M> -constexpr nghttp3_nv make_nv_ll(const char (&name)[N], const char (&value)[M]) { - return {(uint8_t *)name, (uint8_t *)value, N - 1, M - 1, - NGHTTP3_NV_FLAG_NO_COPY_NAME | NGHTTP3_NV_FLAG_NO_COPY_VALUE}; -} - -// Create nghttp3_nv from string literal |name| and c-string |value|. -template <size_t N> -nghttp3_nv make_nv_lc(const char (&name)[N], const char *value) { - return {(uint8_t *)name, (uint8_t *)value, N - 1, strlen(value), - NGHTTP3_NV_FLAG_NO_COPY_NAME}; +// Create nghttp3_nv from |name|, |value| and |flags|. +inline nghttp3_nv make_field_flags(const StringRef &name, + const StringRef &value, + uint8_t flags = NGHTTP3_NV_FLAG_NONE) { + auto ns = as_uint8_span(std::span{name}); + auto vs = as_uint8_span(std::span{value}); + + return {const_cast<uint8_t *>(ns.data()), const_cast<uint8_t *>(vs.data()), + ns.size(), vs.size(), flags}; } -template <size_t N> -nghttp3_nv make_nv_lc_nocopy(const char (&name)[N], const char *value) { - return {(uint8_t *)name, (uint8_t *)value, N - 1, strlen(value), - NGHTTP3_NV_FLAG_NO_COPY_NAME | NGHTTP3_NV_FLAG_NO_COPY_VALUE}; +// Creates nghttp3_nv from |name|, |value| and |flags|. nghttp3 +// library does not copy them. +inline nghttp3_nv make_field(const StringRef &name, const StringRef &value, + uint8_t flags = NGHTTP3_NV_FLAG_NONE) { + return make_field_flags(name, value, + static_cast<uint8_t>(NGHTTP3_NV_FLAG_NO_COPY_NAME | + NGHTTP3_NV_FLAG_NO_COPY_VALUE | + flags)); } -// Create nghttp3_nv from string literal |name| and std::string -// |value|. -template <size_t N> -nghttp3_nv make_nv_ls(const char (&name)[N], const std::string &value) { - return {(uint8_t *)name, (uint8_t *)value.c_str(), N - 1, value.size(), - NGHTTP3_NV_FLAG_NO_COPY_NAME}; +// Returns NGHTTP3_NV_FLAG_NEVER_INDEX if |never_index| is true, +// otherwise NGHTTP3_NV_FLAG_NONE. +inline uint8_t never_index(bool never_index) { + return never_index ? NGHTTP3_NV_FLAG_NEVER_INDEX : NGHTTP3_NV_FLAG_NONE; } -template <size_t N> -nghttp3_nv make_nv_ls_nocopy(const char (&name)[N], const std::string &value) { - return {(uint8_t *)name, (uint8_t *)value.c_str(), N - 1, value.size(), - NGHTTP3_NV_FLAG_NO_COPY_NAME | NGHTTP3_NV_FLAG_NO_COPY_VALUE}; -} - -template <size_t N> -nghttp3_nv make_nv_ls_nocopy(const char (&name)[N], const StringRef &value) { - return {(uint8_t *)name, (uint8_t *)value.c_str(), N - 1, value.size(), - NGHTTP3_NV_FLAG_NO_COPY_NAME | NGHTTP3_NV_FLAG_NO_COPY_VALUE}; -} - -// Appends headers in |headers| to |nv|. |headers| must be indexed -// before this call (its element's token field is assigned). Certain -// headers, including disallowed headers in HTTP/3 spec and headers -// which require special handling (i.e. via), are not copied. |flags| -// is one or more of HeaderBuildOp flags. They tell function that -// certain header fields should not be added. -void copy_headers_to_nva(std::vector<nghttp3_nv> &nva, - const HeaderRefs &headers, uint32_t flags); - // Just like copy_headers_to_nva(), but this adds // NGHTTP3_NV_FLAG_NO_COPY_NAME and NGHTTP3_NV_FLAG_NO_COPY_VALUE. void copy_headers_to_nva_nocopy(std::vector<nghttp3_nv> &nva, const HeaderRefs &headers, uint32_t flags); -// Checks the header name/value pair using nghttp3_check_header_name() -// and nghttp3_check_header_value(). If both function returns nonzero, -// this function returns nonzero. -int check_nv(const uint8_t *name, size_t namelen, const uint8_t *value, - size_t valuelen); - } // namespace http3 } // namespace nghttp2 |