mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-12 09:50:29 +00:00
Code Issues Releases Wiki Activity

conn.c: fix resolver server address backlog

Browse Source 
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.
This commit is contained in:
Florian Westphal 2009-09-11 22:51:00 +02:00
parent 8fd0e29d46
commit d76910ce7b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ngircd/conn.c
View File

@ -1826,7 +1826,8 @@ cb_Connect_to_Server(int fd, UNUSED short events)
size_t len; size_t len;
ng_ipaddr_t dest_addrs[4]; /* we can handle at most 3; but we read up to 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' 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); 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); 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)) { if (len > sizeof(ng_ipaddr_t)) {
/* more than one address for this hostname, remember them /* more than one address for this hostname, remember them
* in case first address is unreachable/not available */ * in case first address is unreachable/not available */
len -= sizeof(ng_ipaddr_t); len -= sizeof(ng_ipaddr_t);
if (len > sizeof(&Conf_Server[i].dst_addr)) { if (len > sizeof(Conf_Server[i].dst_addr)) {
len = sizeof(&Conf_Server[i].dst_addr); len = sizeof(Conf_Server[i].dst_addr);
Log(LOG_NOTICE, Log(LOG_NOTICE,
"Notice: Resolver returned more IP Addresses for host than we can handle, additional addresses dropped."); "Notice: Resolver returned more IP Addresses for host than we can handle, additional addresses dropped.");
} }