IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

QUIC: send STOP_SENDING on stream closure.

Browse Source 
The frame is sent for a read-enabled stream which has not received a FIN or
RESET_STREAM.
This commit is contained in:
Roman Arutyunyan 2020-08-25 14:07:26 +03:00
parent 2cd05e1909
commit 4e4d0938b9
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/event/ngx_event_quic.c
View File

@ -4564,6 +4564,27 @@ ngx_quic_stream_cleanup_handler(void *data)
return; return;
} }
if ((qs->id & NGX_QUIC_STREAM_SERVER_INITIATED) == 0
|| (qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0)
{
if (!c->read->eof && !c->read->error) {
frame = ngx_quic_alloc_frame(pc, 0);
if (frame == NULL) {
return;
}
frame->level = ssl_encryption_application;
frame->type = NGX_QUIC_FT_STOP_SENDING;
frame->u.stop_sending.id = qs->id;
frame->u.stop_sending.error_code = 0x100; /* HTTP/3 no error */
ngx_sprintf(frame->info, "STOP_SENDING id:0x%xL err:0x%xL level:%d",
qs->id, frame->u.stop_sending.error_code, frame->level);
ngx_quic_queue_frame(qc, frame);
}
}
if ((qs->id & NGX_QUIC_STREAM_SERVER_INITIATED) == 0) { if ((qs->id & NGX_QUIC_STREAM_SERVER_INITIATED) == 0) {
frame = ngx_quic_alloc_frame(pc, 0); frame = ngx_quic_alloc_frame(pc, 0);
if (frame == NULL) { if (frame == NULL) {

28
src/event/ngx_event_quic_transport.c
View File

@ -70,6 +70,8 @@ static u_char *ngx_quic_copy_bytes(u_char *pos, u_char *end, size_t len,
static ngx_int_t ngx_quic_frame_allowed(ngx_quic_header_t *pkt, static ngx_int_t ngx_quic_frame_allowed(ngx_quic_header_t *pkt,
ngx_uint_t frame_type); ngx_uint_t frame_type);
static size_t ngx_quic_create_ack(u_char *p, ngx_quic_ack_frame_t *ack); static size_t ngx_quic_create_ack(u_char *p, ngx_quic_ack_frame_t *ack);
static size_t ngx_quic_create_stop_sending(u_char *p,
ngx_quic_stop_sending_frame_t *ss);
static size_t ngx_quic_create_crypto(u_char *p, static size_t ngx_quic_create_crypto(u_char *p,
ngx_quic_crypto_frame_t *crypto); ngx_quic_crypto_frame_t *crypto);
static size_t ngx_quic_create_hs_done(u_char *p); static size_t ngx_quic_create_hs_done(u_char *p);
@ -1165,6 +1167,9 @@ ngx_quic_create_frame(u_char *p, ngx_quic_frame_t *f)
f->need_ack = 0; f->need_ack = 0;
return ngx_quic_create_ack(p, &f->u.ack); return ngx_quic_create_ack(p, &f->u.ack);
case NGX_QUIC_FT_STOP_SENDING:
return ngx_quic_create_stop_sending(p, &f->u.stop_sending);
case NGX_QUIC_FT_CRYPTO: case NGX_QUIC_FT_CRYPTO:
return ngx_quic_create_crypto(p, &f->u.crypto); return ngx_quic_create_crypto(p, &f->u.crypto);
@ -1235,6 +1240,29 @@ ngx_quic_create_ack(u_char *p, ngx_quic_ack_frame_t *ack)
} }
static size_t
ngx_quic_create_stop_sending(u_char *p, ngx_quic_stop_sending_frame_t *ss)
{
size_t len;
u_char *start;
if (p == NULL) {
len = ngx_quic_varint_len(NGX_QUIC_FT_STOP_SENDING);
len += ngx_quic_varint_len(ss->id);
len += ngx_quic_varint_len(ss->error_code);
return len;
}
start = p;
ngx_quic_build_int(&p, NGX_QUIC_FT_STOP_SENDING);
ngx_quic_build_int(&p, ss->id);
ngx_quic_build_int(&p, ss->error_code);
return p - start;
}
static size_t static size_t
ngx_quic_create_crypto(u_char *p, ngx_quic_crypto_frame_t *crypto) ngx_quic_create_crypto(u_char *p, ngx_quic_crypto_frame_t *crypto)
{ {