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

Fixed QUIC stream insert and find.

Browse Source
This commit is contained in:
Roman Arutyunyan 2020-03-25 14:05:40 +03:00
parent dbf1b41cfb
commit bcd54c2643
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/event/ngx_event_quic.c
View File

@ -117,7 +117,7 @@ static ngx_int_t ngx_quic_send_packet(ngx_connection_t *c,
static void ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp, static 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);
static ngx_quic_stream_t *ngx_quic_find_stream(ngx_rbtree_t *rbtree, static ngx_quic_stream_t *ngx_quic_find_stream(ngx_rbtree_t *rbtree,
ngx_uint_t key); uint64_t id);
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, size_t rcvbuf_size); uint64_t id, size_t rcvbuf_size);
static ssize_t ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf, static ssize_t ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf,
@ -1447,26 +1447,10 @@ ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp,
ngx_quic_stream_t *qn, *qnt; ngx_quic_stream_t *qn, *qnt;
for ( ;; ) { for ( ;; ) {
qn = (ngx_quic_stream_t *) node;
qnt = (ngx_quic_stream_t *) temp;
if (node->key < temp->key) { p = (qn->id < qnt->id) ? &temp->left : &temp->right;
p = &temp->left;
} else if (node->key > temp->key) {
p = &temp->right;
} else { /* node->key == temp->key */
qn = (ngx_quic_stream_t *) &node->color;
qnt = (ngx_quic_stream_t *) &temp->color;
if (qn->c < qnt->c) {
p = &temp->left;
} else {
p = &temp->right;
}
}
if (*p == sentinel) { if (*p == sentinel) {
break; break;
@ -1484,20 +1468,22 @@ ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp,
static ngx_quic_stream_t * static ngx_quic_stream_t *
ngx_quic_find_stream(ngx_rbtree_t *rbtree, ngx_uint_t key) ngx_quic_find_stream(ngx_rbtree_t *rbtree, uint64_t id)
{ {
ngx_rbtree_node_t *node, *sentinel; ngx_rbtree_node_t *node, *sentinel;
ngx_quic_stream_t *qn;
node = rbtree->root; node = rbtree->root;
sentinel = rbtree->sentinel; sentinel = rbtree->sentinel;
while (node != sentinel) { while (node != sentinel) {
qn = (ngx_quic_stream_t *) node;
if (key == node->key) { if (id == qn->id) {
return (ngx_quic_stream_t *) node; return qn;
} }
node = (key < node->key) ? node->left : node->right; node = (id < qn->id) ? node->left : node->right;
} }
return NULL; return NULL;