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

QUIC: revised ngx_quic_handle_datagram() error codes.

Browse Source 
The NGX_DECLINED is replaced with NGX_DONE to match closer to return code
of ngx_quic_handle_packet() and ngx_quic_close_connection() rc argument.

The ngx_quic_close_connection() rc code is used only when quic connection
exists, thus anything goes if qc == NULL.

The ngx_quic_handle_datagram() does not return NG_OK in cases when quic
connection is not yet created.
This commit is contained in:
Vladimir Homutov 2022-02-01 14:35:31 +03:00
parent 1491d6ec42
commit 3f94e45a3b
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/event/quic/ngx_event_quic.c
View File

@ -210,17 +210,13 @@ ngx_quic_run(ngx_connection_t *c, ngx_quic_conf_t *conf)
rc = ngx_quic_handle_datagram(c, c->buffer, conf); rc = ngx_quic_handle_datagram(c, c->buffer, conf);
if (rc != NGX_OK) { if (rc != NGX_OK) {
ngx_quic_close_connection(c, rc == NGX_DECLINED ? NGX_DONE : NGX_ERROR); ngx_quic_close_connection(c, rc);
return; return;
} }
/* quic connection is now created */
qc = ngx_quic_get_connection(c); qc = ngx_quic_get_connection(c);
if (qc == NULL) {
ngx_quic_close_connection(c, NGX_DONE);
return;
}
ngx_add_timer(c->read, qc->tp.max_idle_timeout); ngx_add_timer(c->read, qc->tp.max_idle_timeout);
ngx_quic_connstate_dbg(c); ngx_quic_connstate_dbg(c);
@ -443,7 +439,7 @@ ngx_quic_input_handler(ngx_event_t *rev)
return; return;
} }
if (rc == NGX_DECLINED) { if (rc == NGX_DONE) {
return; return;
} }
@ -709,13 +705,8 @@ ngx_quic_handle_datagram(ngx_connection_t *c, ngx_buf_t *b,
} }
#endif #endif
if (rc == NGX_ERROR) { if (rc == NGX_ERROR || rc == NGX_DONE) {
return NGX_ERROR; return rc;
}
if (rc == NGX_DONE) {
/* stop further processing */
return NGX_DECLINED;
} }
if (rc == NGX_OK) { if (rc == NGX_OK) {
@ -750,7 +741,7 @@ ngx_quic_handle_datagram(ngx_connection_t *c, ngx_buf_t *b,
} }
if (!good) { if (!good) {
return NGX_DECLINED; return NGX_DONE;
} }
qc = ngx_quic_get_connection(c); qc = ngx_quic_get_connection(c);

2
src/event/quic/ngx_event_quic_output.c
View File

@ -979,7 +979,7 @@ ngx_quic_send_early_cc(ngx_connection_t *c, ngx_quic_header_t *inpkt,
return NGX_ERROR; return NGX_ERROR;
} }
return NGX_OK; return NGX_DONE;
} }