158 |
|
case AF_INET6: |
159 |
|
if (srv->ss.ss_family == inp->ss.ss_family) |
160 |
|
if (v6->sin6_port == v6in->sin6_port) |
161 |
< |
if (!memcmp(&v6->sin6_addr.s6_addr, &v6in->sin6_addr.s6_addr, |
162 |
< |
sizeof(struct in6_addr))) |
161 |
> |
if (memcmp(&v6->sin6_addr.s6_addr, &v6in->sin6_addr.s6_addr, sizeof(struct in6_addr)) == 0) |
162 |
|
return 1; |
163 |
|
break; |
164 |
|
case AF_INET: |
184 |
|
{ |
185 |
|
irc_res_init(); |
186 |
|
|
187 |
< |
if (!ResolverFileDescriptor) |
187 |
> |
if (ResolverFileDescriptor == NULL) |
188 |
|
{ |
189 |
|
int fd = comm_socket(irc_nsaddr_list[0].ss.ss_family, SOCK_DGRAM, 0); |
190 |
|
if (fd == -1) |
315 |
|
|
316 |
|
strlcpy(host_name, name, sizeof(host_name)); |
317 |
|
|
318 |
< |
if (!request) |
318 |
> |
if (request == NULL) |
319 |
|
{ |
320 |
|
request = make_request(callback, ctx); |
321 |
|
request->type = type; |
371 |
|
(unsigned int)(cp[0] & 0xf), (unsigned int)(cp[0] >> 4)); |
372 |
|
} |
373 |
|
|
374 |
< |
if (!request) |
374 |
> |
if (request == NULL) |
375 |
|
{ |
376 |
|
request = make_request(callback, ctx); |
377 |
|
request->type = T_PTR; |
539 |
|
res_readreply(fde_t *F, void *data) |
540 |
|
{ |
541 |
|
unsigned char buf[sizeof(HEADER) + MAXPACKET]; |
543 |
– |
struct reslist *request = NULL; |
542 |
|
ssize_t rc = 0; |
543 |
|
socklen_t len = sizeof(struct irc_ssaddr); |
544 |
|
struct irc_ssaddr lsin; |
567 |
|
* Response for an id which we have already received an answer for |
568 |
|
* just ignore this response. |
569 |
|
*/ |
570 |
+ |
struct reslist *request; |
571 |
|
if ((request = find_id(header->id)) == NULL) |
572 |
|
continue; |
573 |
|
|