ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/irc_res.c (file contents), Revision 992 by michael, Mon Aug 17 19:19:16 2009 UTC vs.
ircd-hybrid-8/src/irc_res.c (file contents), Revision 1309 by michael, Sun Mar 25 11:24:18 2012 UTC

#	Line 20 | Line 20
20		*/
21
22		#include "stdinc.h"
23	–	#include "tools.h"
24	–	#include "client.h"
23		#include "list.h"
24	<	#include "common.h"
24	>	#include "balloc.h"
25	>	#include "client.h"
26		#include "event.h"
27		#include "irc_string.h"
28		#include "sprintf_irc.h"
29		#include "ircd.h"
30		#include "numeric.h"
32	–	#include "restart.h"
31		#include "rng_mt.h"
32		#include "fdlist.h"
33		#include "fileio.h" /* for fbopen / fbclose / fbputs */
34		#include "s_bsd.h"
35	<	#include "s_log.h"
35	>	#include "log.h"
36	>	#include "s_misc.h"
37		#include "send.h"
38		#include "memory.h"
39		#include "irc_res.h"
40		#include "irc_reslib.h"
42	–	#include "irc_getnameinfo.h"
41
42		#if (CHAR_BIT != 8)
43		#error this code needs to be able to address individual octets
#	Line 94 | Line 92 | struct reslist
92
93		static fde_t ResolverFileDescriptor;
94		static dlink_list request_list = { NULL, NULL, 0 };
95	+	static BlockHeap *dns_heap = NULL;
96
97	<	static void rem_request(struct reslist *request);
98	<	static struct reslist *make_request(dns_callback_fnc callback, void *);
99	<	static void do_query_name(dns_callback_fnc callback, void *,
97	>	static void rem_request(struct reslist *);
98	>	static struct reslist *make_request(dns_callback_fnc, void *);
99	>	static void do_query_name(dns_callback_fnc, void *,
100		const char *, struct reslist *, int);
101	<	static void do_query_number(dns_callback_fnc callback, void *ctx,
101	>	static void do_query_number(dns_callback_fnc, void *,
102		const struct irc_ssaddr *,
103	<	struct reslist *request);
104	<	static void query_name(const char *name, int query_class, int query_type,
105	<	struct reslist *request);
106	<	static int send_res_msg(const char *buf, int len, int count);
107	<	static void resend_query(struct reslist *request);
108	<	static int proc_answer(struct reslist *request, HEADER *header, char *, char *);
110	<	static struct reslist *find_id(int id);
111	<	static struct DNSReply *make_dnsreply(struct reslist *request);
112	<
113	<	extern struct irc_ssaddr irc_nsaddr_list[IRCD_MAXNS];
114	<	extern int irc_nscount;
115	<	extern char irc_domain[HOSTLEN+1];
103	>	struct reslist *);
104	>	static void query_name(const char *, int, int, struct reslist *);
105	>	static int send_res_msg(const char *, int, int);
106	>	static void resend_query(struct reslist *);
107	>	static int proc_answer(struct reslist *, HEADER *, char *, char *);
108	>	static struct reslist *find_id(int);
109
110
111		/*
#	Line 159 | Line 152 | res_ourserver(const struct irc_ssaddr *i
152		sizeof(struct in6_addr)) == 0) ||
153		(memcmp(&v6->sin6_addr.s6_addr, &in6addr_any,
154		sizeof(struct in6_addr)) == 0))
155	<	return(1);
155	>	return 1;
156		break;
157		#endif
158		case AF_INET:
#	Line 167 | Line 160 | res_ourserver(const struct irc_ssaddr *i
160		if (v4->sin_port == v4in->sin_port)
161		if ((v4->sin_addr.s_addr == INADDR_ANY) ||
162		(v4->sin_addr.s_addr == v4in->sin_addr.s_addr))
163	<	return(1);
163	>	return 1;
164		break;
165		default:
166		break;
167		}
168		}
169
170	<	return(0);
170	>	return 0;
171		}
172
173		/*
#	Line 212 | Line 205 | timeout_query_list(time_t now)
205		}
206
207		if ((next_time == 0) || timeout < next_time)
215	–	{
208		next_time = timeout;
217	–	}
209		}
210
211	<	return((next_time > now) ? next_time : (now + AR_TTL));
211	>	return (next_time > now) ? next_time : (now + AR_TTL);
212		}
213
214		/*
#	Line 257 | Line 248 | start_resolver(void)
248		void
249		init_resolver(void)
250		{
251	+	dns_heap = BlockHeapCreate("dns", sizeof(struct reslist), DNS_HEAP_SIZE);
252		memset(&ResolverFileDescriptor, 0, sizeof(fde_t));
253		start_resolver();
254		}
#	Line 273 | Line 265 | restart_resolver(void)
265		}
266
267		/*
276	–	* add_local_domain - Add the domain to hostname, if it is missing
277	–	* (as suggested by eps@TOASTER.SFSU.EDU)
278	–	*/
279	–	void
280	–	add_local_domain(char *hname, size_t size)
281	–	{
282	–	/* try to fix up unqualified names
283	–	*/
284	–	if (strchr(hname, '.') == NULL)
285	–	{
286	–	if (irc_domain[0])
287	–	{
288	–	size_t len = strlen(hname);
289	–
290	–	if ((strlen(irc_domain) + len + 2) < size)
291	–	{
292	–	hname[len++] = '.';
293	–	strcpy(hname + len, irc_domain);
294	–	}
295	–	}
296	–	}
297	–	}
298	–
299	–	/*
268		* rem_request - remove a request from the list.
269		* This must also free any memory that has been allocated for
270		* temporary storage of DNS results.
#	Line 305 | Line 273 | static void
273		rem_request(struct reslist *request)
274		{
275		dlinkDelete(&request->node, &request_list);
276	+
277		MyFree(request->name);
278	<	MyFree(request);
278	>	BlockHeapFree(dns_heap, request);
279		}
280
281		/*
#	Line 315 | Line 284 | rem_request(struct reslist *request)
284		static struct reslist *
285		make_request(dns_callback_fnc callback, void *ctx)
286		{
287	<	struct reslist *request;
319	<
320	<	request = (struct reslist *)MyMalloc(sizeof(struct reslist));
287	>	struct reslist *request = BlockHeapAlloc(dns_heap);
288
289		request->sentat       = CurrentTime;
290		request->retries      = 3;
#	Line 328 | Line 295 | make_request(dns_callback_fnc callback,
295		request->callback_ctx = ctx;
296
297		dlinkAdd(request, &request->node, &request_list);
298	<	return(request);
298	>	return request;
299		}
300
301		/*
#	Line 338 | Line 305 | make_request(dns_callback_fnc callback,
305		void
306		delete_resolver_queries(const void *vptr)
307		{
308	<	dlink_node *ptr;
342	<	dlink_node *next_ptr;
343	<	struct reslist *request;
308	>	dlink_node *ptr = NULL, *next_ptr = NULL;
309
310		DLINK_FOREACH_SAFE(ptr, next_ptr, request_list.head)
311		{
312	<	if ((request = ptr->data) != NULL)
313	<	{
314	<	if (request->callback_ctx == vptr)
315	<	rem_request(request);
351	<	}
312	>	struct reslist *request = ptr->data;
313	>
314	>	if (request->callback_ctx == vptr)
315	>	rem_request(request);
316		}
317		}
318
#	Line 380 | Line 344 | send_res_msg(const char *msg, int len, i
344		++sent;
345		}
346
347	<	return(sent);
347	>	return sent;
348		}
349
350		/*
#	Line 389 | Line 353 | send_res_msg(const char *msg, int len, i
353		static struct reslist *
354		find_id(int id)
355		{
356	<	dlink_node *ptr;
393	<	struct reslist *request;
356	>	dlink_node *ptr = NULL;
357
358		DLINK_FOREACH(ptr, request_list.head)
359		{
360	<	request = ptr->data;
360	>	struct reslist *request = ptr->data;
361
362		if (request->id == id)
363	<	return(request);
363	>	return request;
364		}
365
366	<	return(NULL);
366	>	return NULL;
367		}
368
369		/*
#	Line 410 | Line 373 | find_id(int id)
373		void
374		gethost_byname_type(dns_callback_fnc callback, void *ctx, const char *name, int type)
375		{
376	<	assert(name != 0);
376	>	assert(name != NULL);
377		do_query_name(callback, ctx, name, NULL, type);
378		}
379
#	Line 445 | Line 408 | do_query_name(dns_callback_fnc callback,
408		{
409		char host_name[HOSTLEN + 1];
410
411	<	strlcpy(host_name, name, HOSTLEN + 1);
449	<	add_local_domain(host_name, HOSTLEN + 1);
411	>	strlcpy(host_name, name, sizeof(host_name));
412
413		if (request == NULL)
414		{
#	Line 480 | Line 442 | do_query_number(dns_callback_fnc callbac
442		if (addr->ss.ss_family == AF_INET)
443		{
444		const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
445	<	cp = (const unsigned char*)&v4->sin_addr.s_addr;
445	>	cp = (const unsigned char *)&v4->sin_addr.s_addr;
446
447	<	ircsprintf(ipbuf, "%u.%u.%u.%u.in-addr.arpa.",
448	<	(unsigned int)(cp[3]), (unsigned int)(cp[2]),
449	<	(unsigned int)(cp[1]), (unsigned int)(cp[0]));
447	>	snprintf(ipbuf, sizeof(ipbuf), "%u.%u.%u.%u.in-addr.arpa.",
448	>	(unsigned int)(cp[3]), (unsigned int)(cp[2]),
449	>	(unsigned int)(cp[1]), (unsigned int)(cp[0]));
450		}
451		#ifdef IPV6
452		else if (addr->ss.ss_family == AF_INET6)
#	Line 492 | Line 454 | do_query_number(dns_callback_fnc callbac
454		const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
455		cp = (const unsigned char *)&v6->sin6_addr.s6_addr;
456
457	<	sprintf(ipbuf, "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
458	<	"%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.ip6.arpa.",
459	<	(unsigned int)(cp[15]&0xf), (unsigned int)(cp[15]>>4),
460	<	(unsigned int)(cp[14]&0xf), (unsigned int)(cp[14]>>4),
461	<	(unsigned int)(cp[13]&0xf), (unsigned int)(cp[13]>>4),
462	<	(unsigned int)(cp[12]&0xf), (unsigned int)(cp[12]>>4),
463	<	(unsigned int)(cp[11]&0xf), (unsigned int)(cp[11]>>4),
464	<	(unsigned int)(cp[10]&0xf), (unsigned int)(cp[10]>>4),
465	<	(unsigned int)(cp[9]&0xf), (unsigned int)(cp[9]>>4),
466	<	(unsigned int)(cp[8]&0xf), (unsigned int)(cp[8]>>4),
467	<	(unsigned int)(cp[7]&0xf), (unsigned int)(cp[7]>>4),
468	<	(unsigned int)(cp[6]&0xf), (unsigned int)(cp[6]>>4),
469	<	(unsigned int)(cp[5]&0xf), (unsigned int)(cp[5]>>4),
470	<	(unsigned int)(cp[4]&0xf), (unsigned int)(cp[4]>>4),
471	<	(unsigned int)(cp[3]&0xf), (unsigned int)(cp[3]>>4),
472	<	(unsigned int)(cp[2]&0xf), (unsigned int)(cp[2]>>4),
473	<	(unsigned int)(cp[1]&0xf), (unsigned int)(cp[1]>>4),
474	<	(unsigned int)(cp[0]&0xf), (unsigned int)(cp[0]>>4));
457	>	snprintf(ipbuf, sizeof(ipbuf),
458	>	"%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x."
459	>	"%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.ip6.arpa.",
460	>	(unsigned int)(cp[15] & 0xf), (unsigned int)(cp[15] >> 4),
461	>	(unsigned int)(cp[14] & 0xf), (unsigned int)(cp[14] >> 4),
462	>	(unsigned int)(cp[13] & 0xf), (unsigned int)(cp[13] >> 4),
463	>	(unsigned int)(cp[12] & 0xf), (unsigned int)(cp[12] >> 4),
464	>	(unsigned int)(cp[11] & 0xf), (unsigned int)(cp[11] >> 4),
465	>	(unsigned int)(cp[10] & 0xf), (unsigned int)(cp[10] >> 4),
466	>	(unsigned int)(cp[9] & 0xf), (unsigned int)(cp[9] >> 4),
467	>	(unsigned int)(cp[8] & 0xf), (unsigned int)(cp[8] >> 4),
468	>	(unsigned int)(cp[7] & 0xf), (unsigned int)(cp[7] >> 4),
469	>	(unsigned int)(cp[6] & 0xf), (unsigned int)(cp[6] >> 4),
470	>	(unsigned int)(cp[5] & 0xf), (unsigned int)(cp[5] >> 4),
471	>	(unsigned int)(cp[4] & 0xf), (unsigned int)(cp[4] >> 4),
472	>	(unsigned int)(cp[3] & 0xf), (unsigned int)(cp[3] >> 4),
473	>	(unsigned int)(cp[2] & 0xf), (unsigned int)(cp[2] >> 4),
474	>	(unsigned int)(cp[1] & 0xf), (unsigned int)(cp[1] >> 4),
475	>	(unsigned int)(cp[0] & 0xf), (unsigned int)(cp[0] >> 4));
476		}
477		#endif
478		if (request == NULL)
#	Line 586 | Line 549 | resend_query(struct reslist *request)
549		* proc_answer - process name server reply
550		*/
551		static int
552	<	proc_answer(struct reslist *request, HEADER* header, char* buf, char* eob)
552	>	proc_answer(struct reslist *request, HEADER *header, char *buf, char *eob)
553		{
554		char hostbuf[HOSTLEN + 100]; /* working buffer */
555		unsigned char *current;      /* current position in buf */
#	Line 605 | Line 568 | proc_answer(struct reslist *request, HEA
568		if ((n = irc_dn_skipname(current, (unsigned char *)eob)) < 0)
569		break;
570
571	<	current += (size_t) n + QFIXEDSZ;
571	>	current += (size_t)n + QFIXEDSZ;
572		}
573
574		/*
#	Line 618 | Line 581 | proc_answer(struct reslist *request, HEA
581		n = irc_dn_expand((unsigned char *)buf, (unsigned char *)eob, current,
582		hostbuf, sizeof(hostbuf));
583
584	<	if (n < 0)
585	<	{
623	<	/*
624	<	* broken message
625	<	*/
626	<	return(0);
627	<	}
628	<	else if (n == 0)
629	<	{
630	<	/*
631	<	* no more answers left
632	<	*/
633	<	return(0);
634	<	}
584	>	if (n < 0 /* broken message */ || n == 0 /* no more answers left */)
585	>	return 0;
586
587		hostbuf[HOSTLEN] = '\0';
588
#	Line 663 | Line 614 | proc_answer(struct reslist *request, HEA
614		{
615		case T_A:
616		if (request->type != T_A)
617	<	return(0);
617	>	return 0;
618
619		/*
620		* check for invalid rd_length or too many addresses
621		*/
622		if (rd_length != sizeof(struct in_addr))
623	<	return(0);
623	>	return 0;
624	>
625		v4 = (struct sockaddr_in *)&request->addr;
626		request->addr.ss_len = sizeof(struct sockaddr_in);
627		v4->sin_family = AF_INET;
628		memcpy(&v4->sin_addr, current, sizeof(struct in_addr));
629	<	return(1);
629	>	return 1;
630		break;
631		#ifdef IPV6
632		case T_AAAA:
633		if (request->type != T_AAAA)
634	<	return(0);
634	>	return 0;
635	>
636		if (rd_length != sizeof(struct in6_addr))
637	<	return(0);
637	>	return 0;
638	>
639		request->addr.ss_len = sizeof(struct sockaddr_in6);
640		v6 = (struct sockaddr_in6 *)&request->addr;
641		v6->sin6_family = AF_INET6;
642		memcpy(&v6->sin6_addr, current, sizeof(struct in6_addr));
643	<	return(1);
643	>	return 1;
644		break;
645		#endif
646		case T_PTR:
647		if (request->type != T_PTR)
648	<	return(0);
648	>	return 0;
649	>
650		n = irc_dn_expand((unsigned char *)buf, (unsigned char *)eob,
651		current, hostbuf, sizeof(hostbuf));
652	<	if (n < 0)
653	<	return(0); /* broken message */
699	<	else if (n == 0)
700	<	return(0); /* no more answers left */
652	>	if (n < 0 /* broken message */ || n == 0 /* no more answers left */)
653	>	return 0;
654
655		strlcpy(request->name, hostbuf, HOSTLEN + 1);
656	<
704	<	return(1);
656	>	return 1;
657		break;
658		case T_CNAME: /* first check we already havent started looking
659		into a cname */
660		if (request->type != T_PTR)
661	<	return(0);
661	>	return 0;
662
663		if (request->state == REQ_CNAME)
664		{
#	Line 714 | Line 666 | proc_answer(struct reslist *request, HEA
666		current, hostbuf, sizeof(hostbuf));
667
668		if (n < 0)
669	<	return(0);
670	<	return(1);
669	>	return 0;
670	>	return 1;
671		}
672
673		request->state = REQ_CNAME;
#	Line 727 | Line 679 | proc_answer(struct reslist *request, HEA
679		* but its possible its just a broken nameserver with still
680		* valid answers. But lets do some rudimentary logging for now...
681		*/
682	<	ilog(L_ERROR, "irc_res.c bogus type %d", type);
682	>	ilog(LOG_TYPE_IRCD, "irc_res.c bogus type %d", type);
683		break;
684		}
685		}
686
687	<	return(1);
687	>	return 1;
688		}
689
690		/*
#	Line 753 | Line 705 | res_readreply(fde_t *fd, void *data)
705		HEADER *header;
706		struct reslist *request = NULL;
707		int rc;
756	–	int answer_count;
708		socklen_t len = sizeof(struct irc_ssaddr);
709		struct irc_ssaddr lsin;
710
#	Line 778 | Line 729 | res_readreply(fde_t *fd, void *data)
729		header->arcount = ntohs(header->arcount);
730
731		/*
732	<	* response for an id which we have already received an answer for
782	<	* just ignore this response.
732	>	* check against possibly fake replies
733		*/
734	<	if (0 == (request = find_id(header->id)))
734	>	if (!res_ourserver(&lsin))
735		return;
736
737		/*
738	<	* check against possibly fake replies
738	>	* response for an id which we have already received an answer for
739	>	* just ignore this response.
740		*/
741	<	if (!res_ourserver(&lsin))
741	>	if (!(request = find_id(header->id)))
742		return;
743
744		if ((header->rcode != NO_ERRORS) || (header->ancount == 0))
#	Line 823 | Line 774 | res_readreply(fde_t *fd, void *data)
774		* If this fails there was an error decoding the received packet,
775		* try it again and hope it works the next time.
776		*/
777	<	answer_count = proc_answer(request, header, buf, buf + rc);
827	<
828	<	if (answer_count)
777	>	if (proc_answer(request, header, buf, buf + rc))
778		{
779		if (request->type == T_PTR)
780		{
#	Line 882 | Line 831 | report_dns_servers(struct Client *source
831
832		for (i = 0; i < irc_nscount; i++)
833		{
834	<	irc_getnameinfo((struct sockaddr *)&(irc_nsaddr_list[i]),
835	<	irc_nsaddr_list[i].ss_len, ipaddr,
836	<	sizeof(ipaddr), NULL, 0, NI_NUMERICHOST);
834	>	getnameinfo((struct sockaddr *)&(irc_nsaddr_list[i]),
835	>	irc_nsaddr_list[i].ss_len, ipaddr,
836	>	sizeof(ipaddr), NULL, 0, NI_NUMERICHOST);
837		sendto_one(source_p, form_str(RPL_STATSALINE),
838		me.name, source_p->name, ipaddr);
839		}

Diff Legend

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