2013-07-19 09:50:31 +02:00
|
|
|
/*
|
|
|
|
* nghttp2 - HTTP/2.0 C Library
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013 Tatsuhiro Tsujikawa
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
|
|
* a copy of this software and associated documentation files (the
|
|
|
|
* "Software"), to deal in the Software without restriction, including
|
|
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
* the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be
|
|
|
|
* included in all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
|
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
|
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
#include "nghttp2_hd.h"
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
2013-12-16 15:54:20 +01:00
|
|
|
#include <stdio.h>
|
2013-07-19 09:50:31 +02:00
|
|
|
|
|
|
|
#include "nghttp2_frame.h"
|
|
|
|
#include "nghttp2_helper.h"
|
2013-12-16 15:54:20 +01:00
|
|
|
#include "nghttp2_int.h"
|
2013-07-19 09:50:31 +02:00
|
|
|
|
2013-10-24 15:09:40 +02:00
|
|
|
/* Make scalar initialization form of nghttp2_nv */
|
2013-10-28 16:42:08 +01:00
|
|
|
#define MAKE_NV(N, V) \
|
2013-10-24 15:09:40 +02:00
|
|
|
{ { (uint8_t*)N, (uint8_t*)V, sizeof(N) - 1, sizeof(V) - 1 }, \
|
|
|
|
1, NGHTTP2_HD_FLAG_NONE }
|
|
|
|
|
|
|
|
static nghttp2_hd_entry static_table[] = {
|
2013-11-16 08:18:44 +01:00
|
|
|
/* 1 */ MAKE_NV(":authority", ""),
|
|
|
|
/* 2 */ MAKE_NV(":method", "GET"),
|
|
|
|
/* 3 */ MAKE_NV(":method", "POST"),
|
|
|
|
/* 4 */ MAKE_NV(":path", "/"),
|
|
|
|
/* 5 */ MAKE_NV(":path", "/index.html"),
|
|
|
|
/* 6 */ MAKE_NV(":scheme", "http"),
|
|
|
|
/* 7 */ MAKE_NV(":scheme", "https"),
|
|
|
|
/* 8 */ MAKE_NV(":status", "200"),
|
|
|
|
/* 9 */ MAKE_NV(":status", "500"),
|
|
|
|
/* 10 */ MAKE_NV(":status", "404"),
|
|
|
|
/* 11 */ MAKE_NV(":status", "403"),
|
|
|
|
/* 12 */ MAKE_NV(":status", "400"),
|
|
|
|
/* 13 */ MAKE_NV(":status", "401"),
|
|
|
|
/* 14 */ MAKE_NV("accept-charset", ""),
|
|
|
|
/* 15 */ MAKE_NV("accept-encoding", ""),
|
|
|
|
/* 16 */ MAKE_NV("accept-language", ""),
|
|
|
|
/* 17 */ MAKE_NV("accept-ranges", ""),
|
|
|
|
/* 18 */ MAKE_NV("accept", ""),
|
|
|
|
/* 19 */ MAKE_NV("access-control-allow-origin", ""),
|
|
|
|
/* 20 */ MAKE_NV("age", ""),
|
|
|
|
/* 21 */ MAKE_NV("allow", ""),
|
|
|
|
/* 22 */ MAKE_NV("authorization", ""),
|
|
|
|
/* 23 */ MAKE_NV("cache-control", ""),
|
|
|
|
/* 24 */ MAKE_NV("content-disposition", ""),
|
|
|
|
/* 25 */ MAKE_NV("content-encoding", ""),
|
|
|
|
/* 26 */ MAKE_NV("content-language", ""),
|
|
|
|
/* 27 */ MAKE_NV("content-length", ""),
|
|
|
|
/* 28 */ MAKE_NV("content-location", ""),
|
|
|
|
/* 29 */ MAKE_NV("content-range", ""),
|
|
|
|
/* 30 */ MAKE_NV("content-type", ""),
|
|
|
|
/* 31 */ MAKE_NV("cookie", ""),
|
|
|
|
/* 32 */ MAKE_NV("date", ""),
|
|
|
|
/* 33 */ MAKE_NV("etag", ""),
|
|
|
|
/* 34 */ MAKE_NV("expect", ""),
|
|
|
|
/* 35 */ MAKE_NV("expires", ""),
|
|
|
|
/* 36 */ MAKE_NV("from", ""),
|
|
|
|
/* 37 */ MAKE_NV("host", ""),
|
|
|
|
/* 38 */ MAKE_NV("if-match", ""),
|
|
|
|
/* 39 */ MAKE_NV("if-modified-since", ""),
|
|
|
|
/* 40 */ MAKE_NV("if-none-match", ""),
|
|
|
|
/* 41 */ MAKE_NV("if-range", ""),
|
|
|
|
/* 42 */ MAKE_NV("if-unmodified-since", ""),
|
|
|
|
/* 43 */ MAKE_NV("last-modified", ""),
|
|
|
|
/* 44 */ MAKE_NV("link", ""),
|
|
|
|
/* 45 */ MAKE_NV("location", ""),
|
|
|
|
/* 46 */ MAKE_NV("max-forwards", ""),
|
|
|
|
/* 47 */ MAKE_NV("proxy-authenticate", ""),
|
|
|
|
/* 48 */ MAKE_NV("proxy-authorization", ""),
|
|
|
|
/* 49 */ MAKE_NV("range", ""),
|
|
|
|
/* 50 */ MAKE_NV("referer", ""),
|
|
|
|
/* 51 */ MAKE_NV("refresh", ""),
|
|
|
|
/* 52 */ MAKE_NV("retry-after", ""),
|
|
|
|
/* 53 */ MAKE_NV("server", ""),
|
|
|
|
/* 54 */ MAKE_NV("set-cookie", ""),
|
|
|
|
/* 55 */ MAKE_NV("strict-transport-security", ""),
|
|
|
|
/* 56 */ MAKE_NV("transfer-encoding", ""),
|
|
|
|
/* 57 */ MAKE_NV("user-agent", ""),
|
|
|
|
/* 58 */ MAKE_NV("vary", ""),
|
|
|
|
/* 59 */ MAKE_NV("via", ""),
|
|
|
|
/* 60 */ MAKE_NV("www-authenticate", "")
|
2013-07-19 09:50:31 +02:00
|
|
|
};
|
|
|
|
|
2013-11-07 17:35:15 +01:00
|
|
|
static const size_t STATIC_TABLE_LENGTH =
|
2013-10-24 15:09:40 +02:00
|
|
|
sizeof(static_table)/sizeof(static_table[0]);
|
|
|
|
|
2013-08-23 16:38:28 +02:00
|
|
|
typedef struct {
|
|
|
|
nghttp2_nv *nva;
|
|
|
|
size_t nvacap;
|
|
|
|
size_t nvlen;
|
|
|
|
} nghttp2_nva_out;
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
int nghttp2_hd_entry_init(nghttp2_hd_entry *ent, uint8_t flags,
|
2013-07-19 09:50:31 +02:00
|
|
|
uint8_t *name, uint16_t namelen,
|
|
|
|
uint8_t *value, uint16_t valuelen)
|
|
|
|
{
|
|
|
|
int rv = 0;
|
2013-10-14 16:38:12 +02:00
|
|
|
if((flags & NGHTTP2_HD_FLAG_NAME_ALLOC) &&
|
|
|
|
(flags & NGHTTP2_HD_FLAG_NAME_GIFT) == 0) {
|
2013-07-23 16:10:53 +02:00
|
|
|
if(namelen == 0) {
|
|
|
|
/* We should not allow empty header field name */
|
|
|
|
ent->nv.name = NULL;
|
|
|
|
} else {
|
|
|
|
ent->nv.name = nghttp2_memdup(name, namelen);
|
|
|
|
if(ent->nv.name == NULL) {
|
|
|
|
rv = NGHTTP2_ERR_NOMEM;
|
|
|
|
goto fail;
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ent->nv.name = name;
|
|
|
|
}
|
2013-10-14 16:38:12 +02:00
|
|
|
if((flags & NGHTTP2_HD_FLAG_VALUE_ALLOC) &&
|
|
|
|
(flags & NGHTTP2_HD_FLAG_VALUE_GIFT) == 0) {
|
2013-07-23 16:10:53 +02:00
|
|
|
if(valuelen == 0) {
|
|
|
|
ent->nv.value = NULL;
|
|
|
|
} else {
|
|
|
|
ent->nv.value = nghttp2_memdup(value, valuelen);
|
|
|
|
if(ent->nv.value == NULL) {
|
|
|
|
rv = NGHTTP2_ERR_NOMEM;
|
|
|
|
goto fail2;
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ent->nv.value = value;
|
|
|
|
}
|
|
|
|
ent->nv.namelen = namelen;
|
|
|
|
ent->nv.valuelen = valuelen;
|
|
|
|
ent->ref = 1;
|
|
|
|
ent->flags = flags;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail2:
|
|
|
|
if(flags & NGHTTP2_HD_FLAG_NAME_ALLOC) {
|
|
|
|
free(ent->nv.name);
|
|
|
|
}
|
|
|
|
fail:
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
void nghttp2_hd_entry_free(nghttp2_hd_entry *ent)
|
|
|
|
{
|
|
|
|
assert(ent->ref == 0);
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_NAME_ALLOC) {
|
|
|
|
free(ent->nv.name);
|
|
|
|
}
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_VALUE_ALLOC) {
|
|
|
|
free(ent->nv.value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
static int nghttp2_hd_ringbuf_init(nghttp2_hd_ringbuf *ringbuf,
|
|
|
|
size_t bufsize)
|
|
|
|
{
|
|
|
|
size_t size;
|
|
|
|
for(size = 1; size < bufsize; size <<= 1);
|
|
|
|
ringbuf->buffer = malloc(sizeof(nghttp2_hd_entry*)*size);
|
|
|
|
if(ringbuf->buffer == NULL) {
|
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
ringbuf->mask = size - 1;
|
|
|
|
ringbuf->first = 0;
|
|
|
|
ringbuf->len = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static nghttp2_hd_entry* nghttp2_hd_ringbuf_get(nghttp2_hd_ringbuf *ringbuf,
|
|
|
|
size_t index)
|
|
|
|
{
|
|
|
|
assert(index < ringbuf->len);
|
|
|
|
return ringbuf->buffer[(ringbuf->first + index) & ringbuf->mask];
|
|
|
|
}
|
|
|
|
|
2013-10-25 18:01:28 +02:00
|
|
|
static int nghttp2_hd_ringbuf_reserve(nghttp2_hd_ringbuf *ringbuf,
|
|
|
|
size_t bufsize)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
size_t size;
|
|
|
|
nghttp2_hd_entry **buffer;
|
|
|
|
|
|
|
|
if(ringbuf->mask + 1 >= bufsize) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
for(size = 1; size < bufsize; size <<= 1);
|
|
|
|
buffer = malloc(sizeof(nghttp2_hd_entry*) * size);
|
|
|
|
if(buffer == NULL) {
|
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
for(i = 0; i < ringbuf->len; ++i) {
|
|
|
|
buffer[i] = nghttp2_hd_ringbuf_get(ringbuf, i);
|
|
|
|
}
|
|
|
|
free(ringbuf->buffer);
|
|
|
|
ringbuf->buffer = buffer;
|
|
|
|
ringbuf->mask = size - 1;
|
|
|
|
ringbuf->first = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
static void nghttp2_hd_ringbuf_free(nghttp2_hd_ringbuf *ringbuf)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
if(ringbuf == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
for(i = 0; i < ringbuf->len; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = nghttp2_hd_ringbuf_get(ringbuf, i);
|
|
|
|
--ent->ref;
|
|
|
|
nghttp2_hd_entry_free(ent);
|
|
|
|
free(ent);
|
|
|
|
}
|
|
|
|
free(ringbuf->buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t nghttp2_hd_ringbuf_push_front(nghttp2_hd_ringbuf *ringbuf,
|
|
|
|
nghttp2_hd_entry *ent)
|
|
|
|
{
|
|
|
|
assert(ringbuf->len + 1 <= ringbuf->mask);
|
|
|
|
ringbuf->buffer[--ringbuf->first & ringbuf->mask] = ent;
|
|
|
|
++ringbuf->len;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void nghttp2_hd_ringbuf_pop_back(nghttp2_hd_ringbuf *ringbuf)
|
|
|
|
{
|
|
|
|
assert(ringbuf->len > 0);
|
|
|
|
--ringbuf->len;
|
|
|
|
}
|
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
static int nghttp2_hd_context_init(nghttp2_hd_context *context,
|
2013-08-24 15:58:26 +02:00
|
|
|
nghttp2_hd_role role,
|
2013-10-13 12:24:21 +02:00
|
|
|
nghttp2_hd_side side,
|
2013-12-14 10:48:41 +01:00
|
|
|
size_t deflate_hd_table_bufsize_max)
|
2013-07-19 09:50:31 +02:00
|
|
|
{
|
2013-10-12 14:49:01 +02:00
|
|
|
int rv;
|
2013-08-24 15:58:26 +02:00
|
|
|
context->role = role;
|
2013-10-14 16:38:12 +02:00
|
|
|
context->side = side;
|
2013-07-25 18:34:28 +02:00
|
|
|
context->bad = 0;
|
2013-12-14 10:48:41 +01:00
|
|
|
context->no_refset = 0;
|
2013-10-25 18:01:28 +02:00
|
|
|
context->hd_table_bufsize_max = NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE;
|
|
|
|
rv = nghttp2_hd_ringbuf_init
|
|
|
|
(&context->hd_table,
|
|
|
|
context->hd_table_bufsize_max/NGHTTP2_HD_ENTRY_OVERHEAD);
|
2013-10-12 14:49:01 +02:00
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
2013-08-22 18:28:01 +02:00
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
|
2013-10-30 17:26:37 +01:00
|
|
|
context->emit_set = NULL;
|
2013-11-16 14:52:45 +01:00
|
|
|
context->emit_set_capacity = 0;
|
2013-10-30 17:26:37 +01:00
|
|
|
context->buf_track = NULL;
|
2013-11-16 14:52:45 +01:00
|
|
|
context->buf_track_capacity = 0;
|
2013-10-30 17:26:37 +01:00
|
|
|
|
2013-10-28 16:42:08 +01:00
|
|
|
context->deflate_hd_table_bufsize_max = deflate_hd_table_bufsize_max;
|
|
|
|
context->deflate_hd_table_bufsize = 0;
|
|
|
|
context->deflate_hd_tablelen = 0;
|
2013-08-24 15:58:26 +02:00
|
|
|
context->emit_setlen = 0;
|
2013-10-14 16:38:12 +02:00
|
|
|
context->buf_tracklen = 0;
|
2013-07-19 18:27:26 +02:00
|
|
|
context->hd_table_bufsize = 0;
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_deflate_init(nghttp2_hd_context *deflater, nghttp2_hd_side side)
|
|
|
|
{
|
2013-10-13 12:24:21 +02:00
|
|
|
return nghttp2_hd_context_init(deflater, NGHTTP2_HD_ROLE_DEFLATE, side,
|
2013-12-14 10:48:41 +01:00
|
|
|
NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE);
|
2013-10-13 12:24:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_deflate_init2(nghttp2_hd_context *deflater,
|
|
|
|
nghttp2_hd_side side,
|
2013-12-14 10:48:41 +01:00
|
|
|
size_t deflate_hd_table_bufsize_max)
|
2013-10-13 12:24:21 +02:00
|
|
|
{
|
|
|
|
return nghttp2_hd_context_init(deflater, NGHTTP2_HD_ROLE_DEFLATE, side,
|
2013-12-14 10:48:41 +01:00
|
|
|
deflate_hd_table_bufsize_max);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2013-08-22 20:45:26 +02:00
|
|
|
int nghttp2_hd_inflate_init(nghttp2_hd_context *inflater, nghttp2_hd_side side)
|
|
|
|
{
|
2013-12-17 13:39:21 +01:00
|
|
|
return nghttp2_hd_context_init(inflater, NGHTTP2_HD_ROLE_INFLATE, side,
|
|
|
|
NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE);
|
2013-08-22 20:45:26 +02:00
|
|
|
}
|
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
static void nghttp2_hd_context_free(nghttp2_hd_context *context)
|
|
|
|
{
|
|
|
|
size_t i;
|
2013-10-14 16:38:12 +02:00
|
|
|
for(i = 0; i < context->buf_tracklen; ++i) {
|
|
|
|
free(context->buf_track[i]);
|
|
|
|
}
|
|
|
|
free(context->buf_track);
|
|
|
|
|
2013-08-22 18:28:01 +02:00
|
|
|
for(i = 0; i < context->emit_setlen; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = context->emit_set[i];
|
2013-07-25 18:34:28 +02:00
|
|
|
if(--ent->ref == 0) {
|
2013-07-19 09:50:31 +02:00
|
|
|
nghttp2_hd_entry_free(ent);
|
2013-07-25 18:34:28 +02:00
|
|
|
free(ent);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
}
|
2013-10-14 16:38:12 +02:00
|
|
|
free(context->emit_set);
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
nghttp2_hd_ringbuf_free(&context->hd_table);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void nghttp2_hd_deflate_free(nghttp2_hd_context *deflater)
|
|
|
|
{
|
|
|
|
nghttp2_hd_context_free(deflater);
|
|
|
|
}
|
|
|
|
|
|
|
|
void nghttp2_hd_inflate_free(nghttp2_hd_context *inflater)
|
|
|
|
{
|
|
|
|
nghttp2_hd_context_free(inflater);
|
|
|
|
}
|
|
|
|
|
2013-12-14 10:48:41 +01:00
|
|
|
void nghttp2_hd_deflate_set_no_refset(nghttp2_hd_context *deflater,
|
|
|
|
uint8_t no_refset)
|
|
|
|
{
|
|
|
|
deflater->no_refset = no_refset;
|
|
|
|
}
|
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
static size_t entry_room(size_t namelen, size_t valuelen)
|
|
|
|
{
|
|
|
|
return NGHTTP2_HD_ENTRY_OVERHEAD + namelen + valuelen;
|
|
|
|
}
|
|
|
|
|
2013-11-16 14:52:45 +01:00
|
|
|
/*
|
|
|
|
* Ensures that buffer size is at least |reqmemb| * |size| bytes. The
|
|
|
|
* currnet buffer size is given in the |nmemb| * |size|. If the
|
|
|
|
* requested buffer size is strictly larger than |maxmemb| * |size|,
|
|
|
|
* returns NGHTTP2_ERR_HEADER_COMP. If the |nmemb| is 0, the |inimemb|
|
|
|
|
* is used as initial value and doubles it until it is greater than or
|
|
|
|
* equal to the requested buffer size.
|
|
|
|
*
|
|
|
|
* This function returns the new number of members after buffer
|
|
|
|
* expansion. If no expansion is required, |nmemb| is returned.
|
|
|
|
*/
|
|
|
|
static ssize_t ensure_buffer(void **buf_ptr,
|
|
|
|
size_t size,
|
|
|
|
size_t nmemb,
|
|
|
|
size_t reqmemb,
|
|
|
|
size_t maxmemb,
|
|
|
|
size_t inimemb)
|
|
|
|
{
|
|
|
|
size_t new_nmemb;
|
|
|
|
void *new_buf;
|
|
|
|
assert(inimemb >= 2);
|
|
|
|
if(nmemb >= reqmemb) {
|
|
|
|
return nmemb;
|
|
|
|
}
|
|
|
|
if(reqmemb > maxmemb) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
if(nmemb == 0) {
|
|
|
|
new_nmemb = inimemb;
|
|
|
|
} else {
|
|
|
|
new_nmemb = nmemb;
|
|
|
|
for(; new_nmemb < reqmemb; new_nmemb *= 2);
|
|
|
|
}
|
|
|
|
new_buf = realloc(*buf_ptr, new_nmemb * size);
|
|
|
|
if(new_buf == NULL) {
|
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
*buf_ptr = new_buf;
|
|
|
|
return new_nmemb;
|
|
|
|
}
|
|
|
|
|
2013-08-23 16:38:28 +02:00
|
|
|
static int add_nva(nghttp2_nva_out *nva_out_ptr,
|
|
|
|
uint8_t *name, uint16_t namelen,
|
|
|
|
uint8_t *value, uint16_t valuelen)
|
|
|
|
{
|
|
|
|
nghttp2_nv *nv;
|
|
|
|
if(nva_out_ptr->nvacap == nva_out_ptr->nvlen) {
|
2013-11-16 14:52:45 +01:00
|
|
|
ssize_t new_cap = ensure_buffer((void**)&nva_out_ptr->nva,
|
|
|
|
sizeof(nghttp2_nv),
|
|
|
|
nva_out_ptr->nvacap,
|
|
|
|
nva_out_ptr->nvlen + 1,
|
|
|
|
NGHTTP2_MAX_NVA_LENGTH,
|
|
|
|
NGHTTP2_INITIAL_NVA_LENGTH);
|
|
|
|
if(new_cap == -1) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
2013-11-16 14:52:45 +01:00
|
|
|
nva_out_ptr->nvacap = new_cap;
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
nv = &nva_out_ptr->nva[nva_out_ptr->nvlen++];
|
|
|
|
nv->name = name;
|
|
|
|
nv->namelen = namelen;
|
|
|
|
nv->value = value;
|
|
|
|
nv->valuelen = valuelen;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-14 16:38:12 +02:00
|
|
|
static int track_decode_buf(nghttp2_hd_context *context, uint8_t *buf)
|
|
|
|
{
|
|
|
|
if(context->buf_tracklen == context->buf_track_capacity) {
|
2013-11-16 14:52:45 +01:00
|
|
|
ssize_t new_cap = ensure_buffer((void**)&context->buf_track,
|
|
|
|
sizeof(uint8_t*),
|
|
|
|
context->buf_track_capacity,
|
|
|
|
context->buf_tracklen + 1,
|
|
|
|
NGHTTP2_MAX_BUF_TRACK_LENGTH,
|
|
|
|
NGHTTP2_INITIAL_BUF_TRACK_LENGTH);
|
|
|
|
if(new_cap == -1) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
context->buf_track_capacity = new_cap;
|
2013-10-14 16:38:12 +02:00
|
|
|
}
|
|
|
|
context->buf_track[context->buf_tracklen++] = buf;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-24 16:49:37 +02:00
|
|
|
static int track_decode_buf2(nghttp2_hd_context *context,
|
|
|
|
uint8_t *buf1, uint8_t *buf2)
|
|
|
|
{
|
|
|
|
if(context->buf_tracklen + 2 > context->buf_track_capacity) {
|
2013-11-16 14:52:45 +01:00
|
|
|
ssize_t new_cap = ensure_buffer((void**)&context->buf_track,
|
|
|
|
sizeof(uint8_t*),
|
|
|
|
context->buf_track_capacity,
|
|
|
|
context->buf_tracklen + 2,
|
|
|
|
NGHTTP2_MAX_BUF_TRACK_LENGTH,
|
|
|
|
NGHTTP2_INITIAL_BUF_TRACK_LENGTH);
|
|
|
|
if(new_cap == -1) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
context->buf_track_capacity = new_cap;
|
2013-10-24 16:49:37 +02:00
|
|
|
}
|
|
|
|
context->buf_track[context->buf_tracklen++] = buf1;
|
|
|
|
context->buf_track[context->buf_tracklen++] = buf2;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-23 16:38:28 +02:00
|
|
|
static int add_emit_set(nghttp2_hd_context *context, nghttp2_hd_entry *ent)
|
|
|
|
{
|
|
|
|
if(context->emit_setlen == context->emit_set_capacity) {
|
2013-11-16 14:52:45 +01:00
|
|
|
ssize_t new_cap = ensure_buffer((void**)&context->emit_set,
|
|
|
|
sizeof(nghttp2_hd_entry*),
|
|
|
|
context->emit_set_capacity,
|
|
|
|
context->emit_setlen + 1,
|
|
|
|
NGHTTP2_MAX_EMIT_SET_LENGTH,
|
|
|
|
NGHTTP2_INITIAL_EMIT_SET_LENGTH);
|
|
|
|
if(new_cap == -1) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
context->emit_set_capacity = new_cap;
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
context->emit_set[context->emit_setlen++] = ent;
|
|
|
|
++ent->ref;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int emit_indexed_header(nghttp2_hd_context *context,
|
|
|
|
nghttp2_nva_out *nva_out_ptr,
|
|
|
|
nghttp2_hd_entry *ent)
|
|
|
|
{
|
|
|
|
int rv;
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Header emission:\n"));
|
|
|
|
DEBUGF(fwrite(ent->nv.name, ent->nv.namelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, ": "));
|
|
|
|
DEBUGF(fwrite(ent->nv.value, ent->nv.valuelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, "\n"));
|
2013-09-07 08:28:43 +02:00
|
|
|
/* ent->ref may be 0. This happens if the careless stupid encoder
|
|
|
|
emits literal block larger than header table capacity with
|
|
|
|
indexing. */
|
2013-08-23 16:38:28 +02:00
|
|
|
rv = add_emit_set(context, ent);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
ent->flags |= NGHTTP2_HD_FLAG_EMIT;
|
|
|
|
return add_nva(nva_out_ptr,
|
|
|
|
ent->nv.name, ent->nv.namelen,
|
|
|
|
ent->nv.value, ent->nv.valuelen);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int emit_newname_header(nghttp2_hd_context *context,
|
|
|
|
nghttp2_nva_out *nva_out_ptr,
|
2013-10-20 16:59:15 +02:00
|
|
|
nghttp2_nv *nv,
|
|
|
|
uint8_t flags)
|
2013-08-23 16:38:28 +02:00
|
|
|
{
|
2013-10-14 16:38:12 +02:00
|
|
|
int rv;
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Header emission:\n"));
|
|
|
|
DEBUGF(fwrite(nv->name, nv->namelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, ": "));
|
|
|
|
DEBUGF(fwrite(nv->value, nv->valuelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, "\n"));
|
2013-10-24 16:49:37 +02:00
|
|
|
rv = add_nva(nva_out_ptr,
|
|
|
|
nv->name, nv->namelen, nv->value, nv->valuelen);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
2013-10-14 16:38:12 +02:00
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
if(flags & NGHTTP2_HD_FLAG_NAME_GIFT) {
|
|
|
|
if(flags & NGHTTP2_HD_FLAG_VALUE_GIFT) {
|
|
|
|
return track_decode_buf2(context, nv->name, nv->value);
|
|
|
|
} else {
|
|
|
|
return track_decode_buf(context, nv->name);
|
2013-10-20 16:59:15 +02:00
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
} else if(flags & NGHTTP2_HD_FLAG_VALUE_GIFT) {
|
|
|
|
return track_decode_buf(context, nv->value);
|
2013-10-14 16:38:12 +02:00
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
return 0;
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int emit_indname_header(nghttp2_hd_context *context,
|
|
|
|
nghttp2_nva_out *nva_out_ptr,
|
|
|
|
nghttp2_hd_entry *ent,
|
2013-10-20 16:59:15 +02:00
|
|
|
uint8_t *value, size_t valuelen,
|
|
|
|
uint8_t flags)
|
2013-08-23 16:38:28 +02:00
|
|
|
{
|
|
|
|
int rv;
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Header emission:\n"));
|
|
|
|
DEBUGF(fwrite(ent->nv.name, ent->nv.namelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, ": "));
|
|
|
|
DEBUGF(fwrite(value, valuelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, "\n"));
|
2013-08-23 16:38:28 +02:00
|
|
|
rv = add_emit_set(context, ent);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
rv = add_nva(nva_out_ptr, ent->nv.name, ent->nv.namelen, value, valuelen);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
2013-11-03 09:46:10 +01:00
|
|
|
if(flags & NGHTTP2_HD_FLAG_VALUE_GIFT) {
|
2013-10-24 16:49:37 +02:00
|
|
|
return track_decode_buf(context, value);
|
2013-10-14 16:38:12 +02:00
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
return 0;
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
|
|
|
|
static int ensure_write_buffer(uint8_t **buf_ptr, size_t *buflen_ptr,
|
|
|
|
size_t offset, size_t need)
|
|
|
|
{
|
|
|
|
int rv;
|
2013-08-22 18:28:01 +02:00
|
|
|
/* TODO Remove this limitation when header continuation is
|
|
|
|
implemented. */
|
2013-10-27 13:17:09 +01:00
|
|
|
if(need + offset > NGHTTP2_MAX_FRAME_LENGTH) {
|
2013-07-19 09:50:31 +02:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
rv = nghttp2_reserve_buffer(buf_ptr, buflen_ptr, offset + need);
|
|
|
|
if(rv != 0) {
|
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t count_encoded_length(size_t n, int prefix)
|
|
|
|
{
|
2013-10-18 12:27:15 +02:00
|
|
|
size_t k = (1 << prefix) - 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
size_t len = 0;
|
2013-10-18 12:27:15 +02:00
|
|
|
if(n >= k) {
|
|
|
|
n -= k;
|
|
|
|
++len;
|
|
|
|
} else {
|
|
|
|
return 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-07-27 11:59:30 +02:00
|
|
|
do {
|
2013-07-19 09:50:31 +02:00
|
|
|
++len;
|
|
|
|
if(n >= 128) {
|
|
|
|
n >>= 7;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
2013-07-27 11:59:30 +02:00
|
|
|
} while(n);
|
2013-07-19 09:50:31 +02:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t encode_length(uint8_t *buf, size_t n, int prefix)
|
|
|
|
{
|
2013-10-18 12:27:15 +02:00
|
|
|
size_t k = (1 << prefix) - 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
size_t len = 0;
|
2013-10-20 09:28:52 +02:00
|
|
|
*buf &= ~k;
|
2013-10-18 12:27:15 +02:00
|
|
|
if(n >= k) {
|
2013-10-20 09:28:52 +02:00
|
|
|
*buf++ |= k;
|
2013-10-18 12:27:15 +02:00
|
|
|
n -= k;
|
|
|
|
++len;
|
|
|
|
} else {
|
2013-10-20 09:28:52 +02:00
|
|
|
*buf++ |= n;
|
2013-10-18 12:27:15 +02:00
|
|
|
return 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-07-27 11:59:30 +02:00
|
|
|
do {
|
2013-07-19 09:50:31 +02:00
|
|
|
++len;
|
|
|
|
if(n >= 128) {
|
|
|
|
*buf++ = (1 << 7) | (n & 0x7f);
|
|
|
|
n >>= 7;
|
|
|
|
} else {
|
|
|
|
*buf++ = n;
|
|
|
|
break;
|
|
|
|
}
|
2013-07-27 11:59:30 +02:00
|
|
|
} while(n);
|
2013-07-19 09:50:31 +02:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Decodes |prefx| prefixed integer stored from |in|. The |last|
|
|
|
|
* represents the 1 beyond the last of the valid contiguous memory
|
|
|
|
* region from |in|. The decoded integer must be strictly less than 1
|
|
|
|
* << 16.
|
|
|
|
*
|
|
|
|
* This function returns the next byte of read byte. This function
|
|
|
|
* stores the decoded integer in |*res| if it succeeds, or stores -1
|
|
|
|
* in |*res|, indicating decoding error.
|
|
|
|
*/
|
|
|
|
static uint8_t* decode_length(ssize_t *res, uint8_t *in, uint8_t *last,
|
|
|
|
int prefix)
|
|
|
|
{
|
|
|
|
int k = (1 << prefix) - 1, r;
|
|
|
|
if(in == last) {
|
|
|
|
*res = -1;
|
|
|
|
return in;
|
|
|
|
}
|
2013-10-18 12:27:15 +02:00
|
|
|
if((*in & k) == k) {
|
|
|
|
*res = k;
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
2013-10-18 12:27:15 +02:00
|
|
|
*res = (*in) & k;
|
|
|
|
return in + 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-18 12:27:15 +02:00
|
|
|
++in;
|
2013-07-19 09:50:31 +02:00
|
|
|
for(r = 0; in != last; ++in, r += 7) {
|
|
|
|
*res += (*in & 0x7f) << r;
|
|
|
|
if(*res >= (1 << 16)) {
|
|
|
|
*res = -1;
|
|
|
|
return in + 1;
|
|
|
|
}
|
|
|
|
if((*in & (1 << 7)) == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-10-18 12:30:04 +02:00
|
|
|
if(in == last || *in & (1 << 7)) {
|
2013-07-19 09:50:31 +02:00
|
|
|
*res = -1;
|
2013-07-27 11:59:30 +02:00
|
|
|
return NULL;
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
|
|
|
return in + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-16 09:05:18 +01:00
|
|
|
static int emit_indexed0(uint8_t **buf_ptr, size_t *buflen_ptr,
|
|
|
|
size_t *offset_ptr)
|
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
rv = ensure_write_buffer(buf_ptr, buflen_ptr, *offset_ptr, 1);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
*(*buf_ptr + *offset_ptr) = 0x80u;
|
|
|
|
++*offset_ptr;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-19 18:24:34 +02:00
|
|
|
static int emit_indexed_block(uint8_t **buf_ptr, size_t *buflen_ptr,
|
2013-07-26 17:58:38 +02:00
|
|
|
size_t *offset_ptr, size_t index)
|
2013-07-19 09:50:31 +02:00
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
uint8_t *bufp;
|
2013-11-16 08:18:44 +01:00
|
|
|
size_t blocklen = count_encoded_length(index + 1, 7);
|
2013-07-19 09:50:31 +02:00
|
|
|
rv = ensure_write_buffer(buf_ptr, buflen_ptr, *offset_ptr, blocklen);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
bufp = *buf_ptr + *offset_ptr;
|
2013-10-20 09:28:52 +02:00
|
|
|
*bufp = 0x80u;
|
2013-11-16 08:18:44 +01:00
|
|
|
encode_length(bufp, index + 1, 7);
|
2013-07-19 09:50:31 +02:00
|
|
|
*offset_ptr += blocklen;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-20 17:22:14 +02:00
|
|
|
static size_t emit_string(uint8_t *buf, size_t buflen,
|
|
|
|
size_t enclen, int huffman,
|
|
|
|
const uint8_t *str, size_t len,
|
|
|
|
nghttp2_hd_side side)
|
|
|
|
{
|
|
|
|
size_t rv;
|
|
|
|
*buf = huffman ? 1 << 7 : 0;
|
|
|
|
rv = encode_length(buf, enclen, 7);
|
|
|
|
buf += rv;
|
|
|
|
if(huffman) {
|
|
|
|
nghttp2_hd_huff_encode(buf, buflen - rv, str, len, side);
|
|
|
|
} else {
|
|
|
|
assert(enclen == len);
|
|
|
|
memcpy(buf, str, len);
|
|
|
|
}
|
|
|
|
return rv + enclen;
|
|
|
|
}
|
|
|
|
|
2013-07-19 18:24:34 +02:00
|
|
|
static int emit_indname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
|
2013-07-26 17:58:38 +02:00
|
|
|
size_t *offset_ptr, size_t index,
|
2013-07-19 18:24:34 +02:00
|
|
|
const uint8_t *value, size_t valuelen,
|
2013-10-14 16:38:12 +02:00
|
|
|
int inc_indexing,
|
|
|
|
nghttp2_hd_side side)
|
2013-07-19 09:50:31 +02:00
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
uint8_t *bufp;
|
2013-10-14 16:38:12 +02:00
|
|
|
size_t encvallen = nghttp2_hd_huff_encode_count(value, valuelen, side);
|
2013-10-20 16:59:15 +02:00
|
|
|
size_t blocklen = count_encoded_length(index + 1, 6);
|
|
|
|
int huffman = encvallen < valuelen;
|
|
|
|
if(!huffman) {
|
|
|
|
encvallen = valuelen;
|
|
|
|
}
|
|
|
|
blocklen += count_encoded_length(encvallen, 7) + encvallen;
|
2013-07-19 09:50:31 +02:00
|
|
|
rv = ensure_write_buffer(buf_ptr, buflen_ptr, *offset_ptr, blocklen);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
bufp = *buf_ptr + *offset_ptr;
|
2013-10-20 09:28:52 +02:00
|
|
|
*bufp = inc_indexing ? 0 : 0x40u;
|
2013-10-12 14:49:01 +02:00
|
|
|
bufp += encode_length(bufp, index + 1, 6);
|
2013-10-20 17:22:14 +02:00
|
|
|
bufp += emit_string(bufp, *buflen_ptr - (bufp - *buf_ptr),
|
|
|
|
encvallen, huffman, value, valuelen, side);
|
|
|
|
assert(bufp - (*buf_ptr + *offset_ptr) == (ssize_t)blocklen);
|
2013-07-19 09:50:31 +02:00
|
|
|
*offset_ptr += blocklen;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-19 18:24:34 +02:00
|
|
|
static int emit_newname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
|
2013-07-19 09:50:31 +02:00
|
|
|
size_t *offset_ptr, nghttp2_nv *nv,
|
2013-10-14 16:38:12 +02:00
|
|
|
int inc_indexing,
|
|
|
|
nghttp2_hd_side side)
|
2013-07-19 09:50:31 +02:00
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
uint8_t *bufp;
|
2013-10-14 16:38:12 +02:00
|
|
|
size_t encnamelen =
|
|
|
|
nghttp2_hd_huff_encode_count(nv->name, nv->namelen, side);
|
|
|
|
size_t encvallen =
|
|
|
|
nghttp2_hd_huff_encode_count(nv->value, nv->valuelen, side);
|
2013-10-20 16:59:15 +02:00
|
|
|
size_t blocklen = 1;
|
|
|
|
int name_huffman = encnamelen < nv->namelen;
|
|
|
|
int value_huffman = encvallen < nv->valuelen;
|
|
|
|
if(!name_huffman) {
|
|
|
|
encnamelen = nv->namelen;
|
|
|
|
}
|
|
|
|
if(!value_huffman) {
|
|
|
|
encvallen = nv->valuelen;
|
|
|
|
}
|
|
|
|
blocklen += count_encoded_length(encnamelen, 7) + encnamelen +
|
|
|
|
count_encoded_length(encvallen, 7) + encvallen;
|
2013-07-19 09:50:31 +02:00
|
|
|
rv = ensure_write_buffer(buf_ptr, buflen_ptr, *offset_ptr, blocklen);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
bufp = *buf_ptr + *offset_ptr;
|
2013-10-12 14:49:01 +02:00
|
|
|
*bufp++ = inc_indexing ? 0 : 0x40u;
|
2013-10-20 17:22:14 +02:00
|
|
|
bufp += emit_string(bufp, *buflen_ptr - (bufp - *buf_ptr),
|
|
|
|
encnamelen, name_huffman, nv->name, nv->namelen, side);
|
|
|
|
bufp += emit_string(bufp, *buflen_ptr - (bufp - *buf_ptr),
|
|
|
|
encvallen, value_huffman, nv->value, nv->valuelen, side);
|
2013-07-19 09:50:31 +02:00
|
|
|
*offset_ptr += blocklen;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-09-06 14:53:28 +02:00
|
|
|
/*
|
|
|
|
* Emit common header with |index| by toggle off and on (thus 2
|
|
|
|
* indexed representation emissions).
|
|
|
|
*/
|
|
|
|
static int emit_implicit(uint8_t **buf_ptr,
|
|
|
|
size_t *buflen_ptr,
|
|
|
|
size_t *offset_ptr,
|
|
|
|
size_t index)
|
2013-08-23 16:38:28 +02:00
|
|
|
{
|
2013-09-06 14:53:28 +02:00
|
|
|
int i;
|
|
|
|
int rv;
|
|
|
|
for(i = 0; i < 2; ++i) {
|
|
|
|
rv = emit_indexed_block(buf_ptr, buflen_ptr, offset_ptr, index);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static nghttp2_hd_entry* add_hd_table_incremental(nghttp2_hd_context *context,
|
|
|
|
uint8_t **buf_ptr,
|
|
|
|
size_t *buflen_ptr,
|
|
|
|
size_t *offset_ptr,
|
2013-10-12 15:56:29 +02:00
|
|
|
nghttp2_nv *nv,
|
|
|
|
uint8_t entry_flags)
|
2013-09-06 14:53:28 +02:00
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
nghttp2_hd_entry *new_ent;
|
|
|
|
size_t room = entry_room(nv->namelen, nv->valuelen);
|
2013-10-25 18:01:28 +02:00
|
|
|
while(context->hd_table_bufsize + room > context->hd_table_bufsize_max &&
|
2013-10-12 14:49:01 +02:00
|
|
|
context->hd_table.len > 0) {
|
|
|
|
size_t index = context->hd_table.len - 1;
|
|
|
|
nghttp2_hd_entry* ent = nghttp2_hd_ringbuf_get(&context->hd_table, index);
|
2013-09-06 14:53:28 +02:00
|
|
|
context->hd_table_bufsize -= entry_room(ent->nv.namelen, ent->nv.valuelen);
|
2013-10-30 17:51:16 +01:00
|
|
|
if(context->hd_table_bufsize < context->deflate_hd_table_bufsize) {
|
|
|
|
context->deflate_hd_table_bufsize -= entry_room(ent->nv.namelen,
|
|
|
|
ent->nv.valuelen);
|
|
|
|
--context->deflate_hd_tablelen;
|
|
|
|
}
|
2013-10-25 18:01:28 +02:00
|
|
|
if(context->role == NGHTTP2_HD_ROLE_DEFLATE) {
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_IMPLICIT_EMIT) {
|
|
|
|
/* Emit common header just before it slips away from the
|
|
|
|
table. If we don't do this, we have to emit it in literal
|
|
|
|
representation which hurts compression. */
|
|
|
|
rv = emit_implicit(buf_ptr, buflen_ptr, offset_ptr, index);
|
|
|
|
if(rv != 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
}
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Remove item from header table:\n"));
|
|
|
|
DEBUGF(fwrite(ent->nv.name, ent->nv.namelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, ": "));
|
|
|
|
DEBUGF(fwrite(ent->nv.value, ent->nv.valuelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, "\n"));
|
2013-10-12 14:49:01 +02:00
|
|
|
nghttp2_hd_ringbuf_pop_back(&context->hd_table);
|
2013-09-06 14:53:28 +02:00
|
|
|
if(--ent->ref == 0) {
|
|
|
|
nghttp2_hd_entry_free(ent);
|
|
|
|
free(ent);
|
|
|
|
}
|
|
|
|
}
|
2013-10-30 17:51:16 +01:00
|
|
|
while(context->deflate_hd_table_bufsize + room >
|
|
|
|
context->deflate_hd_table_bufsize_max
|
|
|
|
&& context->deflate_hd_tablelen > 0) {
|
|
|
|
size_t index = context->deflate_hd_tablelen - 1;
|
|
|
|
nghttp2_hd_entry *ent =
|
|
|
|
nghttp2_hd_ringbuf_get(&context->hd_table, index);
|
|
|
|
context->deflate_hd_table_bufsize -= entry_room(ent->nv.namelen,
|
|
|
|
ent->nv.valuelen);
|
|
|
|
--context->deflate_hd_tablelen;
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_IMPLICIT_EMIT) {
|
|
|
|
/* Just like a normal eviction, implicit header must be
|
|
|
|
emitted twice. */
|
|
|
|
rv = emit_implicit(buf_ptr, buflen_ptr, offset_ptr, index);
|
|
|
|
if(rv != 0) {
|
|
|
|
return NULL;
|
2013-10-25 18:01:28 +02:00
|
|
|
}
|
2013-10-30 17:51:16 +01:00
|
|
|
ent->flags ^= NGHTTP2_HD_FLAG_IMPLICIT_EMIT;
|
|
|
|
}
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_REFSET) {
|
|
|
|
/* We need to drop entry from reference set. */
|
|
|
|
rv = emit_indexed_block(buf_ptr, buflen_ptr, offset_ptr, index);
|
|
|
|
if(rv != 0) {
|
|
|
|
return NULL;
|
2013-10-25 18:01:28 +02:00
|
|
|
}
|
2013-10-30 17:51:16 +01:00
|
|
|
ent->flags ^= NGHTTP2_HD_FLAG_REFSET;
|
|
|
|
}
|
|
|
|
/* Release memory. We don't remove entry from the header table
|
|
|
|
at this moment. */
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_NAME_ALLOC) {
|
|
|
|
free(ent->nv.name);
|
|
|
|
ent->nv.name = NULL;
|
|
|
|
ent->flags ^= NGHTTP2_HD_FLAG_NAME_ALLOC;
|
|
|
|
}
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_VALUE_ALLOC) {
|
|
|
|
free(ent->nv.value);
|
|
|
|
ent->nv.value = NULL;
|
|
|
|
ent->flags ^= NGHTTP2_HD_FLAG_VALUE_ALLOC;
|
2013-10-25 18:01:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-06 14:53:28 +02:00
|
|
|
new_ent = malloc(sizeof(nghttp2_hd_entry));
|
|
|
|
if(new_ent == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-10-25 18:01:28 +02:00
|
|
|
|
|
|
|
if(context->role == NGHTTP2_HD_ROLE_DEFLATE &&
|
2013-10-28 16:42:08 +01:00
|
|
|
room > context->deflate_hd_table_bufsize_max) {
|
2013-10-25 18:01:28 +02:00
|
|
|
uint8_t flags = entry_flags &
|
|
|
|
~(NGHTTP2_HD_FLAG_NAME_ALLOC | NGHTTP2_HD_FLAG_VALUE_ALLOC |
|
|
|
|
NGHTTP2_HD_FLAG_NAME_GIFT | NGHTTP2_HD_FLAG_VALUE_GIFT);
|
|
|
|
rv = nghttp2_hd_entry_init(new_ent, flags,
|
|
|
|
NULL, nv->namelen, NULL, nv->valuelen);
|
|
|
|
if(rv != 0) {
|
|
|
|
free(new_ent);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if(flags & NGHTTP2_HD_FLAG_NAME_GIFT) {
|
|
|
|
free(nv->name);
|
|
|
|
nv->name = NULL;
|
|
|
|
}
|
|
|
|
if(flags & NGHTTP2_HD_FLAG_VALUE_GIFT) {
|
|
|
|
free(nv->value);
|
|
|
|
nv->value = NULL;
|
|
|
|
}
|
|
|
|
/* caller must emit indexed repr to toggle off new_ent from
|
|
|
|
reference set. We cannot do it here because it may break the
|
|
|
|
indexing. */
|
|
|
|
} else {
|
|
|
|
rv = nghttp2_hd_entry_init(new_ent,
|
|
|
|
entry_flags,
|
|
|
|
nv->name, nv->namelen, nv->value, nv->valuelen);
|
|
|
|
if(rv != 0) {
|
|
|
|
free(new_ent);
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
2013-10-13 12:24:21 +02:00
|
|
|
if(room > context->hd_table_bufsize_max) {
|
2013-09-06 14:53:28 +02:00
|
|
|
/* The entry taking more than NGHTTP2_HD_MAX_BUFFER_SIZE is
|
|
|
|
immediately evicted. */
|
|
|
|
--new_ent->ref;
|
|
|
|
} else {
|
2013-10-25 18:01:28 +02:00
|
|
|
context->hd_table_bufsize += room;
|
2013-10-12 14:49:01 +02:00
|
|
|
nghttp2_hd_ringbuf_push_front(&context->hd_table, new_ent);
|
2013-10-30 17:51:16 +01:00
|
|
|
if(room <= context->deflate_hd_table_bufsize_max) {
|
2013-12-17 13:39:21 +01:00
|
|
|
new_ent->flags |= NGHTTP2_HD_FLAG_REFSET;
|
2013-10-28 16:42:08 +01:00
|
|
|
context->deflate_hd_table_bufsize += room;
|
|
|
|
++context->deflate_hd_tablelen;
|
2013-10-26 16:30:48 +02:00
|
|
|
}
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
return new_ent;
|
|
|
|
}
|
|
|
|
|
2013-12-18 13:45:15 +01:00
|
|
|
static int name_eq(const nghttp2_nv *a, const nghttp2_nv *b)
|
2013-09-06 14:53:28 +02:00
|
|
|
{
|
2013-12-18 13:45:15 +01:00
|
|
|
return a->namelen == b->namelen && memcmp(a->name, b->name, a->namelen) == 0;
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
|
2013-12-18 13:45:15 +01:00
|
|
|
static int value_eq(const nghttp2_nv *a, const nghttp2_nv *b)
|
|
|
|
{
|
|
|
|
return a->valuelen == b->valuelen &&
|
|
|
|
memcmp(a->value, b->value, a->valuelen) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ssize_t index;
|
|
|
|
/* Nonzero if both name and value are matched. */
|
|
|
|
uint8_t name_value_match;
|
|
|
|
} search_result;
|
|
|
|
|
|
|
|
static search_result search_hd_table(nghttp2_hd_context *context,
|
2013-10-12 14:49:01 +02:00
|
|
|
nghttp2_nv *nv)
|
2013-09-06 14:53:28 +02:00
|
|
|
{
|
2013-12-18 13:45:15 +01:00
|
|
|
search_result res = { -1, 0 };
|
2013-09-06 14:53:28 +02:00
|
|
|
size_t i;
|
2013-10-30 17:51:16 +01:00
|
|
|
for(i = 0; i < context->deflate_hd_tablelen; ++i) {
|
2013-10-12 14:49:01 +02:00
|
|
|
nghttp2_hd_entry *ent = nghttp2_hd_ringbuf_get(&context->hd_table, i);
|
2013-12-18 13:45:15 +01:00
|
|
|
if(name_eq(&ent->nv, nv)) {
|
|
|
|
if(res.index == -1) {
|
|
|
|
res.index = i;
|
|
|
|
}
|
|
|
|
if(value_eq(&ent->nv, nv)) {
|
|
|
|
res.index = i;
|
|
|
|
res.name_value_match = 1;
|
|
|
|
return res;
|
|
|
|
}
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
}
|
2013-10-24 15:09:40 +02:00
|
|
|
for(i = 0; i < STATIC_TABLE_LENGTH; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = &static_table[i];
|
2013-12-18 13:45:15 +01:00
|
|
|
if(name_eq(&ent->nv, nv)) {
|
|
|
|
if(res.index == -1) {
|
|
|
|
res.index = context->hd_table.len + i;
|
|
|
|
}
|
|
|
|
if(value_eq(&ent->nv, nv)) {
|
|
|
|
res.index = context->hd_table.len + i;
|
|
|
|
res.name_value_match = 1;
|
|
|
|
return res;
|
|
|
|
}
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
}
|
2013-12-18 13:45:15 +01:00
|
|
|
return res;
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
|
|
|
|
2013-10-25 18:01:28 +02:00
|
|
|
int nghttp2_hd_change_table_size(nghttp2_hd_context *context,
|
|
|
|
size_t hd_table_bufsize_max)
|
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
rv = nghttp2_hd_ringbuf_reserve
|
|
|
|
(&context->hd_table, hd_table_bufsize_max / NGHTTP2_HD_ENTRY_OVERHEAD);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
context->hd_table_bufsize_max = hd_table_bufsize_max;
|
2013-10-30 17:51:16 +01:00
|
|
|
if(context->role == NGHTTP2_HD_ROLE_INFLATE) {
|
|
|
|
context->deflate_hd_table_bufsize_max = hd_table_bufsize_max;
|
|
|
|
}
|
2013-10-25 18:01:28 +02:00
|
|
|
while(context->hd_table_bufsize > context->hd_table_bufsize_max &&
|
|
|
|
context->hd_table.len > 0) {
|
|
|
|
size_t index = context->hd_table.len - 1;
|
|
|
|
nghttp2_hd_entry* ent = nghttp2_hd_ringbuf_get(&context->hd_table, index);
|
|
|
|
context->hd_table_bufsize -= entry_room(ent->nv.namelen, ent->nv.valuelen);
|
2013-10-30 17:51:16 +01:00
|
|
|
if(context->hd_table_bufsize < context->deflate_hd_table_bufsize) {
|
|
|
|
context->deflate_hd_table_bufsize -= entry_room(ent->nv.namelen,
|
|
|
|
ent->nv.valuelen);
|
|
|
|
--context->deflate_hd_tablelen;
|
2013-10-25 18:01:28 +02:00
|
|
|
}
|
|
|
|
nghttp2_hd_ringbuf_pop_back(&context->hd_table);
|
|
|
|
if(--ent->ref == 0) {
|
|
|
|
nghttp2_hd_entry_free(ent);
|
|
|
|
free(ent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-16 09:05:18 +01:00
|
|
|
static void clear_refset(nghttp2_hd_context *context)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
for(i = 0; i < context->hd_table.len; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = nghttp2_hd_ringbuf_get(&context->hd_table, i);
|
|
|
|
ent->flags &= ~NGHTTP2_HD_FLAG_REFSET;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-24 15:09:40 +02:00
|
|
|
static int check_index_range(nghttp2_hd_context *context, size_t index)
|
|
|
|
{
|
|
|
|
return index < context->hd_table.len + STATIC_TABLE_LENGTH;
|
|
|
|
}
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
nghttp2_hd_entry* nghttp2_hd_table_get(nghttp2_hd_context *context,
|
|
|
|
size_t index)
|
|
|
|
{
|
2013-10-24 15:09:40 +02:00
|
|
|
assert(check_index_range(context, index));
|
2013-10-12 14:49:01 +02:00
|
|
|
if(index < context->hd_table.len) {
|
|
|
|
return nghttp2_hd_ringbuf_get(&context->hd_table, index);
|
|
|
|
} else {
|
2013-10-24 15:09:40 +02:00
|
|
|
return &static_table[index - context->hd_table.len];
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
|
2013-11-19 13:41:02 +01:00
|
|
|
#define name_match(NV, NAME) \
|
|
|
|
(nv->namelen == sizeof(NAME) - 1 && \
|
|
|
|
memcmp(nv->name, NAME, sizeof(NAME) - 1) == 0)
|
|
|
|
|
|
|
|
static int should_indexing(const nghttp2_nv *nv)
|
|
|
|
{
|
|
|
|
#ifdef NGHTTP2_XHD
|
|
|
|
return !name_match(nv, NGHTTP2_XHD);
|
|
|
|
#else /* !NGHTTP2_XHD */
|
|
|
|
return
|
|
|
|
!name_match(nv, "set-cookie") &&
|
|
|
|
!name_match(nv, "content-length") &&
|
|
|
|
!name_match(nv, "location") &&
|
|
|
|
!name_match(nv, "etag") &&
|
|
|
|
!name_match(nv, ":path");
|
|
|
|
#endif /* !NGHTTP2_XHD */
|
|
|
|
}
|
|
|
|
|
2013-08-24 15:58:26 +02:00
|
|
|
static int deflate_nv(nghttp2_hd_context *deflater,
|
|
|
|
uint8_t **buf_ptr, size_t *buflen_ptr,
|
|
|
|
size_t *offset_ptr,
|
|
|
|
nghttp2_nv *nv)
|
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
nghttp2_hd_entry *ent;
|
2013-12-18 13:45:15 +01:00
|
|
|
search_result res;
|
|
|
|
res = search_hd_table(deflater, nv);
|
|
|
|
if(res.index != -1 && res.name_value_match) {
|
|
|
|
size_t index = res.index;
|
2013-10-12 14:49:01 +02:00
|
|
|
ent = nghttp2_hd_table_get(deflater, index);
|
2013-10-24 14:52:02 +02:00
|
|
|
if(index >= deflater->hd_table.len) {
|
|
|
|
nghttp2_hd_entry *new_ent;
|
|
|
|
/* It is important to first add entry to the header table and
|
|
|
|
let eviction go. If NGHTTP2_HD_FLAG_IMPLICIT_EMIT entry is
|
|
|
|
evicted, it must be emitted before the |nv|. */
|
|
|
|
new_ent = add_hd_table_incremental(deflater, buf_ptr, buflen_ptr,
|
|
|
|
offset_ptr, &ent->nv,
|
|
|
|
NGHTTP2_HD_FLAG_NONE);
|
|
|
|
if(!new_ent) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
if(new_ent->ref == 0) {
|
|
|
|
nghttp2_hd_entry_free(new_ent);
|
|
|
|
free(new_ent);
|
2013-10-25 18:01:28 +02:00
|
|
|
new_ent = NULL;
|
|
|
|
} else if(new_ent->nv.name != NULL) {
|
|
|
|
/* new_ent->ref > 0 and nv.name is not NULL means that new_ent is
|
2013-10-28 16:42:08 +01:00
|
|
|
in the reference set and in deflate_hd_table_bufsize */
|
2013-10-24 14:52:02 +02:00
|
|
|
new_ent->flags |= NGHTTP2_HD_FLAG_EMIT;
|
|
|
|
}
|
|
|
|
rv = emit_indexed_block(buf_ptr, buflen_ptr, offset_ptr, index);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
} else if((ent->flags & NGHTTP2_HD_FLAG_REFSET) == 0) {
|
2013-08-24 15:58:26 +02:00
|
|
|
ent->flags |= NGHTTP2_HD_FLAG_REFSET | NGHTTP2_HD_FLAG_EMIT;
|
2013-10-12 14:49:01 +02:00
|
|
|
rv = emit_indexed_block(buf_ptr, buflen_ptr, offset_ptr, index);
|
2013-08-24 15:58:26 +02:00
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
int num_emits = 0;
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_EMIT) {
|
|
|
|
/* occurrences of the same indexed representation. Emit index
|
|
|
|
twice. */
|
|
|
|
num_emits = 2;
|
|
|
|
} else if(ent->flags & NGHTTP2_HD_FLAG_IMPLICIT_EMIT) {
|
|
|
|
/* ent was implicitly emitted because it is the common
|
|
|
|
header field. To support occurrences of the same indexed
|
|
|
|
representation, we have to emit 4 times. This is because
|
|
|
|
"implicitly emitted" means actually not emitted at
|
|
|
|
all. So first 2 emits performs 1st header appears in the
|
|
|
|
reference set. And another 2 emits are done for 2nd
|
|
|
|
(current) header. */
|
|
|
|
ent->flags ^= NGHTTP2_HD_FLAG_IMPLICIT_EMIT;
|
|
|
|
ent->flags |= NGHTTP2_HD_FLAG_EMIT;
|
|
|
|
num_emits = 4;
|
2013-09-06 14:53:28 +02:00
|
|
|
} else {
|
|
|
|
/* This is common header and not emitted in the current
|
|
|
|
run. Just mark IMPLICIT_EMIT, in the hope that we are not
|
|
|
|
required to emit anything for this. We will emit toggle
|
|
|
|
off/on for this entry if it is removed from the header
|
|
|
|
table. */
|
|
|
|
ent->flags |= NGHTTP2_HD_FLAG_IMPLICIT_EMIT;
|
2013-08-24 15:58:26 +02:00
|
|
|
}
|
|
|
|
for(; num_emits > 0; --num_emits) {
|
2013-10-12 14:49:01 +02:00
|
|
|
rv = emit_indexed_block(buf_ptr, buflen_ptr, offset_ptr, index);
|
2013-08-24 15:58:26 +02:00
|
|
|
if(rv != 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2013-10-12 14:49:01 +02:00
|
|
|
ssize_t index = -1;
|
2013-08-24 15:58:26 +02:00
|
|
|
int incidx = 0;
|
2013-12-18 13:45:15 +01:00
|
|
|
if(res.index != -1) {
|
|
|
|
index = res.index;
|
2013-08-24 15:58:26 +02:00
|
|
|
}
|
2013-11-19 13:41:02 +01:00
|
|
|
if(should_indexing(nv) &&
|
|
|
|
entry_room(nv->namelen, nv->valuelen) <= NGHTTP2_HD_MAX_ENTRY_SIZE) {
|
2013-08-24 15:58:26 +02:00
|
|
|
nghttp2_hd_entry *new_ent;
|
2013-10-12 15:56:29 +02:00
|
|
|
if(index >= (ssize_t)deflater->hd_table.len) {
|
|
|
|
nghttp2_nv nv_indname;
|
|
|
|
nv_indname = *nv;
|
|
|
|
nv_indname.name = nghttp2_hd_table_get(deflater, index)->nv.name;
|
|
|
|
new_ent = add_hd_table_incremental(deflater, buf_ptr, buflen_ptr,
|
|
|
|
offset_ptr, &nv_indname,
|
|
|
|
NGHTTP2_HD_FLAG_VALUE_ALLOC);
|
|
|
|
} else {
|
|
|
|
new_ent = add_hd_table_incremental(deflater, buf_ptr, buflen_ptr,
|
|
|
|
offset_ptr, nv,
|
|
|
|
NGHTTP2_HD_FLAG_NAME_ALLOC |
|
|
|
|
NGHTTP2_HD_FLAG_VALUE_ALLOC);
|
|
|
|
}
|
2013-08-24 15:58:26 +02:00
|
|
|
if(!new_ent) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
2013-10-24 14:52:02 +02:00
|
|
|
if(new_ent->ref == 0) {
|
|
|
|
nghttp2_hd_entry_free(new_ent);
|
|
|
|
free(new_ent);
|
2013-10-25 18:01:28 +02:00
|
|
|
} else if(new_ent->nv.name != NULL) {
|
|
|
|
/* new_ent->ref > 0 and nv.name is not NULL means that new_ent is
|
2013-10-28 16:42:08 +01:00
|
|
|
in the reference set and in deflate_hd_table_bufsize */
|
2013-10-24 14:52:02 +02:00
|
|
|
new_ent->flags |= NGHTTP2_HD_FLAG_EMIT;
|
|
|
|
}
|
2013-08-24 15:58:26 +02:00
|
|
|
incidx = 1;
|
|
|
|
}
|
2013-10-12 14:49:01 +02:00
|
|
|
if(index == -1) {
|
2013-10-14 16:38:12 +02:00
|
|
|
rv = emit_newname_block(buf_ptr, buflen_ptr, offset_ptr, nv, incidx,
|
|
|
|
deflater->side);
|
2013-08-24 15:58:26 +02:00
|
|
|
} else {
|
|
|
|
rv = emit_indname_block(buf_ptr, buflen_ptr, offset_ptr, index,
|
2013-10-14 16:38:12 +02:00
|
|
|
nv->value, nv->valuelen, incidx,
|
|
|
|
deflater->side);
|
2013-08-24 15:58:26 +02:00
|
|
|
}
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
static int deflate_post_process_hd_entry(nghttp2_hd_entry *ent,
|
|
|
|
size_t index,
|
|
|
|
uint8_t **buf_ptr,
|
|
|
|
size_t *buflen_ptr,
|
|
|
|
size_t *offset_ptr)
|
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
if((ent->flags & NGHTTP2_HD_FLAG_REFSET) &&
|
|
|
|
(ent->flags & NGHTTP2_HD_FLAG_IMPLICIT_EMIT) == 0 &&
|
|
|
|
(ent->flags & NGHTTP2_HD_FLAG_EMIT) == 0) {
|
|
|
|
/* This entry is not present in the current header set and must
|
|
|
|
be removed. */
|
|
|
|
ent->flags ^= NGHTTP2_HD_FLAG_REFSET;
|
|
|
|
rv = emit_indexed_block(buf_ptr, buflen_ptr, offset_ptr, index);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ent->flags &= ~(NGHTTP2_HD_FLAG_EMIT | NGHTTP2_HD_FLAG_IMPLICIT_EMIT);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_context *deflater,
|
|
|
|
uint8_t **buf_ptr, size_t *buflen_ptr,
|
|
|
|
size_t nv_offset,
|
|
|
|
nghttp2_nv *nv, size_t nvlen)
|
|
|
|
{
|
2013-09-06 14:53:28 +02:00
|
|
|
size_t i, offset;
|
2013-07-25 18:34:28 +02:00
|
|
|
int rv = 0;
|
|
|
|
if(deflater->bad) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
offset = nv_offset;
|
2013-11-16 09:05:18 +01:00
|
|
|
if(deflater->no_refset) {
|
|
|
|
rv = emit_indexed0(buf_ptr, buflen_ptr, &offset);
|
|
|
|
if(rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
clear_refset(deflater);
|
|
|
|
}
|
2013-09-06 14:53:28 +02:00
|
|
|
for(i = 0; i < nvlen; ++i) {
|
2013-08-24 15:58:26 +02:00
|
|
|
rv = deflate_nv(deflater, buf_ptr, buflen_ptr, &offset, &nv[i]);
|
|
|
|
if(rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2013-12-17 13:39:21 +01:00
|
|
|
for(i = 0; i < deflater->deflate_hd_tablelen; ++i) {
|
2013-10-12 14:49:01 +02:00
|
|
|
nghttp2_hd_entry *ent = nghttp2_hd_ringbuf_get(&deflater->hd_table, i);
|
|
|
|
rv = deflate_post_process_hd_entry(ent, i, buf_ptr, buflen_ptr, &offset);
|
|
|
|
if(rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
return offset - nv_offset;
|
2013-07-25 18:34:28 +02:00
|
|
|
fail:
|
|
|
|
deflater->bad = 1;
|
|
|
|
return rv;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
static int inflater_post_process_hd_entry(nghttp2_hd_context *inflater,
|
|
|
|
nghttp2_hd_entry *ent,
|
|
|
|
nghttp2_nva_out *nva_out_ptr)
|
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
if((ent->flags & NGHTTP2_HD_FLAG_REFSET) &&
|
|
|
|
(ent->flags & NGHTTP2_HD_FLAG_EMIT) == 0) {
|
|
|
|
rv = emit_indexed_header(inflater, nva_out_ptr, ent);
|
|
|
|
if(rv != 0) {
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ent->flags &= ~NGHTTP2_HD_FLAG_EMIT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-14 16:38:12 +02:00
|
|
|
static ssize_t inflate_decode(uint8_t **dest_ptr, uint8_t *in, size_t inlen,
|
|
|
|
nghttp2_hd_side side)
|
|
|
|
{
|
2013-12-19 15:19:14 +01:00
|
|
|
ssize_t declen;
|
|
|
|
if(inlen == 0) {
|
|
|
|
*dest_ptr = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
declen = nghttp2_hd_huff_decode_count(in, inlen, side);
|
2013-10-14 16:38:12 +02:00
|
|
|
if(declen == -1) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
*dest_ptr = malloc(declen);
|
|
|
|
if(*dest_ptr == NULL) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
nghttp2_hd_huff_decode(*dest_ptr, declen, in, inlen, side);
|
|
|
|
return declen;
|
|
|
|
}
|
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_context *inflater,
|
|
|
|
nghttp2_nv **nva_ptr,
|
|
|
|
uint8_t *in, size_t inlen)
|
|
|
|
{
|
2013-08-22 18:28:01 +02:00
|
|
|
size_t i;
|
2013-07-25 18:34:28 +02:00
|
|
|
int rv = 0;
|
2013-07-19 09:50:31 +02:00
|
|
|
uint8_t *last = in + inlen;
|
2013-08-23 16:38:28 +02:00
|
|
|
nghttp2_nva_out nva_out;
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "infalte_hd start\n"));
|
2013-08-23 16:38:28 +02:00
|
|
|
memset(&nva_out, 0, sizeof(nva_out));
|
2013-07-25 18:34:28 +02:00
|
|
|
if(inflater->bad) {
|
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
2013-08-22 18:28:01 +02:00
|
|
|
*nva_ptr = NULL;
|
2013-07-19 09:50:31 +02:00
|
|
|
for(; in != last;) {
|
|
|
|
uint8_t c = *in;
|
|
|
|
if(c & 0x80u) {
|
|
|
|
/* Indexed Header Repr */
|
|
|
|
ssize_t index;
|
2013-08-22 18:28:01 +02:00
|
|
|
nghttp2_hd_entry *ent;
|
2013-07-19 09:50:31 +02:00
|
|
|
in = decode_length(&index, in, last, 7);
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Indexed repr index=%zd\n", index));
|
2013-11-16 09:05:18 +01:00
|
|
|
if(index < 0) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Index out of range index=%zd\n", index));
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-11-16 09:05:18 +01:00
|
|
|
if(index == 0) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Clearing reference set\n"));
|
2013-11-16 09:05:18 +01:00
|
|
|
clear_refset(inflater);
|
|
|
|
continue;
|
|
|
|
}
|
2013-11-16 08:18:44 +01:00
|
|
|
--index;
|
2013-10-12 14:49:01 +02:00
|
|
|
if(!check_index_range(inflater, index)) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Index out of range index=%zd\n", index));
|
2013-08-22 18:28:01 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
|
|
|
}
|
2013-10-12 14:49:01 +02:00
|
|
|
ent = nghttp2_hd_table_get(inflater, index);
|
2013-10-24 14:52:02 +02:00
|
|
|
if(index >= (ssize_t)inflater->hd_table.len) {
|
|
|
|
nghttp2_hd_entry *new_ent;
|
|
|
|
new_ent = add_hd_table_incremental(inflater, NULL, NULL, NULL,
|
|
|
|
&ent->nv, NGHTTP2_HD_FLAG_NONE);
|
|
|
|
if(!new_ent) {
|
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-24 14:52:02 +02:00
|
|
|
/* new_ent->ref == 0 may be hold but emit_indexed_header
|
|
|
|
tracks new_ent, so there is no leak. */
|
|
|
|
rv = emit_indexed_header(inflater, &nva_out, new_ent);
|
|
|
|
} else {
|
|
|
|
ent->flags ^= NGHTTP2_HD_FLAG_REFSET;
|
|
|
|
if(ent->flags & NGHTTP2_HD_FLAG_REFSET) {
|
|
|
|
rv = emit_indexed_header(inflater, &nva_out, ent);
|
2013-12-16 15:54:20 +01:00
|
|
|
} else {
|
|
|
|
DEBUGF(fprintf(stderr, "Toggle off item:\n"));
|
|
|
|
DEBUGF(fwrite(ent->nv.name, ent->nv.namelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, ": "));
|
|
|
|
DEBUGF(fwrite(ent->nv.value, ent->nv.valuelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, "\n"));
|
2013-10-24 14:52:02 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if(rv != 0) {
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-12 14:49:01 +02:00
|
|
|
} else if(c == 0x40u || c == 0) {
|
2013-08-28 14:33:57 +02:00
|
|
|
/* Literal Header Repr - New Name */
|
2013-07-19 09:50:31 +02:00
|
|
|
nghttp2_nv nv;
|
2013-10-12 14:49:01 +02:00
|
|
|
ssize_t namelen, valuelen;
|
2013-10-20 16:59:15 +02:00
|
|
|
int name_huffman, value_huffman;
|
2013-10-24 16:49:37 +02:00
|
|
|
uint8_t *decoded_huffman_name = NULL, *decoded_huffman_value = NULL;
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Literal header repr - new name\n"));
|
2013-07-19 09:50:31 +02:00
|
|
|
if(++in == last) {
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-20 16:59:15 +02:00
|
|
|
name_huffman = *in & (1 << 7);
|
|
|
|
in = decode_length(&namelen, in, last, 7);
|
2013-07-19 09:50:31 +02:00
|
|
|
if(namelen < 0 || in + namelen > last) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Invalid namelen=%zd\n", namelen));
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-20 16:59:15 +02:00
|
|
|
if(name_huffman) {
|
|
|
|
rv = inflate_decode(&nv.name, in, namelen, inflater->side);
|
|
|
|
if(rv < 0) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Name huffman decoding failed\n"));
|
2013-10-20 16:59:15 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
decoded_huffman_name = nv.name;
|
2013-10-20 16:59:15 +02:00
|
|
|
nv.namelen = rv;
|
|
|
|
} else {
|
|
|
|
nv.name = in;
|
|
|
|
nv.namelen = namelen;
|
2013-08-25 10:39:29 +02:00
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
in += namelen;
|
2013-10-14 16:38:12 +02:00
|
|
|
|
|
|
|
if(!nghttp2_check_header_name(nv.name, nv.namelen)) {
|
2013-10-24 16:49:37 +02:00
|
|
|
free(decoded_huffman_name);
|
2013-10-14 16:38:12 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2013-10-20 16:59:15 +02:00
|
|
|
if(in == last) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "No value found\n"));
|
2013-10-24 16:49:37 +02:00
|
|
|
free(decoded_huffman_name);
|
2013-10-20 16:59:15 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
value_huffman = *in & (1 << 7);
|
|
|
|
in = decode_length(&valuelen, in, last, 7);
|
2013-07-19 09:50:31 +02:00
|
|
|
if(valuelen < 0 || in + valuelen > last) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Invalid valuelen=%zd\n", valuelen));
|
2013-10-24 16:49:37 +02:00
|
|
|
free(decoded_huffman_name);
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-20 16:59:15 +02:00
|
|
|
if(value_huffman) {
|
|
|
|
rv = inflate_decode(&nv.value, in, valuelen, inflater->side);
|
|
|
|
if(rv < 0) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Value huffman decoding failed\n"));
|
2013-10-24 16:49:37 +02:00
|
|
|
free(decoded_huffman_name);
|
2013-10-20 16:59:15 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
decoded_huffman_value = nv.value;
|
2013-10-20 16:59:15 +02:00
|
|
|
nv.valuelen = rv;
|
|
|
|
} else {
|
|
|
|
nv.value = in;
|
|
|
|
nv.valuelen = valuelen;
|
2013-10-14 16:38:12 +02:00
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
in += valuelen;
|
2013-10-14 16:38:12 +02:00
|
|
|
|
2013-07-19 17:08:14 +02:00
|
|
|
nghttp2_downcase(nv.name, nv.namelen);
|
2013-10-12 14:49:01 +02:00
|
|
|
if(c == 0x40u) {
|
2013-10-20 16:59:15 +02:00
|
|
|
int flags = NGHTTP2_HD_FLAG_NONE;
|
|
|
|
if(name_huffman) {
|
|
|
|
flags |= NGHTTP2_HD_FLAG_NAME_GIFT;
|
|
|
|
}
|
|
|
|
if(value_huffman) {
|
|
|
|
flags |= NGHTTP2_HD_FLAG_VALUE_GIFT;
|
|
|
|
}
|
|
|
|
rv = emit_newname_header(inflater, &nva_out, &nv, flags);
|
2013-10-24 16:49:37 +02:00
|
|
|
if(rv != 0) {
|
|
|
|
free(decoded_huffman_name);
|
|
|
|
free(decoded_huffman_value);
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
2013-08-23 16:38:28 +02:00
|
|
|
nghttp2_hd_entry *new_ent;
|
2013-10-20 16:59:15 +02:00
|
|
|
uint8_t ent_flags = NGHTTP2_HD_FLAG_NAME_ALLOC |
|
|
|
|
NGHTTP2_HD_FLAG_VALUE_ALLOC;
|
|
|
|
if(name_huffman) {
|
|
|
|
ent_flags |= NGHTTP2_HD_FLAG_NAME_GIFT;
|
|
|
|
}
|
|
|
|
if(value_huffman) {
|
|
|
|
ent_flags |= NGHTTP2_HD_FLAG_VALUE_GIFT;
|
|
|
|
}
|
2013-10-12 15:56:29 +02:00
|
|
|
new_ent = add_hd_table_incremental(inflater, NULL, NULL, NULL, &nv,
|
2013-10-20 16:59:15 +02:00
|
|
|
ent_flags);
|
2013-08-22 18:28:01 +02:00
|
|
|
if(new_ent) {
|
2013-08-23 16:38:28 +02:00
|
|
|
rv = emit_indexed_header(inflater, &nva_out, new_ent);
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
2013-10-24 16:49:37 +02:00
|
|
|
free(decoded_huffman_name);
|
|
|
|
free(decoded_huffman_value);
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
}
|
2013-08-28 14:33:57 +02:00
|
|
|
if(rv != 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-08-28 14:33:57 +02:00
|
|
|
} else {
|
|
|
|
/* Literal Header Repr - Indexed Name */
|
2013-07-19 09:50:31 +02:00
|
|
|
nghttp2_hd_entry *ent;
|
|
|
|
uint8_t *value;
|
2013-10-12 14:49:01 +02:00
|
|
|
ssize_t valuelen, index;
|
2013-10-20 16:59:15 +02:00
|
|
|
int value_huffman;
|
2013-10-24 16:49:37 +02:00
|
|
|
uint8_t *decoded_huffman_value = NULL;
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Literal header repr - indexed name\n"));
|
2013-10-12 14:49:01 +02:00
|
|
|
in = decode_length(&index, in, last, 6);
|
2013-11-16 08:18:44 +01:00
|
|
|
if(index <= 0) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Index out of range index=%zd\n", index));
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
--index;
|
2013-10-12 14:49:01 +02:00
|
|
|
if(!check_index_range(inflater, index)) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Index out of range index=%zd\n", index));
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-12 14:49:01 +02:00
|
|
|
ent = nghttp2_hd_table_get(inflater, index);
|
2013-10-20 16:59:15 +02:00
|
|
|
if(in == last) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "No value found\n"));
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2013-10-20 16:59:15 +02:00
|
|
|
value_huffman = *in & (1 << 7);
|
|
|
|
in = decode_length(&valuelen, in , last, 7);
|
|
|
|
if(valuelen < 0 || in + valuelen > last) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Invalid valuelen=%zd\n", valuelen));
|
2013-10-20 16:59:15 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
2013-10-14 16:38:12 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
2013-10-20 16:59:15 +02:00
|
|
|
if(value_huffman) {
|
|
|
|
rv = inflate_decode(&value, in, valuelen, inflater->side);
|
|
|
|
if(rv < 0) {
|
2013-12-16 15:54:20 +01:00
|
|
|
DEBUGF(fprintf(stderr, "Value huffman decoding failed\n"));
|
2013-10-20 16:59:15 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
2013-10-24 16:49:37 +02:00
|
|
|
decoded_huffman_value = value;
|
2013-10-20 16:59:15 +02:00
|
|
|
in += valuelen;
|
|
|
|
valuelen = rv;
|
|
|
|
} else {
|
|
|
|
value = in;
|
|
|
|
in += valuelen;
|
|
|
|
}
|
2013-10-12 14:49:01 +02:00
|
|
|
if((c & 0x40u) == 0x40u) {
|
2013-10-20 16:59:15 +02:00
|
|
|
uint8_t flags = NGHTTP2_HD_FLAG_NONE;
|
|
|
|
if(value_huffman) {
|
|
|
|
flags = NGHTTP2_HD_FLAG_VALUE_GIFT;
|
|
|
|
}
|
|
|
|
rv = emit_indname_header(inflater, &nva_out, ent, value, valuelen,
|
|
|
|
flags);
|
2013-10-24 16:49:37 +02:00
|
|
|
if(rv != 0) {
|
|
|
|
free(decoded_huffman_value);
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
|
|
|
nghttp2_nv nv;
|
|
|
|
nghttp2_hd_entry *new_ent;
|
2013-10-20 16:59:15 +02:00
|
|
|
uint8_t ent_flags = NGHTTP2_HD_FLAG_VALUE_ALLOC;
|
|
|
|
if(value_huffman) {
|
|
|
|
ent_flags |= NGHTTP2_HD_FLAG_VALUE_GIFT;
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
++ent->ref;
|
2013-10-14 16:38:12 +02:00
|
|
|
nv.name = ent->nv.name;
|
|
|
|
if((size_t)index < inflater->hd_table.len) {
|
2013-10-12 15:56:29 +02:00
|
|
|
ent_flags |= NGHTTP2_HD_FLAG_NAME_ALLOC;
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
nv.namelen = ent->nv.namelen;
|
|
|
|
nv.value = value;
|
|
|
|
nv.valuelen = valuelen;
|
2013-10-12 15:56:29 +02:00
|
|
|
new_ent = add_hd_table_incremental(inflater, NULL, NULL, NULL, &nv,
|
|
|
|
ent_flags);
|
2013-07-19 09:50:31 +02:00
|
|
|
if(--ent->ref == 0) {
|
|
|
|
nghttp2_hd_entry_free(ent);
|
|
|
|
free(ent);
|
|
|
|
}
|
|
|
|
if(new_ent) {
|
2013-08-23 16:38:28 +02:00
|
|
|
rv = emit_indexed_header(inflater, &nva_out, new_ent);
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
2013-10-24 16:49:37 +02:00
|
|
|
free(decoded_huffman_value);
|
2013-07-25 18:34:28 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
}
|
2013-08-28 14:33:57 +02:00
|
|
|
if(rv != 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-10-12 14:49:01 +02:00
|
|
|
for(i = 0; i < inflater->hd_table.len; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = nghttp2_hd_ringbuf_get(&inflater->hd_table, i);
|
|
|
|
rv = inflater_post_process_hd_entry(inflater, ent, &nva_out);
|
|
|
|
if(rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2013-12-16 15:54:20 +01:00
|
|
|
#ifdef DEBUGBUILD
|
|
|
|
DEBUGF(fprintf(stderr, "Header table:\n"));
|
|
|
|
for(i = 0; i < inflater->hd_table.len; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = nghttp2_hd_table_get(inflater, i);
|
|
|
|
DEBUGF(fprintf(stderr, "[%zu] (s=%zu) (%c) ",
|
|
|
|
i + 1,
|
|
|
|
entry_room(ent->nv.namelen, ent->nv.valuelen),
|
|
|
|
(ent->flags & NGHTTP2_HD_FLAG_REFSET) ? 'R' : ' '));
|
|
|
|
DEBUGF(fwrite(ent->nv.name, ent->nv.namelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, ": "));
|
|
|
|
DEBUGF(fwrite(ent->nv.value, ent->nv.valuelen, 1, stderr));
|
|
|
|
DEBUGF(fprintf(stderr, "\n"));
|
|
|
|
}
|
|
|
|
#endif /* DEBUGBUILD */
|
2013-08-23 16:38:28 +02:00
|
|
|
*nva_ptr = nva_out.nva;
|
|
|
|
return nva_out.nvlen;
|
2013-07-25 18:34:28 +02:00
|
|
|
fail:
|
|
|
|
inflater->bad = 1;
|
2013-08-23 16:38:28 +02:00
|
|
|
free(nva_out.nva);
|
2013-07-25 18:34:28 +02:00
|
|
|
return rv;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_end_headers(nghttp2_hd_context *context)
|
|
|
|
{
|
2013-08-22 18:28:01 +02:00
|
|
|
size_t i;
|
|
|
|
for(i = 0; i < context->emit_setlen; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = context->emit_set[i];
|
|
|
|
if(--ent->ref == 0) {
|
|
|
|
nghttp2_hd_entry_free(ent);
|
|
|
|
free(ent);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
}
|
2013-08-22 18:28:01 +02:00
|
|
|
context->emit_setlen = 0;
|
2013-10-14 16:38:12 +02:00
|
|
|
for(i = 0; i < context->buf_tracklen; ++i) {
|
|
|
|
free(context->buf_track[i]);
|
|
|
|
}
|
|
|
|
context->buf_tracklen = 0;
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_emit_indname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
|
2013-07-26 17:58:38 +02:00
|
|
|
size_t *offset_ptr, size_t index,
|
2013-07-19 09:50:31 +02:00
|
|
|
const uint8_t *value, size_t valuelen,
|
2013-10-14 16:38:12 +02:00
|
|
|
int inc_indexing,
|
|
|
|
nghttp2_hd_side side)
|
2013-07-19 09:50:31 +02:00
|
|
|
{
|
2013-07-19 18:24:34 +02:00
|
|
|
return emit_indname_block(buf_ptr, buflen_ptr, offset_ptr,
|
2013-10-14 16:38:12 +02:00
|
|
|
index, value, valuelen, inc_indexing,
|
|
|
|
side);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2013-07-19 18:24:34 +02:00
|
|
|
int nghttp2_hd_emit_newname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
|
2013-07-19 09:50:31 +02:00
|
|
|
size_t *offset_ptr, nghttp2_nv *nv,
|
2013-10-14 16:38:12 +02:00
|
|
|
int inc_indexing,
|
|
|
|
nghttp2_hd_side side)
|
2013-07-19 09:50:31 +02:00
|
|
|
{
|
2013-10-14 16:38:12 +02:00
|
|
|
return emit_newname_block(buf_ptr, buflen_ptr, offset_ptr, nv, inc_indexing,
|
|
|
|
side);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|