mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-27 23:56:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUIC: refactored OCSP validation in preparation for 0-RTT support.

Browse Source
This commit is contained in:
Sergey Kandaurov 2021-10-26 17:43:10 +03:00
parent 12bda330d9
commit 2f754d5dcf
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/event/quic/ngx_event_quic_ssl.c
View File

@ -361,7 +361,6 @@ static ngx_int_t
ngx_quic_crypto_input(ngx_connection_t *c, ngx_chain_t *data) ngx_quic_crypto_input(ngx_connection_t *c, ngx_chain_t *data)
{ {
int n, sslerr; int n, sslerr;
ngx_int_t rc;
ngx_buf_t *b; ngx_buf_t *b;
ngx_chain_t *cl; ngx_chain_t *cl;
ngx_ssl_conn_t *ssl_conn; ngx_ssl_conn_t *ssl_conn;
@ -463,19 +462,10 @@ ngx_quic_crypto_input(ngx_connection_t *c, ngx_chain_t *data)
return NGX_ERROR; return NGX_ERROR;
} }
rc = ngx_ssl_ocsp_validate(c); if (ngx_quic_init_streams(c) != NGX_OK) {
if (rc == NGX_ERROR) {
return NGX_ERROR; return NGX_ERROR;
} }
if (rc == NGX_AGAIN) {
c->ssl->handler = ngx_quic_init_streams;
return NGX_OK;
}
ngx_quic_init_streams(c);
return NGX_OK; return NGX_OK;
} }

32
src/event/quic/ngx_event_quic_streams.c
View File

@ -16,6 +16,7 @@
static ngx_quic_stream_t *ngx_quic_create_client_stream(ngx_connection_t *c, static ngx_quic_stream_t *ngx_quic_create_client_stream(ngx_connection_t *c,
uint64_t id); uint64_t id);
static ngx_int_t ngx_quic_init_stream(ngx_quic_stream_t *qs); static ngx_int_t ngx_quic_init_stream(ngx_quic_stream_t *qs);
static void ngx_quic_init_streams_handler(ngx_connection_t *c);
static ngx_quic_stream_t *ngx_quic_create_stream(ngx_connection_t *c, static ngx_quic_stream_t *ngx_quic_create_stream(ngx_connection_t *c,
uint64_t id); uint64_t id);
static void ngx_quic_empty_handler(ngx_event_t *ev); static void ngx_quic_empty_handler(ngx_event_t *ev);
@ -369,8 +370,37 @@ ngx_quic_init_stream(ngx_quic_stream_t *qs)
} }
void ngx_int_t
ngx_quic_init_streams(ngx_connection_t *c) ngx_quic_init_streams(ngx_connection_t *c)
{
ngx_int_t rc;
ngx_quic_connection_t *qc;
qc = ngx_quic_get_connection(c);
if (qc->streams.initialized) {
return NGX_OK;
}
rc = ngx_ssl_ocsp_validate(c);
if (rc == NGX_ERROR) {
return NGX_ERROR;
}
if (rc == NGX_AGAIN) {
c->ssl->handler = ngx_quic_init_streams_handler;
return NGX_OK;
}
ngx_quic_init_streams_handler(c);
return NGX_OK;
}
static void
ngx_quic_init_streams_handler(ngx_connection_t *c)
{ {
ngx_queue_t *q; ngx_queue_t *q;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;

2
src/event/quic/ngx_event_quic_streams.h
View File

@ -31,7 +31,7 @@ ngx_int_t ngx_quic_handle_stop_sending_frame(ngx_connection_t *c,
ngx_int_t ngx_quic_handle_max_streams_frame(ngx_connection_t *c, ngx_int_t ngx_quic_handle_max_streams_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_max_streams_frame_t *f); ngx_quic_header_t *pkt, ngx_quic_max_streams_frame_t *f);
void ngx_quic_init_streams(ngx_connection_t *c); ngx_int_t ngx_quic_init_streams(ngx_connection_t *c);
void ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp, void ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp,
ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
ngx_quic_stream_t *ngx_quic_find_stream(ngx_rbtree_t *rbtree, ngx_quic_stream_t *ngx_quic_find_stream(ngx_rbtree_t *rbtree,