code review.

git-svn-id: file:///svn/unbound/trunk@2327 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2010-11-02 10:03:18 +00:00
parent 4bc34509fa
commit 98c4161631
2 changed files with 10 additions and 6 deletions

View file

@ -1,3 +1,7 @@
2 November 2010: Wouter
- tag 1.4.7rc1.
- code review.
1 November 2010: Wouter
- GOST code enabled by default (RFC 5933).

View file

@ -371,10 +371,10 @@ static void p_ancil(const char* str, struct comm_reply* r)
}
buf1[sizeof(buf1)-1]=0;
log_info("%s: %s", str, buf1);
#endif
#endif /* IP_PKTINFO or PI_RECVDSTDADDR */
}
}
#endif
#endif /* AF_INET6 && IPV6_PKTINFO && HAVE_RECVMSG||HAVE_SENDMSG */
/** send a UDP reply over specified interface*/
static int
@ -428,7 +428,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, ldns_buffer* packet,
#else
verbose(VERB_ALGO, "no IP_PKTINFO or IP_SENDSRCADDR");
msg.msg_control = NULL;
#endif
#endif /* IP_PKTINFO or IP_SENDSRCADDR */
} else if(r->srctype == 6) {
msg.msg_controllen = CMSG_SPACE(sizeof(struct in6_pktinfo));
log_assert(msg.msg_controllen <= sizeof(control));
@ -469,7 +469,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, ldns_buffer* packet,
(void)r;
log_err("sendmsg: IPV6_PKTINFO not supported");
return 0;
#endif
#endif /* AF_INET6 && IPV6_PKTINFO && HAVE_SENDMSG */
}
void
@ -543,7 +543,7 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
memmove(&rep.pktinfo.v4addr, CMSG_DATA(cmsg),
sizeof(struct in_addr));
break;
#endif
#endif /* IP_PKTINFO or IP_RECVDSTADDR */
}
}
if(verbosity >= VERB_ALGO)
@ -564,7 +564,7 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
(void)arg;
fatal_exit("recvmsg: No support for IPV6_PKTINFO. "
"Please disable interface-automatic");
#endif
#endif /* AF_INET6 && IPV6_PKTINFO && HAVE_RECVMSG */
}
void