Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-08-22 23:46:02 UTC
Modified files:
ircd/s_conf.c ChangeLog
Log message:
Fix an IPv6 support bug that prevents an IPv6 server from properly
recognizing an IPv4 server.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.441 ircu2.10/ChangeLog:1.442
--- ircu2.10/ChangeLog:1.441 Sun Aug 22 05:54:50 2004
+++ ircu2.10/ChangeLog Sun Aug 22 16:45:52 2004
@@ -1,3 +1,9 @@
+2004-08-22 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/s_conf.c: find_conf_byip() should use irc_in_addr_cmp()
+ instead of memcmp(). (Fixes IPv4 servers linking to an IPv6
+ server.)
+
2004-08-22 Alex Badea <[EMAIL PROTECTED]>
* include/ircd_defs.h: increased SOCKIPLEN to fit ipv6 addresses
Index: ircu2.10/ircd/s_conf.c
diff -u ircu2.10/ircd/s_conf.c:1.58 ircu2.10/ircd/s_conf.c:1.59
--- ircu2.10/ircd/s_conf.c:1.58 Wed Aug 18 21:00:53 2004
+++ ircu2.10/ircd/s_conf.c Sun Aug 22 16:45:52 2004
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_conf.c,v 1.58 2004/08/19 04:00:53 entrope Exp $
+ * $Id: s_conf.c,v 1.59 2004/08/22 23:45:52 entrope Exp $
*/
#include "config.h"
@@ -606,7 +606,7 @@
for (; lp; lp = lp->next) {
tmp = lp->value.aconf;
if (0 != (tmp->status & statmask)
- && 0 == memcmp(&tmp->address.addr, ip, sizeof(*ip)))
+ && !irc_in_addr_cmp(&tmp->address.addr, ip))
return tmp;
}
return 0;
----------------------- End of diff -----------------------
