ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/irc_res.c
(Generate patch)

Comparing ircd-hybrid-8/src/irc_res.c (file contents):
Revision 1325 by michael, Sat Mar 31 10:29:02 2012 UTC vs.
Revision 1346 by michael, Mon Apr 9 17:35:40 2012 UTC

# Line 129 | Line 129 | res_ourserver(const struct irc_ssaddr *i
129    const struct sockaddr_in *v4in = (const struct sockaddr_in *)inp;
130    int ns;
131  
132 <  for (ns = 0; ns < irc_nscount; ns++)
132 >  for (ns = 0; ns < irc_nscount; ++ns)
133    {
134      const struct irc_ssaddr *srv = &irc_nsaddr_list[ns];
135   #ifdef IPV6
# Line 147 | Line 147 | res_ourserver(const struct irc_ssaddr *i
147        case AF_INET6:
148          if (srv->ss.ss_family == inp->ss.ss_family)
149            if (v6->sin6_port == v6in->sin6_port)
150 <            if ((memcmp(&v6->sin6_addr.s6_addr, &v6in->sin6_addr.s6_addr,
151 <                    sizeof(struct in6_addr)) == 0) ||
152 <                (memcmp(&v6->sin6_addr.s6_addr, &in6addr_any,
153 <                        sizeof(struct in6_addr)) == 0))
150 >            if (!memcmp(&v6->sin6_addr.s6_addr, &v6in->sin6_addr.s6_addr,
151 >                        sizeof(struct in6_addr)))
152                return 1;
153          break;
154   #endif
155        case AF_INET:
156          if (srv->ss.ss_family == inp->ss.ss_family)
157            if (v4->sin_port == v4in->sin_port)
158 <            if ((v4->sin_addr.s_addr == INADDR_ANY) ||
161 <                (v4->sin_addr.s_addr == v4in->sin_addr.s_addr))
158 >            if (v4->sin_addr.s_addr == v4in->sin_addr.s_addr)
159                return 1;
160          break;
161        default:

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)