ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/res.c

Comparing:
ircd-hybrid/trunk/src/irc_res.c (file contents), Revision 3298 by michael, Fri Apr 11 16:21:02 2014 UTC vs.
ircd-hybrid/trunk/src/res.c (file contents), Revision 4448 by michael, Sat Aug 9 19:20:10 2014 UTC

#	Line 19 | Line 19
19		*  USA
20		*/
21
22	<	/*! \file irc_res.c
22	>	/*! \file res.c
23		* \brief ircd resolver functions
24		* \version $Id$
25		*/
26
27		/*
28	<	* A rewrite of Darren Reeds original res.c As there is nothing
29	<	* left of Darrens original code, this is now licensed by the hybrid group.
28	>	* A rewrite of Darren Reed's original res.c As there is nothing
29	>	* left of Darren's original code, this is now licensed by the hybrid group.
30		* (Well, some of the function names are the same, and bits of the structs..)
31		* You can use it where it is useful, free even. Buy us a beer and stuff.
32		*
33		* The authors takes no responsibility for any damage or loss
34		* of property which results from the use of this software.
35		*
36	–	* $Id$
37	–	*
36		* July 1999 - Rewrote a bunch of stuff here. Change hostent builder code,
37		*     added callbacks and reference counting of returned hostents.
38		*     --Bleep (Thomas Helvey <tomh@inxpress.net>)
39		*
40		* This was all needlessly complicated for irc. Simplified. No more hostent
41	<	* All we really care about is the IP -> hostname mappings. Thats all.
41	>	* All we really care about is the IP -> hostname mappings. That's all.
42		*
43		* Apr 28, 2003 --cryogen and Dianora
44		*/
#	Line 56 | Line 54
54		#include "fdlist.h"
55		#include "s_bsd.h"
56		#include "log.h"
57	<	#include "s_misc.h"
57	>	#include "misc.h"
58		#include "send.h"
59		#include "memory.h"
60		#include "mempool.h"
61	<	#include "irc_res.h"
62	<	#include "irc_reslib.h"
61	>	#include "res.h"
62	>	#include "reslib.h"
63
64		#if (CHAR_BIT != 8)
65		#error this code needs to be able to address individual octets
#	Line 69 | Line 67
67
68		static PF res_readreply;
69
70	<	#define MAXPACKET      1024  /* rfc sez 512 but we expand names so ... */
71	<	#define RES_MAXALIASES 35    /* maximum aliases allowed */
74	<	#define RES_MAXADDRS   35    /* maximum addresses allowed */
75	<	#define AR_TTL         600   /* TTL in seconds for dns cache entries */
70	>	#define MAXPACKET      1024  /**< rfc says 512 but we expand names so ... */
71	>	#define AR_TTL         600   /**< TTL in seconds for dns cache entries */
72
73	<	/* RFC 1104/1105 wasn't very helpful about what these fields
73	>	/*
74	>	* RFC 1104/1105 wasn't very helpful about what these fields
75		* should be named, so for now, we'll just name them this way.
76	<	* we probably should look at what named calls them or something.
76	>	* We probably should look at what named calls them or something.
77		*/
78		#define TYPE_SIZE         (size_t)2
79		#define CLASS_SIZE        (size_t)2
#	Line 86 | Line 83 | static PF res_readreply;
83
84		typedef enum
85		{
86	<	REQ_IDLE,  /* We're doing not much at all */
87	<	REQ_PTR,   /* Looking up a PTR */
88	<	REQ_A,     /* Looking up an A, possibly because AAAA failed */
89	<	#ifdef IPV6
90	<	REQ_AAAA,  /* Looking up an AAAA */
94	<	#endif
95	<	REQ_CNAME  /* We got a CNAME in response, we better get a real answer next */
86	>	REQ_IDLE,  /**< We're doing not much at all */
87	>	REQ_PTR,   /**< Looking up a PTR */
88	>	REQ_A,     /**< Looking up an A, possibly because AAAA failed */
89	>	REQ_AAAA,  /**< Looking up an AAAA */
90	>	REQ_CNAME  /**< We got a CNAME in response, we better get a real answer next */
91		} request_state;
92
93		struct reslist
94		{
95	<	dlink_node node;
96	<	int id;
97	<	int sent;                /* number of requests sent */
98	<	request_state state;     /* State the resolver machine is in */
99	<	time_t ttl;
100	<	char type;
101	<	char retries;            /* retry counter */
102	<	unsigned int sends;      /* number of sends (>1 means resent) */
103	<	char resend;             /* send flag. 0 == dont resend */
104	<	time_t sentat;
105	<	time_t timeout;
106	<	struct irc_ssaddr addr;
107	<	char *name;
108	<	dns_callback_fnc callback;
109	<	void *callback_ctx;
95	>	dlink_node node;                           /**< Doubly linked list node. */
96	>	int id;                                    /**< Request ID (from request header). */
97	>	int sent;                                  /**< Number of requests sent */
98	>	request_state state;                       /**< State the resolver machine is in */
99	>	char type;                                 /**< Current request type. */
100	>	char retries;                              /**< Retry counter */
101	>	unsigned int sends;                        /**< Number of sends (>1 means resent). */
102	>	char resend;                               /**< Send flag; 0 == don't resend. */
103	>	time_t sentat;                             /**< Timestamp we last sent this request. */
104	>	time_t timeout;                            /**< When this request times out. */
105	>	struct irc_ssaddr addr;                    /**< Address for this request. */
106	>	char name[RFC1035_MAX_DOMAIN_LENGTH + 1];  /**< Hostname for this request. */
107	>	size_t namelength;                         /**< Actual hostname length. */
108	>	dns_callback_fnc callback;                 /**< Callback function on completion. */
109	>	void *callback_ctx;                        /**< Context pointer for callback. */
110		};
111
112		static fde_t ResolverFileDescriptor;
113		static dlink_list request_list;
114		static mp_pool_t *dns_pool;
115
121	–	static void rem_request(struct reslist *);
122	–	static struct reslist *make_request(dns_callback_fnc, void *);
123	–	static void do_query_name(dns_callback_fnc, void *,
124	–	const char *, struct reslist *, int);
125	–	static void do_query_number(dns_callback_fnc, void *,
126	–	const struct irc_ssaddr *,
127	–	struct reslist *);
128	–	static void query_name(const char *, int, int, struct reslist *);
129	–	static int send_res_msg(const char *, int, unsigned int);
130	–	static void resend_query(struct reslist *);
131	–	static int proc_answer(struct reslist *, HEADER *, char *, char *);
132	–	static struct reslist *find_id(int);
116
117	+	/*
118	+	* rem_request - remove a request from the list.
119	+	* This must also free any memory that has been allocated for
120	+	* temporary storage of DNS results.
121	+	*/
122	+	static void
123	+	rem_request(struct reslist *request)
124	+	{
125	+	dlinkDelete(&request->node, &request_list);
126	+	mp_pool_release(request);
127	+	}
128	+
129	+	/*
130	+	* make_request - Create a DNS request record for the server.
131	+	*/
132	+	static struct reslist *
133	+	make_request(dns_callback_fnc callback, void *ctx)
134	+	{
135	+	struct reslist *request = mp_pool_get(dns_pool);
136	+
137	+	request->sentat       = CurrentTime;
138	+	request->retries      = 2;
139	+	request->resend       = 1;
140	+	request->timeout      = 4;  /* Start at 4 and exponential inc. */
141	+	request->state        = REQ_IDLE;
142	+	request->callback     = callback;
143	+	request->callback_ctx = ctx;
144	+
145	+	dlinkAdd(request, &request->node, &request_list);
146	+	return request;
147	+	}
148
149		/*
150		* int
#	Line 146 | Line 160 | static struct reslist *find_id(int);
160		static int
161		res_ourserver(const struct irc_ssaddr *inp)
162		{
149	–	#ifdef IPV6
163		const struct sockaddr_in6 *v6;
164		const struct sockaddr_in6 *v6in = (const struct sockaddr_in6 *)inp;
152	–	#endif
165		const struct sockaddr_in *v4;
166		const struct sockaddr_in *v4in = (const struct sockaddr_in *)inp;
167
168		for (unsigned int i = 0; i < irc_nscount; ++i)
169		{
170		const struct irc_ssaddr *srv = &irc_nsaddr_list[i];
159	–	#ifdef IPV6
171		v6 = (const struct sockaddr_in6 *)srv;
161	–	#endif
172		v4 = (const struct sockaddr_in *)srv;
173
174	<	/* could probably just memcmp(srv, inp, srv.ss_len) here
174	>	/*
175	>	* Could probably just memcmp(srv, inp, srv.ss_len) here
176		* but we'll air on the side of caution - stu
166	–	*
177		*/
178		switch (srv->ss.ss_family)
179		{
170	–	#ifdef IPV6
180		case AF_INET6:
181		if (srv->ss.ss_family == inp->ss.ss_family)
182		if (v6->sin6_port == v6in->sin6_port)
#	Line 175 | Line 184 | res_ourserver(const struct irc_ssaddr *i
184		sizeof(struct in6_addr)))
185		return 1;
186		break;
178	–	#endif
187		case AF_INET:
188		if (srv->ss.ss_family == inp->ss.ss_family)
189		if (v4->sin_port == v4in->sin_port)
#	Line 191 | Line 199 | res_ourserver(const struct irc_ssaddr *i
199		}
200
201		/*
194	–	* timeout_query_list - Remove queries from the list which have been
195	–	* there too long without being resolved.
196	–	*/
197	–	static time_t
198	–	timeout_query_list(time_t now)
199	–	{
200	–	dlink_node *ptr = NULL, *ptr_next = NULL;
201	–	struct reslist *request;
202	–	time_t next_time = 0;
203	–	time_t timeout   = 0;
204	–
205	–	DLINK_FOREACH_SAFE(ptr, ptr_next, request_list.head)
206	–	{
207	–	request = ptr->data;
208	–	timeout = request->sentat + request->timeout;
209	–
210	–	if (now >= timeout)
211	–	{
212	–	if (--request->retries <= 0)
213	–	{
214	–	(*request->callback)(request->callback_ctx, NULL, NULL);
215	–	rem_request(request);
216	–	continue;
217	–	}
218	–	else
219	–	{
220	–	request->sentat = now;
221	–	request->timeout += request->timeout;
222	–	resend_query(request);
223	–	}
224	–	}
225	–
226	–	if ((next_time == 0) || timeout < next_time)
227	–	next_time = timeout;
228	–	}
229	–
230	–	return (next_time > now) ? next_time : (now + AR_TTL);
231	–	}
232	–
233	–	/*
234	–	* timeout_resolver - check request list
235	–	*/
236	–	static void
237	–	timeout_resolver(void *notused)
238	–	{
239	–	timeout_query_list(CurrentTime);
240	–	}
241	–
242	–	/*
202		* start_resolver - do everything we need to read the resolv.conf file
203		* and initialize the resolver file descriptor if needed
204		*/
#	Line 251 | Line 210 | start_resolver(void)
210		if (!ResolverFileDescriptor.flags.open)
211		{
212		if (comm_open(&ResolverFileDescriptor, irc_nsaddr_list[0].ss.ss_family,
213	<	SOCK_DGRAM, 0, "Resolver socket") == -1)
213	>	SOCK_DGRAM, 0, "UDP resolver socket") == -1)
214		return;
215
216		/* At the moment, the resolver FD data is global .. */
217		comm_setselect(&ResolverFileDescriptor, COMM_SELECT_READ, res_readreply, NULL, 0);
259	–	eventAdd("timeout_resolver", timeout_resolver, NULL, 1);
218		}
219		}
220
221		/*
264	–	* init_resolver - initialize resolver and resolver library
265	–	*/
266	–	void
267	–	init_resolver(void)
268	–	{
269	–	dns_pool = mp_pool_new(sizeof(struct reslist), MP_CHUNK_SIZE_DNS);
270	–	memset(&ResolverFileDescriptor, 0, sizeof(fde_t));
271	–	start_resolver();
272	–	}
273	–
274	–	/*
222		* restart_resolver - reread resolv.conf, reopen socket
223		*/
224		void
225		restart_resolver(void)
226		{
227		fd_close(&ResolverFileDescriptor);
281	–	eventDelete(timeout_resolver, NULL);
228		start_resolver();
229		}
230
231		/*
286	–	* rem_request - remove a request from the list.
287	–	* This must also free any memory that has been allocated for
288	–	* temporary storage of DNS results.
289	–	*/
290	–	static void
291	–	rem_request(struct reslist *request)
292	–	{
293	–	dlinkDelete(&request->node, &request_list);
294	–
295	–	MyFree(request->name);
296	–	mp_pool_release(request);
297	–	}
298	–
299	–	/*
300	–	* make_request - Create a DNS request record for the server.
301	–	*/
302	–	static struct reslist *
303	–	make_request(dns_callback_fnc callback, void *ctx)
304	–	{
305	–	struct reslist *request = mp_pool_get(dns_pool);
306	–
307	–	memset(request, 0, sizeof(*request));
308	–	request->sentat       = CurrentTime;
309	–	request->retries      = 2;
310	–	request->resend       = 1;
311	–	request->timeout      = 4;  /* Start at 4 and exponential inc. */
312	–	request->state        = REQ_IDLE;
313	–	request->callback     = callback;
314	–	request->callback_ctx = ctx;
315	–
316	–	dlinkAdd(request, &request->node, &request_list);
317	–	return request;
318	–	}
319	–
320	–	/*
232		* delete_resolver_queries - cleanup outstanding queries
233		* for which there no longer exist clients or conf lines.
234		*/
#	Line 339 | Line 250 | delete_resolver_queries(const void *vptr
250		* send_res_msg - sends msg to all nameservers found in the "_res" structure.
251		* This should reflect /etc/resolv.conf. We will get responses
252		* which arent needed but is easier than checking to see if nameserver
253	<	* isnt present. Returns number of messages successfully sent to
253	>	* isn't present. Returns number of messages successfully sent to
254		* nameservers or -1 if no successful sends.
255		*/
256		static int
#	Line 385 | Line 296 | find_id(int id)
296		}
297
298		/*
299	<	* gethost_byname_type - get host address from name
389	<	*
299	>	* query_name - generate a query based on class, type and name.
300		*/
301	<	void
302	<	gethost_byname_type(dns_callback_fnc callback, void *ctx, const char *name, int type)
301	>	static void
302	>	query_name(const char *name, int query_class, int type,
303	>	struct reslist *request)
304		{
305	<	assert(name);
306	<	do_query_name(callback, ctx, name, NULL, type);
396	<	}
305	>	char buf[MAXPACKET];
306	>	int request_len = 0;
307
308	<	/*
399	<	* gethost_byname - wrapper for _type - send T_AAAA first if IPV6 supported
400	<	*/
401	<	void
402	<	gethost_byname(dns_callback_fnc callback, void *ctx, const char *name)
403	<	{
404	<	#ifdef IPV6
405	<	gethost_byname_type(callback, ctx, name, T_AAAA);
406	<	#else
407	<	gethost_byname_type(callback, ctx, name, T_A);
408	<	#endif
409	<	}
308	>	memset(buf, 0, sizeof(buf));
309
310	<	/*
311	<	* gethost_byaddr - get host name from address
312	<	*/
313	<	void
314	<	gethost_byaddr(dns_callback_fnc callback, void *ctx, const struct irc_ssaddr *addr)
315	<	{
316	<	do_query_number(callback, ctx, addr, NULL);
310	>	if ((request_len = irc_res_mkquery(name, query_class, type,
311	>	(unsigned char *)buf, sizeof(buf))) > 0)
312	>	{
313	>	HEADER *header = (HEADER *)buf;
314	>
315	>	/*
316	>	* Generate an unique id.
317	>	* NOTE: we don't have to worry about converting this to and from
318	>	* network byte order, the nameserver does not interpret this value
319	>	* and returns it unchanged.
320	>	*/
321	>	do
322	>	header->id = (header->id + genrand_int32()) & 0xFFFF;
323	>	while (find_id(header->id));
324	>
325	>	request->id = header->id;
326	>	++request->sends;
327	>
328	>	request->sent += send_res_msg(buf, request_len, request->sends);
329	>	}
330		}
331
332		/*
#	Line 424 | Line 336 | static void
336		do_query_name(dns_callback_fnc callback, void *ctx, const char *name,
337		struct reslist *request, int type)
338		{
339	<	char host_name[HOSTLEN + 1];
339	>	char host_name[RFC1035_MAX_DOMAIN_LENGTH + 1];
340
341		strlcpy(host_name, name, sizeof(host_name));
342
343		if (request == NULL)
344		{
345	<	request       = make_request(callback, ctx);
346	<	request->name = MyMalloc(strlen(host_name) + 1);
347	<	request->type = type;
348	<	strcpy(request->name, host_name);
437	<	#ifdef IPV6
345	>	request             = make_request(callback, ctx);
346	>	request->type       = type;
347	>	request->namelength = strlcpy(request->name, host_name, sizeof(request->name));
348	>
349		if (type != T_A)
350		request->state = REQ_AAAA;
351		else
352	<	#endif
442	<	request->state = REQ_A;
352	>	request->state = REQ_A;
353		}
354
355		request->type = type;
#	Line 465 | Line 375 | do_query_number(dns_callback_fnc callbac
375		(unsigned int)(cp[3]), (unsigned int)(cp[2]),
376		(unsigned int)(cp[1]), (unsigned int)(cp[0]));
377		}
468	–	#ifdef IPV6
378		else if (addr->ss.ss_family == AF_INET6)
379		{
380		const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
#	Line 491 | Line 400 | do_query_number(dns_callback_fnc callbac
400		(unsigned int)(cp[1] & 0xf), (unsigned int)(cp[1] >> 4),
401		(unsigned int)(cp[0] & 0xf), (unsigned int)(cp[0] >> 4));
402		}
403	<	#endif
403	>
404		if (request == NULL)
405		{
406		request       = make_request(callback, ctx);
407		request->type = T_PTR;
408		memcpy(&request->addr, addr, sizeof(struct irc_ssaddr));
500	–	request->name = MyMalloc(HOSTLEN + 1);
409		}
410
411		query_name(ipbuf, C_IN, T_PTR, request);
412		}
413
414		/*
415	<	* query_name - generate a query based on class, type and name.
415	>	* gethost_byname_type - get host address from name
416	>	*
417		*/
418	<	static void
419	<	query_name(const char *name, int query_class, int type,
511	<	struct reslist *request)
418	>	void
419	>	gethost_byname_type(dns_callback_fnc callback, void *ctx, const char *name, int type)
420		{
421	<	char buf[MAXPACKET];
422	<	int request_len = 0;
423	<
516	<	memset(buf, 0, sizeof(buf));
517	<
518	<	if ((request_len = irc_res_mkquery(name, query_class, type,
519	<	(unsigned char *)buf, sizeof(buf))) > 0)
520	<	{
521	<	HEADER *header = (HEADER *)buf;
522	<
523	<	/*
524	<	* generate an unique id
525	<	* NOTE: we don't have to worry about converting this to and from
526	<	* network byte order, the nameserver does not interpret this value
527	<	* and returns it unchanged
528	<	*/
529	<	do
530	<	header->id = (header->id + genrand_int32()) & 0xffff;
531	<	while (find_id(header->id));
421	>	assert(name);
422	>	do_query_name(callback, ctx, name, NULL, type);
423	>	}
424
425	<	request->id = header->id;
426	<	++request->sends;
425	>	/*
426	>	* gethost_byname - wrapper for _type - send T_AAAA first if IPV6 supported
427	>	*/
428	>	void
429	>	gethost_byname(dns_callback_fnc callback, void *ctx, const char *name)
430	>	{
431	>	gethost_byname_type(callback, ctx, name, T_AAAA);
432	>	}
433
434	<	request->sent += send_res_msg(buf, request_len, request->sends);
435	<	}
434	>	/*
435	>	* gethost_byaddr - get host name from address
436	>	*/
437	>	void
438	>	gethost_byaddr(dns_callback_fnc callback, void *ctx, const struct irc_ssaddr *addr)
439	>	{
440	>	do_query_number(callback, ctx, addr, NULL);
441		}
442
443		static void
#	Line 551 | Line 454 | resend_query(struct reslist *request)
454		case T_A:
455		do_query_name(NULL, NULL, request->name, request, request->type);
456		break;
457	<	#ifdef IPV6
555	<	case T_AAAA:
556	<	/* didnt work, try A */
457	>	case T_AAAA:  /* Didn't work, try A */
458		if (request->state == REQ_AAAA)
459		do_query_name(NULL, NULL, request->name, request, T_A);
559	–	#endif
460		default:
461		break;
462		}
#	Line 568 | Line 468 | resend_query(struct reslist *request)
468		static int
469		proc_answer(struct reslist *request, HEADER *header, char *buf, char *eob)
470		{
471	<	char hostbuf[HOSTLEN + 100]; /* working buffer */
471	>	char hostbuf[RFC1035_MAX_DOMAIN_LENGTH + 100]; /* working buffer */
472		unsigned char *current;      /* current position in buf */
573	–	int query_class;             /* answer class */
473		int type;                    /* answer type */
474		int n;                       /* temp count */
475		int rd_length;
476		struct sockaddr_in *v4;      /* conversion */
578	–	#ifdef IPV6
477		struct sockaddr_in6 *v6;
478	<	#endif
478	>
479		current = (unsigned char *)buf + sizeof(HEADER);
480
481		for (; header->qdcount > 0; --header->qdcount)
#	Line 589 | Line 487 | proc_answer(struct reslist *request, HEA
487		}
488
489		/*
490	<	* process each answer sent to us blech.
490	>	* Process each answer sent to us blech.
491		*/
492		while (header->ancount > 0 && (char *)current < eob)
493		{
#	Line 598 | Line 496 | proc_answer(struct reslist *request, HEA
496		n = irc_dn_expand((unsigned char *)buf, (unsigned char *)eob, current,
497		hostbuf, sizeof(hostbuf));
498
499	<	if (n < 0 /* Broken message */ || n == 0 /* No more answers left */)
499	>	if (n < 0  /* Broken message */ || n == 0  /* No more answers left */)
500		return 0;
501
502	<	hostbuf[HOSTLEN] = '\0';
502	>	hostbuf[RFC1035_MAX_DOMAIN_LENGTH] = '\0';
503
504	<	/* With Address arithmetic you have to be very anal
504	>	/*
505	>	* With Address arithmetic you have to be very anal
506		* this code was not working on alpha due to that
507		* (spotted by rodder/jailbird/dianora)
508		*/
#	Line 614 | Line 513 | proc_answer(struct reslist *request, HEA
513
514		type = irc_ns_get16(current);
515		current += TYPE_SIZE;
617	–
618	–	query_class = irc_ns_get16(current);
516		current += CLASS_SIZE;
620	–
621	–	request->ttl = irc_ns_get32(current);
517		current += TTL_SIZE;
623	–
518		rd_length = irc_ns_get16(current);
519		current += RDLENGTH_SIZE;
520
#	Line 645 | Line 539 | proc_answer(struct reslist *request, HEA
539		memcpy(&v4->sin_addr, current, sizeof(struct in_addr));
540		return 1;
541		break;
648	–	#ifdef IPV6
542		case T_AAAA:
543		if (request->type != T_AAAA)
544		return 0;
#	Line 659 | Line 552 | proc_answer(struct reslist *request, HEA
552		memcpy(&v6->sin6_addr, current, sizeof(struct in6_addr));
553		return 1;
554		break;
662	–	#endif
555		case T_PTR:
556		if (request->type != T_PTR)
557		return 0;
558
559		n = irc_dn_expand((unsigned char *)buf, (unsigned char *)eob,
560		current, hostbuf, sizeof(hostbuf));
561	<	if (n < 0 /* Broken message */ || n == 0 /* No more answers left */)
561	>	if (n < 0  /* Broken message */ || n == 0  /* No more answers left */)
562		return 0;
563
564	<	strlcpy(request->name, hostbuf, HOSTLEN + 1);
564	>	request->namelength = strlcpy(request->name, hostbuf, sizeof(request->name));
565		return 1;
566		break;
567	<	case T_CNAME: /* first check we already havent started looking
676	<	into a cname */
567	>	case T_CNAME:  /* First check we already haven't started looking into a cname */
568		if (request->type != T_PTR)
569		return 0;
570
#	Line 710 | Line 601 | proc_answer(struct reslist *request, HEA
601		static void
602		res_readreply(fde_t *fd, void *data)
603		{
604	<	char buf[sizeof(HEADER) + MAXPACKET]
714	<	/* Sparc and alpha need 16bit-alignment for accessing header->id
715	<	* (which is uint16_t). Because of the header = (HEADER*) buf;
716	<	* lateron, this is neeeded. --FaUl
717	<	*/
718	<	#if defined(__sparc__) || defined(__alpha__)
719	<	__attribute__((aligned (16)))
720	<	#endif
721	<	;
604	>	char buf[sizeof(HEADER) + MAXPACKET];
605		HEADER *header;
606		struct reslist *request = NULL;
607	<	int rc;
607	>	ssize_t rc = 0;
608		socklen_t len = sizeof(struct irc_ssaddr);
609		struct irc_ssaddr lsin;
610
611	<	rc = recvfrom(fd->fd, buf, sizeof(buf), 0, (struct sockaddr *)&lsin, &len);
612	<
613	<	/* Re-schedule a read *after* recvfrom, or we'll be registering
614	<	* interest where it'll instantly be ready for read :-) -- adrian
732	<	*/
733	<	comm_setselect(fd, COMM_SELECT_READ, res_readreply, NULL, 0);
734	<
735	<	/* Better to cast the sizeof instead of rc */
736	<	if (rc <= (int)(sizeof(HEADER)))
737	<	return;
611	>	while ((rc = recvfrom(fd->fd, buf, sizeof(buf), 0, (struct sockaddr *)&lsin, &len)) != -1)
612	>	{
613	>	if (rc <= (ssize_t)sizeof(HEADER))
614	>	continue;
615
616	<	/*
617	<	* Convert DNS reply reader from Network byte order to CPU byte order.
618	<	*/
619	<	header = (HEADER *)buf;
620	<	header->ancount = ntohs(header->ancount);
744	<	header->qdcount = ntohs(header->qdcount);
745	<	header->nscount = ntohs(header->nscount);
746	<	header->arcount = ntohs(header->arcount);
616	>	/*
617	>	* Check against possibly fake replies
618	>	*/
619	>	if (!res_ourserver(&lsin))
620	>	continue;
621
622	<	/*
623	<	* Check against possibly fake replies
624	<	*/
625	<	if (!res_ourserver(&lsin))
626	<	return;
622	>	/*
623	>	* Convert DNS reply reader from Network byte order to CPU byte order.
624	>	*/
625	>	header = (HEADER *)buf;
626	>	header->ancount = ntohs(header->ancount);
627	>	header->qdcount = ntohs(header->qdcount);
628	>	header->nscount = ntohs(header->nscount);
629	>	header->arcount = ntohs(header->arcount);
630
631	<	/*
632	<	* Response for an id which we have already received an answer for
633	<	* just ignore this response.
634	<	*/
635	<	if (!(request = find_id(header->id)))
636	<	return;
631	>	/*
632	>	* Response for an id which we have already received an answer for
633	>	* just ignore this response.
634	>	*/
635	>	if ((request = find_id(header->id)) == NULL)
636	>	continue;
637
638	<	if ((header->rcode != NO_ERRORS) || (header->ancount == 0))
762	<	{
763	<	if (header->rcode == SERVFAIL || header->rcode == NXDOMAIN)
764	<	{
765	<	/*
766	<	* If a bad error was returned, stop here and don't
767	<	* send any more (no retries granted).
768	<	*/
769	<	(*request->callback)(request->callback_ctx, NULL, NULL);
770	<	rem_request(request);
771	<	}
772	<	#ifdef IPV6
773	<	else
638	>	if ((header->rcode != NO_ERRORS) || (header->ancount == 0))
639		{
640	<	/*
776	<	* If we havent already tried this, and we're looking up AAAA, try A
777	<	* now
778	<	*/
779	<	if (request->state == REQ_AAAA && request->type == T_AAAA)
640	>	if (header->rcode == SERVFAIL || header->rcode == NXDOMAIN)
641		{
642	<	request->timeout += 4;
643	<	resend_query(request);
642	>	/*
643	>	* If a bad error was returned, stop here and don't
644	>	* send any more (no retries granted).
645	>	*/
646	>	(*request->callback)(request->callback_ctx, NULL, NULL, 0);
647	>	rem_request(request);
648	>	}
649	>	else
650	>	{
651	>	/*
652	>	* If we havent already tried this, and we're looking up AAAA, try A now.
653	>	*/
654	>	if (request->state == REQ_AAAA && request->type == T_AAAA)
655	>	{
656	>	request->timeout += 4;
657	>	resend_query(request);
658	>	}
659		}
660	+
661	+	continue;
662		}
785	–	#endif
663
664	<	return;
665	<	}
664	>	/*
665	>	* If this fails there was an error decoding the received packet.
666	>	* We only give it one shot. If it fails, just leave the client
667	>	* unresolved.
668	>	*/
669	>	if (!proc_answer(request, header, buf, buf + rc))
670	>	{
671	>	(*request->callback)(request->callback_ctx, NULL, NULL, 0);
672	>	rem_request(request);
673	>	continue;
674	>	}
675
790	–	/*
791	–	* If this fails there was an error decoding the received packet,
792	–	* try it again and hope it works the next time.
793	–	*/
794	–	if (proc_answer(request, header, buf, buf + rc))
795	–	{
676		if (request->type == T_PTR)
677		{
678	<	if (request->name == NULL)
678	>	if (request->namelength == 0)
679		{
680		/*
681		* Got a PTR response with no name, something bogus is happening
682		* don't bother trying again, the client address doesn't resolve
683		*/
684	<	(*request->callback)(request->callback_ctx, NULL, NULL);
684	>	(*request->callback)(request->callback_ctx, NULL, NULL, 0);
685		rem_request(request);
686	<	return;
686	>	continue;
687		}
688
689		/*
690		* Lookup the 'authoritative' name that we were given for the ip#.
691		*/
812	–	#ifdef IPV6
692		if (request->addr.ss.ss_family == AF_INET6)
693		gethost_byname_type(request->callback, request->callback_ctx, request->name, T_AAAA);
694		else
695	<	#endif
817	<	gethost_byname_type(request->callback, request->callback_ctx, request->name, T_A);
695	>	gethost_byname_type(request->callback, request->callback_ctx, request->name, T_A);
696		rem_request(request);
697		}
698		else
#	Line 822 | Line 700 | res_readreply(fde_t *fd, void *data)
700		/*
701		* Got a name and address response, client resolved
702		*/
703	<	(*request->callback)(request->callback_ctx, &request->addr, request->name);
703	>	(*request->callback)(request->callback_ctx, &request->addr, request->name, request->namelength);
704		rem_request(request);
705		}
828	–	}
829	–	else if (!request->sent)
830	–	{
831	–	/* XXX - we got a response for a query we didn't send with a valid id?
832	–	* this should never happen, bail here and leave the client unresolved
833	–	*/
834	–	assert(0);
706
707	<	/* XXX don't leak it */
837	<	rem_request(request);
707	>	continue;
708		}
709	+
710	+	comm_setselect(fd, COMM_SELECT_READ, res_readreply, NULL, 0);
711		}
712
713		void
#	Line 851 | Line 723 | report_dns_servers(struct Client *source
723		sendto_one_numeric(source_p, &me, RPL_STATSALINE, ipaddr);
724		}
725		}
726	+
727	+	/*
728	+	* timeout_query_list - Remove queries from the list which have been
729	+	* there too long without being resolved.
730	+	*/
731	+	static time_t
732	+	timeout_query_list(void)
733	+	{
734	+	dlink_node *ptr = NULL, *ptr_next = NULL;
735	+	struct reslist *request = NULL;
736	+	time_t next_time = 0;
737	+	time_t timeout   = 0;
738	+
739	+	DLINK_FOREACH_SAFE(ptr, ptr_next, request_list.head)
740	+	{
741	+	request = ptr->data;
742	+	timeout = request->sentat + request->timeout;
743	+
744	+	if (CurrentTime >= timeout)
745	+	{
746	+	if (--request->retries <= 0)
747	+	{
748	+	(*request->callback)(request->callback_ctx, NULL, NULL, 0);
749	+	rem_request(request);
750	+	continue;
751	+	}
752	+	else
753	+	{
754	+	request->sentat = CurrentTime;
755	+	request->timeout += request->timeout;
756	+	resend_query(request);
757	+	}
758	+	}
759	+
760	+	if (next_time == 0 || timeout < next_time)
761	+	next_time = timeout;
762	+	}
763	+
764	+	return (next_time > CurrentTime) ? next_time : (CurrentTime + AR_TTL);
765	+	}
766	+
767	+	/*
768	+	* timeout_resolver - check request list
769	+	*/
770	+	static void
771	+	timeout_resolver(void *unused)
772	+	{
773	+	timeout_query_list();
774	+	}
775	+
776	+	/*
777	+	* init_resolver - initialize resolver and resolver library
778	+	*/
779	+	void
780	+	init_resolver(void)
781	+	{
782	+	static struct event event_timeout_resolver =
783	+	{
784	+	.name = "timeout_resolver",
785	+	.handler = timeout_resolver,
786	+	.when = 1
787	+	};
788	+
789	+	dns_pool = mp_pool_new(sizeof(struct reslist), MP_CHUNK_SIZE_DNS);
790	+
791	+	start_resolver();
792	+	event_add(&event_timeout_resolver, NULL);
793	+	}

Diff Legend

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