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

- Remove redundant log_assert and fix error messages.

Browse source
This commit is contained in:
George Thessalonikefs 2021-07-26 16:11:14 +02:00
parent de73af2da2
commit ad2bd61ed4
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/outside_network.c
View file

@ -461,7 +461,8 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
log_reuse_tcp(VERB_CLIENT, "reuse_tcp_insert", &pend_tcp->reuse); log_reuse_tcp(VERB_CLIENT, "reuse_tcp_insert", &pend_tcp->reuse);
if(pend_tcp->reuse.item_on_lru_list) { if(pend_tcp->reuse.item_on_lru_list) {
if(!pend_tcp->reuse.node.key) if(!pend_tcp->reuse.node.key)
log_err("internal error: reuse_tcp_insert: on lru list without key"); log_err("internal error: reuse_tcp_insert: "
"in lru list without key");
return 1; return 1;
} }
pend_tcp->reuse.node.key = &pend_tcp->reuse; pend_tcp->reuse.node.key = &pend_tcp->reuse;
@ -470,7 +471,8 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
/* We are not in the LRU list but we are already in the /* We are not in the LRU list but we are already in the
* tcp_reuse tree, strange. * tcp_reuse tree, strange.
* Continue to add ourselves to the LRU list. */ * Continue to add ourselves to the LRU list. */
verbose(VERB_CLIENT, "reuse_tcp_insert: duplicate connection"); log_err("internal error: reuse_tcp_insert: in lru list but "
"not in the tree");
} }
/* insert into LRU, first is newest */ /* insert into LRU, first is newest */
pend_tcp->reuse.lru_prev = NULL; pend_tcp->reuse.lru_prev = NULL;
@ -1092,7 +1094,6 @@ decommission_pending_tcp(struct outside_network* outnet,
if(outnet->tcp_free != pend) { if(outnet->tcp_free != pend) {
pend->next_free = outnet->tcp_free; pend->next_free = outnet->tcp_free;
outnet->tcp_free = pend; outnet->tcp_free = pend;
log_assert(outnet->tcp_free->next_free != outnet->tcp_free);
} }
if(pend->reuse.node.key) { if(pend->reuse.node.key) {
/* needs unlink from the reuse tree to get deleted */ /* needs unlink from the reuse tree to get deleted */