|
|
@@ -31,6 +31,7 @@
|
|
|
#include "nghttp2_hd.h"
|
|
|
#include "nghttp2_helper.h"
|
|
|
#include "nghttp2_extpri.h"
|
|
|
+#include "sfparse.h"
|
|
|
|
|
|
static uint8_t downcase(uint8_t c) {
|
|
|
return 'A' <= c && c <= 'Z' ? (uint8_t)(c - 'A' + 'a') : c;
|
|
|
@@ -578,713 +579,52 @@ void nghttp2_http_record_request_method(nghttp2_stream *stream,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-/* Generated by genchartbl.py */
|
|
|
-static const int SF_KEY_CHARS[] = {
|
|
|
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
|
|
|
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
|
|
|
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
|
|
|
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
|
|
|
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
|
|
|
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
|
|
|
- 0 /* RS */, 0 /* US */, 0 /* SPC */, 0 /* ! */, 0 /* " */,
|
|
|
- 0 /* # */, 0 /* $ */, 0 /* % */, 0 /* & */, 0 /* ' */,
|
|
|
- 0 /* ( */, 0 /* ) */, 1 /* * */, 0 /* + */, 0 /* , */,
|
|
|
- 1 /* - */, 1 /* . */, 0 /* / */, 1 /* 0 */, 1 /* 1 */,
|
|
|
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
|
|
|
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 0 /* : */, 0 /* ; */,
|
|
|
- 0 /* < */, 0 /* = */, 0 /* > */, 0 /* ? */, 0 /* @ */,
|
|
|
- 0 /* A */, 0 /* B */, 0 /* C */, 0 /* D */, 0 /* E */,
|
|
|
- 0 /* F */, 0 /* G */, 0 /* H */, 0 /* I */, 0 /* J */,
|
|
|
- 0 /* K */, 0 /* L */, 0 /* M */, 0 /* N */, 0 /* O */,
|
|
|
- 0 /* P */, 0 /* Q */, 0 /* R */, 0 /* S */, 0 /* T */,
|
|
|
- 0 /* U */, 0 /* V */, 0 /* W */, 0 /* X */, 0 /* Y */,
|
|
|
- 0 /* Z */, 0 /* [ */, 0 /* \ */, 0 /* ] */, 0 /* ^ */,
|
|
|
- 1 /* _ */, 0 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
|
|
|
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
|
|
|
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
|
|
|
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
|
|
|
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
|
|
|
- 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */, 0 /* | */,
|
|
|
- 0 /* } */, 0 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
|
|
|
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
|
|
|
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
|
|
|
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
|
|
|
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
|
|
|
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
|
|
|
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
|
|
|
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
|
|
|
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
|
|
|
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
|
|
|
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
|
|
|
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
|
|
|
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
|
|
|
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
|
|
|
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
|
|
|
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
|
|
|
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
|
|
|
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
|
|
|
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
|
|
|
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
|
|
|
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
|
|
|
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
|
|
|
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
|
|
|
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
|
|
|
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
|
|
|
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
|
|
|
- 0 /* 0xff */,
|
|
|
-};
|
|
|
-
|
|
|
-static ssize_t sf_parse_key(const uint8_t *begin, const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
-
|
|
|
- if ((*p < 'a' || 'z' < *p) && *p != '*') {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- for (; p != end && SF_KEY_CHARS[*p]; ++p)
|
|
|
- ;
|
|
|
-
|
|
|
- return p - begin;
|
|
|
-}
|
|
|
-
|
|
|
-static ssize_t sf_parse_integer_or_decimal(nghttp2_sf_value *dest,
|
|
|
- const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
- int sign = 1;
|
|
|
- int64_t value = 0;
|
|
|
- int type = NGHTTP2_SF_VALUE_TYPE_INTEGER;
|
|
|
- size_t len = 0;
|
|
|
- size_t fpos = 0;
|
|
|
- size_t i;
|
|
|
-
|
|
|
- if (*p == '-') {
|
|
|
- if (++p == end) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- sign = -1;
|
|
|
- }
|
|
|
-
|
|
|
- if (*p < '0' || '9' < *p) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- for (; p != end; ++p) {
|
|
|
- switch (*p) {
|
|
|
- case '0':
|
|
|
- case '1':
|
|
|
- case '2':
|
|
|
- case '3':
|
|
|
- case '4':
|
|
|
- case '5':
|
|
|
- case '6':
|
|
|
- case '7':
|
|
|
- case '8':
|
|
|
- case '9':
|
|
|
- value *= 10;
|
|
|
- value += *p - '0';
|
|
|
-
|
|
|
- if (++len > 15) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- break;
|
|
|
- case '.':
|
|
|
- if (type != NGHTTP2_SF_VALUE_TYPE_INTEGER) {
|
|
|
- goto fin;
|
|
|
- }
|
|
|
-
|
|
|
- if (len > 12) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
- fpos = len;
|
|
|
- type = NGHTTP2_SF_VALUE_TYPE_DECIMAL;
|
|
|
-
|
|
|
- break;
|
|
|
- default:
|
|
|
- goto fin;
|
|
|
- };
|
|
|
- }
|
|
|
-
|
|
|
-fin:
|
|
|
- switch (type) {
|
|
|
- case NGHTTP2_SF_VALUE_TYPE_INTEGER:
|
|
|
- if (dest) {
|
|
|
- dest->type = (uint8_t)type;
|
|
|
- dest->i = value * sign;
|
|
|
- }
|
|
|
-
|
|
|
- return p - begin;
|
|
|
- case NGHTTP2_SF_VALUE_TYPE_DECIMAL:
|
|
|
- if (fpos == len || len - fpos > 3) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- if (dest) {
|
|
|
- dest->type = (uint8_t)type;
|
|
|
- dest->d = (double)value;
|
|
|
- for (i = len - fpos; i > 0; --i) {
|
|
|
- dest->d /= (double)10;
|
|
|
- }
|
|
|
- dest->d *= sign;
|
|
|
- }
|
|
|
-
|
|
|
- return p - begin;
|
|
|
- default:
|
|
|
- assert(0);
|
|
|
- abort();
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-/* Generated by genchartbl.py */
|
|
|
-static const int SF_DQUOTE_CHARS[] = {
|
|
|
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
|
|
|
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
|
|
|
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
|
|
|
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
|
|
|
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
|
|
|
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
|
|
|
- 0 /* RS */, 0 /* US */, 1 /* SPC */, 1 /* ! */, 0 /* " */,
|
|
|
- 1 /* # */, 1 /* $ */, 1 /* % */, 1 /* & */, 1 /* ' */,
|
|
|
- 1 /* ( */, 1 /* ) */, 1 /* * */, 1 /* + */, 1 /* , */,
|
|
|
- 1 /* - */, 1 /* . */, 1 /* / */, 1 /* 0 */, 1 /* 1 */,
|
|
|
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
|
|
|
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 1 /* : */, 1 /* ; */,
|
|
|
- 1 /* < */, 1 /* = */, 1 /* > */, 1 /* ? */, 1 /* @ */,
|
|
|
- 1 /* A */, 1 /* B */, 1 /* C */, 1 /* D */, 1 /* E */,
|
|
|
- 1 /* F */, 1 /* G */, 1 /* H */, 1 /* I */, 1 /* J */,
|
|
|
- 1 /* K */, 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
|
|
|
- 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */, 1 /* T */,
|
|
|
- 1 /* U */, 1 /* V */, 1 /* W */, 1 /* X */, 1 /* Y */,
|
|
|
- 1 /* Z */, 1 /* [ */, 0 /* \ */, 1 /* ] */, 1 /* ^ */,
|
|
|
- 1 /* _ */, 1 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
|
|
|
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
|
|
|
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
|
|
|
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
|
|
|
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
|
|
|
- 1 /* x */, 1 /* y */, 1 /* z */, 1 /* { */, 1 /* | */,
|
|
|
- 1 /* } */, 1 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
|
|
|
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
|
|
|
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
|
|
|
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
|
|
|
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
|
|
|
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
|
|
|
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
|
|
|
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
|
|
|
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
|
|
|
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
|
|
|
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
|
|
|
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
|
|
|
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
|
|
|
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
|
|
|
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
|
|
|
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
|
|
|
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
|
|
|
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
|
|
|
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
|
|
|
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
|
|
|
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
|
|
|
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
|
|
|
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
|
|
|
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
|
|
|
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
|
|
|
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
|
|
|
- 0 /* 0xff */,
|
|
|
-};
|
|
|
-
|
|
|
-static ssize_t sf_parse_string(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
-
|
|
|
- if (*p++ != '"') {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- for (; p != end; ++p) {
|
|
|
- switch (*p) {
|
|
|
- case '\\':
|
|
|
- if (++p == end) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- switch (*p) {
|
|
|
- case '"':
|
|
|
- case '\\':
|
|
|
- break;
|
|
|
- default:
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- break;
|
|
|
- case '"':
|
|
|
- if (dest) {
|
|
|
- dest->type = NGHTTP2_SF_VALUE_TYPE_STRING;
|
|
|
- dest->s.base = begin + 1;
|
|
|
- dest->s.len = (size_t)(p - dest->s.base);
|
|
|
- }
|
|
|
-
|
|
|
- ++p;
|
|
|
-
|
|
|
- return p - begin;
|
|
|
- default:
|
|
|
- if (!SF_DQUOTE_CHARS[*p]) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return -1;
|
|
|
-}
|
|
|
-
|
|
|
-/* Generated by genchartbl.py */
|
|
|
-static const int SF_TOKEN_CHARS[] = {
|
|
|
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
|
|
|
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
|
|
|
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
|
|
|
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
|
|
|
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
|
|
|
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
|
|
|
- 0 /* RS */, 0 /* US */, 0 /* SPC */, 1 /* ! */, 0 /* " */,
|
|
|
- 1 /* # */, 1 /* $ */, 1 /* % */, 1 /* & */, 1 /* ' */,
|
|
|
- 0 /* ( */, 0 /* ) */, 1 /* * */, 1 /* + */, 0 /* , */,
|
|
|
- 1 /* - */, 1 /* . */, 1 /* / */, 1 /* 0 */, 1 /* 1 */,
|
|
|
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
|
|
|
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 1 /* : */, 0 /* ; */,
|
|
|
- 0 /* < */, 0 /* = */, 0 /* > */, 0 /* ? */, 0 /* @ */,
|
|
|
- 1 /* A */, 1 /* B */, 1 /* C */, 1 /* D */, 1 /* E */,
|
|
|
- 1 /* F */, 1 /* G */, 1 /* H */, 1 /* I */, 1 /* J */,
|
|
|
- 1 /* K */, 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
|
|
|
- 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */, 1 /* T */,
|
|
|
- 1 /* U */, 1 /* V */, 1 /* W */, 1 /* X */, 1 /* Y */,
|
|
|
- 1 /* Z */, 0 /* [ */, 0 /* \ */, 0 /* ] */, 1 /* ^ */,
|
|
|
- 1 /* _ */, 1 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
|
|
|
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
|
|
|
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
|
|
|
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
|
|
|
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
|
|
|
- 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */, 1 /* | */,
|
|
|
- 0 /* } */, 1 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
|
|
|
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
|
|
|
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
|
|
|
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
|
|
|
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
|
|
|
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
|
|
|
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
|
|
|
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
|
|
|
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
|
|
|
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
|
|
|
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
|
|
|
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
|
|
|
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
|
|
|
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
|
|
|
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
|
|
|
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
|
|
|
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
|
|
|
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
|
|
|
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
|
|
|
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
|
|
|
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
|
|
|
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
|
|
|
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
|
|
|
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
|
|
|
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
|
|
|
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
|
|
|
- 0 /* 0xff */,
|
|
|
-};
|
|
|
-
|
|
|
-static ssize_t sf_parse_token(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
-
|
|
|
- if ((*p < 'A' || 'Z' < *p) && (*p < 'a' || 'z' < *p) && *p != '*') {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- for (; p != end && SF_TOKEN_CHARS[*p]; ++p)
|
|
|
- ;
|
|
|
-
|
|
|
- if (dest) {
|
|
|
- dest->type = NGHTTP2_SF_VALUE_TYPE_TOKEN;
|
|
|
- dest->s.base = begin;
|
|
|
- dest->s.len = (size_t)(p - begin);
|
|
|
- }
|
|
|
-
|
|
|
- return p - begin;
|
|
|
-}
|
|
|
-
|
|
|
-/* Generated by genchartbl.py */
|
|
|
-static const int SF_BYTESEQ_CHARS[] = {
|
|
|
- 0 /* NUL */, 0 /* SOH */, 0 /* STX */, 0 /* ETX */, 0 /* EOT */,
|
|
|
- 0 /* ENQ */, 0 /* ACK */, 0 /* BEL */, 0 /* BS */, 0 /* HT */,
|
|
|
- 0 /* LF */, 0 /* VT */, 0 /* FF */, 0 /* CR */, 0 /* SO */,
|
|
|
- 0 /* SI */, 0 /* DLE */, 0 /* DC1 */, 0 /* DC2 */, 0 /* DC3 */,
|
|
|
- 0 /* DC4 */, 0 /* NAK */, 0 /* SYN */, 0 /* ETB */, 0 /* CAN */,
|
|
|
- 0 /* EM */, 0 /* SUB */, 0 /* ESC */, 0 /* FS */, 0 /* GS */,
|
|
|
- 0 /* RS */, 0 /* US */, 0 /* SPC */, 0 /* ! */, 0 /* " */,
|
|
|
- 0 /* # */, 0 /* $ */, 0 /* % */, 0 /* & */, 0 /* ' */,
|
|
|
- 0 /* ( */, 0 /* ) */, 0 /* * */, 1 /* + */, 0 /* , */,
|
|
|
- 0 /* - */, 0 /* . */, 1 /* / */, 1 /* 0 */, 1 /* 1 */,
|
|
|
- 1 /* 2 */, 1 /* 3 */, 1 /* 4 */, 1 /* 5 */, 1 /* 6 */,
|
|
|
- 1 /* 7 */, 1 /* 8 */, 1 /* 9 */, 0 /* : */, 0 /* ; */,
|
|
|
- 0 /* < */, 1 /* = */, 0 /* > */, 0 /* ? */, 0 /* @ */,
|
|
|
- 1 /* A */, 1 /* B */, 1 /* C */, 1 /* D */, 1 /* E */,
|
|
|
- 1 /* F */, 1 /* G */, 1 /* H */, 1 /* I */, 1 /* J */,
|
|
|
- 1 /* K */, 1 /* L */, 1 /* M */, 1 /* N */, 1 /* O */,
|
|
|
- 1 /* P */, 1 /* Q */, 1 /* R */, 1 /* S */, 1 /* T */,
|
|
|
- 1 /* U */, 1 /* V */, 1 /* W */, 1 /* X */, 1 /* Y */,
|
|
|
- 1 /* Z */, 0 /* [ */, 0 /* \ */, 0 /* ] */, 0 /* ^ */,
|
|
|
- 0 /* _ */, 0 /* ` */, 1 /* a */, 1 /* b */, 1 /* c */,
|
|
|
- 1 /* d */, 1 /* e */, 1 /* f */, 1 /* g */, 1 /* h */,
|
|
|
- 1 /* i */, 1 /* j */, 1 /* k */, 1 /* l */, 1 /* m */,
|
|
|
- 1 /* n */, 1 /* o */, 1 /* p */, 1 /* q */, 1 /* r */,
|
|
|
- 1 /* s */, 1 /* t */, 1 /* u */, 1 /* v */, 1 /* w */,
|
|
|
- 1 /* x */, 1 /* y */, 1 /* z */, 0 /* { */, 0 /* | */,
|
|
|
- 0 /* } */, 0 /* ~ */, 0 /* DEL */, 0 /* 0x80 */, 0 /* 0x81 */,
|
|
|
- 0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
|
|
|
- 0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
|
|
|
- 0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
|
|
|
- 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
|
|
|
- 0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
|
|
|
- 0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
|
|
|
- 0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
|
|
|
- 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
|
|
|
- 0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
|
|
|
- 0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
|
|
|
- 0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
|
|
|
- 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
|
|
|
- 0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
|
|
|
- 0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
|
|
|
- 0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
|
|
|
- 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
|
|
|
- 0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
|
|
|
- 0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
|
|
|
- 0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
|
|
|
- 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
|
|
|
- 0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
|
|
|
- 0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
|
|
|
- 0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
|
|
|
- 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
|
|
|
- 0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
|
|
|
- 0 /* 0xff */,
|
|
|
-};
|
|
|
-
|
|
|
-static ssize_t sf_parse_byteseq(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
-
|
|
|
- if (*p++ != ':') {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- for (; p != end; ++p) {
|
|
|
- switch (*p) {
|
|
|
- case ':':
|
|
|
- if (dest) {
|
|
|
- dest->type = NGHTTP2_SF_VALUE_TYPE_BYTESEQ;
|
|
|
- dest->s.base = begin + 1;
|
|
|
- dest->s.len = (size_t)(p - dest->s.base);
|
|
|
- }
|
|
|
-
|
|
|
- ++p;
|
|
|
-
|
|
|
- return p - begin;
|
|
|
- default:
|
|
|
- if (!SF_BYTESEQ_CHARS[*p]) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return -1;
|
|
|
-}
|
|
|
-
|
|
|
-static ssize_t sf_parse_boolean(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
- int b;
|
|
|
-
|
|
|
- if (*p++ != '?') {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- if (p == end) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- switch (*p++) {
|
|
|
- case '0':
|
|
|
- b = 0;
|
|
|
- break;
|
|
|
- case '1':
|
|
|
- b = 1;
|
|
|
- break;
|
|
|
- default:
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- if (dest) {
|
|
|
- dest->type = NGHTTP2_SF_VALUE_TYPE_BOOLEAN;
|
|
|
- dest->b = b;
|
|
|
- }
|
|
|
-
|
|
|
- return p - begin;
|
|
|
-}
|
|
|
-
|
|
|
-static ssize_t sf_parse_bare_item(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- switch (*begin) {
|
|
|
- case '-':
|
|
|
- case '0':
|
|
|
- case '1':
|
|
|
- case '2':
|
|
|
- case '3':
|
|
|
- case '4':
|
|
|
- case '5':
|
|
|
- case '6':
|
|
|
- case '7':
|
|
|
- case '8':
|
|
|
- case '9':
|
|
|
- return sf_parse_integer_or_decimal(dest, begin, end);
|
|
|
- case '"':
|
|
|
- return sf_parse_string(dest, begin, end);
|
|
|
- case '*':
|
|
|
- return sf_parse_token(dest, begin, end);
|
|
|
- case ':':
|
|
|
- return sf_parse_byteseq(dest, begin, end);
|
|
|
- case '?':
|
|
|
- return sf_parse_boolean(dest, begin, end);
|
|
|
- default:
|
|
|
- if (('A' <= *begin && *begin <= 'Z') || ('a' <= *begin && *begin <= 'z')) {
|
|
|
- return sf_parse_token(dest, begin, end);
|
|
|
- }
|
|
|
- return -1;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-#define sf_discard_sp_end_err(BEGIN, END, ERR) \
|
|
|
- for (;; ++(BEGIN)) { \
|
|
|
- if ((BEGIN) == (END)) { \
|
|
|
- return (ERR); \
|
|
|
- } \
|
|
|
- if (*(BEGIN) != ' ') { \
|
|
|
- break; \
|
|
|
- } \
|
|
|
- }
|
|
|
-
|
|
|
-static ssize_t sf_parse_params(const uint8_t *begin, const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
- ssize_t slen;
|
|
|
-
|
|
|
- for (; p != end && *p == ';';) {
|
|
|
- ++p;
|
|
|
-
|
|
|
- sf_discard_sp_end_err(p, end, -1);
|
|
|
-
|
|
|
- slen = sf_parse_key(p, end);
|
|
|
- if (slen < 0) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- p += slen;
|
|
|
-
|
|
|
- if (p == end || *p != '=') {
|
|
|
- /* Boolean true */
|
|
|
- } else if (++p == end) {
|
|
|
- return -1;
|
|
|
- } else {
|
|
|
- slen = sf_parse_bare_item(NULL, p, end);
|
|
|
- if (slen < 0) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- p += slen;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return p - begin;
|
|
|
-}
|
|
|
-
|
|
|
-static ssize_t sf_parse_item(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
- ssize_t slen;
|
|
|
-
|
|
|
- slen = sf_parse_bare_item(dest, p, end);
|
|
|
- if (slen < 0) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- p += slen;
|
|
|
-
|
|
|
- slen = sf_parse_params(p, end);
|
|
|
- if (slen < 0) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- p += slen;
|
|
|
-
|
|
|
- return p - begin;
|
|
|
-}
|
|
|
-
|
|
|
-ssize_t nghttp2_sf_parse_item(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- return sf_parse_item(dest, begin, end);
|
|
|
-}
|
|
|
-
|
|
|
-static ssize_t sf_parse_inner_list(nghttp2_sf_value *dest, const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- const uint8_t *p = begin;
|
|
|
- ssize_t slen;
|
|
|
-
|
|
|
- if (*p++ != '(') {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- for (;;) {
|
|
|
- sf_discard_sp_end_err(p, end, -1);
|
|
|
-
|
|
|
- if (*p == ')') {
|
|
|
- ++p;
|
|
|
-
|
|
|
- slen = sf_parse_params(p, end);
|
|
|
- if (slen < 0) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- p += slen;
|
|
|
-
|
|
|
- if (dest) {
|
|
|
- dest->type = NGHTTP2_SF_VALUE_TYPE_INNER_LIST;
|
|
|
- }
|
|
|
-
|
|
|
- return p - begin;
|
|
|
- }
|
|
|
-
|
|
|
- slen = sf_parse_item(NULL, p, end);
|
|
|
- if (slen < 0) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- p += slen;
|
|
|
-
|
|
|
- if (p == end || (*p != ' ' && *p != ')')) {
|
|
|
- return -1;
|
|
|
- }
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-ssize_t nghttp2_sf_parse_inner_list(nghttp2_sf_value *dest,
|
|
|
- const uint8_t *begin, const uint8_t *end) {
|
|
|
- return sf_parse_inner_list(dest, begin, end);
|
|
|
-}
|
|
|
-
|
|
|
-static ssize_t sf_parse_item_or_inner_list(nghttp2_sf_value *dest,
|
|
|
- const uint8_t *begin,
|
|
|
- const uint8_t *end) {
|
|
|
- if (*begin == '(') {
|
|
|
- return sf_parse_inner_list(dest, begin, end);
|
|
|
- }
|
|
|
-
|
|
|
- return sf_parse_item(dest, begin, end);
|
|
|
-}
|
|
|
-
|
|
|
-#define sf_discard_ows(BEGIN, END) \
|
|
|
- for (;; ++(BEGIN)) { \
|
|
|
- if ((BEGIN) == (END)) { \
|
|
|
- goto fin; \
|
|
|
- } \
|
|
|
- if (*(BEGIN) != ' ' && *(BEGIN) != '\t') { \
|
|
|
- break; \
|
|
|
- } \
|
|
|
- }
|
|
|
-
|
|
|
-#define sf_discard_ows_end_err(BEGIN, END, ERR) \
|
|
|
- for (;; ++(BEGIN)) { \
|
|
|
- if ((BEGIN) == (END)) { \
|
|
|
- return (ERR); \
|
|
|
- } \
|
|
|
- if (*(BEGIN) != ' ' && *(BEGIN) != '\t') { \
|
|
|
- break; \
|
|
|
- } \
|
|
|
- }
|
|
|
-
|
|
|
int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,
|
|
|
size_t valuelen) {
|
|
|
- const uint8_t *p = value, *end = value + valuelen;
|
|
|
- ssize_t slen;
|
|
|
- nghttp2_sf_value val;
|
|
|
nghttp2_extpri pri = *dest;
|
|
|
- const uint8_t *key;
|
|
|
- size_t keylen;
|
|
|
+ sf_parser sfp;
|
|
|
+ sf_vec key;
|
|
|
+ sf_value val;
|
|
|
+ int rv;
|
|
|
+
|
|
|
+ sf_parser_init(&sfp, value, valuelen);
|
|
|
|
|
|
- for (; p != end && *p == ' '; ++p)
|
|
|
- ;
|
|
|
+ for (;;) {
|
|
|
+ rv = sf_parser_dict(&sfp, &key, &val);
|
|
|
+ if (rv != 0) {
|
|
|
+ if (rv == SF_ERR_EOF) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
- for (; p != end;) {
|
|
|
- slen = sf_parse_key(p, end);
|
|
|
- if (slen < 0) {
|
|
|
return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
}
|
|
|
|
|
|
- key = p;
|
|
|
- keylen = (size_t)slen;
|
|
|
-
|
|
|
- p += slen;
|
|
|
-
|
|
|
- if (p == end || *p != '=') {
|
|
|
- /* Boolean true */
|
|
|
- val.type = NGHTTP2_SF_VALUE_TYPE_BOOLEAN;
|
|
|
- val.b = 1;
|
|
|
+ if (key.len != 1) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
- slen = sf_parse_params(p, end);
|
|
|
- if (slen < 0) {
|
|
|
+ switch (key.base[0]) {
|
|
|
+ case 'i':
|
|
|
+ if (val.type != SF_TYPE_BOOLEAN) {
|
|
|
return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
}
|
|
|
- } else if (++p == end) {
|
|
|
- return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
- } else {
|
|
|
- slen = sf_parse_item_or_inner_list(&val, p, end);
|
|
|
- if (slen < 0) {
|
|
|
- return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- p += slen;
|
|
|
|
|
|
- if (keylen == 1) {
|
|
|
- switch (key[0]) {
|
|
|
- case 'i':
|
|
|
- if (val.type != NGHTTP2_SF_VALUE_TYPE_BOOLEAN) {
|
|
|
- return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
- }
|
|
|
-
|
|
|
- pri.inc = val.b;
|
|
|
+ pri.inc = val.boolean;
|
|
|
|
|
|
- break;
|
|
|
- case 'u':
|
|
|
- if (val.type != NGHTTP2_SF_VALUE_TYPE_INTEGER ||
|
|
|
- val.i < NGHTTP2_EXTPRI_URGENCY_HIGH ||
|
|
|
- NGHTTP2_EXTPRI_URGENCY_LOW < val.i) {
|
|
|
- return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
- }
|
|
|
-
|
|
|
- pri.urgency = (uint32_t)val.i;
|
|
|
-
|
|
|
- break;
|
|
|
+ break;
|
|
|
+ case 'u':
|
|
|
+ if (val.type != SF_TYPE_INTEGER ||
|
|
|
+ val.integer < NGHTTP2_EXTPRI_URGENCY_HIGH ||
|
|
|
+ NGHTTP2_EXTPRI_URGENCY_LOW < val.integer) {
|
|
|
+ return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- sf_discard_ows(p, end);
|
|
|
+ pri.urgency = (uint32_t)val.integer;
|
|
|
|
|
|
- if (*p++ != ',') {
|
|
|
- return NGHTTP2_ERR_INVALID_ARGUMENT;
|
|
|
+ break;
|
|
|
}
|
|
|
-
|
|
|
- sf_discard_ows_end_err(p, end, NGHTTP2_ERR_INVALID_ARGUMENT);
|
|
|
}
|
|
|
|
|
|
-fin:
|
|
|
*dest = pri;
|
|
|
|
|
|
return 0;
|
robot-contrib