From: W.C.A. Wijngaards Date: Mon, 20 Apr 2020 13:35:45 +0000 (+0200) Subject: - Remove unneeded was_mesh_reply check. X-Git-Tag: release-1.11.0~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cee3098e87b31e255c5cffa987f581f3d08be3d8;p=thirdparty%2Funbound.git - Remove unneeded was_mesh_reply check. --- diff --git a/doc/Changelog b/doc/Changelog index 4b32207cd..0fa60aec0 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 20 April 2020: Wouter - Fix #222: --enable-rpath, fails to rpath python lib. - Fix for count of reply states in the mesh. + - Remove unneeded was_mesh_reply check. 17 April 2020: George - Add SNI support on more TLS connections (fixes #193). diff --git a/services/mesh.c b/services/mesh.c index f484df934..4bc4341c4 100644 --- a/services/mesh.c +++ b/services/mesh.c @@ -1810,7 +1810,6 @@ void mesh_list_remove(struct mesh_state* m, struct mesh_state** fp, void mesh_state_remove_reply(struct mesh_area* mesh, struct mesh_state* m, struct comm_point* cp) { - int was_mesh_reply = 0; struct mesh_reply* n, *prev = NULL; n = m->reply_list; /* when in mesh_cleanup, it sets the reply_list to NULL, so that @@ -1824,7 +1823,6 @@ void mesh_state_remove_reply(struct mesh_area* mesh, struct mesh_state* m, /* delete it, but allocated in m region */ log_assert(mesh->num_reply_addrs > 0); mesh->num_reply_addrs--; - was_mesh_reply = 1; /* prev = prev; */ n = n->next; @@ -1839,7 +1837,7 @@ void mesh_state_remove_reply(struct mesh_area* mesh, struct mesh_state* m, mesh->num_detached_states++; } /* if not replies any more in mstate, it is no longer a reply_state */ - if(!m->reply_list && !m->cb_list && was_mesh_reply) { + if(!m->reply_list && !m->cb_list) { log_assert(mesh->num_reply_states > 0); mesh->num_reply_states--; }