mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-24 04:49:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUIC: allowed ngx_quic_frame_sendto() to return NGX_AGAIN.

Browse Source 
Previously, NGX_AGAIN returned by ngx_quic_send() was treated by
ngx_quic_frame_sendto() as error, which triggered errors in its callers.
However, a blocked socket is not an error.  Now NGX_AGAIN is passed as is to
the ngx_quic_frame_sendto() callers, which can safely ignore it.
This commit is contained in:
Roman Arutyunyan 2023-08-08 10:43:17 +04:00
parent 8ab3889073
commit 58fc5e2830
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/event/quic/ngx_event_quic_migration.c
View File

@ -46,7 +46,7 @@ ngx_quic_handle_path_challenge_frame(ngx_connection_t *c,
* An endpoint MUST expand datagrams that contain a PATH_RESPONSE frame * An endpoint MUST expand datagrams that contain a PATH_RESPONSE frame
* to at least the smallest allowed maximum datagram size of 1200 bytes. * to at least the smallest allowed maximum datagram size of 1200 bytes.
*/ */
if (ngx_quic_frame_sendto(c, &frame, 1200, pkt->path) != NGX_OK) { if (ngx_quic_frame_sendto(c, &frame, 1200, pkt->path) == NGX_ERROR) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -544,13 +544,13 @@ ngx_quic_send_path_challenge(ngx_connection_t *c, ngx_quic_path_t *path)
*/ */
/* same applies to PATH_RESPONSE frames */ /* same applies to PATH_RESPONSE frames */
if (ngx_quic_frame_sendto(c, &frame, 1200, path) != NGX_OK) { if (ngx_quic_frame_sendto(c, &frame, 1200, path) == NGX_ERROR) {
return NGX_ERROR; return NGX_ERROR;
} }
ngx_memcpy(frame.u.path_challenge.data, path->challenge2, 8); ngx_memcpy(frame.u.path_challenge.data, path->challenge2, 8);
if (ngx_quic_frame_sendto(c, &frame, 1200, path) != NGX_OK) { if (ngx_quic_frame_sendto(c, &frame, 1200, path) == NGX_ERROR) {
return NGX_ERROR; return NGX_ERROR;
} }

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

@ -1233,7 +1233,7 @@ ngx_quic_frame_sendto(ngx_connection_t *c, ngx_quic_frame_t *frame,
sent = ngx_quic_send(c, res.data, res.len, path->sockaddr, path->socklen); sent = ngx_quic_send(c, res.data, res.len, path->sockaddr, path->socklen);
if (sent < 0) { if (sent < 0) {
return NGX_ERROR; return sent;
} }
path->sent += sent; path->sent += sent;