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 3215 by michael, Tue Mar 25 19:23:15 2014 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 4439 by michael, Sat Aug 9 18:36:19 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 74 | Line 64 | static void burst_members(struct Client
64		*                but in no particular order.
65		*/
66		void
67	<	write_links_file(void *notused)
67	>	write_links_file(void *unused)
68		{
69		FILE *file = NULL;
70		dlink_node *ptr = NULL, *ptr_next = NULL;
#	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 134 | Line 124 | read_links_file(void)
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 167 | Line 157 | hunt_server(struct Client *source_p, con
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(source_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 != source_p->from))
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 397 | Line 348 | check_server(const char *name, struct Cl
348		{
349		error = -2;
350
351	<	if (!match_conf_password(client_p->localClient->passwd, conf))
351	>	if (!match_conf_password(client_p->localClient->password, conf))
352		return -2;
353
354		if (!EmptyString(conf->certfp))
#	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;
420	–	#ifdef IPV6
371		struct sockaddr_in6 *v6;
372	<	#endif
372	>
373		switch (server_conf->aftype)
374		{
425	–	#ifdef IPV6
375		case AF_INET6:
376		v6 = (struct sockaddr_in6 *)&server_conf->addr;
377
378		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
379		memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
380		break;
432	–	#endif
381		case AF_INET:
382		v4 = (struct sockaddr_in *)&server_conf->addr;
383
#	Line 454 | Line 402 | check_server(const char *name, struct Cl
402		void
403		add_capability(const char *capab_name, int cap_flag, int add_to_default)
404		{
405	<	struct Capability *cap = MyMalloc(sizeof(*cap));
405	>	struct Capability *cap = MyCalloc(sizeof(*cap));
406
407		cap->name = xstrdup(capab_name);
408		cap->cap = cap_flag;
#	Line 473 | Line 421 | add_capability(const char *capab_name, i
421		int
422		delete_capability(const char *capab_name)
423		{
424	<	dlink_node *ptr;
477	<	dlink_node *next_ptr;
478	<	struct Capability *cap;
424	>	dlink_node *ptr = NULL, *ptr_next = NULL;
425
426	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
426	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
427		{
428	<	cap = ptr->data;
428	>	struct Capability *cap = ptr->data;
429
430	<	if (cap->cap != 0)
430	>	if (cap->cap)
431		{
432	<	if (irccmp(cap->name, capab_name) == 0)
432	>	if (!irccmp(cap->name, capab_name))
433		{
434		default_server_capabs &= ~(cap->cap);
435		dlinkDelete(ptr, &cap_list);
#	Line 530 | Line 476 | find_capability(const char *capab)
476		void
477		send_capabilities(struct Client *client_p, int cap_can_send)
478		{
479	<	struct Capability *cap=NULL;
480	<	char msgbuf[IRCD_BUFSIZE];
535	<	char *t;
536	<	int tl;
537	<	dlink_node *ptr;
538	<
539	<	t = msgbuf;
479	>	char buf[IRCD_BUFSIZE] = "";
480	>	const dlink_node *ptr = NULL;
481
482		DLINK_FOREACH(ptr, cap_list.head)
483		{
484	<	cap = ptr->data;
484	>	const struct Capability *cap = ptr->data;
485
486		if (cap->cap & (cap_can_send|default_server_capabs))
487		{
488	<	tl = sprintf(t, "%s ", cap->name);
489	<	t += tl;
488	>	strlcat(buf, cap->name, sizeof(buf));
489	>	if (ptr->next)
490	>	strlcat(buf, " ", sizeof(buf));
491		}
492		}
493
494	<	*(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", target_p->id, target_p->certfp);
599	<
600	<	if (target_p->away[0])
601	<	sendto_one(client_p, ":%s AWAY :%s", target_p->id, target_p->away);
602	<
494	>	sendto_one(client_p, "CAPAB :%s", buf);
495		}
496
497		/*
#	Line 642 | Line 534 | struct Server *
534		make_server(struct Client *client_p)
535		{
536		if (client_p->serv == NULL)
537	<	client_p->serv = MyMalloc(sizeof(struct Server));
537	>	client_p->serv = MyCalloc(sizeof(struct Server));
538
539		return client_p->serv;
540		}
541
650	–	/* server_estab()
651	–	*
652	–	* inputs       - pointer to a struct Client
653	–	* output       -
654	–	* side effects -
655	–	*/
656	–	void
657	–	server_estab(struct Client *client_p)
658	–	{
659	–	struct MaskItem *conf = NULL;
660	–	char *host;
661	–	const char *inpath;
662	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
663	–	dlink_node *ptr;
664	–	#ifdef HAVE_LIBCRYPTO
665	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
666	–	#endif
667	–
668	–	assert(client_p != NULL);
669	–
670	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
671	–
672	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
673	–	host   = client_p->name;
674	–
675	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
676	–	== NULL)
677	–	{
678	–	/* This shouldn't happen, better tell the ops... -A1kmm */
679	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
680	–	"Warning: Lost connect{} block "
681	–	"for server %s(this shouldn't happen)!", host);
682	–	exit_client(client_p, "Lost connect{} block!");
683	–	return;
684	–	}
685	–
686	–	MyFree(client_p->localClient->passwd);
687	–	client_p->localClient->passwd = NULL;
688	–
689	–	/* Its got identd, since its a server */
690	–	SetGotId(client_p);
691	–
692	–	/* If there is something in the serv_list, it might be this
693	–	* connecting server..
694	–	*/
695	–	if (!ServerInfo.hub && serv_list.head)
696	–	{
697	–	if (client_p != serv_list.head->data || serv_list.head->next)
698	–	{
699	–	++ServerStats.is_ref;
700	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
701	–	exit_client(client_p, "I'm a leaf");
702	–	return;
703	–	}
704	–	}
705	–
706	–	if (IsUnknown(client_p))
707	–	{
708	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
709	–
710	–	send_capabilities(client_p, 0);
711	–
712	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
713	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
714	–	}
715	–
716	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
717	–	(unsigned long)CurrentTime);
718	–
719	–	/* XXX Does this ever happen? I don't think so -db */
720	–	detach_conf(client_p, CONF_OPER);
721	–
722	–	/* *WARNING*
723	–	**    In the following code in place of plain server's
724	–	**    name we send what is returned by get_client_name
725	–	**    which may add the "sockhost" after the name. It's
726	–	**    *very* *important* that there is a SPACE between
727	–	**    the name and sockhost (if present). The receiving
728	–	**    server will start the information field from this
729	–	**    first blank and thus puts the sockhost into info.
730	–	**    ...a bit tricky, but you have been warned, besides
731	–	**    code is more neat this way...  --msa
732	–	*/
733	–	client_p->servptr = &me;
734	–
735	–	if (IsClosing(client_p))
736	–	return;
737	–
738	–	SetServer(client_p);
739	–
740	–	/* Some day, all these lists will be consolidated *sigh* */
741	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
742	–
743	–	assert(dlinkFind(&unknown_list, client_p));
744	–
745	–	dlink_move_node(&client_p->localClient->lclient_node,
746	–	&unknown_list, &serv_list);
747	–
748	–	Count.myserver++;
749	–
750	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
751	–	hash_add_client(client_p);
752	–	hash_add_id(client_p);
753	–
754	–	/* doesnt duplicate client_p->serv if allocated this struct already */
755	–	make_server(client_p);
756	–
757	–	/* fixing eob timings.. -gnp */
758	–	client_p->localClient->firsttime = CurrentTime;
759	–
760	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
761	–	AddFlag(client_p, FLAGS_SERVICE);
762	–
763	–	/* Show the real host/IP to admins */
764	–	#ifdef HAVE_LIBCRYPTO
765	–	if (client_p->localClient->fd.ssl)
766	–	{
767	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
768	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
769	–
770	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
771	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
772	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
773	–	compression ? SSL_COMP_get_name(compression) : "NONE",
774	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
775	–	show_capabilities(client_p));
776	–	/* Now show the masked hostname/IP to opers */
777	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
778	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
779	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
780	–	compression ? SSL_COMP_get_name(compression) : "NONE",
781	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
782	–	show_capabilities(client_p));
783	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
784	–	inpath_ip, 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	–	}
789	–	else
790	–	#endif
791	–	{
792	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
793	–	"Link with %s established: (Capabilities: %s)",
794	–	inpath_ip, show_capabilities(client_p));
795	–	/* Now show the masked hostname/IP to opers */
796	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
797	–	"Link with %s established: (Capabilities: %s)",
798	–	inpath, show_capabilities(client_p));
799	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
800	–	inpath_ip, show_capabilities(client_p));
801	–	}
802	–
803	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
804	–
805	–	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
806	–	me.id, client_p->name, client_p->id,
807	–	IsHidden(client_p) ? "(H) " : "", client_p->info);
808	–
809	–	/*
810	–	* Pass on my client information to the new server
811	–	*
812	–	* First, pass only servers (idea is that if the link gets
813	–	* cancelled beacause the server was already there,
814	–	* there are no NICK's to be cancelled...). Of course,
815	–	* if cancellation occurs, all this info is sent anyway,
816	–	* and I guess the link dies when a read is attempted...? --msa
817	–	*
818	–	* Note: Link cancellation to occur at this point means
819	–	* that at least two servers from my fragment are building
820	–	* up connection this other fragment at the same time, it's
821	–	* a race condition, not the normal way of operation...
822	–	*
823	–	* ALSO NOTE: using the get_client_name for server names--
824	–	*    see previous *WARNING*!!! (Also, original inpath
825	–	*    is destroyed...)
826	–	*/
827	–
828	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
829	–	{
830	–	struct Client *target_p = ptr->data;
831	–
832	–	/* target_p->from == target_p for target_p == client_p */
833	–	if (IsMe(target_p) || target_p->from == client_p)
834	–	continue;
835	–
836	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
837	–	target_p->servptr->id, target_p->name, target_p->hopcount+1,
838	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
839	–	target_p->info);
840	–
841	–	if (HasFlag(target_p, FLAGS_EOB))
842	–	sendto_one(client_p, ":%s EOB", target_p->id, client_p);
843	–	}
844	–
845	–	server_burst(client_p);
846	–	}
847	–
848	–	/* server_burst()
849	–	*
850	–	* inputs       - struct Client pointer server
851	–	*              -
852	–	* output       - none
853	–	* side effects - send a server burst
854	–	* bugs         - still too long
855	–	*/
856	–	static void
857	–	server_burst(struct Client *client_p)
858	–	{
859	–	/* Send it in the shortened format with the TS, if
860	–	** it's a TS server; walk the list of channels, sending
861	–	** all the nicks that haven't been sent yet for each
862	–	** channel, then send the channel itself -- it's less
863	–	** obvious than sending all nicks first, but on the
864	–	** receiving side memory will be allocated more nicely
865	–	** saving a few seconds in the handling of a split
866	–	** -orabidoo
867	–	*/
868	–
869	–	burst_all(client_p);
870	–
871	–	/* EOB stuff is now in burst_all */
872	–	/* Always send a PING after connect burst is done */
873	–	sendto_one(client_p, "PING :%s", me.id);
874	–	}
875	–
876	–	/* burst_all()
877	–	*
878	–	* inputs       - pointer to server to send burst to
879	–	* output       - NONE
880	–	* side effects - complete burst of channels/nicks is sent to client_p
881	–	*/
882	–	static void
883	–	burst_all(struct Client *client_p)
884	–	{
885	–	dlink_node *ptr = NULL;
886	–
887	–	DLINK_FOREACH(ptr, global_channel_list.head)
888	–	{
889	–	struct Channel *chptr = ptr->data;
890	–
891	–	if (dlink_list_length(&chptr->members) != 0)
892	–	{
893	–	burst_members(client_p, chptr);
894	–	send_channel_modes(client_p, chptr);
895	–
896	–	if (IsCapable(client_p, CAP_TBURST))
897	–	send_tb(client_p, chptr);
898	–	}
899	–	}
900	–
901	–	/* also send out those that are not on any channel
902	–	*/
903	–	DLINK_FOREACH(ptr, global_client_list.head)
904	–	{
905	–	struct Client *target_p = ptr->data;
906	–
907	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
908	–	sendnick_TS(client_p, target_p);
909	–
910	–	DelFlag(target_p, FLAGS_BURSTED);
911	–	}
912	–
913	–	if (IsCapable(client_p, CAP_EOB))
914	–	sendto_one(client_p, ":%s EOB", me.id);
915	–	}
916	–
917	–	/*
918	–	* send_tb
919	–	*
920	–	* inputs       - pointer to Client
921	–	*              - pointer to channel
922	–	* output       - NONE
923	–	* side effects - Called on a server burst when
924	–	*                server is CAP_TBURST capable
925	–	*/
926	–	static void
927	–	send_tb(struct Client *client_p, struct Channel *chptr)
928	–	{
929	–	/*
930	–	* We may also send an empty topic here, but only if topic_time isn't 0,
931	–	* i.e. if we had a topic that got unset.  This is required for syncing
932	–	* topics properly.
933	–	*
934	–	* Imagine the following scenario: Our downlink introduces a channel
935	–	* to us with a TS that is equal to ours, but the channel topic on
936	–	* their side got unset while the servers were in splitmode, which means
937	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
938	–	* deal with it in a more sophisticated fashion instead of just resetting
939	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
940	–	* for further information   -Michael
941	–	*/
942	–	if (chptr->topic_time != 0)
943	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s", me.id,
944	–	(unsigned long)chptr->channelts, chptr->chname,
945	–	(unsigned long)chptr->topic_time,
946	–	chptr->topic_info,
947	–	chptr->topic);
948	–	}
949	–
950	–	/* burst_members()
951	–	*
952	–	* inputs       - pointer to server to send members to
953	–	*              - dlink_list pointer to membership list to send
954	–	* output       - NONE
955	–	* side effects -
956	–	*/
957	–	static void
958	–	burst_members(struct Client *client_p, struct Channel *chptr)
959	–	{
960	–	struct Client *target_p;
961	–	struct Membership *ms;
962	–	dlink_node *ptr;
963	–
964	–	DLINK_FOREACH(ptr, chptr->members.head)
965	–	{
966	–	ms       = ptr->data;
967	–	target_p = ms->client_p;
968	–
969	–	if (!HasFlag(target_p, FLAGS_BURSTED))
970	–	{
971	–	AddFlag(target_p, FLAGS_BURSTED);
972	–
973	–	if (target_p->from != client_p)
974	–	sendnick_TS(client_p, target_p);
975	–	}
976	–	}
977	–	}
978	–
542		/* New server connection code
543		* Based upon the stuff floating about in s_bsd.c
544		*   -- adrian
#	Line 1000 | Line 563 | burst_members(struct Client *client_p, s
563		int
564		serv_connect(struct MaskItem *conf, struct Client *by)
565		{
566	<	struct Client *client_p;
567	<	char buf[HOSTIPLEN + 1];
566	>	struct Client *client_p = NULL;
567	>	char buf[HOSTIPLEN + 1] = "";
568
569		/* conversion structs */
570		struct sockaddr_in *v4;
1008	–	/* Make sure conf is useful */
1009	–	assert(conf != NULL);
571
572	+	/* Make sure conf is useful */
573	+	assert(conf);
574
575		getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
576		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
#	Line 1020 | Line 583 | serv_connect(struct MaskItem *conf, stru
583		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
584		"Error connecting to %s: DNS lookup for connect{} in progress.",
585		conf->name);
586	<	return (0);
586	>	return 0;
587		}
588
589		if (conf->dns_failed)
#	Line 1028 | Line 591 | serv_connect(struct MaskItem *conf, stru
591		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
592		"Error connecting to %s: DNS lookup for connect{} failed.",
593		conf->name);
594	<	return (0);
594	>	return 0;
595		}
596
597		/* Make sure this server isn't already connected
598		* Note: conf should ALWAYS be a valid C: line
599		*/
600	<	if ((client_p = hash_find_server(conf->name)) != NULL)
600	>	if ((client_p = hash_find_server(conf->name)))
601		{
602		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
603		"Server %s already present from %s",
#	Line 1059 | Line 622 | serv_connect(struct MaskItem *conf, stru
622		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
623
624		/* create a socket for the server connection */
625	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1063	<	SOCK_STREAM, 0, NULL) < 0)
625	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
626		{
627		/* Eek, failure to create the socket */
628	<	report_error(L_ALL, "opening stream socket to %s: %s",
629	<	conf->name, errno);
628	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
629	>
630		SetDead(client_p);
631		exit_client(client_p, "Connection failed");
632		return 0;
#	Line 1103 | Line 665 | serv_connect(struct MaskItem *conf, stru
665		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
666
667		SetConnecting(client_p);
1106	–	dlinkAdd(client_p, &client_p->node, &global_client_list);
1107	–	/* from def_fam */
668		client_p->localClient->aftype = conf->aftype;
669
670		/* Now, initiate the connection */
#	Line 1115 | Line 675 | serv_connect(struct MaskItem *conf, stru
675		{
676		case AF_INET:
677		v4 = (struct sockaddr_in*)&conf->bind;
678	<	if (v4->sin_addr.s_addr != 0)
678	>	if (v4->sin_addr.s_addr)
679		{
680		struct irc_ssaddr ipn;
681		memset(&ipn, 0, sizeof(struct irc_ssaddr));
#	Line 1127 | Line 687 | serv_connect(struct MaskItem *conf, stru
687		serv_connect_callback, client_p, conf->aftype,
688		CONNECTTIMEOUT);
689		}
690	<	else if (ServerInfo.specific_ipv4_vhost)
690	>	else if (ConfigServerInfo.specific_ipv4_vhost)
691		{
692		struct irc_ssaddr ipn;
693		memset(&ipn, 0, sizeof(struct irc_ssaddr));
694		ipn.ss.ss_family = AF_INET;
695		ipn.ss_port = 0;
696	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
696	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
697		comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
698		(struct sockaddr *)&ipn, ipn.ss_len,
699		serv_connect_callback, client_p, conf->aftype,
#	Line 1144 | Line 704 | serv_connect(struct MaskItem *conf, stru
704		NULL, 0, serv_connect_callback, client_p, conf->aftype,
705		CONNECTTIMEOUT);
706		break;
1147	–	#ifdef IPV6
707		case AF_INET6:
708		{
709		struct irc_ssaddr ipn;
#	Line 1155 | Line 714 | serv_connect(struct MaskItem *conf, stru
714		v6conf = (struct sockaddr_in6 *)&conf->bind;
715		v6 = (struct sockaddr_in6 *)&ipn;
716
717	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
717	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
718		{
719		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
720		ipn.ss.ss_family = AF_INET6;
#	Line 1166 | Line 725 | serv_connect(struct MaskItem *conf, stru
725		serv_connect_callback, client_p,
726		conf->aftype, CONNECTTIMEOUT);
727		}
728	<	else if (ServerInfo.specific_ipv6_vhost)
728	>	else if (ConfigServerInfo.specific_ipv6_vhost)
729		{
730	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
730	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
731		ipn.ss.ss_family = AF_INET6;
732		ipn.ss_port = 0;
733		comm_connect_tcp(&client_p->localClient->fd,
#	Line 1183 | Line 742 | serv_connect(struct MaskItem *conf, stru
742		NULL, 0, serv_connect_callback, client_p,
743		conf->aftype, CONNECTTIMEOUT);
744		}
1186	–	#endif
745		}
746	+
747		return 1;
748		}
749
#	Line 1267 | Line 826 | ssl_server_handshake(fde_t *fd, struct C
826		if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
827		{
828		int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
829	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
830	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
829	>	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
830	>	unsigned char md[EVP_MAX_MD_SIZE] = "";
831
832		if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
833		res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
834		res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
835		{
836	<	unsigned int i = 0, n = 0;
836	>	unsigned int n = 0;
837
838	<	if (X509_digest(cert, EVP_sha256(), md, &n))
838	>	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
839		{
840	<	for (; i < n; ++i)
1282	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
840	>	binary_to_hex(md, buf, n);
841		client_p->certfp = xstrdup(buf);
842		}
843		}
#	Line 1295 | Line 853 | ssl_server_handshake(fde_t *fd, struct C
853		static void
854		ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
855		{
856	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
856	>	if ((client_p->localClient->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
857		{
858		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
859		ERR_error_string(ERR_get_error(), NULL));
#	Line 1327 | Line 885 | serv_connect_callback(fde_t *fd, int sta
885		struct Client *client_p = data;
886		struct MaskItem *conf = NULL;
887
888	<	/* First, make sure its a real client! */
889	<	assert(client_p != NULL);
888	>	/* First, make sure it's a real client! */
889	>	assert(client_p);
890		assert(&client_p->localClient->fd == fd);
891
892		/* Next, for backward purposes, record the ip of the server */
893		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
894		sizeof(struct irc_ssaddr));
895	+
896		/* Check the status */
897		if (status != COMM_OK)
898		{

Diff Legend

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