ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/server.c

Comparing ircd-hybrid/trunk/src/s_serv.c (file contents):
Revision 2212 by michael, Wed Jun 5 22:04:03 2013 UTC vs.
Revision 3319 by michael, Tue Apr 15 15:41:50 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_serv.c: Server related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
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
#	Line 18 | Line 17
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	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_serv.c
23	>	* \brief Server related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 28 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
33		#include "client.h"
34	–	#include "dbuf.h"
34		#include "event.h"
36	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37		#include "ircd.h"
#	Line 41 | Line 39
39		#include "s_bsd.h"
40		#include "numeric.h"
41		#include "packet.h"
44	–	#include "irc_res.h"
42		#include "conf.h"
43		#include "s_serv.h"
44		#include "log.h"
45	<	#include "s_misc.h"
45	>	//#include "s_misc.h"
46		#include "s_user.h"
47		#include "send.h"
48		#include "memory.h"
49	<	#include "channel.h" /* chcap_usage_counts stuff...*/
49	>	#include "channel.h"
50		#include "parse.h"
51
52		#define MIN_CONN_FREQ 300
53
54		dlink_list flatten_links;
55		static dlink_list cap_list = { NULL, NULL, 0 };
59	–	static void server_burst(struct Client *);
60	–	static void burst_all(struct Client *);
61	–	static void send_tb(struct Client *client_p, struct Channel *chptr);
62	–
56		static CNCB serv_connect_callback;
57
65	–	static void burst_members(struct Client *, struct Channel *);
58
59		/*
60		* write_links_file
#	Line 76 | Line 68 | void
68		write_links_file(void *notused)
69		{
70		FILE *file = NULL;
71	<	dlink_node *ptr = NULL, *ptr_next = NULL;;
72	<	char buff[IRCD_BUFSIZE] = { '\0' };
71	>	dlink_node *ptr = NULL, *ptr_next = NULL;
72	>	char buff[IRCD_BUFSIZE] = "";
73
74		if ((file = fopen(LIPATH, "w")) == NULL)
75		return;
#	Line 121 | Line 113 | write_links_file(void *notused)
113		fclose(file);
114		}
115
116	+	void
117	+	read_links_file(void)
118	+	{
119	+	FILE *file = NULL;
120	+	char *p = NULL;
121	+	char buff[IRCD_BUFSIZE] = "";
122	+
123	+	if ((file = fopen(LIPATH, "r")) == NULL)
124	+	return;
125	+
126	+	while (fgets(buff, sizeof(buff), file))
127	+	{
128	+	if ((p = strchr(buff, '\n')))
129	+	*p = '\0';
130	+
131	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
132	+	}
133	+
134	+	fclose(file);
135	+	}
136	+
137		/* hunt_server()
138		*      Do the basic thing in delivering the message (command)
139		*      across the relays to the specific server (server) for
#	Line 141 | Line 154 | write_links_file(void *notused)
154		*      returns: (see #defines)
155		*/
156		int
157	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
157	>	hunt_server(struct Client *source_p, const char *command,
158		const int server, const int parc, char *parv[])
159		{
160		struct Client *target_p = NULL;
#	Line 163 | Line 176 | hunt_server(struct Client *client_p, str
176		if (MyClient(source_p))
177		target_p = hash_find_client(parv[server]);
178		else
179	<	target_p = find_person(client_p, parv[server]);
179	>	target_p = find_person(source_p, parv[server]);
180
181		if (target_p)
182		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 184 | Line 197 | hunt_server(struct Client *client_p, str
197		{
198		if (!(target_p = hash_find_server(parv[server])))
199		{
200	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
188	<	me.name, source_p->name, parv[server]);
200	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
201		return HUNTED_NOSUCH;
202		}
203		}
#	Line 201 | Line 213 | hunt_server(struct Client *client_p, str
213		continue;
214		target_p = ptr->data;
215
216	<	if (IsRegistered(target_p) && (target_p != client_p))
216	>	if (IsRegistered(target_p) && (target_p != source_p->from))
217		break;
218		}
219		}
220		}
221		}
222
223	<	if (target_p != NULL)
223	>	if (target_p)
224		{
225	<	if(!IsRegistered(target_p))
225	>	if (!IsRegistered(target_p))
226		{
227	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
216	<	me.name, source_p->name, parv[server]);
227	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
228		return HUNTED_NOSUCH;
229		}
230
#	Line 224 | Line 235 | hunt_server(struct Client *client_p, str
235		parv[server] = target_p->name;
236
237		/* This is a little kludgy but should work... */
238	<	if (IsClient(source_p) &&
228	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
229	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
230	<	parv[0] = ID(source_p);
231	<
232	<	sendto_one(target_p, command, parv[0],
238	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
239		parv[1], parv[2], parv[3], parv[4],
240		parv[5], parv[6], parv[7], parv[8]);
241		return HUNTED_PASS;
242	<	}
242	>	}
243
244	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
239	<	me.name, source_p->name, parv[server]);
244	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
245		return HUNTED_NOSUCH;
246		}
247
#	Line 267 | Line 272 | try_connections(void *unused)
272
273		assert(conf->type == CONF_SERVER);
274
275	<	/* Also when already connecting! (update holdtimes) --SRB
275	>	/* Also when already connecting! (update holdtimes) --SRB
276		*/
277		if (!conf->port ||!IsConfAllowAutoConn(conf))
278		continue;
#	Line 293 | Line 298 | try_connections(void *unused)
298
299		conf->until = CurrentTime + confrq;
300
301	<	/* Found a CONNECT config with port specified, scan clients
301	>	/*
302	>	* Found a CONNECT config with port specified, scan clients
303		* and see if this server is already connected?
304		*/
305	<	if (hash_find_server(conf->name) != NULL)
305	>	if (hash_find_server(conf->name))
306		continue;
307
308		if (conf->class->ref_count < conf->class->max_total)
309		{
310		/* Go to the end of the list, if not already last */
311	<	if (ptr->next != NULL)
311	>	if (ptr->next)
312		{
313		dlinkDelete(ptr, &server_items);
314		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 311 | Line 317 | try_connections(void *unused)
317		if (find_servconn_in_progress(conf->name))
318		return;
319
320	<	/* We used to only print this if serv_connect() actually
320	>	/*
321	>	* We used to only print this if serv_connect() actually
322		* succeeded, but since comm_tcp_connect() can call the callback
323		* immediately if there is an error, we were getting error messages
324		* in the wrong order. SO, we just print out the activated line,
#	Line 353 | Line 360 | valid_servname(const char *name)
360		++dots;
361		}
362
363	<	return dots != 0 && length <= HOSTLEN;
363	>	return dots && length <= HOSTLEN;
364		}
365
366		int
#	Line 364 | Line 371 | check_server(const char *name, struct Cl
371		struct MaskItem *server_conf = NULL;
372		int error = -1;
373
374	<	assert(client_p != NULL);
374	>	assert(client_p);
375
376		/* loop through looking for all possible connect items that might work */
377		DLINK_FOREACH(ptr, server_items.head)
#	Line 378 | Line 385 | check_server(const char *name, struct Cl
385
386		/* XXX: Fix me for IPv6                    */
387		/* XXX sockhost is the IPv4 ip as a string */
388	<	if (!match(conf->host, client_p->host) ||
388	>	if (!match(conf->host, client_p->host) ||
389		!match(conf->host, client_p->sockhost))
390		{
391		error = -2;
#	Line 386 | Line 393 | check_server(const char *name, struct Cl
393		if (!match_conf_password(client_p->localClient->passwd, conf))
394		return -2;
395
396	+	if (!EmptyString(conf->certfp))
397	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
398	+	return -4;
399	+
400		server_conf = conf;
401		}
402		}
#	Line 396 | Line 407 | check_server(const char *name, struct Cl
407		attach_conf(client_p, server_conf);
408
409
410	<	if (server_conf != NULL)
410	>	if (server_conf)
411		{
412		struct sockaddr_in *v4;
413		#ifdef IPV6
#	Line 405 | Line 416 | check_server(const char *name, struct Cl
416		switch (server_conf->aftype)
417		{
418		#ifdef IPV6
419	<	case AF_INET6:
419	>	case AF_INET6:
420		v6 = (struct sockaddr_in6 *)&server_conf->addr;
421
422		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
#	Line 416 | Line 427 | check_server(const char *name, struct Cl
427		v4 = (struct sockaddr_in *)&server_conf->addr;
428
429		if (v4->sin_addr.s_addr == INADDR_NONE)
430	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
430	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
431		break;
432		}
433		}
#	Line 512 | Line 523 | find_capability(const char *capab)
523		void
524		send_capabilities(struct Client *client_p, int cap_can_send)
525		{
526	<	struct Capability *cap=NULL;
527	<	char msgbuf[IRCD_BUFSIZE];
517	<	char *t;
526	>	char msgbuf[IRCD_BUFSIZE] = "";
527	>	char *t = msgbuf;
528		int tl;
529	<	dlink_node *ptr;
520	<
521	<	t = msgbuf;
529	>	dlink_node *ptr = NULL;
530
531		DLINK_FOREACH(ptr, cap_list.head)
532		{
533	<	cap = ptr->data;
533	>	struct Capability *cap = ptr->data;
534
535		if (cap->cap & (cap_can_send|default_server_capabs))
536		{
#	Line 535 | Line 543 | send_capabilities(struct Client *client_
543		sendto_one(client_p, "CAPAB :%s", msgbuf);
544		}
545
538	–	/* sendnick_TS()
539	–	*
540	–	* inputs       - client (server) to send nick towards
541	–	*          - client to send nick for
542	–	* output       - NONE
543	–	* side effects - NICK message is sent towards given client_p
544	–	*/
545	–	void
546	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
547	–	{
548	–	static char ubuf[12];
549	–
550	–	if (!IsClient(target_p))
551	–	return;
552	–
553	–	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
554	–
555	–	if (ubuf[0] == '\0')
556	–	{
557	–	ubuf[0] = '+';
558	–	ubuf[1] = '\0';
559	–	}
560	–
561	–	if (IsCapable(client_p, CAP_SVS))
562	–	{
563	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
564	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
565	–	target_p->servptr->id,
566	–	target_p->name, target_p->hopcount + 1,
567	–	(unsigned long) target_p->tsinfo,
568	–	ubuf, target_p->username, target_p->host,
569	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
570	–	"0" : target_p->sockhost, target_p->id,
571	–	target_p->svid, target_p->info);
572	–	else
573	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
574	–	target_p->name, target_p->hopcount + 1,
575	–	(unsigned long) target_p->tsinfo,
576	–	ubuf, target_p->username, target_p->host,
577	–	target_p->servptr->name, target_p->svid,
578	–	target_p->info);
579	–	}
580	–	else
581	–	{
582	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
583	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
584	–	target_p->servptr->id,
585	–	target_p->name, target_p->hopcount + 1,
586	–	(unsigned long) target_p->tsinfo,
587	–	ubuf, target_p->username, target_p->host,
588	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
589	–	"0" : target_p->sockhost, target_p->id, target_p->info);
590	–	else
591	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
592	–	target_p->name, target_p->hopcount + 1,
593	–	(unsigned long) target_p->tsinfo,
594	–	ubuf, target_p->username, target_p->host,
595	–	target_p->servptr->name, target_p->info);
596	–	}
597	–
598	–	if (target_p->away[0])
599	–	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
600	–	target_p->away);
601	–
602	–	}
603	–
546		/*
547		* show_capabilities - show current server capabilities
548		*
#	Line 609 | Line 551 | sendnick_TS(struct Client *client_p, str
551		* side effects - build up string representing capabilities of server listed
552		*/
553		const char *
554	<	show_capabilities(struct Client *target_p)
554	>	show_capabilities(const struct Client *target_p)
555		{
556	<	static char msgbuf[IRCD_BUFSIZE];
557	<	char *t = msgbuf;
616	<	dlink_node *ptr;
556	>	static char msgbuf[IRCD_BUFSIZE] = "";
557	>	const dlink_node *ptr = NULL;
558
559	<	t += sprintf(msgbuf, "TS ");
559	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
560
561		DLINK_FOREACH(ptr, cap_list.head)
562		{
563		const struct Capability *cap = ptr->data;
564
565	<	if (IsCapable(target_p, cap->cap))
566	<	t += sprintf(t, "%s ", cap->name);
565	>	if (!IsCapable(target_p, cap->cap))
566	>	continue;
567	>
568	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
569	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
570		}
571
628	–	*(t - 1) = '\0';
572		return msgbuf;
573		}
574
#	Line 645 | Line 588 | make_server(struct Client *client_p)
588		return client_p->serv;
589		}
590
648	–	/* server_estab()
649	–	*
650	–	* inputs       - pointer to a struct Client
651	–	* output       -
652	–	* side effects -
653	–	*/
654	–	void
655	–	server_estab(struct Client *client_p)
656	–	{
657	–	struct Client *target_p;
658	–	struct MaskItem *conf = NULL;
659	–	char *host;
660	–	const char *inpath;
661	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
662	–	dlink_node *ptr;
663	–	#ifdef HAVE_LIBCRYPTO
664	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
665	–	#endif
666	–
667	–	assert(client_p != NULL);
668	–
669	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
670	–
671	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
672	–	host   = client_p->name;
673	–
674	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
675	–	== NULL)
676	–	{
677	–	/* This shouldn't happen, better tell the ops... -A1kmm */
678	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
679	–	"Warning: Lost connect{} block "
680	–	"for server %s(this shouldn't happen)!", host);
681	–	exit_client(client_p, &me, "Lost connect{} block!");
682	–	return;
683	–	}
684	–
685	–	MyFree(client_p->localClient->passwd);
686	–	client_p->localClient->passwd = NULL;
687	–
688	–	/* Its got identd, since its a server */
689	–	SetGotId(client_p);
690	–
691	–	/* If there is something in the serv_list, it might be this
692	–	* connecting server..
693	–	*/
694	–	if (!ServerInfo.hub && serv_list.head)
695	–	{
696	–	if (client_p != serv_list.head->data || serv_list.head->next)
697	–	{
698	–	++ServerStats.is_ref;
699	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
700	–	exit_client(client_p, &me, "I'm a leaf");
701	–	return;
702	–	}
703	–	}
704	–
705	–	if (IsUnknown(client_p))
706	–	{
707	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
708	–
709	–	send_capabilities(client_p, 0);
710	–
711	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
712	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
713	–	}
714	–
715	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
716	–	(unsigned long)CurrentTime);
717	–
718	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
719	–	if (IsCapable(client_p, CAP_TS6))
720	–	hash_add_id(client_p);
721	–
722	–	/* XXX Does this ever happen? I don't think so -db */
723	–	detach_conf(client_p, CONF_OPER);
724	–
725	–	/* *WARNING*
726	–	**    In the following code in place of plain server's
727	–	**    name we send what is returned by get_client_name
728	–	**    which may add the "sockhost" after the name. It's
729	–	**    *very* *important* that there is a SPACE between
730	–	**    the name and sockhost (if present). The receiving
731	–	**    server will start the information field from this
732	–	**    first blank and thus puts the sockhost into info.
733	–	**    ...a bit tricky, but you have been warned, besides
734	–	**    code is more neat this way...  --msa
735	–	*/
736	–	client_p->servptr = &me;
737	–
738	–	if (IsClosing(client_p))
739	–	return;
740	–
741	–	SetServer(client_p);
742	–
743	–	/* Update the capability combination usage counts. -A1kmm */
744	–	set_chcap_usage_counts(client_p);
745	–
746	–	/* Some day, all these lists will be consolidated *sigh* */
747	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
748	–
749	–	assert(dlinkFind(&unknown_list, client_p));
750	–
751	–	dlink_move_node(&client_p->localClient->lclient_node,
752	–	&unknown_list, &serv_list);
753	–
754	–	Count.myserver++;
755	–
756	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
757	–	hash_add_client(client_p);
758	–
759	–	/* doesnt duplicate client_p->serv if allocated this struct already */
760	–	make_server(client_p);
761	–
762	–	/* fixing eob timings.. -gnp */
763	–	client_p->localClient->firsttime = CurrentTime;
764	–
765	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
766	–	AddFlag(client_p, FLAGS_SERVICE);
767	–
768	–	/* Show the real host/IP to admins */
769	–	#ifdef HAVE_LIBCRYPTO
770	–	if (client_p->localClient->fd.ssl)
771	–	{
772	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
773	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
774	–
775	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
776	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
777	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
778	–	compression ? SSL_COMP_get_name(compression) : "NONE",
779	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
780	–	show_capabilities(client_p));
781	–	/* Now show the masked hostname/IP to opers */
782	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
783	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
784	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
785	–	compression ? SSL_COMP_get_name(compression) : "NONE",
786	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
787	–	show_capabilities(client_p));
788	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
789	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
790	–	compression ? SSL_COMP_get_name(compression) : "NONE",
791	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
792	–	show_capabilities(client_p));
793	–	}
794	–	else
795	–	#endif
796	–	{
797	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
798	–	"Link with %s established: (Capabilities: %s)",
799	–	inpath_ip, show_capabilities(client_p));
800	–	/* Now show the masked hostname/IP to opers */
801	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
802	–	"Link with %s established: (Capabilities: %s)",
803	–	inpath, show_capabilities(client_p));
804	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
805	–	inpath_ip, show_capabilities(client_p));
806	–	}
807	–
808	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
809	–
810	–	/* Old sendto_serv_but_one() call removed because we now
811	–	** need to send different names to different servers
812	–	** (domain name matching) Send new server to other servers.
813	–	*/
814	–	DLINK_FOREACH(ptr, serv_list.head)
815	–	{
816	–	target_p = ptr->data;
817	–
818	–	if (target_p == client_p)
819	–	continue;
820	–
821	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
822	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
823	–	me.id, client_p->name, client_p->id,
824	–	IsHidden(client_p) ? "(H) " : "",
825	–	client_p->info);
826	–	else
827	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
828	–	me.name, client_p->name,
829	–	IsHidden(client_p) ? "(H) " : "",
830	–	client_p->info);
831	–	}
832	–
833	–	/* Pass on my client information to the new server
834	–	**
835	–	** First, pass only servers (idea is that if the link gets
836	–	** cancelled beacause the server was already there,
837	–	** there are no NICK's to be cancelled...). Of course,
838	–	** if cancellation occurs, all this info is sent anyway,
839	–	** and I guess the link dies when a read is attempted...? --msa
840	–	**
841	–	** Note: Link cancellation to occur at this point means
842	–	** that at least two servers from my fragment are building
843	–	** up connection this other fragment at the same time, it's
844	–	** a race condition, not the normal way of operation...
845	–	**
846	–	** ALSO NOTE: using the get_client_name for server names--
847	–	**    see previous *WARNING*!!! (Also, original inpath
848	–	**    is destroyed...)
849	–	*/
850	–
851	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
852	–	{
853	–	target_p = ptr->data;
854	–
855	–	/* target_p->from == target_p for target_p == client_p */
856	–	if (IsMe(target_p) || target_p->from == client_p)
857	–	continue;
858	–
859	–	if (IsCapable(client_p, CAP_TS6))
860	–	{
861	–	if (HasID(target_p))
862	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
863	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
864	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
865	–	target_p->info);
866	–	else  /* introducing non-ts6 server */
867	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
868	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
869	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
870	–	}
871	–	else
872	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
873	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
874	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
875	–
876	–	if (HasFlag(target_p, FLAGS_EOB))
877	–	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
878	–	}
879	–
880	–	server_burst(client_p);
881	–	}
882	–
883	–	/* server_burst()
884	–	*
885	–	* inputs       - struct Client pointer server
886	–	*              -
887	–	* output       - none
888	–	* side effects - send a server burst
889	–	* bugs         - still too long
890	–	*/
891	–	static void
892	–	server_burst(struct Client *client_p)
893	–	{
894	–	/* Send it in the shortened format with the TS, if
895	–	** it's a TS server; walk the list of channels, sending
896	–	** all the nicks that haven't been sent yet for each
897	–	** channel, then send the channel itself -- it's less
898	–	** obvious than sending all nicks first, but on the
899	–	** receiving side memory will be allocated more nicely
900	–	** saving a few seconds in the handling of a split
901	–	** -orabidoo
902	–	*/
903	–
904	–	burst_all(client_p);
905	–
906	–	/* EOB stuff is now in burst_all */
907	–	/* Always send a PING after connect burst is done */
908	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
909	–	}
910	–
911	–	/* burst_all()
912	–	*
913	–	* inputs       - pointer to server to send burst to
914	–	* output       - NONE
915	–	* side effects - complete burst of channels/nicks is sent to client_p
916	–	*/
917	–	static void
918	–	burst_all(struct Client *client_p)
919	–	{
920	–	dlink_node *ptr = NULL;
921	–
922	–	DLINK_FOREACH(ptr, global_channel_list.head)
923	–	{
924	–	struct Channel *chptr = ptr->data;
925	–
926	–	if (dlink_list_length(&chptr->members) != 0)
927	–	{
928	–	burst_members(client_p, chptr);
929	–	send_channel_modes(client_p, chptr);
930	–
931	–	if (IsCapable(client_p, CAP_TBURST))
932	–	send_tb(client_p, chptr);
933	–	}
934	–	}
935	–
936	–	/* also send out those that are not on any channel
937	–	*/
938	–	DLINK_FOREACH(ptr, global_client_list.head)
939	–	{
940	–	struct Client *target_p = ptr->data;
941	–
942	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
943	–	sendnick_TS(client_p, target_p);
944	–
945	–	DelFlag(target_p, FLAGS_BURSTED);
946	–	}
947	–
948	–	if (IsCapable(client_p, CAP_EOB))
949	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
950	–	}
951	–
952	–	/*
953	–	* send_tb
954	–	*
955	–	* inputs       - pointer to Client
956	–	*              - pointer to channel
957	–	* output       - NONE
958	–	* side effects - Called on a server burst when
959	–	*                server is CAP_TBURST capable
960	–	*/
961	–	static void
962	–	send_tb(struct Client *client_p, struct Channel *chptr)
963	–	{
964	–	/*
965	–	* We may also send an empty topic here, but only if topic_time isn't 0,
966	–	* i.e. if we had a topic that got unset.  This is required for syncing
967	–	* topics properly.
968	–	*
969	–	* Imagine the following scenario: Our downlink introduces a channel
970	–	* to us with a TS that is equal to ours, but the channel topic on
971	–	* their side got unset while the servers were in splitmode, which means
972	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
973	–	* deal with it in a more sophisticated fashion instead of just resetting
974	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
975	–	* for further information   -Michael
976	–	*/
977	–	if (chptr->topic_time != 0)
978	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
979	–	ID_or_name(&me, client_p),
980	–	(unsigned long)chptr->channelts, chptr->chname,
981	–	(unsigned long)chptr->topic_time,
982	–	chptr->topic_info,
983	–	chptr->topic);
984	–	}
985	–
986	–	/* burst_members()
987	–	*
988	–	* inputs       - pointer to server to send members to
989	–	*              - dlink_list pointer to membership list to send
990	–	* output       - NONE
991	–	* side effects -
992	–	*/
993	–	static void
994	–	burst_members(struct Client *client_p, struct Channel *chptr)
995	–	{
996	–	struct Client *target_p;
997	–	struct Membership *ms;
998	–	dlink_node *ptr;
999	–
1000	–	DLINK_FOREACH(ptr, chptr->members.head)
1001	–	{
1002	–	ms       = ptr->data;
1003	–	target_p = ms->client_p;
1004	–
1005	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1006	–	{
1007	–	AddFlag(target_p, FLAGS_BURSTED);
1008	–
1009	–	if (target_p->from != client_p)
1010	–	sendnick_TS(client_p, target_p);
1011	–	}
1012	–	}
1013	–	}
1014	–
591		/* New server connection code
592		* Based upon the stuff floating about in s_bsd.c
593		*   -- adrian
#	Line 1019 | Line 595 | burst_members(struct Client *client_p, s
595
596		/* serv_connect() - initiate a server connection
597		*
598	<	* inputs       - pointer to conf
598	>	* inputs       - pointer to conf
599		*              - pointer to client doing the connect
600		* output       -
601		* side effects -
#	Line 1036 | Line 612 | burst_members(struct Client *client_p, s
612		int
613		serv_connect(struct MaskItem *conf, struct Client *by)
614		{
615	<	struct Client *client_p;
616	<	char buf[HOSTIPLEN + 1];
615	>	struct Client *client_p = NULL;
616	>	char buf[HOSTIPLEN + 1] = "";
617
618		/* conversion structs */
619		struct sockaddr_in *v4;
1044	–	/* Make sure conf is useful */
1045	–	assert(conf != NULL);
620
621	+	/* Make sure conf is useful */
622	+	assert(conf);
623
624		getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
625		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
#	Line 1056 | Line 632 | serv_connect(struct MaskItem *conf, stru
632		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
633		"Error connecting to %s: DNS lookup for connect{} in progress.",
634		conf->name);
635	<	return (0);
635	>	return 0;
636		}
637
638		if (conf->dns_failed)
#	Line 1064 | Line 640 | serv_connect(struct MaskItem *conf, stru
640		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
641		"Error connecting to %s: DNS lookup for connect{} failed.",
642		conf->name);
643	<	return (0);
643	>	return 0;
644		}
645
646		/* Make sure this server isn't already connected
647		* Note: conf should ALWAYS be a valid C: line
648		*/
649	<	if ((client_p = hash_find_server(conf->name)) != NULL)
650	<	{
649	>	if ((client_p = hash_find_server(conf->name)))
650	>	{
651		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
652		"Server %s already present from %s",
653		conf->name, get_client_name(client_p, SHOW_IP));
#	Line 1079 | Line 655 | serv_connect(struct MaskItem *conf, stru
655		"Server %s already present from %s",
656		conf->name, get_client_name(client_p, MASK_IP));
657		if (by && IsClient(by) && !MyClient(by))
658	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
659	<	me.name, by->name, conf->name,
1084	<	get_client_name(client_p, MASK_IP));
658	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
659	>	conf->name, get_client_name(client_p, MASK_IP));
660		return 0;
661		}
662	<
662	>
663		/* Create a local client */
664		client_p = make_client(NULL);
665
#	Line 1095 | Line 670 | serv_connect(struct MaskItem *conf, stru
670		/* We already converted the ip once, so lets use it - stu */
671		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
672
673	<	/* create a socket for the server connection */
673	>	/* create a socket for the server connection */
674		if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
675		SOCK_STREAM, 0, NULL) < 0)
676		{
#	Line 1103 | Line 678 | serv_connect(struct MaskItem *conf, stru
678		report_error(L_ALL, "opening stream socket to %s: %s",
679		conf->name, errno);
680		SetDead(client_p);
681	<	exit_client(client_p, &me, "Connection failed");
681	>	exit_client(client_p, "Connection failed");
682		return 0;
683		}
684
#	Line 1118 | Line 693 | serv_connect(struct MaskItem *conf, stru
693		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
694		"Host %s is not enabled for connecting: no connect{} block",
695		conf->name);
696	<	if (by && IsClient(by) && !MyClient(by))
697	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
698	<	me.name, by->name, client_p->name);
696	>	if (by && IsClient(by) && !MyClient(by))
697	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
698	>
699		SetDead(client_p);
700	<	exit_client(client_p, client_p, "Connection failed");
700	>	exit_client(client_p, "Connection failed");
701		return 0;
702		}
703
#	Line 1145 | Line 720 | serv_connect(struct MaskItem *conf, stru
720		client_p->localClient->aftype = conf->aftype;
721
722		/* Now, initiate the connection */
723	<	/* XXX assume that a non 0 type means a specific bind address
723	>	/* XXX assume that a non 0 type means a specific bind address
724		* for this connect.
725		*/
726		switch (conf->aftype)
727		{
728		case AF_INET:
729		v4 = (struct sockaddr_in*)&conf->bind;
730	<	if (v4->sin_addr.s_addr != 0)
730	>	if (v4->sin_addr.s_addr)
731		{
732		struct irc_ssaddr ipn;
733		memset(&ipn, 0, sizeof(struct irc_ssaddr));
#	Line 1160 | Line 735 | serv_connect(struct MaskItem *conf, stru
735		ipn.ss_port = 0;
736		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
737		comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
738	<	(struct sockaddr *)&ipn, ipn.ss_len,
738	>	(struct sockaddr *)&ipn, ipn.ss_len,
739		serv_connect_callback, client_p, conf->aftype,
740		CONNECTTIMEOUT);
741		}
#	Line 1177 | Line 752 | serv_connect(struct MaskItem *conf, stru
752		CONNECTTIMEOUT);
753		}
754		else
755	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
756	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
755	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
756	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
757		CONNECTTIMEOUT);
758		break;
759		#ifdef IPV6
#	Line 1192 | Line 767 | serv_connect(struct MaskItem *conf, stru
767		v6conf = (struct sockaddr_in6 *)&conf->bind;
768		v6 = (struct sockaddr_in6 *)&ipn;
769
770	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
770	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
771		{
772		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
773		ipn.ss.ss_family = AF_INET6;
774		ipn.ss_port = 0;
775		comm_connect_tcp(&client_p->localClient->fd,
776		conf->host, conf->port,
777	<	(struct sockaddr *)&ipn, ipn.ss_len,
777	>	(struct sockaddr *)&ipn, ipn.ss_len,
778		serv_connect_callback, client_p,
779		conf->aftype, CONNECTTIMEOUT);
780		}
#	Line 1216 | Line 791 | serv_connect(struct MaskItem *conf, stru
791		}
792		else
793		comm_connect_tcp(&client_p->localClient->fd,
794	<	conf->host, conf->port,
794	>	conf->host, conf->port,
795		NULL, 0, serv_connect_callback, client_p,
796		conf->aftype, CONNECTTIMEOUT);
797		}
#	Line 1240 | Line 815 | finish_ssl_server_handshake(struct Clien
815		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
816		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
817
818	<	exit_client(client_p, &me, "Lost connect{} block");
818	>	exit_client(client_p, "Lost connect{} block");
819		return;
820		}
821
#	Line 1274 | Line 849 | finish_ssl_server_handshake(struct Clien
849		static void
850		ssl_server_handshake(fde_t *fd, struct Client *client_p)
851		{
852	<	int ret;
853	<	int err;
1279	<
1280	<	ret = SSL_connect(client_p->localClient->fd.ssl);
852	>	X509 *cert = NULL;
853	>	int ret = 0;
854
855	<	if (ret <= 0)
855	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
856		{
857	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
857	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
858		{
859		case SSL_ERROR_WANT_WRITE:
860		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1297 | Line 870 | ssl_server_handshake(fde_t *fd, struct C
870		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
871		"Error connecting to %s: %s", client_p->name,
872		sslerr ? sslerr : "unknown SSL error");
873	<	exit_client(client_p, client_p, "Error during SSL handshake");
873	>	exit_client(client_p, "Error during SSL handshake");
874		return;
875		}
876		}
877		}
878
879	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
880	+	{
881	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
882	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
883	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
884	+
885	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
886	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
887	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
888	+	{
889	+	unsigned int i = 0, n = 0;
890	+
891	+	if (X509_digest(cert, EVP_sha256(), md, &n))
892	+	{
893	+	for (; i < n; ++i)
894	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
895	+	client_p->certfp = xstrdup(buf);
896	+	}
897	+	}
898	+	else
899	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
900	+	client_p->name, client_p->username, client_p->host, res);
901	+	X509_free(cert);
902	+	}
903	+
904		finish_ssl_server_handshake(client_p);
905		}
906
#	Line 1314 | Line 912 | ssl_connect_init(struct Client *client_p
912		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
913		ERR_error_string(ERR_get_error(), NULL));
914		SetDead(client_p);
915	<	exit_client(client_p, client_p, "SSL_new failed");
915	>	exit_client(client_p, "SSL_new failed");
916		return;
917		}
918
#	Line 1328 | Line 926 | ssl_connect_init(struct Client *client_p
926		#endif
927
928		/* serv_connect_callback() - complete a server connection.
929	<	*
929	>	*
930		* This routine is called after the server connection attempt has
931		* completed. If unsucessful, an error is sent to ops and the client
932		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1342 | Line 940 | serv_connect_callback(fde_t *fd, int sta
940		struct MaskItem *conf = NULL;
941
942		/* First, make sure its a real client! */
943	<	assert(client_p != NULL);
943	>	assert(client_p);
944		assert(&client_p->localClient->fd == fd);
945
946		/* Next, for backward purposes, record the ip of the server */
947		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
948		sizeof(struct irc_ssaddr));
949	+
950		/* Check the status */
951		if (status != COMM_OK)
952		{
#	Line 1385 | Line 984 | serv_connect_callback(fde_t *fd, int sta
984		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
985		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
986
987	<	exit_client(client_p, &me, "Lost connect{} block");
987	>	exit_client(client_p, "Lost connect{} block");
988		return;
989		}
990
#	Line 1410 | Line 1009 | serv_connect_callback(fde_t *fd, int sta
1009		/* If we've been marked dead because a send failed, just exit
1010		* here now and save everyone the trouble of us ever existing.
1011		*/
1012	<	if (IsDead(client_p))
1012	>	if (IsDead(client_p))
1013		{
1014		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1015		"%s[%s] went dead during handshake",
#	Line 1440 | Line 1039 | find_servconn_in_progress(const char *na
1039		if (!match(name, cptr->name))
1040		return cptr;
1041		}
1042	<
1042	>
1043		return NULL;
1044		}

Diff Legend

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