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 quit on timeout, and printing trailing dots.

Browse source 
git-svn-id: file:///svn/unbound/trunk@885 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2008-01-22 12:01:13 +00:00
parent b26f289ccc
commit 1a4fadaf00
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,6 +1,7 @@
22 January 2008: Wouter 22 January 2008: Wouter
- library code for async in libunbound/unbound.c. - library code for async in libunbound/unbound.c.
- fix link testbound. - fix link testbound.
- fixup exit bug in mini_event.
21 January 2008: Wouter 21 January 2008: Wouter
- libworker work, netevent raw commpoints, write_msg, serialize. - libworker work, netevent raw commpoints, write_msg, serialize.

3
libunbound/worker.c
View file

@ -405,7 +405,7 @@ libworker_fg_done_cb(void* arg, int rcode, ldns_buffer* buf, enum sec_status s)
if(rcode != 0) { if(rcode != 0) {
d->q->res->rcode = rcode; d->q->res->rcode = rcode;
d->q->msg_security = 0; d->q->msg_security = s;
return; return;
} }
@ -419,7 +419,6 @@ libworker_fg_done_cb(void* arg, int rcode, ldns_buffer* buf, enum sec_status s)
/* canonname and results */ /* canonname and results */
d->q->msg_security = s; d->q->msg_security = s;
libworker_enter_result(d->q->res, buf, d->w->env->scratch, s); libworker_enter_result(d->q->res, buf, d->w->env->scratch, s);
} }

3
smallapp/unbound-host.c
View file

@ -302,7 +302,8 @@ pretty_output(char* q, int t, int c, struct ub_val_result* result, int docname)
printf("\n"); printf("\n");
} }
/* remove trailing . from long canonnames for nicer output */ /* remove trailing . from long canonnames for nicer output */
if(result->canonname && strlen(result->canonname) > 1) if(result->canonname && strlen(result->canonname) > 1 &&
result->canonname[strlen(result->canonname)-1] == '.')
result->canonname[strlen(result->canonname)-1] = 0; result->canonname[strlen(result->canonname)-1] = 0;
if(!result->havedata) { if(!result->havedata) {
if(verb > 0) { if(verb > 0) {

2
util/mini_event.c
View file

@ -204,6 +204,8 @@ int event_base_dispatch(struct event_base* base)
return -1; return -1;
/* see if timeouts need handling */ /* see if timeouts need handling */
handle_timeouts(base, &now, &wait); handle_timeouts(base, &now, &wait);
if(base->need_to_exit)
return 0;
/* do select */ /* do select */
if(handle_select(base, &wait) < 0) { if(handle_select(base, &wait) < 0) {
if(base->need_to_exit) if(base->need_to_exit)