CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-08-31 09:06:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

QUIC: hide header creation internals in ngx_event_quic_transport.c.

Browse source 
It doesn't make sense to expose the header type in a public function.
This commit is contained in:
Sergey Kandaurov 2020-11-17 21:32:06 +00:00
parent 5e32d82dea
commit 97dcde9799
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/event/ngx_event_quic.c
View file

@ -4858,7 +4858,7 @@ ngx_quic_send_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
if (start->level == ssl_encryption_initial && pkt.need_ack) {
pad_len = NGX_QUIC_MIN_INITIAL_SIZE - EVP_GCM_TLS_TAG_LEN
- ngx_quic_create_long_header(&pkt, NULL, out.len, NULL);
- ngx_quic_create_header(&pkt, NULL, out.len, NULL);
pad_len = ngx_min(pad_len, NGX_QUIC_MIN_INITIAL_SIZE);
} else {

4
src/event/ngx_event_quic_protection.c
View file

@ -837,7 +837,7 @@ ngx_quic_create_long_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
out.len = pkt->payload.len + EVP_GCM_TLS_TAG_LEN;
ad.data = res->data;
ad.len = ngx_quic_create_long_header(pkt, ad.data, out.len, &pnp);
ad.len = ngx_quic_create_header(pkt, ad.data, out.len, &pnp);
out.data = res->data + ad.len;
@ -895,7 +895,7 @@ ngx_quic_create_short_packet(ngx_quic_header_t *pkt, ngx_str_t *res)
out.len = pkt->payload.len + EVP_GCM_TLS_TAG_LEN;
ad.data = res->data;
ad.len = ngx_quic_create_short_header(pkt, ad.data, out.len, &pnp);
ad.len = ngx_quic_create_header(pkt, ad.data, out.len, &pnp);
out.data = res->data + ad.len;

17
src/event/ngx_event_quic_transport.c
View file

@ -80,6 +80,11 @@ static ngx_int_t ngx_quic_parse_long_header(ngx_quic_header_t *pkt);
static ngx_int_t ngx_quic_supported_version(uint32_t version);
static ngx_int_t ngx_quic_parse_long_header_v1(ngx_quic_header_t *pkt);
static size_t ngx_quic_create_long_header(ngx_quic_header_t *pkt, u_char *out,
size_t pkt_len, u_char **pnp);
static size_t ngx_quic_create_short_header(ngx_quic_header_t *pkt, u_char *out,
size_t pkt_len, u_char **pnp);
static ngx_int_t ngx_quic_frame_allowed(ngx_quic_header_t *pkt,
ngx_uint_t frame_type);
static size_t ngx_quic_create_ack(u_char *p, ngx_quic_ack_frame_t *ack);
@ -562,6 +567,16 @@ ngx_quic_create_version_negotiation(ngx_quic_header_t *pkt, u_char *out)
size_t
ngx_quic_create_header(ngx_quic_header_t *pkt, u_char *out, size_t pkt_len,
u_char **pnp)
{
return ngx_quic_short_pkt(pkt->flags)
? ngx_quic_create_short_header(pkt, out, pkt_len, pnp)
: ngx_quic_create_long_header(pkt, out, pkt_len, pnp);
}
static size_t
ngx_quic_create_long_header(ngx_quic_header_t *pkt, u_char *out,
size_t pkt_len, u_char **pnp)
{
@ -612,7 +627,7 @@ ngx_quic_create_long_header(ngx_quic_header_t *pkt, u_char *out,
}
size_t
static size_t
ngx_quic_create_short_header(ngx_quic_header_t *pkt, u_char *out,
size_t pkt_len, u_char **pnp)
{

5
src/event/ngx_event_quic_transport.h
View file

@ -335,10 +335,7 @@ ngx_int_t ngx_quic_parse_packet(ngx_quic_header_t *pkt);
size_t ngx_quic_create_version_negotiation(ngx_quic_header_t *pkt, u_char *out);
size_t ngx_quic_create_long_header(ngx_quic_header_t *pkt, u_char *out,
size_t pkt_len, u_char **pnp);
size_t ngx_quic_create_short_header(ngx_quic_header_t *pkt, u_char *out,
size_t ngx_quic_create_header(ngx_quic_header_t *pkt, u_char *out,
size_t pkt_len, u_char **pnp);
size_t ngx_quic_create_retry_itag(ngx_quic_header_t *pkt, u_char *out,