ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2718 by michael, Wed Dec 25 13:43:46 2013 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 4028 by michael, Sat Jun 21 18:30:46 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"
43	>	#include "server.h"
44		#include "log.h"
45	<	#include "s_misc.h"
49	<	#include "s_user.h"
45	>	#include "user.h"
46		#include "send.h"
47		#include "memory.h"
48	<	#include "channel.h" /* chcap_usage_counts stuff...*/
48	>	#include "channel.h"
49		#include "parse.h"
50
51		#define MIN_CONN_FREQ 300
52
53		dlink_list flatten_links;
54		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	–
55		static CNCB serv_connect_callback;
56
65	–	static void burst_members(struct Client *, struct Channel *);
57
58		/*
59		* write_links_file
#	Line 77 | Line 68 | write_links_file(void *notused)
68		{
69		FILE *file = NULL;
70		dlink_node *ptr = NULL, *ptr_next = NULL;
71	<	char buff[IRCD_BUFSIZE] = { '\0' };
71	>	char buff[IRCD_BUFSIZE] = "";
72
73		if ((file = fopen(LIPATH, "w")) == NULL)
74		return;
#	Line 126 | Line 117 | read_links_file(void)
117		{
118		FILE *file = NULL;
119		char *p = NULL;
120	<	char buff[IRCD_BUFSIZE] = { '\0' };
120	>	char buff[IRCD_BUFSIZE] = "";
121
122		if ((file = fopen(LIPATH, "r")) == NULL)
123		return;
124
125		while (fgets(buff, sizeof(buff), file))
126		{
127	<	if ((p = strchr(buff, '\n')) != NULL)
127	>	if ((p = strchr(buff, '\n')))
128		*p = '\0';
129
130		dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
#	Line 162 | Line 153 | read_links_file(void)
153		*      returns: (see #defines)
154		*/
155		int
156	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
156	>	hunt_server(struct Client *source_p, const char *command,
157		const int server, const int parc, char *parv[])
158		{
159		struct Client *target_p = NULL;
160		struct Client *target_tmp = NULL;
161		dlink_node *ptr;
171	–	int wilds;
162
163		/* Assume it's me, if no server */
164		if (parc <= server || EmptyString(parv[server]))
#	Line 184 | Line 174 | hunt_server(struct Client *client_p, str
174		if (MyClient(source_p))
175		target_p = hash_find_client(parv[server]);
176		else
177	<	target_p = find_person(client_p, parv[server]);
177	>	target_p = find_person(source_p, parv[server]);
178
179		if (target_p)
180		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 194 | Line 184 | hunt_server(struct Client *client_p, str
184		if (target_p->from == source_p->from && !MyConnect(target_p))
185		target_p = NULL;
186
197	–	wilds = has_wildcards(parv[server]);
198	–
187		/* Again, if there are no wild cards involved in the server
188		* name, use the hash lookup
189		*/
190		if (target_p == NULL)
191		{
192	<	if (!wilds)
192	>	if (!has_wildcards(parv[server]))
193		{
194		if (!(target_p = hash_find_server(parv[server])))
195		{
196	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
209	<	me.name, source_p->name, parv[server]);
196	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
197		return HUNTED_NOSUCH;
198		}
199		}
#	Line 222 | Line 209 | hunt_server(struct Client *client_p, str
209		continue;
210		target_p = ptr->data;
211
212	<	if (IsRegistered(target_p) && (target_p != client_p))
212	>	if (IsRegistered(target_p) && (target_p != source_p->from))
213		break;
214		}
215		}
216		}
217		}
218
219	<	if (target_p != NULL)
219	>	if (target_p)
220		{
221	<	if(!IsRegistered(target_p))
221	>	if (!IsRegistered(target_p))
222		{
223	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
237	<	me.name, source_p->name, parv[server]);
223	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
224		return HUNTED_NOSUCH;
225		}
226
#	Line 245 | Line 231 | hunt_server(struct Client *client_p, str
231		parv[server] = target_p->name;
232
233		/* This is a little kludgy but should work... */
234	<	if (IsClient(source_p) &&
249	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
250	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
251	<	parv[0] = ID(source_p);
252	<
253	<	sendto_one(target_p, command, parv[0],
234	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
235		parv[1], parv[2], parv[3], parv[4],
236		parv[5], parv[6], parv[7], parv[8]);
237		return HUNTED_PASS;
238		}
239
240	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
260	<	me.name, source_p->name, parv[server]);
240	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
241		return HUNTED_NOSUCH;
242		}
243
#	Line 275 | Line 255 | void
255		try_connections(void *unused)
256		{
257		dlink_node *ptr = NULL;
258	<	struct MaskItem *conf;
279	<	int confrq;
258	>	int confrq = 0;
259
260		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
261		if (GlobalSetOptions.autoconn == 0)
#	Line 284 | Line 263 | try_connections(void *unused)
263
264		DLINK_FOREACH(ptr, server_items.head)
265		{
266	<	conf = ptr->data;
266	>	struct MaskItem *conf = ptr->data;
267
268		assert(conf->type == CONF_SERVER);
269
#	Line 303 | Line 282 | try_connections(void *unused)
282		if (conf->until > CurrentTime)
283		continue;
284
285	<	if (conf->class == NULL)
286	<	confrq = DEFAULT_CONNECTFREQUENCY;
287	<	else
288	<	{
289	<	confrq = conf->class->con_freq;
311	<	if (confrq < MIN_CONN_FREQ)
312	<	confrq = MIN_CONN_FREQ;
313	<	}
285	>	assert(conf->class);
286	>
287	>	confrq = conf->class->con_freq;
288	>	if (confrq < MIN_CONN_FREQ)
289	>	confrq = MIN_CONN_FREQ;
290
291		conf->until = CurrentTime + confrq;
292
293	<	/* Found a CONNECT config with port specified, scan clients
293	>	/*
294	>	* Found a CONNECT config with port specified, scan clients
295		* and see if this server is already connected?
296		*/
297	<	if (hash_find_server(conf->name) != NULL)
297	>	if (hash_find_server(conf->name))
298		continue;
299
300		if (conf->class->ref_count < conf->class->max_total)
301		{
302		/* Go to the end of the list, if not already last */
303	<	if (ptr->next != NULL)
303	>	if (ptr->next)
304		{
305		dlinkDelete(ptr, &server_items);
306		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 332 | Line 309 | try_connections(void *unused)
309		if (find_servconn_in_progress(conf->name))
310		return;
311
312	<	/* We used to only print this if serv_connect() actually
312	>	/*
313	>	* We used to only print this if serv_connect() actually
314		* succeeded, but since comm_tcp_connect() can call the callback
315		* immediately if there is an error, we were getting error messages
316		* in the wrong order. SO, we just print out the activated line,
#	Line 359 | Line 337 | try_connections(void *unused)
337		int
338		valid_servname(const char *name)
339		{
340	<	unsigned int length = 0;
363	<	unsigned int dots   = 0;
340	>	unsigned int dots = 0;
341		const char *p = name;
342
343		for (; *p; ++p)
#	Line 368 | Line 345 | valid_servname(const char *name)
345		if (!IsServChar(*p))
346		return 0;
347
371	–	++length;
372	–
348		if (*p == '.')
349		++dots;
350		}
351
352	<	return dots != 0 && length <= HOSTLEN;
352	>	return dots && (p - name) <= HOSTLEN;
353		}
354
355		int
#	Line 385 | Line 360 | check_server(const char *name, struct Cl
360		struct MaskItem *server_conf = NULL;
361		int error = -1;
362
363	<	assert(client_p != NULL);
363	>	assert(client_p);
364
365		/* loop through looking for all possible connect items that might work */
366		DLINK_FOREACH(ptr, server_items.head)
#	Line 421 | Line 396 | check_server(const char *name, struct Cl
396		attach_conf(client_p, server_conf);
397
398
399	<	if (server_conf != NULL)
399	>	if (server_conf)
400		{
401		struct sockaddr_in *v4;
402		#ifdef IPV6
#	Line 461 | Line 436 | check_server(const char *name, struct Cl
436		void
437		add_capability(const char *capab_name, int cap_flag, int add_to_default)
438		{
439	<	struct Capability *cap = MyMalloc(sizeof(*cap));
439	>	struct Capability *cap = MyCalloc(sizeof(*cap));
440
441		cap->name = xstrdup(capab_name);
442		cap->cap = cap_flag;
#	Line 480 | Line 455 | add_capability(const char *capab_name, i
455		int
456		delete_capability(const char *capab_name)
457		{
458	<	dlink_node *ptr;
484	<	dlink_node *next_ptr;
485	<	struct Capability *cap;
458	>	dlink_node *ptr = NULL, *ptr_next = NULL;
459
460	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
460	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
461		{
462	<	cap = ptr->data;
462	>	struct Capability *cap = ptr->data;
463
464	<	if (cap->cap != 0)
464	>	if (cap->cap)
465		{
466	<	if (irccmp(cap->name, capab_name) == 0)
466	>	if (!irccmp(cap->name, capab_name))
467		{
468		default_server_capabs &= ~(cap->cap);
469		dlinkDelete(ptr, &cap_list);
#	Line 537 | Line 510 | find_capability(const char *capab)
510		void
511		send_capabilities(struct Client *client_p, int cap_can_send)
512		{
513	<	struct Capability *cap=NULL;
514	<	char msgbuf[IRCD_BUFSIZE];
542	<	char *t;
543	<	int tl;
544	<	dlink_node *ptr;
545	<
546	<	t = msgbuf;
513	>	char buf[IRCD_BUFSIZE] = "";
514	>	const dlink_node *ptr = NULL;
515
516		DLINK_FOREACH(ptr, cap_list.head)
517		{
518	<	cap = ptr->data;
518	>	const struct Capability *cap = ptr->data;
519
520		if (cap->cap & (cap_can_send|default_server_capabs))
521		{
522	<	tl = sprintf(t, "%s ", cap->name);
523	<	t += tl;
522	>	strlcat(buf, cap->name, sizeof(buf));
523	>	if (ptr->next)
524	>	strlcat(buf, " ", sizeof(buf));
525		}
526		}
527
528	<	*(t - 1) = '\0';
560	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
561	<	}
562	<
563	<	/* sendnick_TS()
564	<	*
565	<	* inputs       - client (server) to send nick towards
566	<	*          - client to send nick for
567	<	* output       - NONE
568	<	* side effects - NICK message is sent towards given client_p
569	<	*/
570	<	void
571	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
572	<	{
573	<	char ubuf[IRCD_BUFSIZE];
574	<
575	<	if (!IsClient(target_p))
576	<	return;
577	<
578	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
579	<
580	<	if (ubuf[0] == '\0')
581	<	{
582	<	ubuf[0] = '+';
583	<	ubuf[1] = '\0';
584	<	}
585	<
586	<	if (IsCapable(client_p, CAP_SVS))
587	<	{
588	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
589	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
590	<	target_p->servptr->id,
591	<	target_p->name, target_p->hopcount + 1,
592	<	(unsigned long) target_p->tsinfo,
593	<	ubuf, target_p->username, target_p->host,
594	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
595	<	"0" : target_p->sockhost, target_p->id,
596	<	target_p->svid, target_p->info);
597	<	else
598	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
599	<	target_p->name, target_p->hopcount + 1,
600	<	(unsigned long) target_p->tsinfo,
601	<	ubuf, target_p->username, target_p->host,
602	<	target_p->servptr->name, target_p->svid,
603	<	target_p->info);
604	<	}
605	<	else
606	<	{
607	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
608	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
609	<	target_p->servptr->id,
610	<	target_p->name, target_p->hopcount + 1,
611	<	(unsigned long) target_p->tsinfo,
612	<	ubuf, target_p->username, target_p->host,
613	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
614	<	"0" : target_p->sockhost, target_p->id, target_p->info);
615	<	else
616	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
617	<	target_p->name, target_p->hopcount + 1,
618	<	(unsigned long) target_p->tsinfo,
619	<	ubuf, target_p->username, target_p->host,
620	<	target_p->servptr->name, target_p->info);
621	<	}
622	<
623	<	if (!EmptyString(target_p->certfp))
624	<	sendto_one(client_p, ":%s CERTFP %s",
625	<	ID_or_name(target_p, client_p), target_p->certfp);
626	<
627	<	if (target_p->away[0])
628	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
629	<	target_p->away);
630	<
528	>	sendto_one(client_p, "CAPAB :%s", buf);
529		}
530
531		/*
#	Line 670 | Line 568 | struct Server *
568		make_server(struct Client *client_p)
569		{
570		if (client_p->serv == NULL)
571	<	client_p->serv = MyMalloc(sizeof(struct Server));
571	>	client_p->serv = MyCalloc(sizeof(struct Server));
572
573		return client_p->serv;
574		}
575
678	–	/* server_estab()
679	–	*
680	–	* inputs       - pointer to a struct Client
681	–	* output       -
682	–	* side effects -
683	–	*/
684	–	void
685	–	server_estab(struct Client *client_p)
686	–	{
687	–	struct Client *target_p;
688	–	struct MaskItem *conf = NULL;
689	–	char *host;
690	–	const char *inpath;
691	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
692	–	dlink_node *ptr;
693	–	#ifdef HAVE_LIBCRYPTO
694	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
695	–	#endif
696	–
697	–	assert(client_p != NULL);
698	–
699	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
700	–
701	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
702	–	host   = client_p->name;
703	–
704	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
705	–	== NULL)
706	–	{
707	–	/* This shouldn't happen, better tell the ops... -A1kmm */
708	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
709	–	"Warning: Lost connect{} block "
710	–	"for server %s(this shouldn't happen)!", host);
711	–	exit_client(client_p, &me, "Lost connect{} block!");
712	–	return;
713	–	}
714	–
715	–	MyFree(client_p->localClient->passwd);
716	–	client_p->localClient->passwd = NULL;
717	–
718	–	/* Its got identd, since its a server */
719	–	SetGotId(client_p);
720	–
721	–	/* If there is something in the serv_list, it might be this
722	–	* connecting server..
723	–	*/
724	–	if (!ServerInfo.hub && serv_list.head)
725	–	{
726	–	if (client_p != serv_list.head->data || serv_list.head->next)
727	–	{
728	–	++ServerStats.is_ref;
729	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
730	–	exit_client(client_p, &me, "I'm a leaf");
731	–	return;
732	–	}
733	–	}
734	–
735	–	if (IsUnknown(client_p))
736	–	{
737	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
738	–
739	–	send_capabilities(client_p, 0);
740	–
741	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
742	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
743	–	}
744	–
745	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
746	–	(unsigned long)CurrentTime);
747	–
748	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
749	–	if (IsCapable(client_p, CAP_TS6))
750	–	hash_add_id(client_p);
751	–
752	–	/* XXX Does this ever happen? I don't think so -db */
753	–	detach_conf(client_p, CONF_OPER);
754	–
755	–	/* *WARNING*
756	–	**    In the following code in place of plain server's
757	–	**    name we send what is returned by get_client_name
758	–	**    which may add the "sockhost" after the name. It's
759	–	**    *very* *important* that there is a SPACE between
760	–	**    the name and sockhost (if present). The receiving
761	–	**    server will start the information field from this
762	–	**    first blank and thus puts the sockhost into info.
763	–	**    ...a bit tricky, but you have been warned, besides
764	–	**    code is more neat this way...  --msa
765	–	*/
766	–	client_p->servptr = &me;
767	–
768	–	if (IsClosing(client_p))
769	–	return;
770	–
771	–	SetServer(client_p);
772	–
773	–	/* Update the capability combination usage counts. -A1kmm */
774	–	set_chcap_usage_counts(client_p);
775	–
776	–	/* Some day, all these lists will be consolidated *sigh* */
777	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
778	–
779	–	assert(dlinkFind(&unknown_list, client_p));
780	–
781	–	dlink_move_node(&client_p->localClient->lclient_node,
782	–	&unknown_list, &serv_list);
783	–
784	–	Count.myserver++;
785	–
786	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
787	–	hash_add_client(client_p);
788	–
789	–	/* doesnt duplicate client_p->serv if allocated this struct already */
790	–	make_server(client_p);
791	–
792	–	/* fixing eob timings.. -gnp */
793	–	client_p->localClient->firsttime = CurrentTime;
794	–
795	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
796	–	AddFlag(client_p, FLAGS_SERVICE);
797	–
798	–	/* Show the real host/IP to admins */
799	–	#ifdef HAVE_LIBCRYPTO
800	–	if (client_p->localClient->fd.ssl)
801	–	{
802	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
803	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
804	–
805	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
806	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
807	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
808	–	compression ? SSL_COMP_get_name(compression) : "NONE",
809	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
810	–	show_capabilities(client_p));
811	–	/* Now show the masked hostname/IP to opers */
812	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
813	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
814	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
815	–	compression ? SSL_COMP_get_name(compression) : "NONE",
816	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
817	–	show_capabilities(client_p));
818	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
819	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
820	–	compression ? SSL_COMP_get_name(compression) : "NONE",
821	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
822	–	show_capabilities(client_p));
823	–	}
824	–	else
825	–	#endif
826	–	{
827	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
828	–	"Link with %s established: (Capabilities: %s)",
829	–	inpath_ip, show_capabilities(client_p));
830	–	/* Now show the masked hostname/IP to opers */
831	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
832	–	"Link with %s established: (Capabilities: %s)",
833	–	inpath, show_capabilities(client_p));
834	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
835	–	inpath_ip, show_capabilities(client_p));
836	–	}
837	–
838	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
839	–
840	–	/* Old sendto_serv_but_one() call removed because we now
841	–	** need to send different names to different servers
842	–	** (domain name matching) Send new server to other servers.
843	–	*/
844	–	DLINK_FOREACH(ptr, serv_list.head)
845	–	{
846	–	target_p = ptr->data;
847	–
848	–	if (target_p == client_p)
849	–	continue;
850	–
851	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
852	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
853	–	me.id, client_p->name, client_p->id,
854	–	IsHidden(client_p) ? "(H) " : "",
855	–	client_p->info);
856	–	else
857	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
858	–	me.name, client_p->name,
859	–	IsHidden(client_p) ? "(H) " : "",
860	–	client_p->info);
861	–	}
862	–
863	–	/*
864	–	* Pass on my client information to the new server
865	–	*
866	–	* First, pass only servers (idea is that if the link gets
867	–	* cancelled beacause the server was already there,
868	–	* there are no NICK's to be cancelled...). Of course,
869	–	* if cancellation occurs, all this info is sent anyway,
870	–	* and I guess the link dies when a read is attempted...? --msa
871	–	*
872	–	* Note: Link cancellation to occur at this point means
873	–	* that at least two servers from my fragment are building
874	–	* up connection this other fragment at the same time, it's
875	–	* a race condition, not the normal way of operation...
876	–	*
877	–	* ALSO NOTE: using the get_client_name for server names--
878	–	*    see previous *WARNING*!!! (Also, original inpath
879	–	*    is destroyed...)
880	–	*/
881	–
882	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
883	–	{
884	–	target_p = ptr->data;
885	–
886	–	/* target_p->from == target_p for target_p == client_p */
887	–	if (IsMe(target_p) || target_p->from == client_p)
888	–	continue;
889	–
890	–	if (IsCapable(client_p, CAP_TS6))
891	–	{
892	–	if (HasID(target_p))
893	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
894	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
895	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
896	–	target_p->info);
897	–	else  /* introducing non-ts6 server */
898	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
899	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
900	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
901	–	}
902	–	else
903	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
904	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
905	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
906	–
907	–	if (HasFlag(target_p, FLAGS_EOB))
908	–	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
909	–	}
910	–
911	–	server_burst(client_p);
912	–	}
913	–
914	–	/* server_burst()
915	–	*
916	–	* inputs       - struct Client pointer server
917	–	*              -
918	–	* output       - none
919	–	* side effects - send a server burst
920	–	* bugs         - still too long
921	–	*/
922	–	static void
923	–	server_burst(struct Client *client_p)
924	–	{
925	–	/* Send it in the shortened format with the TS, if
926	–	** it's a TS server; walk the list of channels, sending
927	–	** all the nicks that haven't been sent yet for each
928	–	** channel, then send the channel itself -- it's less
929	–	** obvious than sending all nicks first, but on the
930	–	** receiving side memory will be allocated more nicely
931	–	** saving a few seconds in the handling of a split
932	–	** -orabidoo
933	–	*/
934	–
935	–	burst_all(client_p);
936	–
937	–	/* EOB stuff is now in burst_all */
938	–	/* Always send a PING after connect burst is done */
939	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
940	–	}
941	–
942	–	/* burst_all()
943	–	*
944	–	* inputs       - pointer to server to send burst to
945	–	* output       - NONE
946	–	* side effects - complete burst of channels/nicks is sent to client_p
947	–	*/
948	–	static void
949	–	burst_all(struct Client *client_p)
950	–	{
951	–	dlink_node *ptr = NULL;
952	–
953	–	DLINK_FOREACH(ptr, global_channel_list.head)
954	–	{
955	–	struct Channel *chptr = ptr->data;
956	–
957	–	if (dlink_list_length(&chptr->members) != 0)
958	–	{
959	–	burst_members(client_p, chptr);
960	–	send_channel_modes(client_p, chptr);
961	–
962	–	if (IsCapable(client_p, CAP_TBURST))
963	–	send_tb(client_p, chptr);
964	–	}
965	–	}
966	–
967	–	/* also send out those that are not on any channel
968	–	*/
969	–	DLINK_FOREACH(ptr, global_client_list.head)
970	–	{
971	–	struct Client *target_p = ptr->data;
972	–
973	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
974	–	sendnick_TS(client_p, target_p);
975	–
976	–	DelFlag(target_p, FLAGS_BURSTED);
977	–	}
978	–
979	–	if (IsCapable(client_p, CAP_EOB))
980	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
981	–	}
982	–
983	–	/*
984	–	* send_tb
985	–	*
986	–	* inputs       - pointer to Client
987	–	*              - pointer to channel
988	–	* output       - NONE
989	–	* side effects - Called on a server burst when
990	–	*                server is CAP_TBURST capable
991	–	*/
992	–	static void
993	–	send_tb(struct Client *client_p, struct Channel *chptr)
994	–	{
995	–	/*
996	–	* We may also send an empty topic here, but only if topic_time isn't 0,
997	–	* i.e. if we had a topic that got unset.  This is required for syncing
998	–	* topics properly.
999	–	*
1000	–	* Imagine the following scenario: Our downlink introduces a channel
1001	–	* to us with a TS that is equal to ours, but the channel topic on
1002	–	* their side got unset while the servers were in splitmode, which means
1003	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1004	–	* deal with it in a more sophisticated fashion instead of just resetting
1005	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1006	–	* for further information   -Michael
1007	–	*/
1008	–	if (chptr->topic_time != 0)
1009	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1010	–	ID_or_name(&me, client_p),
1011	–	(unsigned long)chptr->channelts, chptr->chname,
1012	–	(unsigned long)chptr->topic_time,
1013	–	chptr->topic_info,
1014	–	chptr->topic);
1015	–	}
1016	–
1017	–	/* burst_members()
1018	–	*
1019	–	* inputs       - pointer to server to send members to
1020	–	*              - dlink_list pointer to membership list to send
1021	–	* output       - NONE
1022	–	* side effects -
1023	–	*/
1024	–	static void
1025	–	burst_members(struct Client *client_p, struct Channel *chptr)
1026	–	{
1027	–	struct Client *target_p;
1028	–	struct Membership *ms;
1029	–	dlink_node *ptr;
1030	–
1031	–	DLINK_FOREACH(ptr, chptr->members.head)
1032	–	{
1033	–	ms       = ptr->data;
1034	–	target_p = ms->client_p;
1035	–
1036	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1037	–	{
1038	–	AddFlag(target_p, FLAGS_BURSTED);
1039	–
1040	–	if (target_p->from != client_p)
1041	–	sendnick_TS(client_p, target_p);
1042	–	}
1043	–	}
1044	–	}
1045	–
576		/* New server connection code
577		* Based upon the stuff floating about in s_bsd.c
578		*   -- adrian
#	Line 1067 | Line 597 | burst_members(struct Client *client_p, s
597		int
598		serv_connect(struct MaskItem *conf, struct Client *by)
599		{
600	<	struct Client *client_p;
601	<	char buf[HOSTIPLEN + 1];
600	>	struct Client *client_p = NULL;
601	>	char buf[HOSTIPLEN + 1] = "";
602
603		/* conversion structs */
604		struct sockaddr_in *v4;
1075	–	/* Make sure conf is useful */
1076	–	assert(conf != NULL);
605
606	+	/* Make sure conf is useful */
607	+	assert(conf);
608
609		getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
610		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
#	Line 1087 | Line 617 | serv_connect(struct MaskItem *conf, stru
617		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
618		"Error connecting to %s: DNS lookup for connect{} in progress.",
619		conf->name);
620	<	return (0);
620	>	return 0;
621		}
622
623		if (conf->dns_failed)
#	Line 1095 | Line 625 | serv_connect(struct MaskItem *conf, stru
625		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
626		"Error connecting to %s: DNS lookup for connect{} failed.",
627		conf->name);
628	<	return (0);
628	>	return 0;
629		}
630
631		/* Make sure this server isn't already connected
632		* Note: conf should ALWAYS be a valid C: line
633		*/
634	<	if ((client_p = hash_find_server(conf->name)) != NULL)
634	>	if ((client_p = hash_find_server(conf->name)))
635		{
636		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
637		"Server %s already present from %s",
#	Line 1110 | Line 640 | serv_connect(struct MaskItem *conf, stru
640		"Server %s already present from %s",
641		conf->name, get_client_name(client_p, MASK_IP));
642		if (by && IsClient(by) && !MyClient(by))
643	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
644	<	me.name, by->name, conf->name,
1115	<	get_client_name(client_p, MASK_IP));
643	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
644	>	conf->name, get_client_name(client_p, MASK_IP));
645		return 0;
646		}
647
#	Line 1127 | Line 656 | serv_connect(struct MaskItem *conf, stru
656		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
657
658		/* create a socket for the server connection */
659	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1131	<	SOCK_STREAM, 0, NULL) < 0)
659	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
660		{
661		/* Eek, failure to create the socket */
662	<	report_error(L_ALL, "opening stream socket to %s: %s",
663	<	conf->name, errno);
662	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
663	>
664		SetDead(client_p);
665	<	exit_client(client_p, &me, "Connection failed");
665	>	exit_client(client_p, "Connection failed");
666		return 0;
667		}
668
#	Line 1150 | Line 678 | serv_connect(struct MaskItem *conf, stru
678		"Host %s is not enabled for connecting: no connect{} block",
679		conf->name);
680		if (by && IsClient(by) && !MyClient(by))
681	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
682	<	me.name, by->name, client_p->name);
681	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
682	>
683		SetDead(client_p);
684	<	exit_client(client_p, client_p, "Connection failed");
684	>	exit_client(client_p, "Connection failed");
685		return 0;
686		}
687
#	Line 1172 | Line 700 | serv_connect(struct MaskItem *conf, stru
700
701		SetConnecting(client_p);
702		dlinkAdd(client_p, &client_p->node, &global_client_list);
703	<	/* from def_fam */
703	>
704		client_p->localClient->aftype = conf->aftype;
705
706		/* Now, initiate the connection */
#	Line 1183 | Line 711 | serv_connect(struct MaskItem *conf, stru
711		{
712		case AF_INET:
713		v4 = (struct sockaddr_in*)&conf->bind;
714	<	if (v4->sin_addr.s_addr != 0)
714	>	if (v4->sin_addr.s_addr)
715		{
716		struct irc_ssaddr ipn;
717		memset(&ipn, 0, sizeof(struct irc_ssaddr));
#	Line 1223 | Line 751 | serv_connect(struct MaskItem *conf, stru
751		v6conf = (struct sockaddr_in6 *)&conf->bind;
752		v6 = (struct sockaddr_in6 *)&ipn;
753
754	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
754	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
755		{
756		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
757		ipn.ss.ss_family = AF_INET6;
#	Line 1271 | Line 799 | finish_ssl_server_handshake(struct Clien
799		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
800		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
801
802	<	exit_client(client_p, &me, "Lost connect{} block");
802	>	exit_client(client_p, "Lost connect{} block");
803		return;
804		}
805
#	Line 1326 | Line 854 | ssl_server_handshake(fde_t *fd, struct C
854		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
855		"Error connecting to %s: %s", client_p->name,
856		sslerr ? sslerr : "unknown SSL error");
857	<	exit_client(client_p, client_p, "Error during SSL handshake");
857	>	exit_client(client_p, "Error during SSL handshake");
858		return;
859		}
860		}
#	Line 1335 | Line 863 | ssl_server_handshake(fde_t *fd, struct C
863		if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
864		{
865		int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
866	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
867	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
866	>	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
867	>	unsigned char md[EVP_MAX_MD_SIZE] = "";
868
869		if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
870		res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
871		res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
872		{
873	<	unsigned int i = 0, n = 0;
873	>	unsigned int n = 0;
874
875		if (X509_digest(cert, EVP_sha256(), md, &n))
876		{
877	<	for (; i < n; ++i)
877	>	for (unsigned int i = 0; i < n; ++i)
878		snprintf(buf + 2 * i, 3, "%02X", md[i]);
879		client_p->certfp = xstrdup(buf);
880		}
#	Line 1368 | Line 896 | ssl_connect_init(struct Client *client_p
896		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
897		ERR_error_string(ERR_get_error(), NULL));
898		SetDead(client_p);
899	<	exit_client(client_p, client_p, "SSL_new failed");
899	>	exit_client(client_p, "SSL_new failed");
900		return;
901		}
902
#	Line 1396 | Line 924 | serv_connect_callback(fde_t *fd, int sta
924		struct MaskItem *conf = NULL;
925
926		/* First, make sure its a real client! */
927	<	assert(client_p != NULL);
927	>	assert(client_p);
928		assert(&client_p->localClient->fd == fd);
929
930		/* Next, for backward purposes, record the ip of the server */
931		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
932		sizeof(struct irc_ssaddr));
933	+
934		/* Check the status */
935		if (status != COMM_OK)
936		{
#	Line 1439 | Line 968 | serv_connect_callback(fde_t *fd, int sta
968		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
969		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
970
971	<	exit_client(client_p, &me, "Lost connect{} block");
971	>	exit_client(client_p, "Lost connect{} block");
972		return;
973		}
974

Diff Legend

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