upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-31 02:39:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix to set pending pointer in reuse tcp structure

Browse source 
fix debug output of reuse tcp and test leak of process
This commit is contained in:
W.C.A. Wijngaards 2020-06-09 09:14:01 +02:00
parent fd723aed27
commit d8b7b5ee27
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/outside_network.c
View file

@ -457,6 +457,7 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
pend->query = w;
pend->c->repinfo.addrlen = w->addrlen;
memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
pend->reuse.pending = pend;
outnet_tcp_take_query_setup(s, pend, pkt, pkt_len);
return 1;
}
@ -550,8 +551,8 @@ log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse)
if(verbosity < v) return;
addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf));
port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port);
verbose(v, "%s %s %u %lx", msg, addrbuf, (unsigned)port,
(unsigned long)reuse);
verbose(v, "%s %s#%u 0x%llx fd %d", msg, addrbuf, (unsigned)port,
(unsigned long long)reuse, reuse->pending->c->fd);
}
/** insert into reuse tcp tree and LRU, false on failure (duplicate) */
@ -1734,6 +1735,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
verbose(5, "pending_tcp_query: new fd, connect");
/* create new fd and connect to addr, setup to
* write query */
pend->reuse.pending = pend;
memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen);
pend->reuse.addrlen = sq->addrlen;
if(!outnet_tcp_take_into_use(w,

2
testdata/tcp_reuse.tdir/tcp_reuse.post vendored
View file

@ -6,7 +6,7 @@
#
# do your teardown here
. ../common.sh
kill_pid $UPSTREAM_PID
kill_pid `cat unbound2.pid`
if test -f unbound2.log; then
echo ">>> upstream log"
cat unbound2.log