mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-13 02:39:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduced macros for building length-value transport parameters.

Browse Source
This commit is contained in:
Sergey Kandaurov 2020-05-29 13:05:57 +03:00
parent 76bbe70406
commit 25f5ab5e2d
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/event/ngx_event_quic_transport.c
View File

@ -1613,6 +1613,18 @@ ngx_quic_create_transport_params(u_char *pos, u_char *end, ngx_quic_tp_t *tp)
ngx_quic_build_int(&p, value); \ ngx_quic_build_int(&p, value); \
} while (0) } while (0)
#define ngx_quic_tp_strlen(id, value) \
ngx_quic_varint_len(id) \
+ ngx_quic_varint_len(value.len) \
+ value.len
#define ngx_quic_tp_str(id, value) \
do { \
ngx_quic_build_int(&p, id); \
ngx_quic_build_int(&p, value.len); \
p = ngx_cpymem(p, value.data, value.len); \
} while (0)
p = pos; p = pos;
len = ngx_quic_tp_len(NGX_QUIC_TP_ACTIVE_CONNECTION_ID_LIMIT, len = ngx_quic_tp_len(NGX_QUIC_TP_ACTIVE_CONNECTION_ID_LIMIT,
@ -1639,9 +1651,8 @@ ngx_quic_create_transport_params(u_char *pos, u_char *end, ngx_quic_tp_t *tp)
tp->max_idle_timeout); tp->max_idle_timeout);
if (tp->retry) { if (tp->retry) {
len += ngx_quic_varint_len(NGX_QUIC_TP_ORIGINAL_CONNECTION_ID); len += ngx_quic_tp_strlen(NGX_QUIC_TP_ORIGINAL_CONNECTION_ID,
len += ngx_quic_varint_len(tp->original_connection_id.len); tp->original_connection_id);
len += tp->original_connection_id.len;
} }
if (pos == NULL) { if (pos == NULL) {
@ -1673,10 +1684,8 @@ ngx_quic_create_transport_params(u_char *pos, u_char *end, ngx_quic_tp_t *tp)
tp->max_idle_timeout); tp->max_idle_timeout);
if (tp->retry) { if (tp->retry) {
ngx_quic_build_int(&p, NGX_QUIC_TP_ORIGINAL_CONNECTION_ID); ngx_quic_tp_str(NGX_QUIC_TP_ORIGINAL_CONNECTION_ID,
ngx_quic_build_int(&p, tp->original_connection_id.len); tp->original_connection_id);
p = ngx_cpymem(p, tp->original_connection_id.data,
tp->original_connection_id.len);
} }
return p - pos; return p - pos;