Mercurial > hg > nginx

changeset 8429:8fc9fcf18608 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stream ID handling in MAX_STREAM_DATA and STREAM_DATA_BLOCKED.
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 05 Jun 2020 20:59:27 +0300
parents 953cf44708b0
children 6fec79e43694
files src/event/ngx_event_quic.c
diffstat 1 files changed, 21 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -2875,6 +2875,14 @@ ngx_quic_handle_stream_data_blocked_fram
     ngx_quic_connection_t  *qc;
 
     qc = c->quic;
+
+    if ((f->id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+        && (f->id & NGX_QUIC_STREAM_SERVER_INITIATED))
+    {
+        qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        return NGX_ERROR;
+    }
+
     sn = ngx_quic_find_stream(&qc->streams.tree, f->id);
 
     if (sn == NULL) {
@@ -2917,10 +2925,23 @@ ngx_quic_handle_max_stream_data_frame(ng
     ngx_quic_connection_t  *qc;
 
     qc = c->quic;
+
+    if ((f->id & NGX_QUIC_STREAM_UNIDIRECTIONAL)
+        && (f->id & NGX_QUIC_STREAM_SERVER_INITIATED) == 0)
+    {
+        qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        return NGX_ERROR;
+    }
+
     sn = ngx_quic_find_stream(&qc->streams.tree, f->id);
 
     if (sn == NULL) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0, "unknown stream id:%uL", f->id);
+
+        if (f->id & NGX_QUIC_STREAM_SERVER_INITIATED) {
+            qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
+        }
+
         return NGX_ERROR;
     }