mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

REORG: include: move hpack*.h to haproxy/ and split hpack-tbl

Browse Source 
The various hpack files are self-contained, but hpack-tbl was one of
those showing difficulties when pools were added because that began
to add quite some dependencies. Now when built in standalone mode,
it still uses the bare minimum pool definitions and doesn't require
to know the prototypes anymore when only the structures are needed.
Thus the files were moved verbatim except for hpack-tbl which was
split between types and prototypes.
This commit is contained in:
Willy Tarreau 2020-06-03 09:09:57 +02:00
parent 16f958c0e9
commit be327fa332
12 changed files with 197 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/hpack/decode.c
View File

@ -19,7 +19,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <haproxy/chunk.h>
#include <common/hpack-dec.h>
#include <haproxy/hpack-dec.h>
#define MAX_RQ_SIZE 65536
#define MAX_HDR_NUM 1000

2
contrib/hpack/gen-enc.c
View File

@ -15,7 +15,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <import/ist.h>
#include <common/hpack-tbl.h>
#include <haproxy/hpack-tbl-t.h>
#include "../../src/hpack-tbl.c"
struct idxhdr {

4
include/common/hpack-dec.h → include/haproxy/hpack-dec.h
View File

@ -1,7 +1,7 @@
/*
* HPACK decompressor (RFC7541)
*
* Copyright (C) 2014-2017 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2014-2020 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2017 HAProxy Technologies
*
* Permission is hereby granted, free of charge, to any person obtaining
@ -30,7 +30,7 @@
#include <haproxy/api.h>
#include <haproxy/chunk.h>
#include <common/hpack-tbl.h>
#include <haproxy/hpack-tbl.h>
int hpack_decode_frame(struct hpack_dht *dht, const uint8_t *raw, uint32_t len,
struct http_hdr *list, int list_size,

4
include/common/hpack-enc.h → include/haproxy/hpack-enc.h
View File

@ -1,7 +1,7 @@
/*
* HPACK compressor (RFC7541)
*
* Copyright (C) 2014-2017 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2014-2020 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2017 HAProxy Technologies
*
* Permission is hereby granted, free of charge, to any person obtaining
@ -29,10 +29,10 @@
#define _COMMON_HPACK_ENC_H
#include <string.h>
#include <import/ist.h>
#include <haproxy/api.h>
#include <haproxy/buf-t.h>
#include <haproxy/http-t.h>
#include <import/ist.h>
int hpack_encode_header(struct buffer *out, const struct ist n,
const struct ist v);

8
include/common/hpack-huff.h → include/haproxy/hpack-huff.h
View File

@ -1,7 +1,7 @@
/*
* Huffman decoding and encoding for HPACK (RFC7541)
*
* Copyright (C) 2014-2017 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2014-2020 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2017 HAProxy Technologies
*
* Permission is hereby granted, free of charge, to any person obtaining
@ -24,12 +24,12 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef _PROTO_HPACK_HUFF_H
#define _PROTO_HPACK_HUFF_H
#ifndef _HAPROXY_HPACK_HUFF_H
#define _HAPROXY_HPACK_HUFF_H
#include <inttypes.h>
int huff_enc(const char *s, char *out);
int huff_dec(const uint8_t *huff, int hlen, char *out, int olen);
#endif
#endif /* _HAPROXY_HPACK_HUFF_H */

148
include/common/hpack-tbl.h → include/haproxy/hpack-tbl-t.h
View File

@ -1,7 +1,7 @@
/*
* HPACK header table management (RFC7541) - type definitions and prototypes
* HPACK header table management (RFC7541) - type definitions
*
* Copyright (C) 2014-2017 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2014-2020 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2017 HAProxy Technologies
*
* Permission is hereby granted, free of charge, to any person obtaining
@ -24,14 +24,10 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef _COMMON_HPACK_TBL_H
#define _COMMON_HPACK_TBL_H
#ifndef _HAPROXY_HPACK_TBL_T_H
#define _HAPROXY_HPACK_TBL_T_H
#include <stdlib.h>
#include <haproxy/api.h>
#include <haproxy/http-hdr-t.h>
#include <import/ist.h>
#include <haproxy/pool.h>
#include <inttypes.h>
/* Dynamic Headers Table, usable for tables up to 4GB long and values of 64kB-1.
* The model can be improved by using offsets relative to the table entry's end
@ -132,137 +128,5 @@ enum {
/* static header table as in RFC7541 Appendix A. [0] unused. */
#define HPACK_SHT_SIZE 62
extern const struct http_hdr hpack_sht[HPACK_SHT_SIZE];
extern struct pool_head *pool_head_hpack_tbl;
/* when built outside of haproxy, HPACK_STANDALONE must be defined, and
* pool_head_hpack_tbl->size must be set to the DHT size.
*/
#ifndef HPACK_STANDALONE
#define hpack_alloc(pool) pool_alloc(pool)
#define hpack_free(pool, ptr) pool_free(pool, ptr)
#else
#define hpack_alloc(pool) malloc(pool->size)
#define hpack_free(pool, ptr) free(ptr)
#endif
extern int __hpack_dht_make_room(struct hpack_dht *dht, unsigned int needed);
extern int hpack_dht_insert(struct hpack_dht *dht, struct ist name, struct ist value);
/* return a pointer to the entry designated by index <idx> (starting at 1) or
* NULL if this index is not there.
*/
static inline const struct hpack_dte *hpack_get_dte(const struct hpack_dht *dht, uint16_t idx)
{
idx--;
if (idx >= dht->used)
return NULL;
if (idx <= dht->head)
idx = dht->head - idx;
else
idx = dht->head - idx + dht->wrap;
return &dht->dte[idx];
}
/* returns non-zero if <idx> is valid for table <dht> */
static inline int hpack_valid_idx(const struct hpack_dht *dht, uint32_t idx)
{
return idx < dht->used + HPACK_SHT_SIZE;
}
/* return a pointer to the header name for entry <dte>. */
static inline struct ist hpack_get_name(const struct hpack_dht *dht, const struct hpack_dte *dte)
{
struct ist ret = {
.ptr = (void *)dht + dte->addr,
.len = dte->nlen,
};
return ret;
}
/* return a pointer to the header value for entry <dte>. */
static inline struct ist hpack_get_value(const struct hpack_dht *dht, const struct hpack_dte *dte)
{
struct ist ret = {
.ptr = (void *)dht + dte->addr + dte->nlen,
.len = dte->vlen,
};
return ret;
}
/* takes an idx, returns the associated name */
static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, uint32_t idx)
{
const struct hpack_dte *dte;
if (idx < HPACK_SHT_SIZE)
return hpack_sht[idx].n;
dte = hpack_get_dte(dht, idx - HPACK_SHT_SIZE + 1);
if (!dte)
return ist("### ERR ###"); // error
return hpack_get_name(dht, dte);
}
/* takes an idx, returns the associated value */
static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, uint32_t idx)
{
const struct hpack_dte *dte;
if (idx < HPACK_SHT_SIZE)
return hpack_sht[idx].v;
dte = hpack_get_dte(dht, idx - HPACK_SHT_SIZE + 1);
if (!dte)
return ist("### ERR ###"); // error
return hpack_get_value(dht, dte);
}
/* Purges table dht until a header field of <needed> bytes fits according to
* the protocol (adding 32 bytes overhead). Returns non-zero on success, zero
* on failure (ie: table empty but still not sufficient).
*/
static inline int hpack_dht_make_room(struct hpack_dht *dht, unsigned int needed)
{
if (dht->used * 32 + dht->total + needed + 32 <= dht->size)
return 1;
else if (!dht->used)
return 0;
return __hpack_dht_make_room(dht, needed);
}
/* allocate a dynamic headers table of <size> bytes and return it initialized */
static inline void hpack_dht_init(struct hpack_dht *dht, uint32_t size)
{
dht->size = size;
dht->total = 0;
dht->used = 0;
}
/* allocate a dynamic headers table from the pool and return it initialized */
static inline struct hpack_dht *hpack_dht_alloc()
{
struct hpack_dht *dht;
if (unlikely(!pool_head_hpack_tbl))
return NULL;
dht = hpack_alloc(pool_head_hpack_tbl);
if (dht)
hpack_dht_init(dht, pool_head_hpack_tbl->size);
return dht;
}
/* free a dynamic headers table */
static inline void hpack_dht_free(struct hpack_dht *dht)
{
hpack_free(pool_head_hpack_tbl, dht);
}
#endif /* _COMMON_HPACK_TBL_H */
#endif /* _HAPROXY_HPACK_TBL_T_H */

171
include/haproxy/hpack-tbl.h Normal file
View File

@ -0,0 +1,171 @@
/*
* HPACK header table management (RFC7541) - prototypes
*
* Copyright (C) 2014-2020 Willy Tarreau <willy@haproxy.org>
* Copyright (C) 2017 HAProxy Technologies
*
* 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.
*/
#ifndef _HAPROXY_HPACK_TBL_H
#define _HAPROXY_HPACK_TBL_H
#include <import/ist.h>
#include <haproxy/api.h>
#include <haproxy/hpack-tbl-t.h>
#include <haproxy/http-hdr-t.h>
/* when built outside of haproxy, HPACK_STANDALONE must be defined, and
* pool_head_hpack_tbl->size must be set to the DHT size.
*/
#ifndef HPACK_STANDALONE
#include <haproxy/pool.h>
#define hpack_alloc(pool) pool_alloc(pool)
#define hpack_free(pool, ptr) pool_free(pool, ptr)
#else
#include <stdlib.h>
#include <haproxy/pool-t.h>
#define hpack_alloc(pool) malloc(pool->size)
#define hpack_free(pool, ptr) free(ptr)
#endif
extern const struct http_hdr hpack_sht[HPACK_SHT_SIZE];
extern struct pool_head *pool_head_hpack_tbl;
extern int __hpack_dht_make_room(struct hpack_dht *dht, unsigned int needed);
extern int hpack_dht_insert(struct hpack_dht *dht, struct ist name, struct ist value);
/* return a pointer to the entry designated by index <idx> (starting at 1) or
* NULL if this index is not there.
*/
static inline const struct hpack_dte *hpack_get_dte(const struct hpack_dht *dht, uint16_t idx)
{
idx--;
if (idx >= dht->used)
return NULL;
if (idx <= dht->head)
idx = dht->head - idx;
else
idx = dht->head - idx + dht->wrap;
return &dht->dte[idx];
}
/* returns non-zero if <idx> is valid for table <dht> */
static inline int hpack_valid_idx(const struct hpack_dht *dht, uint32_t idx)
{
return idx < dht->used + HPACK_SHT_SIZE;
}
/* return a pointer to the header name for entry <dte>. */
static inline struct ist hpack_get_name(const struct hpack_dht *dht, const struct hpack_dte *dte)
{
struct ist ret = {
.ptr = (void *)dht + dte->addr,
.len = dte->nlen,
};
return ret;
}
/* return a pointer to the header value for entry <dte>. */
static inline struct ist hpack_get_value(const struct hpack_dht *dht, const struct hpack_dte *dte)
{
struct ist ret = {
.ptr = (void *)dht + dte->addr + dte->nlen,
.len = dte->vlen,
};
return ret;
}
/* takes an idx, returns the associated name */
static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, uint32_t idx)
{
const struct hpack_dte *dte;
if (idx < HPACK_SHT_SIZE)
return hpack_sht[idx].n;
dte = hpack_get_dte(dht, idx - HPACK_SHT_SIZE + 1);
if (!dte)
return ist("### ERR ###"); // error
return hpack_get_name(dht, dte);
}
/* takes an idx, returns the associated value */
static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, uint32_t idx)
{
const struct hpack_dte *dte;
if (idx < HPACK_SHT_SIZE)
return hpack_sht[idx].v;
dte = hpack_get_dte(dht, idx - HPACK_SHT_SIZE + 1);
if (!dte)
return ist("### ERR ###"); // error
return hpack_get_value(dht, dte);
}
/* Purges table dht until a header field of <needed> bytes fits according to
* the protocol (adding 32 bytes overhead). Returns non-zero on success, zero
* on failure (ie: table empty but still not sufficient).
*/
static inline int hpack_dht_make_room(struct hpack_dht *dht, unsigned int needed)
{
if (dht->used * 32 + dht->total + needed + 32 <= dht->size)
return 1;
else if (!dht->used)
return 0;
return __hpack_dht_make_room(dht, needed);
}
/* allocate a dynamic headers table of <size> bytes and return it initialized */
static inline void hpack_dht_init(struct hpack_dht *dht, uint32_t size)
{
dht->size = size;
dht->total = 0;
dht->used = 0;
}
/* allocate a dynamic headers table from the pool and return it initialized */
static inline struct hpack_dht *hpack_dht_alloc()
{
struct hpack_dht *dht;
if (unlikely(!pool_head_hpack_tbl))
return NULL;
dht = hpack_alloc(pool_head_hpack_tbl);
if (dht)
hpack_dht_init(dht, pool_head_hpack_tbl->size);
return dht;
}
/* free a dynamic headers table */
static inline void hpack_dht_free(struct hpack_dht *dht)
{
hpack_free(pool_head_hpack_tbl, dht);
}
#endif /* _HAPROXY_HPACK_TBL_H */

6
src/hpack-dec.c
View File

@ -31,9 +31,9 @@
#include <string.h>
#include <common/standard.h>
#include <common/hpack-dec.h>
#include <common/hpack-huff.h>
#include <common/hpack-tbl.h>
#include <haproxy/hpack-dec.h>
#include <haproxy/hpack-huff.h>
#include <haproxy/hpack-tbl.h>
#include <haproxy/chunk.h>
#include <common/h2.h>
#include <import/ist.h>

2
src/hpack-enc.c
View File

@ -30,7 +30,7 @@
#include <stdlib.h>
#include <string.h>
#include <common/hpack-enc.h>
#include <haproxy/hpack-enc.h>
#include <haproxy/http-hdr-t.h>
#include <import/ist.h>

2
src/hpack-huff.c
View File

@ -30,7 +30,7 @@
#include <string.h>
#include <haproxy/api.h>
#include <common/hpack-huff.h>
#include <haproxy/hpack-huff.h>
struct huff {
uint32_t c; /* code point */

4
src/hpack-tbl.c
View File

@ -30,8 +30,8 @@
#include <stdlib.h>
#include <string.h>
#include <common/hpack-huff.h>
#include <common/hpack-tbl.h>
#include <haproxy/hpack-huff.h>
#include <haproxy/hpack-tbl.h>
#include <import/ist.h>
#include <types/global.h>

6
src/mux_h2.c
View File

@ -15,9 +15,9 @@
#include <common/cfgparse.h>
#include <haproxy/h1.h>
#include <common/h2.h>
#include <common/hpack-dec.h>
#include <common/hpack-enc.h>
#include <common/hpack-tbl.h>
#include <haproxy/hpack-dec.h>
#include <haproxy/hpack-enc.h>
#include <haproxy/hpack-tbl.h>
#include <haproxy/htx.h>
#include <haproxy/net_helper.h>
#include <proto/connection.h>