summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2009-09-11 22:51:00 +0200
committerFlorian Westphal <fw@strlen.de>2009-09-11 22:55:32 +0200
commitd76910ce7b9fad5679b7c614ed086e036560e37d (patch)
tree9e031c72ad7cfe949248bc47240af12c9535f575 /src
parent8fd0e29d463c934756dce7a562f09ea831b5d968 (diff)
downloadngircd-d76910ce7b9fad5679b7c614ed086e036560e37d.tar.gz
ngircd-d76910ce7b9fad5679b7c614ed086e036560e37d.zip
conn.c: fix resolver server address backlog
if more than one ip address is returned for a single host
name, ngircd is supposed to try other addresses in case
connect() to the first address returned fails for some
reason.

Alexander Barton noticed that this did not work at all,
as the additional results were not stored.
Diffstat (limited to 'src')
-rw-r--r--src/ngircd/conn.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index d6ad1e7b..cd5921a4 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1826,7 +1826,8 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 	size_t len;
 	ng_ipaddr_t dest_addrs[4];	/* we can handle at most 3; but we read up to
 					   four so we can log the 'more than we can handle'
-					   condition */
+					   condition. First result is tried immediately, rest
+					   is saved for later if needed. */
 
 	LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
 
@@ -1851,13 +1852,13 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 
 	LogDebug("Got result from resolver: %u structs (%u bytes).", len/sizeof(ng_ipaddr_t), len);
 
-	memset(&Conf_Server[i].dst_addr, 0, sizeof(&Conf_Server[i].dst_addr));
+	memset(&Conf_Server[i].dst_addr, 0, sizeof(Conf_Server[i].dst_addr));
 	if (len > sizeof(ng_ipaddr_t)) {
 		/* more than one address for this hostname, remember them
 		 * in case first address is unreachable/not available */
 		len -= sizeof(ng_ipaddr_t);
-		if (len > sizeof(&Conf_Server[i].dst_addr)) {
-			len = sizeof(&Conf_Server[i].dst_addr);
+		if (len > sizeof(Conf_Server[i].dst_addr)) {
+			len = sizeof(Conf_Server[i].dst_addr);
 			Log(LOG_NOTICE,
 				"Notice: Resolver returned more IP Addresses for host than we can handle, additional addresses dropped.");
 		}