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

errno filtering better: sendto and sendmsg filtered in the same way. Also

Browse source 
ENETDOWN and ENETUNREACH for tcp (already had EHOSTDOWN and EHOSTUNREACH).


git-svn-id: file:///svn/unbound/trunk@2343 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2010-11-15 14:00:20 +00:00
parent 95da05c4bc
commit e430e8cef8
2 changed files with 52 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,5 +1,5 @@
15 November 2010: Wouter 15 November 2010: Wouter
- silence 'tcp connect: broken pipe' at low verbosity. - silence 'tcp connect: broken pipe' and 'net down' at low verbosity.
- iana portlist updated. - iana portlist updated.
9 November 2010: Wouter 9 November 2010: Wouter

83
util/netevent.c
View file

@ -266,6 +266,46 @@ struct event_base* comm_base_internal(struct comm_base* b)
return b->eb->base; return b->eb->base;
} }
/** see if errno for udp has to be logged or not uses globals */
static int
udp_send_errno_needs_log(struct sockaddr* addr, socklen_t addrlen)
{
/* do not log transient errors (unless high verbosity) */
#if defined(ENETUNREACH) || defined(EHOSTDOWN) || defined(EHOSTUNREACH) || defined(ENETDOWN)
switch(errno) {
# ifdef ENETUNREACH
case ENETUNREACH:
# endif
# ifdef EHOSTDOWN
case EHOSTDOWN:
# endif
# ifdef EHOSTUNREACH
case EHOSTUNREACH:
# endif
# ifdef ENETDOWN
case ENETDOWN:
# endif
if(verbosity < VERB_ALGO)
return 0;
default:
break;
}
#endif
/* squelch errors where people deploy AAAA ::ffff:bla for
* authority servers, which we try for intranets. */
if(errno == EINVAL && addr_is_ip4mapped(
(struct sockaddr_storage*)addr, addrlen) &&
verbosity < VERB_DETAIL)
return 0;
/* SO_BROADCAST sockopt can give access to 255.255.255.255,
* but a dns cache does not need it. */
if(errno == EACCES && addr_is_broadcast(
(struct sockaddr_storage*)addr, addrlen) &&
verbosity < VERB_DETAIL)
return 0;
return 1;
}
/* send a UDP reply */ /* send a UDP reply */
int int
comm_point_send_udp_msg(struct comm_point *c, ldns_buffer* packet, comm_point_send_udp_msg(struct comm_point *c, ldns_buffer* packet,
@ -282,38 +322,7 @@ comm_point_send_udp_msg(struct comm_point *c, ldns_buffer* packet,
ldns_buffer_remaining(packet), 0, ldns_buffer_remaining(packet), 0,
addr, addrlen); addr, addrlen);
if(sent == -1) { if(sent == -1) {
/* do not log transient errors (unless high verbosity) */ if(!udp_send_errno_needs_log(addr, addrlen))
#if defined(ENETUNREACH) || defined(EHOSTDOWN) || defined(EHOSTUNREACH) || defined(ENETDOWN)
switch(errno) {
# ifdef ENETUNREACH
case ENETUNREACH:
# endif
# ifdef EHOSTDOWN
case EHOSTDOWN:
# endif
# ifdef EHOSTUNREACH
case EHOSTUNREACH:
# endif
# ifdef ENETDOWN
case ENETDOWN:
# endif
if(verbosity < VERB_ALGO)
return 0;
default:
break;
}
#endif
/* squelch errors where people deploy AAAA ::ffff:bla for
* authority servers, which we try for intranets. */
if(errno == EINVAL && addr_is_ip4mapped(
(struct sockaddr_storage*)addr, addrlen) &&
verbosity < VERB_DETAIL)
return 0;
/* SO_BROADCAST sockopt can give access to 255.255.255.255,
* but a dns cache does not need it. */
if(errno == EACCES && addr_is_broadcast(
(struct sockaddr_storage*)addr, addrlen) &&
verbosity < VERB_DETAIL)
return 0; return 0;
#ifndef USE_WINSOCK #ifndef USE_WINSOCK
verbose(VERB_OPS, "sendto failed: %s", strerror(errno)); verbose(VERB_OPS, "sendto failed: %s", strerror(errno));
@ -451,6 +460,8 @@ comm_point_send_udp_msg_if(struct comm_point *c, ldns_buffer* packet,
p_ancil("send_udp over interface", r); p_ancil("send_udp over interface", r);
sent = sendmsg(c->fd, &msg, 0); sent = sendmsg(c->fd, &msg, 0);
if(sent == -1) { if(sent == -1) {
if(!udp_send_errno_needs_log(addr, addrlen))
return 0;
verbose(VERB_OPS, "sendmsg failed: %s", strerror(errno)); verbose(VERB_OPS, "sendmsg failed: %s", strerror(errno));
log_addr(VERB_OPS, "remote address is", log_addr(VERB_OPS, "remote address is",
(struct sockaddr_storage*)addr, addrlen); (struct sockaddr_storage*)addr, addrlen);
@ -884,6 +895,14 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
else if(error == ECONNREFUSED && verbosity < 2) else if(error == ECONNREFUSED && verbosity < 2)
return 0; /* silence 'connection refused' */ return 0; /* silence 'connection refused' */
#endif #endif
#ifdef ENETUNREACH
else if(error == ENETUNREACH && verbosity < 2)
return 0; /* silence 'network unreachable' */
#endif
#ifdef ENETDOWN
else if(error == ENETDOWN && verbosity < 2)
return 0; /* silence 'network is down' */
#endif
#ifdef EHOSTUNREACH #ifdef EHOSTUNREACH
else if(error == EHOSTUNREACH && verbosity < 2) else if(error == EHOSTUNREACH && verbosity < 2)
return 0; /* silence 'no route to host' */ return 0; /* silence 'no route to host' */