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

verbosity works.

Browse source 
git-svn-id: file:///svn/unbound/trunk@109 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2007-02-15 15:50:22 +00:00
parent 9b935c0715
commit 34c67e452d
8 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/unbound.c
View file

@ -133,7 +133,7 @@ main(int argc, char* argv[])
} }
/* drop user priviliges and chroot if needed */ /* drop user priviliges and chroot if needed */
verbose(VERB_OPS, "start of service (%s).", PACKAGE_STRING); log_info("start of service (%s).", PACKAGE_STRING);
worker_work(worker); worker_work(worker);
/* cleanup */ /* cleanup */

2
daemon/worker.c
View file

@ -155,7 +155,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
{ {
struct worker* worker = (struct worker*)arg; struct worker* worker = (struct worker*)arg;
int ret; int ret;
log_info("worker handle request"); verbose(VERB_DETAIL, "worker handle request");
if(error != NETEVENT_NOERROR) { if(error != NETEVENT_NOERROR) {
log_err("called with err=%d", error); log_err("called with err=%d", error);
return 0; return 0;

2
doc/Changelog
View file

@ -4,6 +4,8 @@
- malloc rndstate, so that it is aligned for access. - malloc rndstate, so that it is aligned for access.
- fixed rbtree cleanup with postorder traverse. - fixed rbtree cleanup with postorder traverse.
- fixed pending messages are deleted when handled. - fixed pending messages are deleted when handled.
- You can control verbosity; default is not verbose, every -v
adds more verbosity.
14 February 2007: Wouter 14 February 2007: Wouter
- Included configure.ac changes from ldns. - Included configure.ac changes from ldns.

14
services/outside_network.c
View file

@ -117,7 +117,7 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error,
struct outside_network* outnet = (struct outside_network*)arg; struct outside_network* outnet = (struct outside_network*)arg;
struct pending key; struct pending key;
struct pending* p; struct pending* p;
log_info("answer cb"); verbose(VERB_ALGO, "answer cb");
if(error != NETEVENT_NOERROR) { if(error != NETEVENT_NOERROR) {
log_info("outnetudp got udp error %d", error); log_info("outnetudp got udp error %d", error);
@ -129,11 +129,11 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error,
key.id = LDNS_ID_WIRE(ldns_buffer_begin(c->buffer)); key.id = LDNS_ID_WIRE(ldns_buffer_begin(c->buffer));
memcpy(&key.addr, &reply_info->addr, reply_info->addrlen); memcpy(&key.addr, &reply_info->addr, reply_info->addrlen);
key.addrlen = reply_info->addrlen; key.addrlen = reply_info->addrlen;
log_info("Incoming reply id=%4.4x addr=", key.id); verbose(VERB_ALGO, "Incoming reply id=%4.4x addr=", key.id);
log_addr(&key.addr, key.addrlen); log_addr(&key.addr, key.addrlen);
/* find it, see if this thing is a valid query response */ /* find it, see if this thing is a valid query response */
log_info("lookup size is %d entries", (int)outnet->pending->count); verbose(VERB_ALGO, "lookup size is %d entries", (int)outnet->pending->count);
p = (struct pending*)rbtree_search(outnet->pending, &key); p = (struct pending*)rbtree_search(outnet->pending, &key);
if(!p) { if(!p) {
verbose(VERB_DETAIL, "received unsolicited udp reply. dropped."); verbose(VERB_DETAIL, "received unsolicited udp reply. dropped.");
@ -147,7 +147,7 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error,
return 0; return 0;
} }
comm_timer_disable(p->timer); comm_timer_disable(p->timer);
log_info("outnet handle udp reply"); verbose(VERB_ALGO, "outnet handle udp reply");
(void)(*p->cb)(p->c, p->cb_arg, NETEVENT_NOERROR, NULL); (void)(*p->cb)(p->c, p->cb_arg, NETEVENT_NOERROR, NULL);
pending_delete(outnet, p); pending_delete(outnet, p);
return 0; return 0;
@ -261,7 +261,7 @@ pending_udp_timer_cb(void *arg)
{ {
struct pending* p = (struct pending*)arg; struct pending* p = (struct pending*)arg;
/* it timed out */ /* it timed out */
log_info("timeout udp"); verbose(VERB_ALGO, "timeout udp");
(void)(*p->cb)(p->c, p->cb_arg, NETEVENT_TIMEOUT, NULL); (void)(*p->cb)(p->c, p->cb_arg, NETEVENT_TIMEOUT, NULL);
pending_delete(p->outnet, p); pending_delete(p->outnet, p);
} }
@ -427,7 +427,7 @@ new_pending(struct outside_network* outnet, ldns_buffer* packet,
return NULL; return NULL;
} }
} }
log_info("inserted new pending reply id=%4.4x addr=", pend->id); verbose(VERB_ALGO, "inserted new pending reply id=%4.4x addr=", pend->id);
log_addr(&pend->addr, pend->addrlen); log_addr(&pend->addr, pend->addrlen);
return pend; return pend;
} }
@ -484,7 +484,7 @@ select_port(struct outside_network* outnet, struct pending* pend)
else pend->c = outnet->udp4_ports[chosen]; else pend->c = outnet->udp4_ports[chosen];
log_assert(pend->c); log_assert(pend->c);
log_info("query %x outbound %d of %d", pend->id, chosen, nummax); verbose(VERB_ALGO, "query %x outbound %d of %d", pend->id, chosen, nummax);
} }

BIN
testdata/fwd_tcp.tpkg vendored
View file

Binary file not shown.

BIN
testdata/fwd_udp.tpkg vendored
View file

Binary file not shown.

3
util/log.c
View file

@ -43,7 +43,7 @@
#include <time.h> #include <time.h>
#endif #endif
enum verbosity_value verbosity = 3; enum verbosity_value verbosity = 0;
void void
log_init() log_init()
@ -58,6 +58,7 @@ log_vmsg(const char* type, const char *format, va_list args)
vsnprintf(message, sizeof(message), format, args); vsnprintf(message, sizeof(message), format, args);
fprintf(stderr, "[%d] %s[%d] %s: %s\n", fprintf(stderr, "[%d] %s[%d] %s: %s\n",
(int)time(NULL), ident, (int)getpid(), type, message); (int)time(NULL), ident, (int)getpid(), type, message);
fflush(stderr);
} }
/** /**

8
util/netevent.c
View file

@ -386,7 +386,7 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c)
verbose(VERB_DETAIL, "tcp: dropped bogus too short."); verbose(VERB_DETAIL, "tcp: dropped bogus too short.");
return 0; return 0;
} }
log_info("Reading tcp query of length %d", verbose(VERB_ALGO, "Reading tcp query of length %d",
(int)ldns_buffer_limit(c->buffer)); (int)ldns_buffer_limit(c->buffer));
} }
@ -712,7 +712,7 @@ comm_point_drop_reply(struct comm_reply* repinfo)
void void
comm_point_stop_listening(struct comm_point* c) comm_point_stop_listening(struct comm_point* c)
{ {
log_info("comm point stop listening %d", c->fd); verbose(VERB_ALGO, "comm point stop listening %d", c->fd);
if(event_del(&c->ev->ev) != 0) { if(event_del(&c->ev->ev) != 0) {
log_err("event_del error to stoplisten"); log_err("event_del error to stoplisten");
} }
@ -721,7 +721,7 @@ comm_point_stop_listening(struct comm_point* c)
void void
comm_point_start_listening(struct comm_point* c, int newfd, int sec) comm_point_start_listening(struct comm_point* c, int newfd, int sec)
{ {
log_info("comm point start listening %d", c->fd); verbose(VERB_ALGO, "comm point start listening %d", c->fd);
if(c->type == comm_tcp_accept && !c->tcp_free) { if(c->type == comm_tcp_accept && !c->tcp_free) {
/* no use to start listening no free slots. */ /* no use to start listening no free slots. */
return; return;
@ -918,6 +918,6 @@ log_addr(struct sockaddr_storage* addr, socklen_t addrlen)
strncpy(dest, "(inet_ntop error)", sizeof(dest)); strncpy(dest, "(inet_ntop error)", sizeof(dest));
} }
port = ntohs(((struct sockaddr_in*)addr)->sin_port); port = ntohs(((struct sockaddr_in*)addr)->sin_port);
log_info("addr fam=%s port=%d dest=%s len=%d", verbose(VERB_DETAIL, "addr fam=%s port=%d dest=%s len=%d",
family, (int)port, dest, (int)addrlen); family, (int)port, dest, (int)addrlen);
} }