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 3136 by michael, Tue Mar 11 18:24:03 2014 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 4210 by michael, Sat Jul 12 19:22:05 2014 UTC

#	Line 30 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
33	–	#include "channel.h"
34	–	#include "channel_mode.h"
33		#include "client.h"
34		#include "event.h"
37	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37		#include "ircd.h"
#	Line 42 | Line 39
39		#include "s_bsd.h"
40		#include "numeric.h"
41		#include "packet.h"
45	–	#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"
50	<	#include "s_user.h"
45	>	#include "user.h"
46		#include "send.h"
47		#include "memory.h"
48		#include "channel.h"
#	Line 57 | Line 52
52
53		dlink_list flatten_links;
54		static dlink_list cap_list = { NULL, NULL, 0 };
60	–	static void server_burst(struct Client *);
61	–	static void burst_all(struct Client *);
62	–	static void send_tb(struct Client *client_p, struct Channel *chptr);
63	–
55		static CNCB serv_connect_callback;
56
66	–	static void burst_members(struct Client *, struct Channel *);
57
58		/*
59		* write_links_file
#	Line 78 | 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 90 | Line 80 | write_links_file(void *notused)
80		free_dlink_node(ptr);
81		}
82
83	<	DLINK_FOREACH(ptr, global_serv_list.head)
83	>	DLINK_FOREACH(ptr, global_server_list.head)
84		{
85		const struct Client *target_p = ptr->data;
86
#	Line 127 | 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 163 | 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;
171	<	dlink_node *ptr;
172	<	int wilds;
160	>	dlink_node *ptr = NULL;
161
162		/* Assume it's me, if no server */
163		if (parc <= server || EmptyString(parv[server]))
164		return HUNTED_ISME;
165
166	<	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
167	<	return HUNTED_ISME;
166	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
167	>	target_p = hash_find_server(parv[server]);
168
169	<	/* These are to pickup matches that would cause the following
169	>	/*
170	>	* These are to pickup matches that would cause the following
171		* message to go in the wrong direction while doing quick fast
172		* non-matching lookups.
173		*/
185	–	if (MyClient(source_p))
186	–	target_p = hash_find_client(parv[server]);
187	–	else
188	–	target_p = find_person(client_p, parv[server]);
189	–
174		if (target_p)
175		if (target_p->from == source_p->from && !MyConnect(target_p))
176		target_p = NULL;
177
178	<	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
195	<	if (target_p->from == source_p->from && !MyConnect(target_p))
196	<	target_p = NULL;
197	<
198	<	wilds = has_wildcards(parv[server]);
199	<
200	<	/* Again, if there are no wild cards involved in the server
201	<	* name, use the hash lookup
202	<	*/
203	<	if (target_p == NULL)
178	>	if (!target_p && has_wildcards(parv[server]))
179		{
180	<	if (!wilds)
180	>	DLINK_FOREACH(ptr, global_client_list.head)
181		{
182	<	if (!(target_p = hash_find_server(parv[server])))
208	<	{
209	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	<	return HUNTED_NOSUCH;
211	<	}
212	<	}
213	<	else
214	<	{
215	<	DLINK_FOREACH(ptr, global_client_list.head)
216	<	{
217	<	target_tmp = ptr->data;
182	>	struct Client *tmp = ptr->data;
183
184	<	if (!match(parv[server], target_tmp->name))
185	<	{
186	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
187	<	continue;
188	<	target_p = ptr->data;
184	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
185	>	if (!match(parv[server], tmp->name))
186	>	{
187	>	if (tmp->from == source_p->from && !MyConnect(tmp))
188	>	continue;
189
190	<	if (IsRegistered(target_p) && (target_p != client_p))
191	<	break;
227	<	}
190	>	target_p = ptr->data;
191	>	break;
192		}
193		}
194		}
195
196	<	if (target_p != NULL)
196	>	if (target_p)
197		{
198	<	if(!IsRegistered(target_p))
235	<	{
236	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237	<	return HUNTED_NOSUCH;
238	<	}
239	<
198	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
199		if (IsMe(target_p) || MyClient(target_p))
200		return HUNTED_ISME;
201
202	<	if (match(target_p->name, parv[server]))
203	<	parv[server] = target_p->name;
245	<
246	<	/* This is a little kludgy but should work... */
247	<	sendto_one(target_p, command, ID_or_name(source_p, target_p),
202	>	parv[server] = target_p->id;
203	>	sendto_one(target_p, command, source_p->id,
204		parv[1], parv[2], parv[3], parv[4],
205		parv[5], parv[6], parv[7], parv[8]);
206		return HUNTED_PASS;
#	Line 268 | Line 224 | void
224		try_connections(void *unused)
225		{
226		dlink_node *ptr = NULL;
227	<	struct MaskItem *conf;
272	<	int confrq;
227	>	int confrq = 0;
228
229		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
230		if (GlobalSetOptions.autoconn == 0)
#	Line 277 | Line 232 | try_connections(void *unused)
232
233		DLINK_FOREACH(ptr, server_items.head)
234		{
235	<	conf = ptr->data;
235	>	struct MaskItem *conf = ptr->data;
236
237		assert(conf->type == CONF_SERVER);
238
239		/* Also when already connecting! (update holdtimes) --SRB
240		*/
241	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
241	>	if (!conf->port || !IsConfAllowAutoConn(conf))
242		continue;
243
244
#	Line 296 | Line 251 | try_connections(void *unused)
251		if (conf->until > CurrentTime)
252		continue;
253
254	<	if (conf->class == NULL)
255	<	confrq = DEFAULT_CONNECTFREQUENCY;
256	<	else
257	<	{
258	<	confrq = conf->class->con_freq;
304	<	if (confrq < MIN_CONN_FREQ)
305	<	confrq = MIN_CONN_FREQ;
306	<	}
254	>	assert(conf->class);
255	>
256	>	confrq = conf->class->con_freq;
257	>	if (confrq < MIN_CONN_FREQ)
258	>	confrq = MIN_CONN_FREQ;
259
260		conf->until = CurrentTime + confrq;
261
262	<	/* Found a CONNECT config with port specified, scan clients
262	>	/*
263	>	* Found a CONNECT config with port specified, scan clients
264		* and see if this server is already connected?
265		*/
266	<	if (hash_find_server(conf->name) != NULL)
266	>	if (hash_find_server(conf->name))
267		continue;
268
269		if (conf->class->ref_count < conf->class->max_total)
270		{
271		/* Go to the end of the list, if not already last */
272	<	if (ptr->next != NULL)
272	>	if (ptr->next)
273		{
274		dlinkDelete(ptr, &server_items);
275		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 325 | Line 278 | try_connections(void *unused)
278		if (find_servconn_in_progress(conf->name))
279		return;
280
281	<	/* We used to only print this if serv_connect() actually
281	>	/*
282	>	* We used to only print this if serv_connect() actually
283		* succeeded, but since comm_tcp_connect() can call the callback
284		* immediately if there is an error, we were getting error messages
285		* in the wrong order. SO, we just print out the activated line,
#	Line 352 | Line 306 | try_connections(void *unused)
306		int
307		valid_servname(const char *name)
308		{
309	<	unsigned int length = 0;
356	<	unsigned int dots   = 0;
309	>	unsigned int dots = 0;
310		const char *p = name;
311
312		for (; *p; ++p)
#	Line 361 | Line 314 | valid_servname(const char *name)
314		if (!IsServChar(*p))
315		return 0;
316
364	–	++length;
365	–
317		if (*p == '.')
318		++dots;
319		}
320
321	<	return dots != 0 && length <= HOSTLEN;
321	>	return dots && (p - name) <= HOSTLEN;
322		}
323
324		int
#	Line 378 | Line 329 | check_server(const char *name, struct Cl
329		struct MaskItem *server_conf = NULL;
330		int error = -1;
331
332	<	assert(client_p != NULL);
332	>	assert(client_p);
333
334		/* loop through looking for all possible connect items that might work */
335		DLINK_FOREACH(ptr, server_items.head)
#	Line 414 | Line 365 | check_server(const char *name, struct Cl
365		attach_conf(client_p, server_conf);
366
367
368	<	if (server_conf != NULL)
368	>	if (server_conf)
369		{
370		struct sockaddr_in *v4;
371		#ifdef IPV6
#	Line 454 | Line 405 | check_server(const char *name, struct Cl
405		void
406		add_capability(const char *capab_name, int cap_flag, int add_to_default)
407		{
408	<	struct Capability *cap = MyMalloc(sizeof(*cap));
408	>	struct Capability *cap = MyCalloc(sizeof(*cap));
409
410		cap->name = xstrdup(capab_name);
411		cap->cap = cap_flag;
#	Line 473 | Line 424 | add_capability(const char *capab_name, i
424		int
425		delete_capability(const char *capab_name)
426		{
427	<	dlink_node *ptr;
477	<	dlink_node *next_ptr;
478	<	struct Capability *cap;
427	>	dlink_node *ptr = NULL, *ptr_next = NULL;
428
429	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
429	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
430		{
431	<	cap = ptr->data;
431	>	struct Capability *cap = ptr->data;
432
433	<	if (cap->cap != 0)
433	>	if (cap->cap)
434		{
435	<	if (irccmp(cap->name, capab_name) == 0)
435	>	if (!irccmp(cap->name, capab_name))
436		{
437		default_server_capabs &= ~(cap->cap);
438		dlinkDelete(ptr, &cap_list);
#	Line 530 | Line 479 | find_capability(const char *capab)
479		void
480		send_capabilities(struct Client *client_p, int cap_can_send)
481		{
482	<	struct Capability *cap=NULL;
483	<	char msgbuf[IRCD_BUFSIZE];
535	<	char *t;
536	<	int tl;
537	<	dlink_node *ptr;
538	<
539	<	t = msgbuf;
482	>	char buf[IRCD_BUFSIZE] = "";
483	>	const dlink_node *ptr = NULL;
484
485		DLINK_FOREACH(ptr, cap_list.head)
486		{
487	<	cap = ptr->data;
487	>	const struct Capability *cap = ptr->data;
488
489		if (cap->cap & (cap_can_send|default_server_capabs))
490		{
491	<	tl = sprintf(t, "%s ", cap->name);
492	<	t += tl;
491	>	strlcat(buf, cap->name, sizeof(buf));
492	>	if (ptr->next)
493	>	strlcat(buf, " ", sizeof(buf));
494		}
495		}
496
497	<	*(t - 1) = '\0';
553	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
554	<	}
555	<
556	<	/* sendnick_TS()
557	<	*
558	<	* inputs       - client (server) to send nick towards
559	<	*          - client to send nick for
560	<	* output       - NONE
561	<	* side effects - NICK message is sent towards given client_p
562	<	*/
563	<	void
564	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
565	<	{
566	<	char ubuf[IRCD_BUFSIZE];
567	<
568	<	if (!IsClient(target_p))
569	<	return;
570	<
571	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
572	<
573	<	if (ubuf[0] == '\0')
574	<	{
575	<	ubuf[0] = '+';
576	<	ubuf[1] = '\0';
577	<	}
578	<
579	<	if (IsCapable(client_p, CAP_SVS))
580	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
581	<	target_p->servptr->id,
582	<	target_p->name, target_p->hopcount + 1,
583	<	(unsigned long) target_p->tsinfo,
584	<	ubuf, target_p->username, target_p->host,
585	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
586	<	"0" : target_p->sockhost, target_p->id,
587	<	target_p->svid, target_p->info);
588	<	else
589	<	sendto_one(client_p, ":%s UID %s %d %lu %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, target_p->info);
596	<
597	<	if (!EmptyString(target_p->certfp))
598	<	sendto_one(client_p, ":%s CERTFP %s",
599	<	ID_or_name(target_p, client_p), target_p->certfp);
600	<
601	<	if (target_p->away[0])
602	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
603	<	target_p->away);
604	<
497	>	sendto_one(client_p, "CAPAB :%s", buf);
498		}
499
500		/*
#	Line 644 | Line 537 | struct Server *
537		make_server(struct Client *client_p)
538		{
539		if (client_p->serv == NULL)
540	<	client_p->serv = MyMalloc(sizeof(struct Server));
540	>	client_p->serv = MyCalloc(sizeof(struct Server));
541
542		return client_p->serv;
543		}
544
652	–	/* server_estab()
653	–	*
654	–	* inputs       - pointer to a struct Client
655	–	* output       -
656	–	* side effects -
657	–	*/
658	–	void
659	–	server_estab(struct Client *client_p)
660	–	{
661	–	struct Client *target_p;
662	–	struct MaskItem *conf = NULL;
663	–	char *host;
664	–	const char *inpath;
665	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
666	–	dlink_node *ptr;
667	–	#ifdef HAVE_LIBCRYPTO
668	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
669	–	#endif
670	–
671	–	assert(client_p != NULL);
672	–
673	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
674	–
675	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
676	–	host   = client_p->name;
677	–
678	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
679	–	== NULL)
680	–	{
681	–	/* This shouldn't happen, better tell the ops... -A1kmm */
682	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
683	–	"Warning: Lost connect{} block "
684	–	"for server %s(this shouldn't happen)!", host);
685	–	exit_client(client_p, &me, "Lost connect{} block!");
686	–	return;
687	–	}
688	–
689	–	MyFree(client_p->localClient->passwd);
690	–	client_p->localClient->passwd = NULL;
691	–
692	–	/* Its got identd, since its a server */
693	–	SetGotId(client_p);
694	–
695	–	/* If there is something in the serv_list, it might be this
696	–	* connecting server..
697	–	*/
698	–	if (!ServerInfo.hub && serv_list.head)
699	–	{
700	–	if (client_p != serv_list.head->data || serv_list.head->next)
701	–	{
702	–	++ServerStats.is_ref;
703	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
704	–	exit_client(client_p, &me, "I'm a leaf");
705	–	return;
706	–	}
707	–	}
708	–
709	–	if (IsUnknown(client_p))
710	–	{
711	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
712	–
713	–	send_capabilities(client_p, 0);
714	–
715	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
716	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
717	–	}
718	–
719	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
720	–	(unsigned long)CurrentTime);
721	–
722	–	if (HasID(client_p))
723	–	hash_add_id(client_p);
724	–
725	–	/* XXX Does this ever happen? I don't think so -db */
726	–	detach_conf(client_p, CONF_OPER);
727	–
728	–	/* *WARNING*
729	–	**    In the following code in place of plain server's
730	–	**    name we send what is returned by get_client_name
731	–	**    which may add the "sockhost" after the name. It's
732	–	**    *very* *important* that there is a SPACE between
733	–	**    the name and sockhost (if present). The receiving
734	–	**    server will start the information field from this
735	–	**    first blank and thus puts the sockhost into info.
736	–	**    ...a bit tricky, but you have been warned, besides
737	–	**    code is more neat this way...  --msa
738	–	*/
739	–	client_p->servptr = &me;
740	–
741	–	if (IsClosing(client_p))
742	–	return;
743	–
744	–	SetServer(client_p);
745	–
746	–	/* Update the capability combination usage counts. -A1kmm */
747	–	set_chcap_usage_counts(client_p);
748	–
749	–	/* Some day, all these lists will be consolidated *sigh* */
750	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
751	–
752	–	assert(dlinkFind(&unknown_list, client_p));
753	–
754	–	dlink_move_node(&client_p->localClient->lclient_node,
755	–	&unknown_list, &serv_list);
756	–
757	–	Count.myserver++;
758	–
759	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
760	–	hash_add_client(client_p);
761	–
762	–	/* doesnt duplicate client_p->serv if allocated this struct already */
763	–	make_server(client_p);
764	–
765	–	/* fixing eob timings.. -gnp */
766	–	client_p->localClient->firsttime = CurrentTime;
767	–
768	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
769	–	AddFlag(client_p, FLAGS_SERVICE);
770	–
771	–	/* Show the real host/IP to admins */
772	–	#ifdef HAVE_LIBCRYPTO
773	–	if (client_p->localClient->fd.ssl)
774	–	{
775	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
776	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
777	–
778	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
779	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
780	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
781	–	compression ? SSL_COMP_get_name(compression) : "NONE",
782	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
783	–	show_capabilities(client_p));
784	–	/* Now show the masked hostname/IP to opers */
785	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
786	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
787	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
788	–	compression ? SSL_COMP_get_name(compression) : "NONE",
789	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
790	–	show_capabilities(client_p));
791	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
792	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
793	–	compression ? SSL_COMP_get_name(compression) : "NONE",
794	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
795	–	show_capabilities(client_p));
796	–	}
797	–	else
798	–	#endif
799	–	{
800	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
801	–	"Link with %s established: (Capabilities: %s)",
802	–	inpath_ip, show_capabilities(client_p));
803	–	/* Now show the masked hostname/IP to opers */
804	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
805	–	"Link with %s established: (Capabilities: %s)",
806	–	inpath, show_capabilities(client_p));
807	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
808	–	inpath_ip, show_capabilities(client_p));
809	–	}
810	–
811	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
812	–
813	–	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
814	–	me.id, client_p->name, client_p->id,
815	–	IsHidden(client_p) ? "(H) " : "", client_p->info);
816	–
817	–	/*
818	–	* Pass on my client information to the new server
819	–	*
820	–	* First, pass only servers (idea is that if the link gets
821	–	* cancelled beacause the server was already there,
822	–	* there are no NICK's to be cancelled...). Of course,
823	–	* if cancellation occurs, all this info is sent anyway,
824	–	* and I guess the link dies when a read is attempted...? --msa
825	–	*
826	–	* Note: Link cancellation to occur at this point means
827	–	* that at least two servers from my fragment are building
828	–	* up connection this other fragment at the same time, it's
829	–	* a race condition, not the normal way of operation...
830	–	*
831	–	* ALSO NOTE: using the get_client_name for server names--
832	–	*    see previous *WARNING*!!! (Also, original inpath
833	–	*    is destroyed...)
834	–	*/
835	–
836	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
837	–	{
838	–	target_p = ptr->data;
839	–
840	–	/* target_p->from == target_p for target_p == client_p */
841	–	if (IsMe(target_p) || target_p->from == client_p)
842	–	continue;
843	–
844	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
845	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
846	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
847	–	target_p->info);
848	–
849	–	if (HasFlag(target_p, FLAGS_EOB))
850	–	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
851	–	}
852	–
853	–	server_burst(client_p);
854	–	}
855	–
856	–	/* server_burst()
857	–	*
858	–	* inputs       - struct Client pointer server
859	–	*              -
860	–	* output       - none
861	–	* side effects - send a server burst
862	–	* bugs         - still too long
863	–	*/
864	–	static void
865	–	server_burst(struct Client *client_p)
866	–	{
867	–	/* Send it in the shortened format with the TS, if
868	–	** it's a TS server; walk the list of channels, sending
869	–	** all the nicks that haven't been sent yet for each
870	–	** channel, then send the channel itself -- it's less
871	–	** obvious than sending all nicks first, but on the
872	–	** receiving side memory will be allocated more nicely
873	–	** saving a few seconds in the handling of a split
874	–	** -orabidoo
875	–	*/
876	–
877	–	burst_all(client_p);
878	–
879	–	/* EOB stuff is now in burst_all */
880	–	/* Always send a PING after connect burst is done */
881	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
882	–	}
883	–
884	–	/* burst_all()
885	–	*
886	–	* inputs       - pointer to server to send burst to
887	–	* output       - NONE
888	–	* side effects - complete burst of channels/nicks is sent to client_p
889	–	*/
890	–	static void
891	–	burst_all(struct Client *client_p)
892	–	{
893	–	dlink_node *ptr = NULL;
894	–
895	–	DLINK_FOREACH(ptr, global_channel_list.head)
896	–	{
897	–	struct Channel *chptr = ptr->data;
898	–
899	–	if (dlink_list_length(&chptr->members) != 0)
900	–	{
901	–	burst_members(client_p, chptr);
902	–	send_channel_modes(client_p, chptr);
903	–
904	–	if (IsCapable(client_p, CAP_TBURST))
905	–	send_tb(client_p, chptr);
906	–	}
907	–	}
908	–
909	–	/* also send out those that are not on any channel
910	–	*/
911	–	DLINK_FOREACH(ptr, global_client_list.head)
912	–	{
913	–	struct Client *target_p = ptr->data;
914	–
915	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
916	–	sendnick_TS(client_p, target_p);
917	–
918	–	DelFlag(target_p, FLAGS_BURSTED);
919	–	}
920	–
921	–	if (IsCapable(client_p, CAP_EOB))
922	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
923	–	}
924	–
925	–	/*
926	–	* send_tb
927	–	*
928	–	* inputs       - pointer to Client
929	–	*              - pointer to channel
930	–	* output       - NONE
931	–	* side effects - Called on a server burst when
932	–	*                server is CAP_TBURST capable
933	–	*/
934	–	static void
935	–	send_tb(struct Client *client_p, struct Channel *chptr)
936	–	{
937	–	/*
938	–	* We may also send an empty topic here, but only if topic_time isn't 0,
939	–	* i.e. if we had a topic that got unset.  This is required for syncing
940	–	* topics properly.
941	–	*
942	–	* Imagine the following scenario: Our downlink introduces a channel
943	–	* to us with a TS that is equal to ours, but the channel topic on
944	–	* their side got unset while the servers were in splitmode, which means
945	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
946	–	* deal with it in a more sophisticated fashion instead of just resetting
947	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
948	–	* for further information   -Michael
949	–	*/
950	–	if (chptr->topic_time != 0)
951	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
952	–	ID_or_name(&me, client_p),
953	–	(unsigned long)chptr->channelts, chptr->chname,
954	–	(unsigned long)chptr->topic_time,
955	–	chptr->topic_info,
956	–	chptr->topic);
957	–	}
958	–
959	–	/* burst_members()
960	–	*
961	–	* inputs       - pointer to server to send members to
962	–	*              - dlink_list pointer to membership list to send
963	–	* output       - NONE
964	–	* side effects -
965	–	*/
966	–	static void
967	–	burst_members(struct Client *client_p, struct Channel *chptr)
968	–	{
969	–	struct Client *target_p;
970	–	struct Membership *ms;
971	–	dlink_node *ptr;
972	–
973	–	DLINK_FOREACH(ptr, chptr->members.head)
974	–	{
975	–	ms       = ptr->data;
976	–	target_p = ms->client_p;
977	–
978	–	if (!HasFlag(target_p, FLAGS_BURSTED))
979	–	{
980	–	AddFlag(target_p, FLAGS_BURSTED);
981	–
982	–	if (target_p->from != client_p)
983	–	sendnick_TS(client_p, target_p);
984	–	}
985	–	}
986	–	}
987	–
545		/* New server connection code
546		* Based upon the stuff floating about in s_bsd.c
547		*   -- adrian
#	Line 1009 | Line 566 | burst_members(struct Client *client_p, s
566		int
567		serv_connect(struct MaskItem *conf, struct Client *by)
568		{
569	<	struct Client *client_p;
570	<	char buf[HOSTIPLEN + 1];
569	>	struct Client *client_p = NULL;
570	>	char buf[HOSTIPLEN + 1] = "";
571
572		/* conversion structs */
573		struct sockaddr_in *v4;
1017	–	/* Make sure conf is useful */
1018	–	assert(conf != NULL);
574
575	+	/* Make sure conf is useful */
576	+	assert(conf);
577
578		getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
579		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
#	Line 1029 | Line 586 | serv_connect(struct MaskItem *conf, stru
586		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
587		"Error connecting to %s: DNS lookup for connect{} in progress.",
588		conf->name);
589	<	return (0);
589	>	return 0;
590		}
591
592		if (conf->dns_failed)
#	Line 1037 | Line 594 | serv_connect(struct MaskItem *conf, stru
594		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
595		"Error connecting to %s: DNS lookup for connect{} failed.",
596		conf->name);
597	<	return (0);
597	>	return 0;
598		}
599
600		/* Make sure this server isn't already connected
601		* Note: conf should ALWAYS be a valid C: line
602		*/
603	<	if ((client_p = hash_find_server(conf->name)) != NULL)
603	>	if ((client_p = hash_find_server(conf->name)))
604		{
605		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
606		"Server %s already present from %s",
#	Line 1068 | Line 625 | serv_connect(struct MaskItem *conf, stru
625		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
626
627		/* create a socket for the server connection */
628	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1072	<	SOCK_STREAM, 0, NULL) < 0)
628	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
629		{
630		/* Eek, failure to create the socket */
631	<	report_error(L_ALL, "opening stream socket to %s: %s",
632	<	conf->name, errno);
631	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
632	>
633		SetDead(client_p);
634	<	exit_client(client_p, &me, "Connection failed");
634	>	exit_client(client_p, "Connection failed");
635		return 0;
636		}
637
#	Line 1094 | Line 650 | serv_connect(struct MaskItem *conf, stru
650		sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
651
652		SetDead(client_p);
653	<	exit_client(client_p, client_p, "Connection failed");
653	>	exit_client(client_p, "Connection failed");
654		return 0;
655		}
656
#	Line 1112 | Line 668 | serv_connect(struct MaskItem *conf, stru
668		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
669
670		SetConnecting(client_p);
1115	–	dlinkAdd(client_p, &client_p->node, &global_client_list);
1116	–	/* from def_fam */
671		client_p->localClient->aftype = conf->aftype;
672
673		/* Now, initiate the connection */
#	Line 1124 | Line 678 | serv_connect(struct MaskItem *conf, stru
678		{
679		case AF_INET:
680		v4 = (struct sockaddr_in*)&conf->bind;
681	<	if (v4->sin_addr.s_addr != 0)
681	>	if (v4->sin_addr.s_addr)
682		{
683		struct irc_ssaddr ipn;
684		memset(&ipn, 0, sizeof(struct irc_ssaddr));
#	Line 1164 | Line 718 | serv_connect(struct MaskItem *conf, stru
718		v6conf = (struct sockaddr_in6 *)&conf->bind;
719		v6 = (struct sockaddr_in6 *)&ipn;
720
721	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
721	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
722		{
723		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
724		ipn.ss.ss_family = AF_INET6;
#	Line 1212 | Line 766 | finish_ssl_server_handshake(struct Clien
766		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
767		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
768
769	<	exit_client(client_p, &me, "Lost connect{} block");
769	>	exit_client(client_p, "Lost connect{} block");
770		return;
771		}
772
#	Line 1267 | Line 821 | ssl_server_handshake(fde_t *fd, struct C
821		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
822		"Error connecting to %s: %s", client_p->name,
823		sslerr ? sslerr : "unknown SSL error");
824	<	exit_client(client_p, client_p, "Error during SSL handshake");
824	>	exit_client(client_p, "Error during SSL handshake");
825		return;
826		}
827		}
#	Line 1276 | Line 830 | ssl_server_handshake(fde_t *fd, struct C
830		if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
831		{
832		int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
833	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
834	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
833	>	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
834	>	unsigned char md[EVP_MAX_MD_SIZE] = "";
835
836		if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
837		res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
838		res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
839		{
840	<	unsigned int i = 0, n = 0;
840	>	unsigned int n = 0;
841
842	<	if (X509_digest(cert, EVP_sha256(), md, &n))
842	>	if (X509_digest(cert, ServerInfo.message_digest_algorithm, md, &n))
843		{
844	<	for (; i < n; ++i)
1291	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
844	>	binary_to_hex(md, buf, n);
845		client_p->certfp = xstrdup(buf);
846		}
847		}
#	Line 1309 | Line 862 | ssl_connect_init(struct Client *client_p
862		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
863		ERR_error_string(ERR_get_error(), NULL));
864		SetDead(client_p);
865	<	exit_client(client_p, client_p, "SSL_new failed");
865	>	exit_client(client_p, "SSL_new failed");
866		return;
867		}
868
#	Line 1337 | Line 890 | serv_connect_callback(fde_t *fd, int sta
890		struct MaskItem *conf = NULL;
891
892		/* First, make sure its a real client! */
893	<	assert(client_p != NULL);
893	>	assert(client_p);
894		assert(&client_p->localClient->fd == fd);
895
896		/* Next, for backward purposes, record the ip of the server */
897		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
898		sizeof(struct irc_ssaddr));
899	+
900		/* Check the status */
901		if (status != COMM_OK)
902		{
#	Line 1380 | Line 934 | serv_connect_callback(fde_t *fd, int sta
934		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
935		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
936
937	<	exit_client(client_p, &me, "Lost connect{} block");
937	>	exit_client(client_p, "Lost connect{} block");
938		return;
939		}
940

Diff Legend

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