2013-07-19 09:50:31 +02:00
|
|
|
/*
|
2014-03-30 12:09:21 +02:00
|
|
|
* nghttp2 - HTTP/2 C Library
|
2013-07-19 09:50:31 +02:00
|
|
|
*
|
|
|
|
* 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_helper.h"
|
2014-04-30 15:02:37 +02:00
|
|
|
#include "nghttp2_int.h"
|
2013-07-19 09:50:31 +02:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
/* Make scalar initialization form of nghttp2_hd_entry */
|
|
|
|
#define MAKE_STATIC_ENT(N, V, T) \
|
2014-11-27 15:39:04 +01:00
|
|
|
{ \
|
2015-04-15 15:32:11 +02:00
|
|
|
{ (uint8_t *)(N), (uint8_t *)(V), sizeof((N)) - 1, sizeof((V)) - 1, 0 } \
|
|
|
|
, (T), 1, NGHTTP2_HD_FLAG_NONE \
|
2014-11-27 15:39:04 +01:00
|
|
|
}
|
2014-09-29 14:58:37 +02:00
|
|
|
|
2014-10-25 11:14:53 +02:00
|
|
|
/* Generated by mkstatictbl.py */
|
2015-04-15 15:32:11 +02:00
|
|
|
/* 3rd parameter is nghttp2_token value for header field name. We use
|
|
|
|
first enum value if same header names are repeated (e.g.,
|
|
|
|
:status). */
|
|
|
|
static nghttp2_hd_entry static_table[] = {
|
|
|
|
MAKE_STATIC_ENT(":authority", "", 0),
|
|
|
|
MAKE_STATIC_ENT(":method", "GET", 1),
|
|
|
|
MAKE_STATIC_ENT(":method", "POST", 1),
|
|
|
|
MAKE_STATIC_ENT(":path", "/", 3),
|
|
|
|
MAKE_STATIC_ENT(":path", "/index.html", 3),
|
|
|
|
MAKE_STATIC_ENT(":scheme", "http", 5),
|
|
|
|
MAKE_STATIC_ENT(":scheme", "https", 5),
|
|
|
|
MAKE_STATIC_ENT(":status", "200", 7),
|
|
|
|
MAKE_STATIC_ENT(":status", "204", 7),
|
|
|
|
MAKE_STATIC_ENT(":status", "206", 7),
|
|
|
|
MAKE_STATIC_ENT(":status", "304", 7),
|
|
|
|
MAKE_STATIC_ENT(":status", "400", 7),
|
|
|
|
MAKE_STATIC_ENT(":status", "404", 7),
|
|
|
|
MAKE_STATIC_ENT(":status", "500", 7),
|
|
|
|
MAKE_STATIC_ENT("accept-charset", "", 14),
|
|
|
|
MAKE_STATIC_ENT("accept-encoding", "gzip, deflate", 15),
|
|
|
|
MAKE_STATIC_ENT("accept-language", "", 16),
|
|
|
|
MAKE_STATIC_ENT("accept-ranges", "", 17),
|
|
|
|
MAKE_STATIC_ENT("accept", "", 18),
|
|
|
|
MAKE_STATIC_ENT("access-control-allow-origin", "", 19),
|
|
|
|
MAKE_STATIC_ENT("age", "", 20),
|
|
|
|
MAKE_STATIC_ENT("allow", "", 21),
|
|
|
|
MAKE_STATIC_ENT("authorization", "", 22),
|
|
|
|
MAKE_STATIC_ENT("cache-control", "", 23),
|
|
|
|
MAKE_STATIC_ENT("content-disposition", "", 24),
|
|
|
|
MAKE_STATIC_ENT("content-encoding", "", 25),
|
|
|
|
MAKE_STATIC_ENT("content-language", "", 26),
|
|
|
|
MAKE_STATIC_ENT("content-length", "", 27),
|
|
|
|
MAKE_STATIC_ENT("content-location", "", 28),
|
|
|
|
MAKE_STATIC_ENT("content-range", "", 29),
|
|
|
|
MAKE_STATIC_ENT("content-type", "", 30),
|
|
|
|
MAKE_STATIC_ENT("cookie", "", 31),
|
|
|
|
MAKE_STATIC_ENT("date", "", 32),
|
|
|
|
MAKE_STATIC_ENT("etag", "", 33),
|
|
|
|
MAKE_STATIC_ENT("expect", "", 34),
|
|
|
|
MAKE_STATIC_ENT("expires", "", 35),
|
|
|
|
MAKE_STATIC_ENT("from", "", 36),
|
|
|
|
MAKE_STATIC_ENT("host", "", 37),
|
|
|
|
MAKE_STATIC_ENT("if-match", "", 38),
|
|
|
|
MAKE_STATIC_ENT("if-modified-since", "", 39),
|
|
|
|
MAKE_STATIC_ENT("if-none-match", "", 40),
|
|
|
|
MAKE_STATIC_ENT("if-range", "", 41),
|
|
|
|
MAKE_STATIC_ENT("if-unmodified-since", "", 42),
|
|
|
|
MAKE_STATIC_ENT("last-modified", "", 43),
|
|
|
|
MAKE_STATIC_ENT("link", "", 44),
|
|
|
|
MAKE_STATIC_ENT("location", "", 45),
|
|
|
|
MAKE_STATIC_ENT("max-forwards", "", 46),
|
|
|
|
MAKE_STATIC_ENT("proxy-authenticate", "", 47),
|
|
|
|
MAKE_STATIC_ENT("proxy-authorization", "", 48),
|
|
|
|
MAKE_STATIC_ENT("range", "", 49),
|
|
|
|
MAKE_STATIC_ENT("referer", "", 50),
|
|
|
|
MAKE_STATIC_ENT("refresh", "", 51),
|
|
|
|
MAKE_STATIC_ENT("retry-after", "", 52),
|
|
|
|
MAKE_STATIC_ENT("server", "", 53),
|
|
|
|
MAKE_STATIC_ENT("set-cookie", "", 54),
|
|
|
|
MAKE_STATIC_ENT("strict-transport-security", "", 55),
|
|
|
|
MAKE_STATIC_ENT("transfer-encoding", "", 56),
|
|
|
|
MAKE_STATIC_ENT("user-agent", "", 57),
|
|
|
|
MAKE_STATIC_ENT("vary", "", 58),
|
|
|
|
MAKE_STATIC_ENT("via", "", 59),
|
|
|
|
MAKE_STATIC_ENT("www-authenticate", "", 60),
|
2014-09-29 14:58:37 +02:00
|
|
|
};
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int memeq(const void *s1, const void *s2, size_t n) {
|
2015-04-15 15:32:11 +02:00
|
|
|
return memcmp(s1, s2, n) == 0;
|
2014-01-07 13:51:48 +01:00
|
|
|
}
|
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
/*
|
|
|
|
* This function was generated by genlibtokenlookup.py. Inspired by
|
|
|
|
* h2o header lookup. https://github.com/h2o/h2o
|
|
|
|
*/
|
2015-04-22 16:25:54 +02:00
|
|
|
static int lookup_token(const uint8_t *name, size_t namelen) {
|
2015-04-15 15:32:11 +02:00
|
|
|
switch (namelen) {
|
|
|
|
case 2:
|
|
|
|
switch (name[1]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("t", name, 1)) {
|
|
|
|
return NGHTTP2_TOKEN_TE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
switch (name[2]) {
|
|
|
|
case 'a':
|
|
|
|
if (lstreq("vi", name, 2)) {
|
|
|
|
return NGHTTP2_TOKEN_VIA;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("ag", name, 2)) {
|
|
|
|
return NGHTTP2_TOKEN_AGE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
switch (name[3]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("dat", name, 3)) {
|
|
|
|
return NGHTTP2_TOKEN_DATE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'g':
|
|
|
|
if (lstreq("eta", name, 3)) {
|
|
|
|
return NGHTTP2_TOKEN_ETAG;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'k':
|
|
|
|
if (lstreq("lin", name, 3)) {
|
|
|
|
return NGHTTP2_TOKEN_LINK;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
if (lstreq("fro", name, 3)) {
|
|
|
|
return NGHTTP2_TOKEN_FROM;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
if (lstreq("hos", name, 3)) {
|
|
|
|
return NGHTTP2_TOKEN_HOST;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'y':
|
|
|
|
if (lstreq("var", name, 3)) {
|
|
|
|
return NGHTTP2_TOKEN_VARY;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
switch (name[4]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("rang", name, 4)) {
|
|
|
|
return NGHTTP2_TOKEN_RANGE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
if (lstreq(":pat", name, 4)) {
|
|
|
|
return NGHTTP2_TOKEN__PATH;
|
|
|
|
}
|
|
|
|
if (lstreq(":pat", name, 4)) {
|
|
|
|
return NGHTTP2_TOKEN__PATH;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
if (lstreq("allo", name, 4)) {
|
|
|
|
return NGHTTP2_TOKEN_ALLOW;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
switch (name[5]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("cooki", name, 5)) {
|
|
|
|
return NGHTTP2_TOKEN_COOKIE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
if (lstreq("serve", name, 5)) {
|
|
|
|
return NGHTTP2_TOKEN_SERVER;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
if (lstreq("accep", name, 5)) {
|
|
|
|
return NGHTTP2_TOKEN_ACCEPT;
|
|
|
|
}
|
|
|
|
if (lstreq("expec", name, 5)) {
|
|
|
|
return NGHTTP2_TOKEN_EXPECT;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
switch (name[6]) {
|
|
|
|
case 'd':
|
|
|
|
if (lstreq(":metho", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__METHOD;
|
|
|
|
}
|
|
|
|
if (lstreq(":metho", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__METHOD;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
if (lstreq(":schem", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__SCHEME;
|
|
|
|
}
|
|
|
|
if (lstreq(":schem", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__SCHEME;
|
|
|
|
}
|
|
|
|
if (lstreq("upgrad", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN_UPGRADE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
if (lstreq("refres", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN_REFRESH;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
if (lstreq("refere", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN_REFERER;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
if (lstreq(":statu", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__STATUS;
|
|
|
|
}
|
|
|
|
if (lstreq(":statu", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__STATUS;
|
|
|
|
}
|
|
|
|
if (lstreq(":statu", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__STATUS;
|
|
|
|
}
|
|
|
|
if (lstreq(":statu", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__STATUS;
|
|
|
|
}
|
|
|
|
if (lstreq(":statu", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__STATUS;
|
|
|
|
}
|
|
|
|
if (lstreq(":statu", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__STATUS;
|
|
|
|
}
|
|
|
|
if (lstreq(":statu", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN__STATUS;
|
|
|
|
}
|
|
|
|
if (lstreq("expire", name, 6)) {
|
|
|
|
return NGHTTP2_TOKEN_EXPIRES;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
switch (name[7]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("if-rang", name, 7)) {
|
|
|
|
return NGHTTP2_TOKEN_IF_RANGE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
if (lstreq("if-matc", name, 7)) {
|
|
|
|
return NGHTTP2_TOKEN_IF_MATCH;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
if (lstreq("locatio", name, 7)) {
|
|
|
|
return NGHTTP2_TOKEN_LOCATION;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 10:
|
|
|
|
switch (name[9]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("keep-aliv", name, 9)) {
|
|
|
|
return NGHTTP2_TOKEN_KEEP_ALIVE;
|
|
|
|
}
|
|
|
|
if (lstreq("set-cooki", name, 9)) {
|
|
|
|
return NGHTTP2_TOKEN_SET_COOKIE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
if (lstreq("connectio", name, 9)) {
|
|
|
|
return NGHTTP2_TOKEN_CONNECTION;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
if (lstreq("user-agen", name, 9)) {
|
|
|
|
return NGHTTP2_TOKEN_USER_AGENT;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'y':
|
|
|
|
if (lstreq(":authorit", name, 9)) {
|
|
|
|
return NGHTTP2_TOKEN__AUTHORITY;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 11:
|
|
|
|
switch (name[10]) {
|
|
|
|
case 'r':
|
|
|
|
if (lstreq("retry-afte", name, 10)) {
|
|
|
|
return NGHTTP2_TOKEN_RETRY_AFTER;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 12:
|
|
|
|
switch (name[11]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("content-typ", name, 11)) {
|
|
|
|
return NGHTTP2_TOKEN_CONTENT_TYPE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
if (lstreq("max-forward", name, 11)) {
|
|
|
|
return NGHTTP2_TOKEN_MAX_FORWARDS;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 13:
|
|
|
|
switch (name[12]) {
|
|
|
|
case 'd':
|
|
|
|
if (lstreq("last-modifie", name, 12)) {
|
|
|
|
return NGHTTP2_TOKEN_LAST_MODIFIED;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("content-rang", name, 12)) {
|
|
|
|
return NGHTTP2_TOKEN_CONTENT_RANGE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
if (lstreq("if-none-matc", name, 12)) {
|
|
|
|
return NGHTTP2_TOKEN_IF_NONE_MATCH;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'l':
|
|
|
|
if (lstreq("cache-contro", name, 12)) {
|
|
|
|
return NGHTTP2_TOKEN_CACHE_CONTROL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
if (lstreq("authorizatio", name, 12)) {
|
|
|
|
return NGHTTP2_TOKEN_AUTHORIZATION;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
if (lstreq("accept-range", name, 12)) {
|
|
|
|
return NGHTTP2_TOKEN_ACCEPT_RANGES;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 14:
|
|
|
|
switch (name[13]) {
|
|
|
|
case 'h':
|
|
|
|
if (lstreq("content-lengt", name, 13)) {
|
|
|
|
return NGHTTP2_TOKEN_CONTENT_LENGTH;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
if (lstreq("accept-charse", name, 13)) {
|
|
|
|
return NGHTTP2_TOKEN_ACCEPT_CHARSET;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
switch (name[14]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("accept-languag", name, 14)) {
|
|
|
|
return NGHTTP2_TOKEN_ACCEPT_LANGUAGE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'g':
|
|
|
|
if (lstreq("accept-encodin", name, 14)) {
|
|
|
|
return NGHTTP2_TOKEN_ACCEPT_ENCODING;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
switch (name[15]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("content-languag", name, 15)) {
|
|
|
|
return NGHTTP2_TOKEN_CONTENT_LANGUAGE;
|
|
|
|
}
|
|
|
|
if (lstreq("www-authenticat", name, 15)) {
|
|
|
|
return NGHTTP2_TOKEN_WWW_AUTHENTICATE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'g':
|
|
|
|
if (lstreq("content-encodin", name, 15)) {
|
|
|
|
return NGHTTP2_TOKEN_CONTENT_ENCODING;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
if (lstreq("content-locatio", name, 15)) {
|
|
|
|
return NGHTTP2_TOKEN_CONTENT_LOCATION;
|
|
|
|
}
|
|
|
|
if (lstreq("proxy-connectio", name, 15)) {
|
|
|
|
return NGHTTP2_TOKEN_PROXY_CONNECTION;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 17:
|
|
|
|
switch (name[16]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("if-modified-sinc", name, 16)) {
|
|
|
|
return NGHTTP2_TOKEN_IF_MODIFIED_SINCE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'g':
|
|
|
|
if (lstreq("transfer-encodin", name, 16)) {
|
|
|
|
return NGHTTP2_TOKEN_TRANSFER_ENCODING;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 18:
|
|
|
|
switch (name[17]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("proxy-authenticat", name, 17)) {
|
|
|
|
return NGHTTP2_TOKEN_PROXY_AUTHENTICATE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 19:
|
|
|
|
switch (name[18]) {
|
|
|
|
case 'e':
|
|
|
|
if (lstreq("if-unmodified-sinc", name, 18)) {
|
|
|
|
return NGHTTP2_TOKEN_IF_UNMODIFIED_SINCE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
if (lstreq("content-dispositio", name, 18)) {
|
|
|
|
return NGHTTP2_TOKEN_CONTENT_DISPOSITION;
|
|
|
|
}
|
|
|
|
if (lstreq("proxy-authorizatio", name, 18)) {
|
|
|
|
return NGHTTP2_TOKEN_PROXY_AUTHORIZATION;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 25:
|
|
|
|
switch (name[24]) {
|
|
|
|
case 'y':
|
|
|
|
if (lstreq("strict-transport-securit", name, 24)) {
|
|
|
|
return NGHTTP2_TOKEN_STRICT_TRANSPORT_SECURITY;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 27:
|
|
|
|
switch (name[26]) {
|
|
|
|
case 'n':
|
|
|
|
if (lstreq("access-control-allow-origi", name, 26)) {
|
|
|
|
return NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_ORIGIN;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2014-01-07 14:43:34 +01:00
|
|
|
}
|
2015-04-15 15:32:11 +02:00
|
|
|
return -1;
|
2014-01-07 14:43:34 +01:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
int nghttp2_hd_entry_init(nghttp2_hd_entry *ent, uint8_t flags, uint8_t *name,
|
|
|
|
size_t namelen, uint8_t *value, size_t valuelen,
|
2015-04-15 15:32:11 +02:00
|
|
|
int token, nghttp2_mem *mem) {
|
2013-07-19 09:50:31 +02:00
|
|
|
int rv = 0;
|
2014-04-01 16:17:50 +02:00
|
|
|
|
|
|
|
/* Since nghttp2_hd_entry is used for indexing, ent->nv.flags always
|
|
|
|
NGHTTP2_NV_FLAG_NONE */
|
|
|
|
ent->nv.flags = NGHTTP2_NV_FLAG_NONE;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if ((flags & NGHTTP2_HD_FLAG_NAME_ALLOC) &&
|
|
|
|
(flags & NGHTTP2_HD_FLAG_NAME_GIFT) == 0) {
|
|
|
|
if (namelen == 0) {
|
2015-03-23 15:25:57 +01:00
|
|
|
flags &= ~NGHTTP2_HD_FLAG_NAME_ALLOC;
|
|
|
|
ent->nv.name = (uint8_t *)"";
|
2013-07-23 16:10:53 +02:00
|
|
|
} else {
|
2015-03-23 15:25:57 +01:00
|
|
|
/* copy including terminating NULL byte */
|
|
|
|
ent->nv.name = nghttp2_memdup(name, namelen + 1, mem);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (ent->nv.name == NULL) {
|
2013-07-23 16:10:53 +02:00
|
|
|
rv = NGHTTP2_ERR_NOMEM;
|
|
|
|
goto fail;
|
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ent->nv.name = name;
|
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
if ((flags & NGHTTP2_HD_FLAG_VALUE_ALLOC) &&
|
|
|
|
(flags & NGHTTP2_HD_FLAG_VALUE_GIFT) == 0) {
|
|
|
|
if (valuelen == 0) {
|
2015-03-23 15:25:57 +01:00
|
|
|
flags &= ~NGHTTP2_HD_FLAG_VALUE_ALLOC;
|
|
|
|
ent->nv.value = (uint8_t *)"";
|
2013-07-23 16:10:53 +02:00
|
|
|
} else {
|
2015-03-23 15:25:57 +01:00
|
|
|
/* copy including terminating NULL byte */
|
|
|
|
ent->nv.value = nghttp2_memdup(value, valuelen + 1, mem);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (ent->nv.value == NULL) {
|
2013-07-23 16:10:53 +02:00
|
|
|
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;
|
2015-04-15 15:32:11 +02:00
|
|
|
ent->token = token;
|
2013-07-19 09:50:31 +02:00
|
|
|
ent->ref = 1;
|
|
|
|
ent->flags = flags;
|
2014-08-06 15:00:12 +02:00
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
fail2:
|
|
|
|
if (flags & NGHTTP2_HD_FLAG_NAME_ALLOC) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, ent->nv.name);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
fail:
|
2013-07-19 09:50:31 +02:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
void nghttp2_hd_entry_free(nghttp2_hd_entry *ent, nghttp2_mem *mem) {
|
2013-07-19 09:50:31 +02:00
|
|
|
assert(ent->ref == 0);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (ent->flags & NGHTTP2_HD_FLAG_NAME_ALLOC) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, ent->nv.name);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
if (ent->flags & NGHTTP2_HD_FLAG_VALUE_ALLOC) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, ent->nv.value);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
static int hd_ringbuf_init(nghttp2_hd_ringbuf *ringbuf, size_t bufsize,
|
|
|
|
nghttp2_mem *mem) {
|
2013-10-12 14:49:01 +02:00
|
|
|
size_t size;
|
2014-11-27 15:39:04 +01:00
|
|
|
for (size = 1; size < bufsize; size <<= 1)
|
|
|
|
;
|
2014-12-07 15:07:13 +01:00
|
|
|
ringbuf->buffer = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry *) * size);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (ringbuf->buffer == NULL) {
|
2013-10-12 14:49:01 +02:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
ringbuf->mask = size - 1;
|
|
|
|
ringbuf->first = 0;
|
|
|
|
ringbuf->len = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static nghttp2_hd_entry *hd_ringbuf_get(nghttp2_hd_ringbuf *ringbuf,
|
|
|
|
size_t idx) {
|
2014-05-27 22:28:12 +02:00
|
|
|
assert(idx < ringbuf->len);
|
|
|
|
return ringbuf->buffer[(ringbuf->first + idx) & ringbuf->mask];
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
static int hd_ringbuf_reserve(nghttp2_hd_ringbuf *ringbuf, size_t bufsize,
|
|
|
|
nghttp2_mem *mem) {
|
2013-10-25 18:01:28 +02:00
|
|
|
size_t i;
|
|
|
|
size_t size;
|
|
|
|
nghttp2_hd_entry **buffer;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (ringbuf->mask + 1 >= bufsize) {
|
2013-10-25 18:01:28 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
for (size = 1; size < bufsize; size <<= 1)
|
|
|
|
;
|
2014-12-07 15:07:13 +01:00
|
|
|
buffer = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry *) * size);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (buffer == NULL) {
|
2013-10-25 18:01:28 +02:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
for (i = 0; i < ringbuf->len; ++i) {
|
2014-05-08 16:54:07 +02:00
|
|
|
buffer[i] = hd_ringbuf_get(ringbuf, i);
|
2013-10-25 18:01:28 +02:00
|
|
|
}
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, ringbuf->buffer);
|
2013-10-25 18:01:28 +02:00
|
|
|
ringbuf->buffer = buffer;
|
|
|
|
ringbuf->mask = size - 1;
|
|
|
|
ringbuf->first = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
static void hd_ringbuf_free(nghttp2_hd_ringbuf *ringbuf, nghttp2_mem *mem) {
|
2013-10-12 14:49:01 +02:00
|
|
|
size_t i;
|
2014-11-27 15:39:04 +01:00
|
|
|
if (ringbuf == NULL) {
|
2013-10-12 14:49:01 +02:00
|
|
|
return;
|
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
for (i = 0; i < ringbuf->len; ++i) {
|
2014-05-08 16:54:07 +02:00
|
|
|
nghttp2_hd_entry *ent = hd_ringbuf_get(ringbuf, i);
|
2013-10-12 14:49:01 +02:00
|
|
|
--ent->ref;
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry_free(ent, mem);
|
|
|
|
nghttp2_mem_free(mem, ent);
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, ringbuf->buffer);
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
|
|
|
|
2014-06-22 06:39:17 +02:00
|
|
|
static int hd_ringbuf_push_front(nghttp2_hd_ringbuf *ringbuf,
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry *ent, nghttp2_mem *mem) {
|
2014-06-22 06:39:17 +02:00
|
|
|
int rv;
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = hd_ringbuf_reserve(ringbuf, ringbuf->len + 1, mem);
|
2014-06-22 06:39:17 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-06-22 06:39:17 +02:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
ringbuf->buffer[--ringbuf->first & ringbuf->mask] = ent;
|
|
|
|
++ringbuf->len;
|
2014-06-22 06:39:17 +02:00
|
|
|
|
2013-10-12 14:49:01 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static void hd_ringbuf_pop_back(nghttp2_hd_ringbuf *ringbuf) {
|
2013-10-12 14:49:01 +02:00
|
|
|
assert(ringbuf->len > 0);
|
|
|
|
--ringbuf->len;
|
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
static int hd_context_init(nghttp2_hd_context *context, nghttp2_mem *mem) {
|
2013-10-12 14:49:01 +02:00
|
|
|
int rv;
|
2014-12-07 15:07:13 +01:00
|
|
|
context->mem = mem;
|
2013-07-25 18:34:28 +02:00
|
|
|
context->bad = 0;
|
2013-10-25 18:01:28 +02:00
|
|
|
context->hd_table_bufsize_max = NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE;
|
2014-11-27 15:39:04 +01:00
|
|
|
rv = hd_ringbuf_init(&context->hd_table, context->hd_table_bufsize_max /
|
2014-12-07 15:07:13 +01:00
|
|
|
NGHTTP2_HD_ENTRY_OVERHEAD,
|
|
|
|
mem);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2013-10-12 14:49:01 +02:00
|
|
|
return rv;
|
2013-08-22 18:28:01 +02:00
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
|
2013-07-19 18:27:26 +02:00
|
|
|
context->hd_table_bufsize = 0;
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static void hd_context_free(nghttp2_hd_context *context) {
|
2014-12-07 15:07:13 +01:00
|
|
|
hd_ringbuf_free(&context->hd_table, context->mem);
|
2014-04-30 04:32:05 +02:00
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
int nghttp2_hd_deflate_init(nghttp2_hd_deflater *deflater, nghttp2_mem *mem) {
|
|
|
|
return nghttp2_hd_deflate_init2(
|
|
|
|
deflater, NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE, mem);
|
2013-10-13 12:24:21 +02:00
|
|
|
}
|
|
|
|
|
2014-01-26 09:53:04 +01:00
|
|
|
int nghttp2_hd_deflate_init2(nghttp2_hd_deflater *deflater,
|
2014-12-07 15:07:13 +01:00
|
|
|
size_t deflate_hd_table_bufsize_max,
|
|
|
|
nghttp2_mem *mem) {
|
2014-01-26 09:53:04 +01:00
|
|
|
int rv;
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = hd_context_init(&deflater->ctx, mem);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-01-26 09:53:04 +01:00
|
|
|
return rv;
|
|
|
|
}
|
2014-05-11 14:25:27 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (deflate_hd_table_bufsize_max < NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE) {
|
2014-05-11 14:25:27 +02:00
|
|
|
deflater->notify_table_size_change = 1;
|
|
|
|
deflater->ctx.hd_table_bufsize_max = deflate_hd_table_bufsize_max;
|
|
|
|
} else {
|
|
|
|
deflater->notify_table_size_change = 0;
|
|
|
|
}
|
|
|
|
|
2014-02-13 15:22:52 +01:00
|
|
|
deflater->deflate_hd_table_bufsize_max = deflate_hd_table_bufsize_max;
|
2014-07-25 15:55:45 +02:00
|
|
|
deflater->min_hd_table_bufsize_max = UINT32_MAX;
|
2014-05-11 14:25:27 +02:00
|
|
|
|
2014-01-26 09:53:04 +01:00
|
|
|
return 0;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
int nghttp2_hd_inflate_init(nghttp2_hd_inflater *inflater, nghttp2_mem *mem) {
|
2014-01-25 10:24:15 +01:00
|
|
|
int rv;
|
2014-02-13 15:22:52 +01:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = hd_context_init(&inflater->ctx, mem);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-04-30 04:32:05 +02:00
|
|
|
goto fail;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-02-13 15:22:52 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
inflater->settings_hd_table_bufsize_max = NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE;
|
2014-02-13 15:22:52 +01:00
|
|
|
|
2014-01-26 09:53:04 +01:00
|
|
|
inflater->ent_keep = NULL;
|
2014-05-28 16:02:23 +02:00
|
|
|
inflater->nv_keep = NULL;
|
2014-01-26 09:53:04 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->opcode = NGHTTP2_HD_OPCODE_NONE;
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_OPCODE;
|
2014-04-30 04:32:05 +02:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = nghttp2_bufs_init3(&inflater->nvbufs, NGHTTP2_HD_MAX_NV / 8, 8, 1, 0,
|
|
|
|
mem);
|
2014-04-30 04:32:05 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-28 16:02:23 +02:00
|
|
|
goto nvbufs_fail;
|
2014-04-30 04:32:05 +02:00
|
|
|
}
|
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->huffman_encoded = 0;
|
|
|
|
inflater->index = 0;
|
|
|
|
inflater->left = 0;
|
2014-07-21 18:50:29 +02:00
|
|
|
inflater->shift = 0;
|
2014-05-28 16:02:23 +02:00
|
|
|
inflater->newnamelen = 0;
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->index_required = 0;
|
2014-04-01 18:25:44 +02:00
|
|
|
inflater->no_index = 0;
|
2014-04-30 04:32:05 +02:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
return 0;
|
2014-04-30 04:32:05 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
nvbufs_fail:
|
2014-05-08 16:54:07 +02:00
|
|
|
hd_context_free(&inflater->ctx);
|
2014-11-27 15:39:04 +01:00
|
|
|
fail:
|
2014-04-30 04:32:05 +02:00
|
|
|
return rv;
|
2013-08-22 20:45:26 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static void hd_inflate_keep_free(nghttp2_hd_inflater *inflater) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
|
|
|
|
|
|
|
mem = inflater->ctx.mem;
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->ent_keep) {
|
|
|
|
if (inflater->ent_keep->ref == 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry_free(inflater->ent_keep, mem);
|
|
|
|
nghttp2_mem_free(mem, inflater->ent_keep);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-01-16 15:41:13 +01:00
|
|
|
inflater->ent_keep = NULL;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-05-28 16:02:23 +02:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, inflater->nv_keep);
|
2014-05-28 16:02:23 +02:00
|
|
|
inflater->nv_keep = NULL;
|
2014-01-16 15:41:13 +01:00
|
|
|
}
|
2013-10-14 16:38:12 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
void nghttp2_hd_deflate_free(nghttp2_hd_deflater *deflater) {
|
2014-05-08 16:54:07 +02:00
|
|
|
hd_context_free(&deflater->ctx);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
void nghttp2_hd_inflate_free(nghttp2_hd_inflater *inflater) {
|
2014-01-16 15:41:13 +01:00
|
|
|
hd_inflate_keep_free(inflater);
|
2014-05-28 16:02:23 +02:00
|
|
|
nghttp2_bufs_free(&inflater->nvbufs);
|
2014-05-08 16:54:07 +02:00
|
|
|
hd_context_free(&inflater->ctx);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static size_t entry_room(size_t namelen, size_t valuelen) {
|
2013-07-19 09:50:31 +02:00
|
|
|
return NGHTTP2_HD_ENTRY_OVERHEAD + namelen + valuelen;
|
|
|
|
}
|
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
static int emit_indexed_header(nghttp2_nv *nv_out, int *token_out,
|
|
|
|
nghttp2_hd_entry *ent) {
|
2015-03-23 15:25:57 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: header emission: %s: %s\n", ent->nv.name,
|
|
|
|
ent->nv.value));
|
2014-07-12 11:47:55 +02:00
|
|
|
/* ent->ref may be 0. This happens if the encoder emits literal
|
|
|
|
block larger than header table capacity with indexing. */
|
2014-01-16 15:41:13 +01:00
|
|
|
*nv_out = ent->nv;
|
2015-04-15 15:32:11 +02:00
|
|
|
*token_out = ent->token;
|
2014-01-16 15:41:13 +01:00
|
|
|
return 0;
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
static int emit_literal_header(nghttp2_nv *nv_out, int *token_out,
|
|
|
|
nghttp2_nv *nv) {
|
2015-03-23 15:25:57 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: header emission: %s: %s\n", nv->name,
|
|
|
|
nv->value));
|
2014-01-16 15:41:13 +01:00
|
|
|
*nv_out = *nv;
|
2015-04-15 15:32:11 +02:00
|
|
|
*token_out = lookup_token(nv->name, nv->namelen);
|
2013-10-24 16:49:37 +02:00
|
|
|
return 0;
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static size_t count_encoded_length(size_t n, size_t 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;
|
2014-11-20 17:59:20 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (n < k) {
|
2013-10-18 12:27:15 +02:00
|
|
|
return 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-11-20 17:59:20 +01:00
|
|
|
|
|
|
|
n -= k;
|
|
|
|
++len;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
for (; n >= 128; n >>= 7, ++len)
|
|
|
|
;
|
2014-11-20 17:59:20 +01:00
|
|
|
|
|
|
|
return len + 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static size_t encode_length(uint8_t *buf, size_t n, size_t prefix) {
|
2013-10-18 12:27:15 +02:00
|
|
|
size_t k = (1 << prefix) - 1;
|
2014-11-20 17:59:20 +01:00
|
|
|
uint8_t *begin = buf;
|
2014-07-26 11:19:25 +02:00
|
|
|
|
2013-10-20 09:28:52 +02:00
|
|
|
*buf &= ~k;
|
2014-07-26 11:19:25 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (n < k) {
|
2014-11-20 17:59:20 +01:00
|
|
|
*buf |= n;
|
2013-10-18 12:27:15 +02:00
|
|
|
return 1;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-07-26 11:19:25 +02:00
|
|
|
|
|
|
|
*buf++ |= k;
|
|
|
|
n -= k;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
for (; n >= 128; n >>= 7) {
|
2014-11-20 17:59:20 +01:00
|
|
|
*buf++ = (1 << 7) | (n & 0x7f);
|
|
|
|
}
|
|
|
|
|
|
|
|
*buf++ = (uint8_t)n;
|
|
|
|
|
|
|
|
return (size_t)(buf - begin);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2014-08-03 07:07:35 +02:00
|
|
|
* Decodes |prefix| prefixed integer stored from |in|. The |last|
|
2013-07-19 09:50:31 +02:00
|
|
|
* represents the 1 beyond the last of the valid contiguous memory
|
2014-07-22 15:38:18 +02:00
|
|
|
* region from |in|. The decoded integer must be less than or equal
|
|
|
|
* to UINT32_MAX.
|
2013-07-19 09:50:31 +02:00
|
|
|
*
|
2014-01-25 10:24:15 +01:00
|
|
|
* If the |initial| is nonzero, it is used as a initial value, this
|
|
|
|
* function assumes the |in| starts with intermediate data.
|
|
|
|
*
|
|
|
|
* An entire integer is decoded successfully, decoded, the |*final| is
|
|
|
|
* set to nonzero.
|
|
|
|
*
|
2014-07-22 15:38:18 +02:00
|
|
|
* This function stores the decoded integer in |*res| if it succeed,
|
|
|
|
* including partial decoding (in this case, number of shift to make
|
|
|
|
* in the next call will be stored in |*shift_ptr|) and returns number
|
|
|
|
* of bytes processed, or returns -1, indicating decoding error.
|
2013-07-19 09:50:31 +02:00
|
|
|
*/
|
2014-07-22 15:38:18 +02:00
|
|
|
static ssize_t decode_length(uint32_t *res, size_t *shift_ptr, int *final,
|
2014-11-27 15:39:04 +01:00
|
|
|
uint32_t initial, size_t shift, uint8_t *in,
|
|
|
|
uint8_t *last, size_t prefix) {
|
2014-07-22 15:38:18 +02:00
|
|
|
uint32_t k = (1 << prefix) - 1;
|
|
|
|
uint32_t n = initial;
|
|
|
|
uint8_t *start = in;
|
2014-07-21 18:50:29 +02:00
|
|
|
|
|
|
|
*shift_ptr = 0;
|
2014-01-25 10:24:15 +01:00
|
|
|
*final = 0;
|
2014-07-21 18:50:29 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (n == 0) {
|
|
|
|
if ((*in & k) != k) {
|
2014-01-25 10:24:15 +01:00
|
|
|
*res = (*in) & k;
|
|
|
|
*final = 1;
|
2014-07-22 15:38:18 +02:00
|
|
|
return 1;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
|
|
|
|
n = k;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (++in == last) {
|
2014-02-26 13:44:48 +01:00
|
|
|
*res = n;
|
2014-08-04 09:04:29 +02:00
|
|
|
return (ssize_t)(in - start);
|
2014-02-26 13:44:48 +01:00
|
|
|
}
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
for (; in != last; ++in, shift += 7) {
|
2014-07-22 15:38:18 +02:00
|
|
|
uint32_t add = *in & 0x7f;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if ((UINT32_MAX >> shift) < add) {
|
2014-07-22 15:38:18 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflate: integer overflow on shift\n"));
|
|
|
|
return -1;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
|
|
|
|
add <<= shift;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (UINT32_MAX - add < n) {
|
2014-07-22 15:38:18 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflate: integer overflow on addition\n"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
n += add;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if ((*in & (1 << 7)) == 0) {
|
2013-07-19 09:50:31 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-07-21 18:50:29 +02:00
|
|
|
|
|
|
|
*shift_ptr = shift;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (in == last) {
|
2014-01-25 10:24:15 +01:00
|
|
|
*res = n;
|
2014-08-04 09:04:29 +02:00
|
|
|
return (ssize_t)(in - start);
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-07-21 18:52:51 +02:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
*res = n;
|
|
|
|
*final = 1;
|
2014-08-04 09:04:29 +02:00
|
|
|
return (ssize_t)(in + 1 - start);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int emit_table_size(nghttp2_bufs *bufs, size_t table_size) {
|
2014-02-13 15:22:52 +01:00
|
|
|
int rv;
|
|
|
|
uint8_t *bufp;
|
2014-03-10 17:47:38 +01:00
|
|
|
size_t blocklen;
|
2014-03-13 14:11:02 +01:00
|
|
|
uint8_t sb[16];
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: emit table_size=%zu\n", table_size));
|
|
|
|
|
2014-07-12 11:47:55 +02:00
|
|
|
blocklen = count_encoded_length(table_size, 5);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (sizeof(sb) < blocklen) {
|
2014-03-13 14:11:02 +01:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
2014-02-13 15:22:52 +01:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
bufp = sb;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-04-01 18:25:44 +02:00
|
|
|
*bufp = 0x20u;
|
|
|
|
|
2014-07-12 11:47:55 +02:00
|
|
|
encode_length(bufp, table_size, 5);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
rv = nghttp2_bufs_add(bufs, sb, blocklen);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-12 14:48:00 +02:00
|
|
|
return rv;
|
2014-03-13 14:11:02 +01:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2013-11-16 09:05:18 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int emit_indexed_block(nghttp2_bufs *bufs, size_t idx) {
|
2013-07-19 09:50:31 +02:00
|
|
|
int rv;
|
2014-03-10 17:47:38 +01:00
|
|
|
size_t blocklen;
|
2014-03-13 14:11:02 +01:00
|
|
|
uint8_t sb[16];
|
|
|
|
uint8_t *bufp;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-05-27 22:28:12 +02:00
|
|
|
blocklen = count_encoded_length(idx + 1, 7);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: emit indexed index=%zu, %zu bytes\n", idx,
|
|
|
|
blocklen));
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (sizeof(sb) < blocklen) {
|
2014-03-13 14:11:02 +01:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
bufp = sb;
|
|
|
|
*bufp = 0x80u;
|
2014-05-27 22:28:12 +02:00
|
|
|
encode_length(bufp, idx + 1, 7);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
rv = nghttp2_bufs_add(bufs, sb, blocklen);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-12 14:48:00 +02:00
|
|
|
return rv;
|
2014-03-13 14:11:02 +01:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int emit_string(nghttp2_bufs *bufs, const uint8_t *str, size_t len) {
|
2014-06-11 16:37:16 +02:00
|
|
|
int rv;
|
2014-03-13 14:11:02 +01:00
|
|
|
uint8_t sb[16];
|
|
|
|
uint8_t *bufp;
|
|
|
|
size_t blocklen;
|
2014-07-26 11:19:25 +02:00
|
|
|
size_t enclen;
|
|
|
|
int huffman = 0;
|
|
|
|
|
|
|
|
enclen = nghttp2_hd_huff_encode_count(str, len);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (enclen < len) {
|
2014-07-26 11:19:25 +02:00
|
|
|
huffman = 1;
|
|
|
|
} else {
|
|
|
|
enclen = len;
|
|
|
|
}
|
2014-03-13 14:11:02 +01:00
|
|
|
|
|
|
|
blocklen = count_encoded_length(enclen, 7);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: emit string str="));
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fwrite(str, len, 1, stderr));
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(fprintf(stderr, ", length=%zu, huffman=%d, encoded_length=%zu\n", len,
|
|
|
|
huffman, enclen));
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (sizeof(sb) < blocklen) {
|
2014-03-13 14:11:02 +01:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
|
|
|
|
bufp = sb;
|
|
|
|
*bufp = huffman ? 1 << 7 : 0;
|
2014-04-30 08:54:02 +02:00
|
|
|
encode_length(bufp, enclen, 7);
|
2014-03-13 14:11:02 +01:00
|
|
|
|
|
|
|
rv = nghttp2_bufs_add(bufs, sb, blocklen);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-12 14:48:00 +02:00
|
|
|
return rv;
|
2014-03-13 14:11:02 +01:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (huffman) {
|
2014-03-13 14:11:02 +01:00
|
|
|
rv = nghttp2_hd_huff_encode(bufs, str, len);
|
2013-10-20 17:22:14 +02:00
|
|
|
} else {
|
|
|
|
assert(enclen == len);
|
2014-03-13 14:11:02 +01:00
|
|
|
rv = nghttp2_bufs_add(bufs, str, len);
|
2013-10-20 17:22:14 +02:00
|
|
|
}
|
2014-03-13 14:11:02 +01:00
|
|
|
|
2014-05-12 14:48:00 +02:00
|
|
|
return rv;
|
2013-10-20 17:22:14 +02:00
|
|
|
}
|
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
static uint8_t pack_first_byte(int indexing_mode) {
|
|
|
|
switch (indexing_mode) {
|
|
|
|
case NGHTTP2_HD_WITH_INDEXING:
|
2014-04-01 18:25:44 +02:00
|
|
|
return 0x40u;
|
2015-04-14 18:21:27 +02:00
|
|
|
case NGHTTP2_HD_WITHOUT_INDEXING:
|
|
|
|
return 0;
|
|
|
|
case NGHTTP2_HD_NEVER_INDEXING:
|
2014-04-01 18:25:44 +02:00
|
|
|
return 0x10u;
|
2015-04-14 18:21:27 +02:00
|
|
|
default:
|
|
|
|
assert(0);
|
2014-04-01 18:25:44 +02:00
|
|
|
}
|
2015-04-17 16:46:19 +02:00
|
|
|
/* This is required to compile with android NDK r10d +
|
|
|
|
--enable-werror */
|
|
|
|
return 0;
|
2014-04-01 18:25:44 +02:00
|
|
|
}
|
|
|
|
|
2014-05-27 22:28:12 +02:00
|
|
|
static int emit_indname_block(nghttp2_bufs *bufs, size_t idx,
|
2015-04-14 18:21:27 +02:00
|
|
|
const nghttp2_nv *nv, int indexing_mode) {
|
2013-07-19 09:50:31 +02:00
|
|
|
int rv;
|
|
|
|
uint8_t *bufp;
|
2014-03-10 17:47:38 +01:00
|
|
|
size_t blocklen;
|
2014-03-13 14:11:02 +01:00
|
|
|
uint8_t sb[16];
|
2014-04-01 18:25:44 +02:00
|
|
|
size_t prefixlen;
|
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
if (indexing_mode == NGHTTP2_HD_WITH_INDEXING) {
|
2014-04-01 18:25:44 +02:00
|
|
|
prefixlen = 6;
|
|
|
|
} else {
|
|
|
|
prefixlen = 4;
|
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: emit indname index=%zu, valuelen=%zu, "
|
2015-04-14 18:21:27 +02:00
|
|
|
"indexing_mode=%d\n",
|
|
|
|
idx, nv->valuelen, indexing_mode));
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-05-27 22:28:12 +02:00
|
|
|
blocklen = count_encoded_length(idx + 1, prefixlen);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (sizeof(sb) < blocklen) {
|
2014-03-13 14:11:02 +01:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
bufp = sb;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
*bufp = pack_first_byte(indexing_mode);
|
2014-04-01 18:25:44 +02:00
|
|
|
|
2014-05-27 22:28:12 +02:00
|
|
|
encode_length(bufp, idx + 1, prefixlen);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
rv = nghttp2_bufs_add(bufs, sb, blocklen);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-12 14:48:00 +02:00
|
|
|
return rv;
|
2014-03-13 14:11:02 +01:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-07-26 11:19:25 +02:00
|
|
|
rv = emit_string(bufs, nv->value, nv->valuelen);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-03-13 14:11:02 +01:00
|
|
|
return rv;
|
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-06-29 16:43:14 +02:00
|
|
|
static int emit_newname_block(nghttp2_bufs *bufs, const nghttp2_nv *nv,
|
2015-04-14 18:21:27 +02:00
|
|
|
int indexing_mode) {
|
2013-07-19 09:50:31 +02:00
|
|
|
int rv;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: emit newname namelen=%zu, valuelen=%zu, "
|
2015-04-14 18:21:27 +02:00
|
|
|
"indexing_mode=%d\n",
|
|
|
|
nv->namelen, nv->valuelen, indexing_mode));
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
rv = nghttp2_bufs_addb(bufs, pack_first_byte(indexing_mode));
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-12 14:48:00 +02:00
|
|
|
return rv;
|
2014-03-13 14:11:02 +01:00
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-07-26 11:19:25 +02:00
|
|
|
rv = emit_string(bufs, nv->name, nv->namelen);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2013-07-19 09:50:31 +02:00
|
|
|
return rv;
|
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-07-26 11:19:25 +02:00
|
|
|
rv = emit_string(bufs, nv->value, nv->valuelen);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-03-13 14:11:02 +01:00
|
|
|
return rv;
|
|
|
|
}
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static nghttp2_hd_entry *add_hd_table_incremental(nghttp2_hd_context *context,
|
2014-06-29 16:43:14 +02:00
|
|
|
const nghttp2_nv *nv,
|
2015-04-15 15:32:11 +02:00
|
|
|
int token,
|
2014-11-27 15:39:04 +01:00
|
|
|
uint8_t entry_flags) {
|
2013-09-06 14:53:28 +02:00
|
|
|
int rv;
|
|
|
|
nghttp2_hd_entry *new_ent;
|
2014-03-10 17:47:38 +01:00
|
|
|
size_t room;
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
mem = context->mem;
|
2014-03-10 17:47:38 +01:00
|
|
|
room = entry_room(nv->namelen, nv->valuelen);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
while (context->hd_table_bufsize + room > context->hd_table_bufsize_max &&
|
|
|
|
context->hd_table.len > 0) {
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-05-27 22:28:12 +02:00
|
|
|
size_t idx = context->hd_table.len - 1;
|
2014-11-27 15:39:04 +01:00
|
|
|
nghttp2_hd_entry *ent = hd_ringbuf_get(&context->hd_table, idx);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2013-09-06 14:53:28 +02:00
|
|
|
context->hd_table_bufsize -= entry_room(ent->nv.namelen, ent->nv.valuelen);
|
2014-07-12 11:47:55 +02:00
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
DEBUGF(fprintf(stderr, "hpack: remove item from header table: %s: %s\n",
|
|
|
|
ent->nv.name, ent->nv.value));
|
|
|
|
|
2014-05-08 16:54:07 +02:00
|
|
|
hd_ringbuf_pop_back(&context->hd_table);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (--ent->ref == 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry_free(ent, mem);
|
|
|
|
nghttp2_mem_free(mem, ent);
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
}
|
2013-10-25 18:01:28 +02:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
new_ent = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry));
|
2014-11-27 15:39:04 +01:00
|
|
|
if (new_ent == NULL) {
|
2013-09-06 14:53:28 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2013-10-25 18:01:28 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
rv = nghttp2_hd_entry_init(new_ent, entry_flags, nv->name, nv->namelen,
|
2015-04-15 15:32:11 +02:00
|
|
|
nv->value, nv->valuelen, token, mem);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, new_ent);
|
2014-02-13 15:22:52 +01:00
|
|
|
return NULL;
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
2014-02-13 15:22:52 +01:00
|
|
|
|
2014-11-27 15:39:04 +01: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 {
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = hd_ringbuf_push_front(&context->hd_table, new_ent, mem);
|
2014-06-22 06:39:17 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-06-22 06:39:17 +02:00
|
|
|
--new_ent->ref;
|
2014-07-15 15:47:04 +02:00
|
|
|
|
2014-12-18 13:02:44 +01:00
|
|
|
if ((entry_flags & NGHTTP2_HD_FLAG_NAME_ALLOC) &&
|
|
|
|
(entry_flags & NGHTTP2_HD_FLAG_NAME_GIFT)) {
|
|
|
|
/* nv->name are managed by caller. */
|
|
|
|
new_ent->nv.name = NULL;
|
|
|
|
new_ent->nv.namelen = 0;
|
|
|
|
}
|
|
|
|
if ((entry_flags & NGHTTP2_HD_FLAG_VALUE_ALLOC) &&
|
|
|
|
(entry_flags & NGHTTP2_HD_FLAG_VALUE_GIFT)) {
|
|
|
|
/* nv->value are managed by caller. */
|
|
|
|
new_ent->nv.value = NULL;
|
|
|
|
new_ent->nv.valuelen = 0;
|
|
|
|
}
|
2014-07-15 15:47:04 +02:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry_free(new_ent, mem);
|
|
|
|
nghttp2_mem_free(mem, new_ent);
|
2014-06-22 06:39:17 +02:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-10-25 18:01:28 +02:00
|
|
|
context->hd_table_bufsize += room;
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
return new_ent;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int name_eq(const nghttp2_nv *a, const nghttp2_nv *b) {
|
2015-04-15 15:32:11 +02:00
|
|
|
return a->namelen == b->namelen &&
|
|
|
|
a->name[a->namelen - 1] == b->name[a->namelen - 1] &&
|
|
|
|
memeq(a->name, b->name, a->namelen);
|
2013-09-06 14:53:28 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int value_eq(const nghttp2_nv *a, const nghttp2_nv *b) {
|
2015-04-15 15:32:11 +02:00
|
|
|
return a->valuelen == b->valuelen &&
|
|
|
|
a->value[a->valuelen - 1] == b->value[a->valuelen - 1] &&
|
|
|
|
memeq(a->value, b->value, a->valuelen);
|
2013-12-18 13:45:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ssize_t index;
|
|
|
|
/* Nonzero if both name and value are matched. */
|
|
|
|
uint8_t name_value_match;
|
|
|
|
} search_result;
|
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
static search_result search_static_table(const nghttp2_nv *nv, int token,
|
|
|
|
int indexing_mode) {
|
|
|
|
search_result res = {token, 0};
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (indexing_mode == NGHTTP2_HD_NEVER_INDEXING) {
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = token;
|
|
|
|
i <= NGHTTP2_TOKEN_WWW_AUTHENTICATE && static_table[i].token == token;
|
|
|
|
++i) {
|
|
|
|
if (value_eq(&static_table[i].nv, nv)) {
|
|
|
|
res.index = i;
|
|
|
|
res.name_value_match = 1;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2013-12-18 13:45:15 +01:00
|
|
|
static search_result search_hd_table(nghttp2_hd_context *context,
|
2015-04-15 15:32:11 +02:00
|
|
|
const nghttp2_nv *nv, int token,
|
|
|
|
int indexing_mode) {
|
2014-11-27 15:39:04 +01:00
|
|
|
search_result res = {-1, 0};
|
2013-09-06 14:53:28 +02:00
|
|
|
size_t i;
|
2014-04-01 18:25:44 +02:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
if (token >= 0 && token <= NGHTTP2_TOKEN_WWW_AUTHENTICATE) {
|
|
|
|
res = search_static_table(nv, token, indexing_mode);
|
|
|
|
if (res.name_value_match) {
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-19 11:21:26 +02:00
|
|
|
for (i = 0; i < context->hd_table.len; ++i) {
|
|
|
|
nghttp2_hd_entry *ent = hd_ringbuf_get(&context->hd_table, i);
|
|
|
|
if (ent->token != token || (token == -1 && !name_eq(&ent->nv, nv))) {
|
|
|
|
continue;
|
|
|
|
}
|
2014-09-27 16:08:14 +02:00
|
|
|
|
2015-04-19 11:21:26 +02:00
|
|
|
if (res.index == -1) {
|
|
|
|
res.index = (ssize_t)(i + NGHTTP2_STATIC_TABLE_LENGTH);
|
|
|
|
}
|
2014-09-27 16:08:14 +02:00
|
|
|
|
2015-04-19 11:21:26 +02:00
|
|
|
if (indexing_mode != NGHTTP2_HD_NEVER_INDEXING && value_eq(&ent->nv, nv)) {
|
|
|
|
res.index = (ssize_t)(i + NGHTTP2_STATIC_TABLE_LENGTH);
|
|
|
|
res.name_value_match = 1;
|
|
|
|
return res;
|
2014-09-27 16:08:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-18 13:45:15 +01:00
|
|
|
return res;
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static void hd_context_shrink_table_size(nghttp2_hd_context *context) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
|
|
|
|
|
|
|
mem = context->mem;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
while (context->hd_table_bufsize > context->hd_table_bufsize_max &&
|
|
|
|
context->hd_table.len > 0) {
|
2014-05-27 22:28:12 +02:00
|
|
|
size_t idx = context->hd_table.len - 1;
|
2014-11-27 15:39:04 +01:00
|
|
|
nghttp2_hd_entry *ent = hd_ringbuf_get(&context->hd_table, idx);
|
2013-10-25 18:01:28 +02:00
|
|
|
context->hd_table_bufsize -= entry_room(ent->nv.namelen, ent->nv.valuelen);
|
2014-05-08 16:54:07 +02:00
|
|
|
hd_ringbuf_pop_back(&context->hd_table);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (--ent->ref == 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry_free(ent, mem);
|
|
|
|
nghttp2_mem_free(mem, ent);
|
2013-10-25 18:01:28 +02:00
|
|
|
}
|
|
|
|
}
|
2014-02-13 15:22:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_deflate_change_table_size(nghttp2_hd_deflater *deflater,
|
2014-11-27 15:39:04 +01:00
|
|
|
size_t settings_hd_table_bufsize_max) {
|
2014-02-13 15:22:52 +01:00
|
|
|
size_t next_bufsize = nghttp2_min(settings_hd_table_bufsize_max,
|
|
|
|
deflater->deflate_hd_table_bufsize_max);
|
|
|
|
|
2014-05-11 14:25:27 +02:00
|
|
|
deflater->ctx.hd_table_bufsize_max = next_bufsize;
|
|
|
|
|
2014-07-25 15:55:45 +02:00
|
|
|
deflater->min_hd_table_bufsize_max =
|
2014-11-27 15:39:04 +01:00
|
|
|
nghttp2_min(deflater->min_hd_table_bufsize_max, next_bufsize);
|
2014-07-25 15:55:45 +02:00
|
|
|
|
2014-05-11 14:25:27 +02:00
|
|
|
deflater->notify_table_size_change = 1;
|
2014-02-13 15:22:52 +01:00
|
|
|
|
|
|
|
hd_context_shrink_table_size(&deflater->ctx);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_inflate_change_table_size(nghttp2_hd_inflater *inflater,
|
2014-11-27 15:39:04 +01:00
|
|
|
size_t settings_hd_table_bufsize_max) {
|
2014-02-13 15:22:52 +01:00
|
|
|
inflater->settings_hd_table_bufsize_max = settings_hd_table_bufsize_max;
|
|
|
|
inflater->ctx.hd_table_bufsize_max = settings_hd_table_bufsize_max;
|
|
|
|
hd_context_shrink_table_size(&inflater->ctx);
|
2013-10-25 18:01:28 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
#define INDEX_RANGE_VALID(context, idx) \
|
2014-07-16 16:04:00 +02:00
|
|
|
((idx) < (context)->hd_table.len + NGHTTP2_STATIC_TABLE_LENGTH)
|
2013-10-24 15:09:40 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static size_t get_max_index(nghttp2_hd_context *context) {
|
2014-07-16 16:04:00 +02:00
|
|
|
return context->hd_table.len + NGHTTP2_STATIC_TABLE_LENGTH - 1;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
nghttp2_hd_entry *nghttp2_hd_table_get(nghttp2_hd_context *context,
|
|
|
|
size_t idx) {
|
2014-06-16 18:52:11 +02:00
|
|
|
assert(INDEX_RANGE_VALID(context, idx));
|
2014-11-27 15:39:04 +01:00
|
|
|
if (idx >= NGHTTP2_STATIC_TABLE_LENGTH) {
|
|
|
|
return hd_ringbuf_get(&context->hd_table,
|
|
|
|
idx - NGHTTP2_STATIC_TABLE_LENGTH);
|
2013-10-12 14:49:01 +02:00
|
|
|
} else {
|
2015-04-15 15:32:11 +02:00
|
|
|
return &static_table[idx];
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
2013-08-23 16:38:28 +02:00
|
|
|
}
|
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
static int hd_deflate_decide_indexing(nghttp2_hd_deflater *deflater,
|
2015-04-15 15:32:11 +02:00
|
|
|
const nghttp2_nv *nv, int token) {
|
|
|
|
if (token == NGHTTP2_TOKEN__PATH || token == NGHTTP2_TOKEN_AGE ||
|
|
|
|
token == NGHTTP2_TOKEN_CONTENT_LENGTH || token == NGHTTP2_TOKEN_ETAG ||
|
|
|
|
token == NGHTTP2_TOKEN_IF_MODIFIED_SINCE ||
|
|
|
|
token == NGHTTP2_TOKEN_IF_NONE_MATCH || token == NGHTTP2_TOKEN_LOCATION ||
|
|
|
|
token == NGHTTP2_TOKEN_SET_COOKIE ||
|
|
|
|
entry_room(nv->namelen, nv->valuelen) >
|
|
|
|
deflater->ctx.hd_table_bufsize_max * 3 / 4) {
|
2015-04-14 18:21:27 +02:00
|
|
|
return NGHTTP2_HD_WITHOUT_INDEXING;
|
2014-01-21 13:48:25 +01:00
|
|
|
}
|
2015-04-15 15:32:11 +02:00
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
return NGHTTP2_HD_WITH_INDEXING;
|
2013-11-19 13:41:02 +01:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int deflate_nv(nghttp2_hd_deflater *deflater, nghttp2_bufs *bufs,
|
|
|
|
const nghttp2_nv *nv) {
|
2013-08-24 15:58:26 +02:00
|
|
|
int rv;
|
2013-12-18 13:45:15 +01:00
|
|
|
search_result res;
|
2014-10-30 15:31:28 +01:00
|
|
|
ssize_t idx;
|
2015-04-14 18:21:27 +02:00
|
|
|
int indexing_mode;
|
2015-04-15 15:32:11 +02:00
|
|
|
int token;
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: deflating %s: %s\n", nv->name, nv->value));
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
mem = deflater->ctx.mem;
|
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
token = lookup_token(nv->name, nv->namelen);
|
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
/* Don't index authorization header field since it may contain low
|
|
|
|
entropy secret data (e.g., id/password). Also cookie header
|
|
|
|
field with less than 20 bytes value is also never indexed. This
|
|
|
|
is the same criteria used in Firefox codebase. */
|
2015-04-15 15:32:11 +02:00
|
|
|
indexing_mode =
|
|
|
|
token == NGHTTP2_TOKEN_AUTHORIZATION ||
|
|
|
|
(token == NGHTTP2_TOKEN_COOKIE && nv->valuelen < 20) ||
|
|
|
|
(nv->flags & NGHTTP2_NV_FLAG_NO_INDEX)
|
|
|
|
? NGHTTP2_HD_NEVER_INDEXING
|
|
|
|
: hd_deflate_decide_indexing(deflater, nv, token);
|
2015-04-14 18:21:27 +02:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
res = search_hd_table(&deflater->ctx, nv, token, indexing_mode);
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-07-26 11:19:25 +02:00
|
|
|
idx = res.index;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (res.name_value_match) {
|
2014-07-26 11:19:25 +02:00
|
|
|
|
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: name/value match index=%zd\n", idx));
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-07-16 16:04:00 +02:00
|
|
|
rv = emit_indexed_block(bufs, idx);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-07-16 16:04:00 +02:00
|
|
|
return rv;
|
2013-08-24 15:58:26 +02:00
|
|
|
}
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-07-26 11:19:25 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (res.index != -1) {
|
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: name match index=%zd\n", res.index));
|
2014-07-26 11:19:25 +02:00
|
|
|
}
|
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
if (indexing_mode == NGHTTP2_HD_WITH_INDEXING) {
|
2014-07-26 11:19:25 +02:00
|
|
|
nghttp2_hd_entry *new_ent;
|
2014-11-27 15:39:04 +01:00
|
|
|
if (idx != -1 && idx < (ssize_t)NGHTTP2_STATIC_TABLE_LENGTH) {
|
2014-07-26 11:19:25 +02:00
|
|
|
nghttp2_nv nv_indname;
|
|
|
|
nv_indname = *nv;
|
|
|
|
nv_indname.name = nghttp2_hd_table_get(&deflater->ctx, idx)->nv.name;
|
2015-04-15 15:32:11 +02:00
|
|
|
new_ent = add_hd_table_incremental(&deflater->ctx, &nv_indname, token,
|
|
|
|
NGHTTP2_HD_FLAG_VALUE_ALLOC);
|
2013-08-24 15:58:26 +02:00
|
|
|
} else {
|
2015-04-15 15:32:11 +02:00
|
|
|
new_ent = add_hd_table_incremental(&deflater->ctx, nv, token,
|
|
|
|
NGHTTP2_HD_FLAG_NAME_ALLOC |
|
|
|
|
NGHTTP2_HD_FLAG_VALUE_ALLOC);
|
2013-08-24 15:58:26 +02:00
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
if (!new_ent) {
|
2014-07-26 11:19:25 +02:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
if (new_ent->ref == 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry_free(new_ent, mem);
|
|
|
|
nghttp2_mem_free(mem, new_ent);
|
2013-08-24 15:58:26 +02:00
|
|
|
}
|
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
if (idx == -1) {
|
2015-04-14 18:21:27 +02:00
|
|
|
rv = emit_newname_block(bufs, nv, indexing_mode);
|
2014-07-26 11:19:25 +02:00
|
|
|
} else {
|
2015-04-14 18:21:27 +02:00
|
|
|
rv = emit_indname_block(bufs, idx, nv, indexing_mode);
|
2014-07-26 11:19:25 +02:00
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-07-26 11:19:25 +02:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2013-08-24 15:58:26 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-05-13 16:42:55 +02:00
|
|
|
int nghttp2_hd_deflate_hd_bufs(nghttp2_hd_deflater *deflater,
|
2014-11-27 15:39:04 +01:00
|
|
|
nghttp2_bufs *bufs, const nghttp2_nv *nv,
|
|
|
|
size_t nvlen) {
|
2014-03-10 17:47:38 +01:00
|
|
|
size_t i;
|
2013-07-25 18:34:28 +02:00
|
|
|
int rv = 0;
|
2014-03-10 17:47:38 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (deflater->ctx.bad) {
|
2013-07-25 18:34:28 +02:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
2014-02-13 15:22:52 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (deflater->notify_table_size_change) {
|
2014-07-25 15:55:45 +02:00
|
|
|
size_t min_hd_table_bufsize_max;
|
|
|
|
|
|
|
|
min_hd_table_bufsize_max = deflater->min_hd_table_bufsize_max;
|
2014-05-11 14:25:27 +02:00
|
|
|
|
|
|
|
deflater->notify_table_size_change = 0;
|
2014-07-25 15:55:45 +02:00
|
|
|
deflater->min_hd_table_bufsize_max = UINT32_MAX;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (deflater->ctx.hd_table_bufsize_max > min_hd_table_bufsize_max) {
|
2014-07-25 15:55:45 +02:00
|
|
|
|
|
|
|
rv = emit_table_size(bufs, min_hd_table_bufsize_max);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-07-25 15:55:45 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2014-05-11 14:25:27 +02:00
|
|
|
|
|
|
|
rv = emit_table_size(bufs, deflater->ctx.hd_table_bufsize_max);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-02-13 15:22:52 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
for (i = 0; i < nvlen; ++i) {
|
2014-03-13 14:11:02 +01:00
|
|
|
rv = deflate_nv(deflater, bufs, &nv[i]);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2013-08-24 15:58:26 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(
|
|
|
|
fprintf(stderr, "deflatehd: all input name/value pairs were deflated\n"));
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
return 0;
|
2014-11-27 15:39:04 +01:00
|
|
|
fail:
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "deflatehd: error return %d\n", rv));
|
|
|
|
|
2014-01-26 09:53:04 +01:00
|
|
|
deflater->ctx.bad = 1;
|
2013-07-25 18:34:28 +02:00
|
|
|
return rv;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater, uint8_t *buf,
|
|
|
|
size_t buflen, const nghttp2_nv *nv,
|
|
|
|
size_t nvlen) {
|
2014-05-13 16:42:55 +02:00
|
|
|
nghttp2_bufs bufs;
|
|
|
|
int rv;
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
|
|
|
|
|
|
|
mem = deflater->ctx.mem;
|
2014-05-13 16:42:55 +02:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = nghttp2_bufs_wrap_init(&bufs, buf, buflen, mem);
|
2014-05-13 16:42:55 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-13 16:42:55 +02:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
rv = nghttp2_hd_deflate_hd_bufs(deflater, &bufs, nv, nvlen);
|
|
|
|
|
|
|
|
buflen = nghttp2_bufs_len(&bufs);
|
|
|
|
|
|
|
|
nghttp2_bufs_wrap_free(&bufs);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv == NGHTTP2_ERR_BUFFER_ERROR) {
|
2014-05-13 16:42:55 +02:00
|
|
|
return NGHTTP2_ERR_INSUFF_BUFSIZE;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-05-13 16:42:55 +02:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2014-06-16 19:17:49 +02:00
|
|
|
return (ssize_t)buflen;
|
2014-05-13 16:42:55 +02:00
|
|
|
}
|
|
|
|
|
2014-10-19 15:19:33 +02:00
|
|
|
size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater _U_,
|
2014-11-27 15:39:04 +01:00
|
|
|
const nghttp2_nv *nva, size_t nvlen) {
|
2014-07-12 11:47:55 +02:00
|
|
|
size_t n = 0;
|
2014-05-13 16:42:55 +02:00
|
|
|
size_t i;
|
|
|
|
|
|
|
|
/* Possible Maximum Header Table Size Change. Encoding (1u << 31) -
|
2014-07-25 18:12:19 +02:00
|
|
|
1 using 4 bit prefix requires 6 bytes. We may emit this at most
|
|
|
|
twice. */
|
|
|
|
n += 12;
|
2014-05-13 16:42:55 +02:00
|
|
|
|
|
|
|
/* Use Literal Header Field without indexing - New Name, since it is
|
|
|
|
most space consuming format. Also we choose the less one between
|
|
|
|
non-huffman and huffman, so using literal byte count is
|
|
|
|
sufficient for upper bound.
|
|
|
|
|
|
|
|
Encoding (1u << 31) - 1 using 7 bit prefix requires 6 bytes. We
|
|
|
|
need 2 of this for |nvlen| header fields. */
|
|
|
|
n += 6 * 2 * nvlen;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
for (i = 0; i < nvlen; ++i) {
|
2014-05-13 16:42:55 +02:00
|
|
|
n += nva[i].namelen + nva[i].valuelen;
|
|
|
|
}
|
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
|
2014-11-27 15:39:04 +01:00
|
|
|
size_t deflate_hd_table_bufsize_max) {
|
2014-12-07 15:07:13 +01:00
|
|
|
return nghttp2_hd_deflate_new2(deflater_ptr, deflate_hd_table_bufsize_max,
|
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_deflate_new2(nghttp2_hd_deflater **deflater_ptr,
|
|
|
|
size_t deflate_hd_table_bufsize_max,
|
|
|
|
nghttp2_mem *mem) {
|
2014-06-25 14:26:47 +02:00
|
|
|
int rv;
|
|
|
|
nghttp2_hd_deflater *deflater;
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
if (mem == NULL) {
|
|
|
|
mem = nghttp2_mem_default();
|
|
|
|
}
|
|
|
|
|
|
|
|
deflater = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_deflater));
|
2014-05-13 16:42:55 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (deflater == NULL) {
|
2014-05-13 16:42:55 +02:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = nghttp2_hd_deflate_init2(deflater, deflate_hd_table_bufsize_max, mem);
|
2014-06-25 14:26:47 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, deflater);
|
2014-07-17 17:21:15 +02:00
|
|
|
|
2014-06-25 14:26:47 +02:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
*deflater_ptr = deflater;
|
|
|
|
|
|
|
|
return 0;
|
2014-05-13 16:42:55 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
void nghttp2_hd_deflate_del(nghttp2_hd_deflater *deflater) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
|
|
|
|
|
|
|
mem = deflater->ctx.mem;
|
|
|
|
|
2014-05-13 16:42:55 +02:00
|
|
|
nghttp2_hd_deflate_free(deflater);
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, deflater);
|
2014-05-13 16:42:55 +02:00
|
|
|
}
|
|
|
|
|
2014-01-26 09:53:04 +01:00
|
|
|
static void hd_inflate_set_huffman_encoded(nghttp2_hd_inflater *inflater,
|
2014-11-27 15:39:04 +01:00
|
|
|
const uint8_t *in) {
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->huffman_encoded = (*in & (1 << 7)) != 0;
|
|
|
|
}
|
2014-01-16 15:41:13 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
/*
|
|
|
|
* Decodes the integer from the range [in, last). The result is
|
|
|
|
* assigned to |inflater->left|. If the |inflater->left| is 0, then
|
|
|
|
* it performs variable integer decoding from scratch. Otherwise, it
|
|
|
|
* uses the |inflater->left| as the initial value and continues to
|
|
|
|
* decode assuming that [in, last) begins with intermediary sequence.
|
|
|
|
*
|
|
|
|
* This function returns the number of bytes read if it succeeds, or
|
|
|
|
* one of the following negative error codes:
|
|
|
|
*
|
|
|
|
* NGHTTP2_ERR_HEADER_COMP
|
|
|
|
* Integer decoding failed
|
|
|
|
*/
|
2014-11-27 15:39:04 +01:00
|
|
|
static ssize_t hd_inflate_read_len(nghttp2_hd_inflater *inflater, int *rfin,
|
|
|
|
uint8_t *in, uint8_t *last, size_t prefix,
|
|
|
|
size_t maxlen) {
|
2014-07-22 15:38:18 +02:00
|
|
|
ssize_t rv;
|
|
|
|
uint32_t out;
|
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
*rfin = 0;
|
2014-07-22 15:38:18 +02:00
|
|
|
|
|
|
|
rv = decode_length(&out, &inflater->shift, rfin, (uint32_t)inflater->left,
|
|
|
|
inflater->shift, in, last, prefix);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv == -1) {
|
2014-07-22 15:38:18 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: integer decoding failed\n"));
|
2014-01-25 10:24:15 +01:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (out > maxlen) {
|
|
|
|
DEBUGF(fprintf(
|
|
|
|
stderr, "inflatehd: integer exceeded the maximum value %zu\n", maxlen));
|
2013-07-25 18:34:28 +02:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
|
|
|
|
inflater->left = out;
|
|
|
|
|
2014-08-02 03:40:25 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: decoded integer is %u\n", out));
|
|
|
|
|
2014-07-22 15:38:18 +02:00
|
|
|
return rv;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-01-16 15:41:13 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
/*
|
|
|
|
* Reads |inflater->left| bytes from the range [in, last) and performs
|
|
|
|
* huffman decoding against them and pushes the result into the
|
|
|
|
* |buffer|.
|
|
|
|
*
|
|
|
|
* This function returns the number of bytes read if it succeeds, or
|
|
|
|
* one of the following negative error codes:
|
|
|
|
*
|
|
|
|
* NGHTTP2_ERR_NOMEM
|
|
|
|
* Out of memory
|
|
|
|
* NGHTTP2_ERR_HEADER_COMP
|
|
|
|
* Huffman decoding failed
|
2014-05-12 14:48:00 +02:00
|
|
|
* NGHTTP2_ERR_BUFFER_ERROR
|
|
|
|
* Out of buffer space.
|
2014-01-25 10:24:15 +01:00
|
|
|
*/
|
2014-01-26 09:53:04 +01:00
|
|
|
static ssize_t hd_inflate_read_huff(nghttp2_hd_inflater *inflater,
|
2014-11-27 15:39:04 +01:00
|
|
|
nghttp2_bufs *bufs, uint8_t *in,
|
|
|
|
uint8_t *last) {
|
2014-06-11 16:37:16 +02:00
|
|
|
ssize_t readlen;
|
2014-01-25 10:24:15 +01:00
|
|
|
int final = 0;
|
2014-11-27 15:39:04 +01:00
|
|
|
if ((size_t)(last - in) >= inflater->left) {
|
2014-01-25 10:24:15 +01:00
|
|
|
last = in + inflater->left;
|
|
|
|
final = 1;
|
|
|
|
}
|
2014-11-27 15:39:04 +01:00
|
|
|
readlen = nghttp2_hd_huff_decode(&inflater->huff_decode_ctx, bufs, in,
|
|
|
|
last - in, final);
|
2014-05-12 14:48:00 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (readlen < 0) {
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: huffman decoding failed\n"));
|
2014-06-11 16:37:16 +02:00
|
|
|
return readlen;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
inflater->left -= (size_t)readlen;
|
2014-06-11 16:37:16 +02:00
|
|
|
return readlen;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reads |inflater->left| bytes from the range [in, last) and copies
|
|
|
|
* them into the |buffer|.
|
|
|
|
*
|
|
|
|
* This function returns the number of bytes read if it succeeds, or
|
|
|
|
* one of the following negative error codes:
|
|
|
|
*
|
|
|
|
* NGHTTP2_ERR_NOMEM
|
|
|
|
* Out of memory
|
|
|
|
* NGHTTP2_ERR_HEADER_COMP
|
|
|
|
* Header decompression failed
|
2014-05-12 14:48:00 +02:00
|
|
|
* NGHTTP2_ERR_BUFFER_ERROR
|
|
|
|
* Out of buffer space.
|
2014-01-25 10:24:15 +01:00
|
|
|
*/
|
2014-01-26 09:53:04 +01:00
|
|
|
static ssize_t hd_inflate_read(nghttp2_hd_inflater *inflater,
|
2014-11-27 15:39:04 +01:00
|
|
|
nghttp2_bufs *bufs, uint8_t *in, uint8_t *last) {
|
2014-01-25 10:24:15 +01:00
|
|
|
int rv;
|
2014-07-22 15:38:18 +02:00
|
|
|
size_t len = nghttp2_min((size_t)(last - in), inflater->left);
|
2014-03-11 13:18:28 +01:00
|
|
|
rv = nghttp2_bufs_add(bufs, in, len);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-01-25 10:24:15 +01:00
|
|
|
return rv;
|
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
inflater->left -= len;
|
2014-06-16 19:17:49 +02:00
|
|
|
return (ssize_t)len;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finalize indexed header representation reception. If header is
|
|
|
|
* emitted, |*nv_out| is filled with that value and 0 is returned. If
|
|
|
|
* no header is emitted, 1 is returned.
|
|
|
|
*
|
|
|
|
* This function returns either 0 or 1 if it succeeds, or one of the
|
|
|
|
* following negative error codes:
|
|
|
|
*
|
|
|
|
* NGHTTP2_ERR_NOMEM
|
|
|
|
* Out of memory
|
|
|
|
*/
|
2014-01-26 09:53:04 +01:00
|
|
|
static int hd_inflate_commit_indexed(nghttp2_hd_inflater *inflater,
|
2015-04-15 15:32:11 +02:00
|
|
|
nghttp2_nv *nv_out, int *token_out) {
|
2014-01-26 09:53:04 +01:00
|
|
|
nghttp2_hd_entry *ent = nghttp2_hd_table_get(&inflater->ctx, inflater->index);
|
2014-07-12 11:47:55 +02:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
emit_indexed_header(nv_out, token_out, ent);
|
2014-07-12 11:47:55 +02:00
|
|
|
|
|
|
|
return 0;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-01-16 15:41:13 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
static int hd_inflate_remove_bufs(nghttp2_hd_inflater *inflater, nghttp2_nv *nv,
|
|
|
|
int value_only) {
|
2014-03-11 13:18:28 +01:00
|
|
|
ssize_t rv;
|
2014-05-28 16:02:23 +02:00
|
|
|
size_t buflen;
|
|
|
|
uint8_t *buf;
|
2014-09-30 16:01:58 +02:00
|
|
|
nghttp2_buf *pbuf;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->index_required ||
|
|
|
|
inflater->nvbufs.head != inflater->nvbufs.cur) {
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-09-30 16:01:58 +02:00
|
|
|
rv = nghttp2_bufs_remove(&inflater->nvbufs, &buf);
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
2014-09-30 16:01:58 +02:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
|
2015-03-24 13:54:05 +01:00
|
|
|
nghttp2_bufs_reset(&inflater->nvbufs);
|
|
|
|
|
2014-09-30 16:01:58 +02:00
|
|
|
buflen = rv;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (value_only) {
|
2015-03-23 15:25:57 +01:00
|
|
|
/* we don't use this value, so no need to NULL-terminate */
|
2014-09-30 16:01:58 +02:00
|
|
|
nv->name = NULL;
|
|
|
|
nv->namelen = 0;
|
2015-03-23 15:25:57 +01:00
|
|
|
|
|
|
|
nv->value = buf;
|
|
|
|
nv->valuelen = buflen - 1;
|
2014-09-30 16:01:58 +02:00
|
|
|
} else {
|
|
|
|
nv->name = buf;
|
|
|
|
nv->namelen = inflater->newnamelen;
|
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
nv->value = buf + nv->namelen + 1;
|
|
|
|
nv->valuelen = buflen - nv->namelen - 2;
|
|
|
|
}
|
2014-09-30 16:01:58 +02:00
|
|
|
|
|
|
|
return 0;
|
2014-03-11 13:18:28 +01:00
|
|
|
}
|
|
|
|
|
2014-09-30 16:01:58 +02:00
|
|
|
/* If we are not going to store header in header table and
|
|
|
|
name/value are in first chunk, we just refer them from nv,
|
|
|
|
instead of mallocing another memory. */
|
|
|
|
|
|
|
|
pbuf = &inflater->nvbufs.head->buf;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (value_only) {
|
2015-03-23 15:25:57 +01:00
|
|
|
/* we don't use this value, so no need to NULL-terminate */
|
2014-05-28 16:02:23 +02:00
|
|
|
nv->name = NULL;
|
|
|
|
nv->namelen = 0;
|
2015-03-23 15:25:57 +01:00
|
|
|
|
|
|
|
nv->value = pbuf->pos;
|
|
|
|
nv->valuelen = nghttp2_buf_len(pbuf) - 1;
|
2014-05-28 16:02:23 +02:00
|
|
|
} else {
|
2014-09-30 16:01:58 +02:00
|
|
|
nv->name = pbuf->pos;
|
2014-05-28 16:02:23 +02:00
|
|
|
nv->namelen = inflater->newnamelen;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
nv->value = pbuf->pos + nv->namelen + 1;
|
|
|
|
nv->valuelen = nghttp2_buf_len(pbuf) - nv->namelen - 2;
|
|
|
|
}
|
2014-09-30 16:01:58 +02:00
|
|
|
|
|
|
|
/* Resetting does not change the content of first buffer */
|
|
|
|
nghttp2_bufs_reset(&inflater->nvbufs);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
/*
|
|
|
|
* Finalize literal header representation - new name- reception. If
|
|
|
|
* header is emitted, |*nv_out| is filled with that value and 0 is
|
|
|
|
* returned.
|
|
|
|
*
|
|
|
|
* This function returns 0 if it succeeds, or one of the following
|
|
|
|
* negative error codes:
|
|
|
|
*
|
|
|
|
* NGHTTP2_ERR_NOMEM
|
|
|
|
* Out of memory
|
|
|
|
*/
|
2014-01-26 09:53:04 +01:00
|
|
|
static int hd_inflate_commit_newname(nghttp2_hd_inflater *inflater,
|
2015-04-15 15:32:11 +02:00
|
|
|
nghttp2_nv *nv_out, int *token_out) {
|
2014-03-11 13:18:28 +01:00
|
|
|
int rv;
|
|
|
|
nghttp2_nv nv;
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
|
|
|
|
|
|
|
mem = inflater->ctx.mem;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
|
|
|
rv = hd_inflate_remove_bufs(inflater, &nv, 0 /* name and value */);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-03-11 13:18:28 +01:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->no_index) {
|
2014-04-01 18:25:44 +02:00
|
|
|
nv.flags = NGHTTP2_NV_FLAG_NO_INDEX;
|
|
|
|
} else {
|
|
|
|
nv.flags = NGHTTP2_NV_FLAG_NONE;
|
|
|
|
}
|
2014-04-01 16:17:50 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->index_required) {
|
2014-01-25 10:24:15 +01:00
|
|
|
nghttp2_hd_entry *new_ent;
|
2014-03-11 13:18:28 +01:00
|
|
|
uint8_t ent_flags;
|
|
|
|
|
2014-05-28 16:02:23 +02:00
|
|
|
/* nv->value points to the middle of the buffer pointed by
|
|
|
|
nv->name. So we just need to keep track of nv->name for memory
|
|
|
|
management. */
|
|
|
|
ent_flags = NGHTTP2_HD_FLAG_NAME_ALLOC | NGHTTP2_HD_FLAG_NAME_GIFT;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
new_ent = add_hd_table_incremental(
|
|
|
|
&inflater->ctx, &nv, lookup_token(nv.name, nv.namelen), ent_flags);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (new_ent) {
|
2015-04-15 15:32:11 +02:00
|
|
|
emit_indexed_header(nv_out, token_out, new_ent);
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->ent_keep = new_ent;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, nv.name);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
emit_literal_header(nv_out, token_out, &nv);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (nv.name != inflater->nvbufs.head->buf.pos) {
|
2014-09-30 16:01:58 +02:00
|
|
|
inflater->nv_keep = nv.name;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finalize literal header representation - indexed name-
|
|
|
|
* reception. If header is emitted, |*nv_out| is filled with that
|
|
|
|
* value and 0 is returned.
|
|
|
|
*
|
|
|
|
* This function returns 0 if it succeeds, or one of the following
|
|
|
|
* negative error codes:
|
|
|
|
*
|
|
|
|
* NGHTTP2_ERR_NOMEM
|
|
|
|
* Out of memory
|
|
|
|
*/
|
2014-01-26 09:53:04 +01:00
|
|
|
static int hd_inflate_commit_indname(nghttp2_hd_inflater *inflater,
|
2015-04-15 15:32:11 +02:00
|
|
|
nghttp2_nv *nv_out, int *token_out) {
|
2014-03-11 13:18:28 +01:00
|
|
|
int rv;
|
|
|
|
nghttp2_nv nv;
|
2014-07-21 19:09:01 +02:00
|
|
|
nghttp2_hd_entry *ent_name;
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
|
|
|
|
|
|
|
mem = inflater->ctx.mem;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
|
|
|
rv = hd_inflate_remove_bufs(inflater, &nv, 1 /* value only */);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-03-11 13:18:28 +01:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->no_index) {
|
2014-04-01 18:25:44 +02:00
|
|
|
nv.flags = NGHTTP2_NV_FLAG_NO_INDEX;
|
|
|
|
} else {
|
|
|
|
nv.flags = NGHTTP2_NV_FLAG_NONE;
|
|
|
|
}
|
2014-04-01 16:17:50 +02:00
|
|
|
|
2014-07-21 19:09:01 +02:00
|
|
|
ent_name = nghttp2_hd_table_get(&inflater->ctx, inflater->index);
|
|
|
|
|
|
|
|
nv.name = ent_name->nv.name;
|
|
|
|
nv.namelen = ent_name->nv.namelen;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->index_required) {
|
2014-01-25 10:24:15 +01:00
|
|
|
nghttp2_hd_entry *new_ent;
|
2014-03-11 13:18:28 +01:00
|
|
|
uint8_t ent_flags;
|
|
|
|
int static_name;
|
|
|
|
|
|
|
|
ent_flags = NGHTTP2_HD_FLAG_VALUE_ALLOC | NGHTTP2_HD_FLAG_VALUE_GIFT;
|
2014-07-16 16:04:00 +02:00
|
|
|
static_name = inflater->index < NGHTTP2_STATIC_TABLE_LENGTH;
|
2014-01-25 10:24:15 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (!static_name) {
|
2014-01-25 10:24:15 +01:00
|
|
|
ent_flags |= NGHTTP2_HD_FLAG_NAME_ALLOC;
|
2014-03-02 16:53:04 +01:00
|
|
|
/* For entry in static table, we must not touch ref, because it
|
|
|
|
is shared by threads */
|
2014-07-21 19:09:01 +02:00
|
|
|
++ent_name->ref;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
new_ent = add_hd_table_incremental(&inflater->ctx, &nv, ent_name->token,
|
|
|
|
ent_flags);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (!static_name && --ent_name->ref == 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_hd_entry_free(ent_name, mem);
|
|
|
|
nghttp2_mem_free(mem, ent_name);
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (new_ent) {
|
2015-04-15 15:32:11 +02:00
|
|
|
emit_indexed_header(nv_out, token_out, new_ent);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->ent_keep = new_ent;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, nv.value);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
|
|
|
}
|
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
emit_literal_header(nv_out, token_out, &nv);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (nv.value != inflater->nvbufs.head->buf.pos) {
|
2014-09-30 16:01:58 +02:00
|
|
|
inflater->nv_keep = nv.value;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
|
|
|
return 0;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater, nghttp2_nv *nv_out,
|
|
|
|
int *inflate_flags, uint8_t *in, size_t inlen,
|
|
|
|
int in_final) {
|
2015-04-15 15:32:11 +02:00
|
|
|
int token;
|
|
|
|
|
|
|
|
return nghttp2_hd_inflate_hd2(inflater, nv_out, inflate_flags, &token, in,
|
|
|
|
inlen, in_final);
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
|
|
|
|
nghttp2_nv *nv_out, int *inflate_flags,
|
|
|
|
int *token_out, uint8_t *in, size_t inlen,
|
|
|
|
int in_final) {
|
2014-01-25 10:24:15 +01:00
|
|
|
ssize_t rv = 0;
|
|
|
|
uint8_t *first = in;
|
|
|
|
uint8_t *last = in + inlen;
|
|
|
|
int rfin = 0;
|
2015-03-23 15:25:57 +01:00
|
|
|
int busy = 0;
|
2014-01-25 10:24:15 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->ctx.bad) {
|
2014-02-26 15:20:52 +01:00
|
|
|
return NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: start state=%d\n", inflater->state));
|
2014-02-13 15:22:52 +01:00
|
|
|
hd_inflate_keep_free(inflater);
|
2015-04-15 15:32:11 +02:00
|
|
|
*token_out = -1;
|
2014-01-25 10:24:15 +01:00
|
|
|
*inflate_flags = NGHTTP2_HD_INFLATE_NONE;
|
2015-03-23 15:25:57 +01:00
|
|
|
for (; in != last || busy;) {
|
|
|
|
busy = 0;
|
2014-11-27 15:39:04 +01:00
|
|
|
switch (inflater->state) {
|
2014-01-25 10:24:15 +01:00
|
|
|
case NGHTTP2_HD_STATE_OPCODE:
|
2014-11-27 15:39:04 +01:00
|
|
|
if ((*in & 0xe0u) == 0x20u) {
|
2014-04-01 18:25:44 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: header table size change\n"));
|
|
|
|
inflater->opcode = NGHTTP2_HD_OPCODE_INDEXED;
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_READ_TABLE_SIZE;
|
2014-11-27 15:39:04 +01:00
|
|
|
} else if (*in & 0x80u) {
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: indexed repr\n"));
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->opcode = NGHTTP2_HD_OPCODE_INDEXED;
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_READ_INDEX;
|
|
|
|
} else {
|
2014-11-27 15:39:04 +01:00
|
|
|
if (*in == 0x40u || *in == 0 || *in == 0x10u) {
|
|
|
|
DEBUGF(
|
|
|
|
fprintf(stderr, "inflatehd: literal header repr - new name\n"));
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->opcode = NGHTTP2_HD_OPCODE_NEWNAME;
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_NEWNAME_CHECK_NAMELEN;
|
|
|
|
} else {
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr,
|
|
|
|
"inflatehd: literal header repr - indexed name\n"));
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->opcode = NGHTTP2_HD_OPCODE_INDNAME;
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_READ_INDEX;
|
|
|
|
}
|
2014-04-01 18:25:44 +02:00
|
|
|
inflater->index_required = (*in & 0x40) != 0;
|
2014-07-31 16:08:51 +02:00
|
|
|
inflater->no_index = (*in & 0xf0u) == 0x10u;
|
2014-11-27 15:39:04 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: indexing required=%d, no_index=%d\n",
|
|
|
|
inflater->index_required, inflater->no_index));
|
|
|
|
if (inflater->opcode == NGHTTP2_HD_OPCODE_NEWNAME) {
|
2014-01-25 10:24:15 +01:00
|
|
|
++in;
|
|
|
|
}
|
2013-11-16 09:05:18 +01:00
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->left = 0;
|
2014-07-21 18:50:29 +02:00
|
|
|
inflater->shift = 0;
|
2014-02-13 15:22:52 +01:00
|
|
|
break;
|
|
|
|
case NGHTTP2_HD_STATE_READ_TABLE_SIZE:
|
|
|
|
rfin = 0;
|
2014-07-12 11:47:55 +02:00
|
|
|
rv = hd_inflate_read_len(inflater, &rfin, in, last, 5,
|
2014-02-13 15:22:52 +01:00
|
|
|
inflater->settings_hd_table_bufsize_max);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
2014-02-13 15:22:52 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
in += rv;
|
2014-11-27 15:39:04 +01:00
|
|
|
if (!rfin) {
|
2014-03-13 16:51:26 +01:00
|
|
|
goto almost_ok;
|
2014-02-13 15:22:52 +01:00
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: table_size=%zu\n", inflater->left));
|
2014-02-13 15:22:52 +01:00
|
|
|
inflater->ctx.hd_table_bufsize_max = inflater->left;
|
|
|
|
hd_context_shrink_table_size(&inflater->ctx);
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_OPCODE;
|
|
|
|
break;
|
2014-04-01 18:25:44 +02:00
|
|
|
case NGHTTP2_HD_STATE_READ_INDEX: {
|
|
|
|
size_t prefixlen;
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->opcode == NGHTTP2_HD_OPCODE_INDEXED) {
|
2014-04-01 18:25:44 +02:00
|
|
|
prefixlen = 7;
|
2014-11-27 15:39:04 +01:00
|
|
|
} else if (inflater->index_required) {
|
2014-04-01 18:25:44 +02:00
|
|
|
prefixlen = 6;
|
|
|
|
} else {
|
|
|
|
prefixlen = 4;
|
|
|
|
}
|
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
rfin = 0;
|
2014-04-01 18:25:44 +02:00
|
|
|
rv = hd_inflate_read_len(inflater, &rfin, in, last, prefixlen,
|
2014-01-26 09:53:04 +01:00
|
|
|
get_max_index(&inflater->ctx) + 1);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
2013-08-22 18:28:01 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
2014-05-01 02:06:54 +02:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
in += rv;
|
2014-05-01 02:06:54 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (!rfin) {
|
2014-07-21 19:09:01 +02:00
|
|
|
goto almost_ok;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->left == 0) {
|
2014-05-01 02:06:54 +02:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2014-07-22 15:38:18 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: index=%zu\n", inflater->left));
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->opcode == NGHTTP2_HD_OPCODE_INDEXED) {
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->index = inflater->left;
|
|
|
|
--inflater->index;
|
2014-07-21 19:09:01 +02:00
|
|
|
|
2015-04-15 15:32:11 +02:00
|
|
|
rv = hd_inflate_commit_indexed(inflater, nv_out, token_out);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_OPCODE;
|
|
|
|
/* If rv == 1, no header was emitted */
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv == 0) {
|
2014-01-25 10:24:15 +01:00
|
|
|
*inflate_flags |= NGHTTP2_HD_INFLATE_EMIT;
|
2014-06-16 19:17:49 +02:00
|
|
|
return (ssize_t)(in - first);
|
2013-10-24 14:52:02 +02:00
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
} else {
|
|
|
|
inflater->index = inflater->left;
|
|
|
|
--inflater->index;
|
2014-07-21 19:09:01 +02:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_CHECK_VALUELEN;
|
2013-10-24 14:52:02 +02:00
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
break;
|
2014-04-01 18:25:44 +02:00
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
case NGHTTP2_HD_STATE_NEWNAME_CHECK_NAMELEN:
|
|
|
|
hd_inflate_set_huffman_encoded(inflater, in);
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN;
|
|
|
|
inflater->left = 0;
|
2014-07-21 18:50:29 +02:00
|
|
|
inflater->shift = 0;
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: huffman encoded=%d\n",
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->huffman_encoded != 0));
|
2014-11-27 15:39:04 +01:00
|
|
|
/* Fall through */
|
2014-01-25 10:24:15 +01:00
|
|
|
case NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN:
|
|
|
|
rfin = 0;
|
2014-11-27 15:39:04 +01:00
|
|
|
rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
|
|
|
|
if (rv < 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
in += rv;
|
2014-11-27 15:39:04 +01:00
|
|
|
if (!rfin) {
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr,
|
2014-07-22 15:38:18 +02:00
|
|
|
"inflatehd: integer not fully decoded. current=%zu\n",
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->left));
|
2014-03-13 16:51:26 +01:00
|
|
|
|
|
|
|
goto almost_ok;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->huffman_encoded) {
|
2014-02-13 15:22:52 +01:00
|
|
|
nghttp2_hd_huff_decode_context_init(&inflater->huff_decode_ctx);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_NEWNAME_READ_NAMEHUFF;
|
2013-10-20 16:59:15 +02:00
|
|
|
} else {
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_NEWNAME_READ_NAME;
|
2013-08-25 10:39:29 +02:00
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
break;
|
|
|
|
case NGHTTP2_HD_STATE_NEWNAME_READ_NAMEHUFF:
|
2014-05-28 16:02:23 +02:00
|
|
|
rv = hd_inflate_read_huff(inflater, &inflater->nvbufs, in, last);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
2013-10-20 16:59:15 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
in += rv;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: %zd bytes read\n", rv));
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->left) {
|
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: still %zu bytes to go\n",
|
|
|
|
inflater->left));
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-03-13 16:51:26 +01:00
|
|
|
goto almost_ok;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-05-28 16:02:23 +02:00
|
|
|
inflater->newnamelen = nghttp2_bufs_len(&inflater->nvbufs);
|
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
rv = nghttp2_bufs_addb(&inflater->nvbufs, '\0');
|
|
|
|
if (rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_CHECK_VALUELEN;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
break;
|
|
|
|
case NGHTTP2_HD_STATE_NEWNAME_READ_NAME:
|
2014-05-28 16:02:23 +02:00
|
|
|
rv = hd_inflate_read(inflater, &inflater->nvbufs, in, last);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
in += rv;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: %zd bytes read\n", rv));
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->left) {
|
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: still %zu bytes to go\n",
|
|
|
|
inflater->left));
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-03-13 16:51:26 +01:00
|
|
|
goto almost_ok;
|
2013-10-14 16:38:12 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-05-28 16:02:23 +02:00
|
|
|
inflater->newnamelen = nghttp2_bufs_len(&inflater->nvbufs);
|
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
rv = nghttp2_bufs_addb(&inflater->nvbufs, '\0');
|
|
|
|
if (rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_CHECK_VALUELEN;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
break;
|
|
|
|
case NGHTTP2_HD_STATE_CHECK_VALUELEN:
|
|
|
|
hd_inflate_set_huffman_encoded(inflater, in);
|
|
|
|
inflater->state = NGHTTP2_HD_STATE_READ_VALUELEN;
|
|
|
|
inflater->left = 0;
|
2014-07-21 18:50:29 +02:00
|
|
|
inflater->shift = 0;
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: huffman encoded=%d\n",
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->huffman_encoded != 0));
|
2014-11-27 15:39:04 +01:00
|
|
|
/* Fall through */
|
2014-01-25 10:24:15 +01:00
|
|
|
case NGHTTP2_HD_STATE_READ_VALUELEN:
|
|
|
|
rfin = 0;
|
2014-11-27 15:39:04 +01:00
|
|
|
rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
|
|
|
|
if (rv < 0) {
|
2014-01-25 10:24:15 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
in += rv;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (!rfin) {
|
2014-03-13 16:51:26 +01:00
|
|
|
goto almost_ok;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-07-22 15:38:18 +02:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: valuelen=%zu\n", inflater->left));
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->huffman_encoded) {
|
2014-02-13 15:22:52 +01:00
|
|
|
nghttp2_hd_huff_decode_context_init(&inflater->huff_decode_ctx);
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_READ_VALUEHUFF;
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_READ_VALUE;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2015-03-23 15:25:57 +01:00
|
|
|
|
|
|
|
busy = 1;
|
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
break;
|
|
|
|
case NGHTTP2_HD_STATE_READ_VALUEHUFF:
|
2014-05-28 16:02:23 +02:00
|
|
|
rv = hd_inflate_read_huff(inflater, &inflater->nvbufs, in, last);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
in += rv;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: %zd bytes read\n", rv));
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->left) {
|
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: still %zu bytes to go\n",
|
|
|
|
inflater->left));
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-03-13 16:51:26 +01:00
|
|
|
goto almost_ok;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
rv = nghttp2_bufs_addb(&inflater->nvbufs, '\0');
|
|
|
|
if (rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->opcode == NGHTTP2_HD_OPCODE_NEWNAME) {
|
2015-04-15 15:32:11 +02:00
|
|
|
rv = hd_inflate_commit_newname(inflater, nv_out, token_out);
|
2014-01-25 10:24:15 +01:00
|
|
|
} else {
|
2015-04-15 15:32:11 +02:00
|
|
|
rv = hd_inflate_commit_indname(inflater, nv_out, token_out);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_OPCODE;
|
|
|
|
*inflate_flags |= NGHTTP2_HD_INFLATE_EMIT;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-06-16 19:17:49 +02:00
|
|
|
return (ssize_t)(in - first);
|
2014-01-25 10:24:15 +01:00
|
|
|
case NGHTTP2_HD_STATE_READ_VALUE:
|
2014-05-28 16:02:23 +02:00
|
|
|
rv = hd_inflate_read(inflater, &inflater->nvbufs, in, last);
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv < 0) {
|
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: value read failure %zd: %s\n", rv,
|
|
|
|
nghttp2_strerror((int)rv)));
|
2013-10-14 16:38:12 +02:00
|
|
|
goto fail;
|
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
in += rv;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: %zd bytes read\n", rv));
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->left) {
|
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: still %zu bytes to go\n",
|
|
|
|
inflater->left));
|
2014-03-13 16:51:26 +01:00
|
|
|
goto almost_ok;
|
2014-01-25 10:24:15 +01:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2015-03-23 15:25:57 +01:00
|
|
|
rv = nghttp2_bufs_addb(&inflater->nvbufs, '\0');
|
|
|
|
if (rv != 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->opcode == NGHTTP2_HD_OPCODE_NEWNAME) {
|
2015-04-15 15:32:11 +02:00
|
|
|
rv = hd_inflate_commit_newname(inflater, nv_out, token_out);
|
2013-07-19 09:50:31 +02:00
|
|
|
} else {
|
2015-04-15 15:32:11 +02:00
|
|
|
rv = hd_inflate_commit_indname(inflater, nv_out, token_out);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2013-07-25 18:34:28 +02:00
|
|
|
goto fail;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
inflater->state = NGHTTP2_HD_STATE_OPCODE;
|
|
|
|
*inflate_flags |= NGHTTP2_HD_INFLATE_EMIT;
|
2014-03-11 13:18:28 +01:00
|
|
|
|
2014-06-16 19:17:49 +02:00
|
|
|
return (ssize_t)(in - first);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
}
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-01-25 10:24:15 +01:00
|
|
|
assert(in == last);
|
2014-03-19 16:27:39 +01:00
|
|
|
|
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: all input bytes were processed\n"));
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (in_final) {
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: in_final set\n"));
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater->state != NGHTTP2_HD_STATE_OPCODE) {
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: unacceptable state=%d\n",
|
|
|
|
inflater->state));
|
2014-02-11 08:00:59 +01:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-02-11 08:00:59 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
2014-01-25 10:24:15 +01:00
|
|
|
*inflate_flags |= NGHTTP2_HD_INFLATE_FINAL;
|
2013-10-12 14:49:01 +02:00
|
|
|
}
|
2014-06-16 19:17:49 +02:00
|
|
|
return (ssize_t)(in - first);
|
2014-03-13 16:51:26 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
almost_ok:
|
|
|
|
if (in_final && inflater->state != NGHTTP2_HD_STATE_OPCODE) {
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: input ended prematurely\n"));
|
|
|
|
|
2014-03-13 16:51:26 +01:00
|
|
|
rv = NGHTTP2_ERR_HEADER_COMP;
|
2014-03-19 16:27:39 +01:00
|
|
|
|
2014-03-13 16:51:26 +01:00
|
|
|
goto fail;
|
|
|
|
}
|
2014-08-02 15:42:55 +02:00
|
|
|
return (ssize_t)(in - first);
|
2014-03-13 16:51:26 +01:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
fail:
|
2014-03-19 16:27:39 +01:00
|
|
|
DEBUGF(fprintf(stderr, "inflatehd: error return %zd\n", rv));
|
|
|
|
|
2014-01-26 09:53:04 +01:00
|
|
|
inflater->ctx.bad = 1;
|
2013-07-25 18:34:28 +02:00
|
|
|
return rv;
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
int nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater) {
|
2014-01-16 15:41:13 +01:00
|
|
|
hd_inflate_keep_free(inflater);
|
2013-07-19 09:50:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr) {
|
2014-12-07 15:07:13 +01:00
|
|
|
return nghttp2_hd_inflate_new2(inflater_ptr, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int nghttp2_hd_inflate_new2(nghttp2_hd_inflater **inflater_ptr,
|
|
|
|
nghttp2_mem *mem) {
|
2014-06-25 14:26:47 +02:00
|
|
|
int rv;
|
|
|
|
nghttp2_hd_inflater *inflater;
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
if (mem == NULL) {
|
|
|
|
mem = nghttp2_mem_default();
|
|
|
|
}
|
|
|
|
|
|
|
|
inflater = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_inflater));
|
2014-04-29 08:53:46 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (inflater == NULL) {
|
2014-04-30 15:16:21 +02:00
|
|
|
return NGHTTP2_ERR_NOMEM;
|
2014-04-29 08:53:46 +02:00
|
|
|
}
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
rv = nghttp2_hd_inflate_init(inflater, mem);
|
2014-06-25 14:26:47 +02:00
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
if (rv != 0) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, inflater);
|
2014-07-17 17:21:15 +02:00
|
|
|
|
2014-06-25 14:26:47 +02:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
*inflater_ptr = inflater;
|
|
|
|
|
|
|
|
return 0;
|
2014-04-29 08:53:46 +02:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
void nghttp2_hd_inflate_del(nghttp2_hd_inflater *inflater) {
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem *mem;
|
|
|
|
|
|
|
|
mem = inflater->ctx.mem;
|
2014-04-29 08:53:46 +02:00
|
|
|
nghttp2_hd_inflate_free(inflater);
|
|
|
|
|
2014-12-07 15:07:13 +01:00
|
|
|
nghttp2_mem_free(mem, inflater);
|
2014-04-29 08:53:46 +02:00
|
|
|
}
|
|
|
|
|
2014-05-27 22:28:12 +02:00
|
|
|
int nghttp2_hd_emit_indname_block(nghttp2_bufs *bufs, size_t idx,
|
2015-04-14 18:21:27 +02:00
|
|
|
nghttp2_nv *nv, int indexing_mode) {
|
2014-04-01 18:25:44 +02:00
|
|
|
|
2015-04-14 18:21:27 +02:00
|
|
|
return emit_indname_block(bufs, idx, nv, indexing_mode);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
|
|
|
|
2014-03-13 14:11:02 +01:00
|
|
|
int nghttp2_hd_emit_newname_block(nghttp2_bufs *bufs, nghttp2_nv *nv,
|
2015-04-14 18:21:27 +02:00
|
|
|
int indexing_mode) {
|
|
|
|
return emit_newname_block(bufs, nv, indexing_mode);
|
2014-02-13 15:22:52 +01:00
|
|
|
}
|
|
|
|
|
2014-11-27 15:39:04 +01:00
|
|
|
int nghttp2_hd_emit_table_size(nghttp2_bufs *bufs, size_t table_size) {
|
2014-03-13 14:11:02 +01:00
|
|
|
return emit_table_size(bufs, table_size);
|
2013-07-19 09:50:31 +02:00
|
|
|
}
|
2014-07-22 15:38:18 +02:00
|
|
|
|
|
|
|
ssize_t nghttp2_hd_decode_length(uint32_t *res, size_t *shift_ptr, int *final,
|
2014-11-27 15:39:04 +01:00
|
|
|
uint32_t initial, size_t shift, uint8_t *in,
|
|
|
|
uint8_t *last, size_t prefix) {
|
|
|
|
return decode_length(res, shift_ptr, final, initial, shift, in, last, prefix);
|
2014-07-22 15:38:18 +02:00
|
|
|
}
|