upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- For #1103: Fix to drop mesh state reference for the http2 stream

Browse source 
associated with the reply, not the currently active stream. And
  it does not remove it twice on a mesh_send_reply call. The reply
  h2_stream is NULL when not in use, for more initialisation.
This commit is contained in:
W.C.A. Wijngaards 2024-07-16 14:23:10 +02:00
parent 8947c2c764
commit 8fca3e7c5b
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/Changelog
View file

@ -1,3 +1,9 @@
16 July 2024: Wouter
- For #1103: Fix to drop mesh state reference for the http2 stream
associated with the reply, not the currently active stream. And
it does not remove it twice on a mesh_send_reply call. The reply
h2_stream is NULL when not in use, for more initialisation.
15 July 2024: Wouter 15 July 2024: Wouter
- For #1103: fix to also drop mesh state reference when the discard - For #1103: fix to also drop mesh state reference when the discard
limit is reached, when there is an error making a new recursion limit is reached, when there is an error making a new recursion

23
services/mesh.c
View file

@ -977,8 +977,7 @@ mesh_state_cleanup(struct mesh_state* mstate)
infra_wait_limit_dec(mesh->env->infra_cache, infra_wait_limit_dec(mesh->env->infra_cache,
&rep->query_reply, mesh->env->cfg); &rep->query_reply, mesh->env->cfg);
if(rep->query_reply.c->use_h2) if(rep->query_reply.c->use_h2)
http2_stream_remove_mesh_state( http2_stream_remove_mesh_state(rep->h2_stream);
rep->query_reply.c->h2_stream);
comm_point_drop_reply(&rep->query_reply); comm_point_drop_reply(&rep->query_reply);
log_assert(mesh->num_reply_addrs > 0); log_assert(mesh->num_reply_addrs > 0);
mesh->num_reply_addrs--; mesh->num_reply_addrs--;
@ -1536,8 +1535,7 @@ void mesh_query_done(struct mesh_state* mstate)
&r->query_reply, mstate->s.env->cfg); &r->query_reply, mstate->s.env->cfg);
mstate->reply_list = NULL; mstate->reply_list = NULL;
if(r->query_reply.c->use_h2) if(r->query_reply.c->use_h2)
http2_stream_remove_mesh_state( http2_stream_remove_mesh_state(r->h2_stream);
r->query_reply.c->h2_stream);
comm_point_drop_reply(&r->query_reply); comm_point_drop_reply(&r->query_reply);
mstate->reply_list = reply_list; mstate->reply_list = reply_list;
mstate->s.env->mesh->stats_dropped++; mstate->s.env->mesh->stats_dropped++;
@ -1571,8 +1569,7 @@ void mesh_query_done(struct mesh_state* mstate)
&r->query_reply, mstate->s.env->cfg); &r->query_reply, mstate->s.env->cfg);
mstate->reply_list = NULL; mstate->reply_list = NULL;
if(r->query_reply.c->use_h2) { if(r->query_reply.c->use_h2) {
http2_stream_remove_mesh_state( http2_stream_remove_mesh_state(r->h2_stream);
r->query_reply.c->h2_stream);
} }
comm_point_drop_reply(&r->query_reply); comm_point_drop_reply(&r->query_reply);
mstate->reply_list = reply_list; mstate->reply_list = reply_list;
@ -1588,10 +1585,8 @@ void mesh_query_done(struct mesh_state* mstate)
tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate); tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate);
r_buffer = NULL; r_buffer = NULL;
} }
if(r->query_reply.c->use_h2) { /* mesh_send_reply removed mesh state from
http2_stream_remove_mesh_state( * http2_stream. */
r->query_reply.c->h2_stream);
}
prev = r; prev = r;
prev_buffer = r_buffer; prev_buffer = r_buffer;
} }
@ -1744,6 +1739,7 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns,
return 0; return 0;
if(rep->c->use_h2) if(rep->c->use_h2)
r->h2_stream = rep->c->h2_stream; r->h2_stream = rep->c->h2_stream;
else r->h2_stream = NULL;
/* Data related to local alias stored in 'qinfo' (if any) is ephemeral /* Data related to local alias stored in 'qinfo' (if any) is ephemeral
* and can be different for different original queries (even if the * and can be different for different original queries (even if the
@ -2268,8 +2264,7 @@ mesh_serve_expired_callback(void* arg)
&r->query_reply, mstate->s.env->cfg); &r->query_reply, mstate->s.env->cfg);
mstate->reply_list = NULL; mstate->reply_list = NULL;
if(r->query_reply.c->use_h2) if(r->query_reply.c->use_h2)
http2_stream_remove_mesh_state( http2_stream_remove_mesh_state(r->h2_stream);
r->query_reply.c->h2_stream);
comm_point_drop_reply(&r->query_reply); comm_point_drop_reply(&r->query_reply);
mstate->reply_list = reply_list; mstate->reply_list = reply_list;
mstate->s.env->mesh->stats_dropped++; mstate->s.env->mesh->stats_dropped++;
@ -2303,9 +2298,7 @@ mesh_serve_expired_callback(void* arg)
r, r_buffer, prev, prev_buffer); r, r_buffer, prev, prev_buffer);
if(r->query_reply.c->tcp_req_info) if(r->query_reply.c->tcp_req_info)
tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate); tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate);
if(r->query_reply.c->use_h2) /* mesh_send_reply removed mesh state from http2_stream. */
http2_stream_remove_mesh_state(
r->query_reply.c->h2_stream);
infra_wait_limit_dec(mstate->s.env->infra_cache, infra_wait_limit_dec(mstate->s.env->infra_cache,
&r->query_reply, mstate->s.env->cfg); &r->query_reply, mstate->s.env->cfg);
prev = r; prev = r;