Mercurial > hg > nginx
diff src/event/ngx_event_quic_transport.c @ 8417:6633f17044eb quic
QUIC draft-28 transport parameters support.
Draft-27 and draft-28 support can now be enabled interchangeably,
it's based on the compile-time macro NGX_QUIC_DRAFT_VERSION.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Fri, 29 May 2020 15:06:33 +0300 |
parents | 78e362f0b081 |
children | c206233d9c29 |
line wrap: on
line diff
--- a/src/event/ngx_event_quic_transport.c Fri May 29 13:05:57 2020 +0300 +++ b/src/event/ngx_event_quic_transport.c Fri May 29 15:06:33 2020 +0300 @@ -1354,6 +1354,10 @@ ngx_quic_tp_t *dst) { uint64_t varint; + ngx_str_t str; + + varint = 0; + ngx_str_null(&str); switch (id) { @@ -1383,6 +1387,12 @@ } break; + case NGX_QUIC_TP_INITIAL_SCID: + + str.len = end - p; + p = ngx_quic_read_bytes(p, end, str.len, &str.data); + break; + default: return NGX_DECLINED; } @@ -1433,6 +1443,10 @@ dst->active_connection_id_limit = varint; break; + case NGX_QUIC_TP_INITIAL_SCID: + dst->initial_scid = str; + break; + default: return NGX_ERROR; } @@ -1457,8 +1471,9 @@ } switch (id) { - case NGX_QUIC_TP_ORIGINAL_CONNECTION_ID: + case NGX_QUIC_TP_ORIGINAL_DCID: case NGX_QUIC_TP_PREFERRED_ADDRESS: + case NGX_QUIC_TP_RETRY_SCID: case NGX_QUIC_TP_STATELESS_RESET_TOKEN: ngx_log_error(NGX_LOG_INFO, log, 0, "quic client sent forbidden transport param" @@ -1547,6 +1562,11 @@ "quic tp active_connection_id_limit: %ui", tp->active_connection_id_limit); +#if (NGX_QUIC_DRAFT_VERSION >= 28) + ngx_quic_hexdump(log, "quic tp initial_source_connection_id:", + tp->initial_scid.data, tp->initial_scid.len); +#endif + return NGX_OK; } @@ -1650,9 +1670,17 @@ len += ngx_quic_tp_len(NGX_QUIC_TP_MAX_IDLE_TIMEOUT, tp->max_idle_timeout); +#if (NGX_QUIC_DRAFT_VERSION >= 28) + len += ngx_quic_tp_strlen(NGX_QUIC_TP_ORIGINAL_DCID, tp->original_dcid); + len += ngx_quic_tp_strlen(NGX_QUIC_TP_INITIAL_SCID, tp->initial_scid); +#endif + if (tp->retry) { - len += ngx_quic_tp_strlen(NGX_QUIC_TP_ORIGINAL_CONNECTION_ID, - tp->original_connection_id); +#if (NGX_QUIC_DRAFT_VERSION >= 28) + len += ngx_quic_tp_strlen(NGX_QUIC_TP_RETRY_SCID, tp->retry_scid); +#else + len += ngx_quic_tp_strlen(NGX_QUIC_TP_ORIGINAL_DCID, tp->original_dcid); +#endif } if (pos == NULL) { @@ -1683,9 +1711,17 @@ ngx_quic_tp_vint(NGX_QUIC_TP_MAX_IDLE_TIMEOUT, tp->max_idle_timeout); +#if (NGX_QUIC_DRAFT_VERSION >= 28) + ngx_quic_tp_str(NGX_QUIC_TP_ORIGINAL_DCID, tp->original_dcid); + ngx_quic_tp_str(NGX_QUIC_TP_INITIAL_SCID, tp->initial_scid); +#endif + if (tp->retry) { - ngx_quic_tp_str(NGX_QUIC_TP_ORIGINAL_CONNECTION_ID, - tp->original_connection_id); +#if (NGX_QUIC_DRAFT_VERSION >= 28) + ngx_quic_tp_str(NGX_QUIC_TP_RETRY_SCID, tp->retry_scid); +#else + ngx_quic_tp_str(NGX_QUIC_TP_ORIGINAL_DCID, tp->original_dcid); +#endif } return p - pos;