forked from Lainports/freebsd-ports
c90d26d28b
There are a few bugs in dnrd that should probably be fixed by the author but could be made to work on bsd: 1. Initialization in common.h of recv_addr is broken, causing at least the '-a' switch not to work. Instead of assuming positions of fields in the struct across platforms I thought it safer to do a standard initialization in main(). 2. The buffer overflow code in udp.c:dnsrecv() is off by one, rejecting messages where the size exactly fills the available buffer. I also changed to the calls to dnsrecv to pass 512 as the max size instead of the buffers that seem to be padded by 4 bytes for a reason I don't understand. This causes a calling named to resend packets. Eventually one seems to get through but response times can be painfully slow. PR: ports/41128 Submitted by: Michael C. Adler <mad1@tapil.com>
29 lines
872 B
C
29 lines
872 B
C
--- udp.c.orig Sat Jan 3 16:39:53 2004
|
|
+++ udp.c Sat Jan 3 16:40:36 2004
|
|
@@ -74,7 +74,7 @@
|
|
|
|
/* Read in the message */
|
|
addr_len = sizeof(struct sockaddr_in);
|
|
- len = recvfrom(isock, msg, sizeof(msg), 0,
|
|
+ len = recvfrom(isock, msg, maxsize, 0,
|
|
(struct sockaddr *)&from_addr, &addr_len);
|
|
if (len < 0) {
|
|
log_debug("recvfrom error %s", strerror(errno));
|
|
@@ -172,7 +172,7 @@
|
|
inet_ntoa(dns_srv[k].addr.sin_addr));
|
|
return (-1);
|
|
}
|
|
- else if (rc == len) {
|
|
+ else if (rc > len) {
|
|
log_msg(LOG_NOTICE, "packet too large: %s",
|
|
inet_ntoa(dns_srv[k].addr.sin_addr));
|
|
return (0);
|
|
@@ -202,7 +202,7 @@
|
|
struct sockaddr_in from_addr;
|
|
unsigned addr_len;
|
|
|
|
- len = dnsrecv(srvidx, msg, sizeof(msg));
|
|
+ len = dnsrecv(srvidx, msg, maxsize);
|
|
if (opt_debug) {
|
|
char buf[80];
|
|
sprintf_cname(&msg[12], buf, 80);
|