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

- Fix tcp timeouts in tv.usec.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3795 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-06-16 07:21:07 +00:00
parent c9495c33a7
commit 61b9ea24a8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
16 June 2016: Wouter
- Fix tcp timeouts in tv.usec.
15 June 2016: Wouter 15 June 2016: Wouter
- TCP_TIMEOUT is specified in milliseconds. - TCP_TIMEOUT is specified in milliseconds.
- If more than half of tcp connections are in use, a shorter timeout - If more than half of tcp connections are in use, a shorter timeout

4
util/netevent.c
View file

@ -777,7 +777,7 @@ int comm_point_perform_accept(struct comm_point* c,
(*b->stop_accept)(b->cb_arg); (*b->stop_accept)(b->cb_arg);
/* set timeout, no mallocs */ /* set timeout, no mallocs */
tv.tv_sec = NETEVENT_SLOW_ACCEPT_TIME/1000; tv.tv_sec = NETEVENT_SLOW_ACCEPT_TIME/1000;
tv.tv_usec = NETEVENT_SLOW_ACCEPT_TIME%1000; tv.tv_usec = (NETEVENT_SLOW_ACCEPT_TIME%1000)*1000;
b->eb->slow_accept = ub_event_new(b->eb->base, b->eb->slow_accept = ub_event_new(b->eb->base,
-1, UB_EV_TIMEOUT, -1, UB_EV_TIMEOUT,
comm_base_handle_slow_accept, b); comm_base_handle_slow_accept, b);
@ -2038,7 +2038,7 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
ub_event_add_bits(c->ev->ev, UB_EV_TIMEOUT); ub_event_add_bits(c->ev->ev, UB_EV_TIMEOUT);
#ifndef S_SPLINT_S /* splint fails on struct timeval. */ #ifndef S_SPLINT_S /* splint fails on struct timeval. */
c->timeout->tv_sec = msec/1000; c->timeout->tv_sec = msec/1000;
c->timeout->tv_usec = msec%1000; c->timeout->tv_usec = (msec%1000)*1000;
#endif /* S_SPLINT_S */ #endif /* S_SPLINT_S */
} }
if(c->type == comm_tcp) { if(c->type == comm_tcp) {