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 1592 by michael, Sat Oct 27 21:02:32 2012 UTC vs.
ircd-hybrid/trunk/src/res.c (file contents), Revision 4415 by michael, Thu Aug 7 14:09:36 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	* A rewrite of Darren Reeds original res.c As there is nothing
3	<	* left of Darrens original code, this is now licensed by the hybrid group.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3	>	*
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5	>	*
6	>	*  This program is free software; you can redistribute it and/or modify
7	>	*  it under the terms of the GNU General Public License as published by
8	>	*  the Free Software Foundation; either version 2 of the License, or
9	>	*  (at your option) any later version.
10	>	*
11	>	*  This program is distributed in the hope that it will be useful,
12	>	*  but WITHOUT ANY WARRANTY; without even the implied warranty of
13	>	*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	>	*  GNU General Public License for more details.
15	>	*
16	>	*  You should have received a copy of the GNU General Public License
17	>	*  along with this program; if not, write to the Free Software
18	>	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19	>	*  USA
20	>	*/
21	>
22	>	/*! \file res.c
23	>	* \brief ircd resolver functions
24	>	* \version $Id$
25	>	*/
26	>
27	>	/*
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		*
10	–	* $Id$
11	–	*
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		*/
45
46		#include "stdinc.h"
47		#include "list.h"
24	–	#include "balloc.h"
48		#include "client.h"
49		#include "event.h"
50		#include "irc_string.h"
28	–	#include "sprintf_irc.h"
51		#include "ircd.h"
52		#include "numeric.h"
53		#include "rng_mt.h"
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 "irc_res.h"
61	<	#include "irc_reslib.h"
60	>	#include "mempool.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
65	>	#error this code needs to be able to address individual octets
66		#endif
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 */
49	<	#define RES_MAXADDRS   35    /* maximum addresses allowed */
50	<	#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 59 | Line 81 | static PF res_readreply;
81		#define RDLENGTH_SIZE     (size_t)2
82		#define ANSWER_FIXED_SIZE (TYPE_SIZE + CLASS_SIZE + TTL_SIZE + RDLENGTH_SIZE)
83
84	<	typedef enum
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 */
69	<	#endif
70	<	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
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	<	char 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];  /**< 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 = { NULL, NULL, 0 };
114	<	static BlockHeap *dns_heap = NULL;
113	>	static dlink_list request_list;
114	>	static mp_pool_t *dns_pool;
115	>
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	<	static void rem_request(struct reslist *);
130	<	static struct reslist *make_request(dns_callback_fnc, void *);
131	<	static void do_query_name(dns_callback_fnc, void *,
132	<	const char *, struct reslist *, int);
133	<	static void do_query_number(dns_callback_fnc, void *,
134	<	const struct irc_ssaddr *,
135	<	struct reslist *);
103	<	static void query_name(const char *, int, int, struct reslist *);
104	<	static int send_res_msg(const char *, int, int);
105	<	static void resend_query(struct reslist *);
106	<	static int proc_answer(struct reslist *, HEADER *, char *, char *);
107	<	static struct reslist *find_id(int);
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 119 | Line 158 | static struct reslist *find_id(int);
158		*      revised for ircd, cryogen(stu) may03
159		*/
160		static int
161	<	res_ourserver(const struct irc_ssaddr *inp)
161	>	res_ourserver(const struct irc_ssaddr *inp)
162		{
124	–	#ifdef IPV6
163		const struct sockaddr_in6 *v6;
164		const struct sockaddr_in6 *v6in = (const struct sockaddr_in6 *)inp;
127	–	#endif
165		const struct sockaddr_in *v4;
166	<	const struct sockaddr_in *v4in = (const struct sockaddr_in *)inp;
130	<	int ns;
166	>	const struct sockaddr_in *v4in = (const struct sockaddr_in *)inp;
167
168	<	for (ns = 0; ns < irc_nscount; ++ns)
168	>	for (unsigned int i = 0; i < irc_nscount; ++i)
169		{
170	<	const struct irc_ssaddr *srv = &irc_nsaddr_list[ns];
135	<	#ifdef IPV6
170	>	const struct irc_ssaddr *srv = &irc_nsaddr_list[i];
171		v6 = (const struct sockaddr_in6 *)srv;
137	–	#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
142	–	*
177		*/
178		switch (srv->ss.ss_family)
179		{
146	–	#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 151 | Line 184 | res_ourserver(const struct irc_ssaddr *i
184		sizeof(struct in6_addr)))
185		return 1;
186		break;
154	–	#endif
187		case AF_INET:
188		if (srv->ss.ss_family == inp->ss.ss_family)
189		if (v4->sin_port == v4in->sin_port)
#	Line 167 | Line 199 | res_ourserver(const struct irc_ssaddr *i
199		}
200
201		/*
170	–	* timeout_query_list - Remove queries from the list which have been
171	–	* there too long without being resolved.
172	–	*/
173	–	static time_t
174	–	timeout_query_list(time_t now)
175	–	{
176	–	dlink_node *ptr;
177	–	dlink_node *next_ptr;
178	–	struct reslist *request;
179	–	time_t next_time = 0;
180	–	time_t timeout   = 0;
181	–
182	–	DLINK_FOREACH_SAFE(ptr, next_ptr, request_list.head)
183	–	{
184	–	request = ptr->data;
185	–	timeout = request->sentat + request->timeout;
186	–
187	–	if (now >= timeout)
188	–	{
189	–	if (--request->retries <= 0)
190	–	{
191	–	(*request->callback)(request->callback_ctx, NULL, NULL);
192	–	rem_request(request);
193	–	continue;
194	–	}
195	–	else
196	–	{
197	–	request->sentat = now;
198	–	request->timeout += request->timeout;
199	–	resend_query(request);
200	–	}
201	–	}
202	–
203	–	if ((next_time == 0) || timeout < next_time)
204	–	next_time = timeout;
205	–	}
206	–
207	–	return (next_time > now) ? next_time : (now + AR_TTL);
208	–	}
209	–
210	–	/*
211	–	* timeout_resolver - check request list
212	–	*/
213	–	static void
214	–	timeout_resolver(void *notused)
215	–	{
216	–	timeout_query_list(CurrentTime);
217	–	}
218	–
219	–	/*
202		* start_resolver - do everything we need to read the resolv.conf file
203		* and initialize the resolver file descriptor if needed
204		*/
#	Line 232 | Line 214 | start_resolver(void)
214		return;
215
216		/* At the moment, the resolver FD data is global .. */
217	<	comm_setselect(&ResolverFileDescriptor, COMM_SELECT_READ,
236	<	res_readreply, NULL, 0);
237	<	eventAdd("timeout_resolver", timeout_resolver, NULL, 1);
217	>	comm_setselect(&ResolverFileDescriptor, COMM_SELECT_READ, res_readreply, NULL, 0);
218		}
219		}
220
221		/*
242	–	* init_resolver - initialize resolver and resolver library
243	–	*/
244	–	void
245	–	init_resolver(void)
246	–	{
247	–	dns_heap = BlockHeapCreate("dns", sizeof(struct reslist), DNS_HEAP_SIZE);
248	–	memset(&ResolverFileDescriptor, 0, sizeof(fde_t));
249	–	start_resolver();
250	–	}
251	–
252	–	/*
222		* restart_resolver - reread resolv.conf, reopen socket
223		*/
224		void
225		restart_resolver(void)
226		{
227		fd_close(&ResolverFileDescriptor);
259	–	eventDelete(timeout_resolver, NULL); /* -ddosen */
228		start_resolver();
229		}
230
231		/*
232	<	* rem_request - remove a request from the list.
265	<	* This must also free any memory that has been allocated for
266	<	* temporary storage of DNS results.
267	<	*/
268	<	static void
269	<	rem_request(struct reslist *request)
270	<	{
271	<	dlinkDelete(&request->node, &request_list);
272	<
273	<	MyFree(request->name);
274	<	BlockHeapFree(dns_heap, request);
275	<	}
276	<
277	<	/*
278	<	* make_request - Create a DNS request record for the server.
279	<	*/
280	<	static struct reslist *
281	<	make_request(dns_callback_fnc callback, void *ctx)
282	<	{
283	<	struct reslist *request = BlockHeapAlloc(dns_heap);
284	<
285	<	request->sentat       = CurrentTime;
286	<	request->retries      = 3;
287	<	request->resend       = 1;
288	<	request->timeout      = 4;    /* start at 4 and exponential inc. */
289	<	request->state        = REQ_IDLE;
290	<	request->callback     = callback;
291	<	request->callback_ctx = ctx;
292	<
293	<	dlinkAdd(request, &request->node, &request_list);
294	<	return request;
295	<	}
296	<
297	<	/*
298	<	* delete_resolver_queries - cleanup outstanding queries
232	>	* delete_resolver_queries - cleanup outstanding queries
233		* for which there no longer exist clients or conf lines.
234		*/
235		void
236		delete_resolver_queries(const void *vptr)
237		{
238	<	dlink_node *ptr = NULL, *next_ptr = NULL;
238	>	dlink_node *ptr = NULL, *ptr_next = NULL;
239
240	<	DLINK_FOREACH_SAFE(ptr, next_ptr, request_list.head)
240	>	DLINK_FOREACH_SAFE(ptr, ptr_next, request_list.head)
241		{
242		struct reslist *request = ptr->data;
243
#	Line 316 | 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
257	<	send_res_msg(const char *msg, int len, int rcount)
257	>	send_res_msg(const char *msg, int len, unsigned int rcount)
258		{
325	–	int i;
259		int sent = 0;
260	<	int max_queries = IRCD_MIN(irc_nscount, rcount);
260	>	unsigned int max_queries = IRCD_MIN(irc_nscount, rcount);
261
262		/* RES_PRIMARY option is not implemented
263		* if (res.options & RES_PRIMARY || 0 == max_queries)
#	Line 332 | Line 265 | send_res_msg(const char *msg, int len, i
265		if (max_queries == 0)
266		max_queries = 1;
267
268	<	for (i = 0; i < max_queries; i++)
268	>	for (unsigned int i = 0; i < max_queries; ++i)
269		{
270	<	if (sendto(ResolverFileDescriptor.fd, msg, len, 0,
271	<	(struct sockaddr*)&(irc_nsaddr_list[i]),
272	<	irc_nsaddr_list[i].ss_len) == len)
270	>	if (sendto(ResolverFileDescriptor.fd, msg, len, 0,
271	>	(struct sockaddr*)&(irc_nsaddr_list[i]),
272	>	irc_nsaddr_list[i].ss_len) == len)
273		++sent;
274		}
275
#	Line 362 | Line 295 | find_id(int id)
295		return NULL;
296		}
297
365	–	/*
366	–	* gethost_byname_type - get host address from name
367	–	*
368	–	*/
369	–	void
370	–	gethost_byname_type(dns_callback_fnc callback, void *ctx, const char *name, int type)
371	–	{
372	–	assert(name != NULL);
373	–	do_query_name(callback, ctx, name, NULL, type);
374	–	}
375	–
298		/*
299	<	* gethost_byname - wrapper for _type - send T_AAAA first if IPV6 supported
299	>	* query_name - generate a query based on class, type and name.
300		*/
301	<	void
302	<	gethost_byname(dns_callback_fnc callback, void *ctx, const char *name)
301	>	static void
302	>	query_name(const char *name, int query_class, int type,
303	>	struct reslist *request)
304		{
305	<	#ifdef IPV6
306	<	gethost_byname_type(callback, ctx, name, T_AAAA);
384	<	#else
385	<	gethost_byname_type(callback, ctx, name, T_A);
386	<	#endif
387	<	}
305	>	char buf[MAXPACKET];
306	>	int request_len = 0;
307
308	<	/*
309	<	* gethost_byaddr - get host name from address
310	<	*/
311	<	void
312	<	gethost_byaddr(dns_callback_fnc callback, void *ctx, const struct irc_ssaddr *addr)
313	<	{
314	<	do_query_number(callback, ctx, addr, NULL);
308	>	memset(buf, 0, sizeof(buf));
309	>
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 402 | 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);
415	<	#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
420	<	request->state = REQ_A;
352	>	request->state = REQ_A;
353		}
354
355		request->type = type;
#	Line 432 | Line 364 | do_query_number(dns_callback_fnc callbac
364		const struct irc_ssaddr *addr,
365		struct reslist *request)
366		{
367	<	char ipbuf[128];
436	<	const unsigned char *cp;
367	>	char ipbuf[128] = "";
368
369		if (addr->ss.ss_family == AF_INET)
370		{
371		const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
372	<	cp = (const unsigned char *)&v4->sin_addr.s_addr;
372	>	const unsigned char *cp = (const unsigned char *)&v4->sin_addr.s_addr;
373
374		snprintf(ipbuf, sizeof(ipbuf), "%u.%u.%u.%u.in-addr.arpa.",
375		(unsigned int)(cp[3]), (unsigned int)(cp[2]),
376		(unsigned int)(cp[1]), (unsigned int)(cp[0]));
377		}
447	–	#ifdef IPV6
378		else if (addr->ss.ss_family == AF_INET6)
379		{
380		const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
381	<	cp = (const unsigned char *)&v6->sin6_addr.s6_addr;
381	>	const unsigned char *cp = (const unsigned char *)&v6->sin6_addr.s6_addr;
382
383		snprintf(ipbuf, sizeof(ipbuf),
384		"%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
#	Line 470 | 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));
479	–	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,
490	<	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	<
495	<	memset(buf, 0, sizeof(buf));
496	<
497	<	if ((request_len = irc_res_mkquery(name, query_class, type,
498	<	(unsigned char *)buf, sizeof(buf))) > 0)
499	<	{
500	<	HEADER *header = (HEADER *)buf;
501	<
502	<	/*
503	<	* generate an unique id
504	<	* NOTE: we don't have to worry about converting this to and from
505	<	* network byte order, the nameserver does not interpret this value
506	<	* and returns it unchanged
507	<	*/
508	<	do
509	<	header->id = (header->id + genrand_int32()) & 0xffff;
510	<	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 530 | 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
534	<	case T_AAAA:
535	<	/* 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);
538	–	#endif
460		default:
461		break;
462		}
#	Line 547 | 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 */
552	–	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 */
557	–	#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 568 | 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 577 | 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		*/
509	<	current += (size_t) n;
509	>	current += (size_t)n;
510
511		if (!(((char *)current + ANSWER_FIXED_SIZE) < eob))
512		break;
513
514		type = irc_ns_get16(current);
515		current += TYPE_SIZE;
596	–
597	–	query_class = irc_ns_get16(current);
516		current += CLASS_SIZE;
599	–
600	–	request->ttl = irc_ns_get32(current);
517		current += TTL_SIZE;
602	–
518		rd_length = irc_ns_get16(current);
519		current += RDLENGTH_SIZE;
520
521	<	/*
522	<	* Wait to set request->type until we verify this structure
521	>	/*
522	>	* Wait to set request->type until we verify this structure
523		*/
524		switch (type)
525		{
#	Line 613 | Line 528 | proc_answer(struct reslist *request, HEA
528		return 0;
529
530		/*
531	<	* check for invalid rd_length or too many addresses
531	>	* Check for invalid rd_length or too many addresses
532		*/
533		if (rd_length != sizeof(struct in_addr))
534		return 0;
#	Line 624 | Line 539 | proc_answer(struct reslist *request, HEA
539		memcpy(&v4->sin_addr, current, sizeof(struct in_addr));
540		return 1;
541		break;
627	–	#ifdef IPV6
542		case T_AAAA:
543		if (request->type != T_AAAA)
544		return 0;
#	Line 638 | Line 552 | proc_answer(struct reslist *request, HEA
552		memcpy(&v6->sin6_addr, current, sizeof(struct in6_addr));
553		return 1;
554		break;
641	–	#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 */)
560	>	current, hostbuf, sizeof(hostbuf));
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
568	<	into a cname */
656	<	if (request->type != T_PTR)
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
571		if (request->state == REQ_CNAME)
#	Line 669 | Line 581 | proc_answer(struct reslist *request, HEA
581		request->state = REQ_CNAME;
582		current += rd_length;
583		break;
584	<
584	>
585		default:
586		/* XXX I'd rather just throw away the entire bogus thing
587		* but its possible its just a broken nameserver with still
#	Line 689 | 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]
693	<	/* Sparc and alpha need 16bit-alignment for accessing header->id
694	<	* (which is uint16_t). Because of the header = (HEADER*) buf;
695	<	* lateron, this is neeeded. --FaUl
696	<	*/
697	<	#if defined(__sparc__) || defined(__alpha__)
698	<	__attribute__((aligned (16)))
699	<	#endif
700	<	;
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
711	<	*/
712	<	comm_setselect(fd, COMM_SELECT_READ, res_readreply, NULL, 0);
713	<
714	<	/* Better to cast the sizeof instead of rc */
715	<	if (rc <= (int)(sizeof(HEADER)))
716	<	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);
723	<	header->qdcount = ntohs(header->qdcount);
724	<	header->nscount = ntohs(header->nscount);
725	<	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))
741	<	{
742	<	if (header->rcode == SERVFAIL || header->rcode == NXDOMAIN)
743	<	{
744	<	/*
745	<	* If a bad error was returned, stop here and don't
746	<	* send any more (no retries granted).
747	<	*/
748	<	(*request->callback)(request->callback_ctx, NULL, NULL);
749	<	rem_request(request);
750	<	}
751	<	#ifdef IPV6
752	<	else
638	>	if ((header->rcode != NO_ERRORS) || (header->ancount == 0))
639		{
640	<	/*
755	<	* If we havent already tried this, and we're looking up AAAA, try A
756	<	* now
757	<	*/
758	<	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		}
764	–	#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
769	–	/*
770	–	* If this fails there was an error decoding the received packet,
771	–	* try it again and hope it works the next time.
772	–	*/
773	–	if (proc_answer(request, header, buf, buf + rc))
774	–	{
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
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
790	<	* ip#.
791	<	*
690	>	* Lookup the 'authoritative' name that we were given for the ip#.
691		*/
793	–	#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
798	<	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
699		{
700		/*
701	<	* got a name and address response, client resolved
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		}
809	–	}
810	–	else if (!request->sent)
811	–	{
812	–	/* XXX - we got a response for a query we didn't send with a valid id?
813	–	* this should never happen, bail here and leave the client unresolved
814	–	*/
815	–	assert(0);
706
707	<	/* XXX don't leak it */
818	<	rem_request(request);
707	>	continue;
708		}
709	+
710	+	comm_setselect(fd, COMM_SELECT_READ, res_readreply, NULL, 0);
711		}
712
713		void
714		report_dns_servers(struct Client *source_p)
715		{
716	<	int i;
826	<	char ipaddr[HOSTIPLEN + 1];
716	>	char ipaddr[HOSTIPLEN + 1] = "";
717
718	<	for (i = 0; i < irc_nscount; i++)
718	>	for (unsigned int i = 0; i < irc_nscount; ++i)
719		{
720		getnameinfo((struct sockaddr *)&(irc_nsaddr_list[i]),
721		irc_nsaddr_list[i].ss_len, ipaddr,
722		sizeof(ipaddr), NULL, 0, NI_NUMERICHOST);
723	<	sendto_one(source_p, form_str(RPL_STATSALINE),
834	<	me.name, source_p->name, ipaddr);
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 *notused)
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	+	memset(&ResolverFileDescriptor, 0, sizeof(fde_t));
791	+	start_resolver();
792	+
793	+	event_add(&event_timeout_resolver, NULL);
794	+	}

Diff Legend

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