ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1545 by michael, Sun Sep 30 15:21:59 2012 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2691 by michael, Tue Dec 17 18:55:59 2013 UTC

#	Line 36 | Line 36
36		#include "fdlist.h"
37		#include "hash.h"
38		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
39		#include "ircd.h"
40		#include "ircd_defs.h"
41		#include "s_bsd.h"
#	Line 55 | Line 54
54
55		#define MIN_CONN_FREQ 300
56
57	+	dlink_list flatten_links;
58		static dlink_list cap_list = { NULL, NULL, 0 };
59		static void server_burst(struct Client *);
60		static void burst_all(struct Client *);
#	Line 73 | Line 73 | static void burst_members(struct Client
73		*                but in no particular order.
74		*/
75		void
76	<	write_links_file(void* notused)
76	>	write_links_file(void *notused)
77		{
78	<	MessageFileLine *next_mptr = NULL;
79	<	MessageFileLine *mptr = NULL;
80	<	MessageFileLine *currentMessageLine = NULL;
81	<	MessageFileLine *newMessageLine = NULL;
82	<	MessageFile *MessageFileptr = &ConfigFileEntry.linksfile;
83	<	FILE *file;
84	<	char buff[512];
85	<	dlink_node *ptr;
78	>	FILE *file = NULL;
79	>	dlink_node *ptr = NULL, *ptr_next = NULL;
80	>	char buff[IRCD_BUFSIZE] = { '\0' };
81
82	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
82	>	if ((file = fopen(LIPATH, "w")) == NULL)
83		return;
84
85	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
85	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
86		{
87	<	next_mptr = mptr->next;
88	<	MyFree(mptr);
87	>	dlinkDelete(ptr, &flatten_links);
88	>	MyFree(ptr->data);
89	>	free_dlink_node(ptr);
90		}
91
96	–	MessageFileptr->contentsOfFile = NULL;
97	–
92		DLINK_FOREACH(ptr, global_serv_list.head)
93		{
94		const struct Client *target_p = ptr->data;
95
96	<	/* skip ourselves, we send ourselves in /links */
97	<	if (IsMe(target_p))
96	>	/*
97	>	* Skip hidden servers, aswell as ourselves, since we already send
98	>	* ourselves in /links
99	>	*/
100	>	if (IsHidden(target_p) || IsMe(target_p))
101		continue;
102
103	<	/* skip hidden servers */
107	<	if (IsHidden(target_p))
103	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
104		continue;
105
110	–	newMessageLine = MyMalloc(sizeof(MessageFileLine));
111	–
106		/*
107		* Attempt to format the file in such a way it follows the usual links output
108		* ie  "servername uplink :hops info"
109		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
110		* - madmax
111		*/
112	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
113	<	target_p->name, me.name, target_p->info);
114	<
115	<	if (MessageFileptr->contentsOfFile)
116	<	{
123	<	if (currentMessageLine)
124	<	currentMessageLine->next = newMessageLine;
125	<	currentMessageLine = newMessageLine;
126	<	}
127	<	else
128	<	{
129	<	MessageFileptr->contentsOfFile = newMessageLine;
130	<	currentMessageLine = newMessageLine;
131	<	}
112	>	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
113	>	me.name, target_p->info);
114	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
115	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
116	>	me.name, target_p->info);
117
133	–	snprintf(buff, sizeof(buff), "%s %s :1 %s\n",
134	–	target_p->name, me.name, target_p->info);
118		fputs(buff, file);
119		}
120
121		fclose(file);
122		}
123
124	+	void
125	+	read_links_file(void)
126	+	{
127	+	FILE *file = NULL;
128	+	char *p = NULL;
129	+	char buff[IRCD_BUFSIZE] = { '\0' };
130	+
131	+	if ((file = fopen(LIPATH, "r")) == NULL)
132	+	return;
133	+
134	+	while (fgets(buff, sizeof(buff), file))
135	+	{
136	+	if ((p = strchr(buff, '\n')) != NULL)
137	+	*p = '\0';
138	+
139	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
140	+	}
141	+
142	+	fclose(file);
143	+	}
144	+
145		/* hunt_server()
146		*      Do the basic thing in delivering the message (command)
147		*      across the relays to the specific server (server) for
#	Line 159 | Line 163 | write_links_file(void* notused)
163		*/
164		int
165		hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
166	<	int server, int parc, char *parv[])
166	>	const int server, const int parc, char *parv[])
167		{
168		struct Client *target_p = NULL;
169		struct Client *target_tmp = NULL;
#	Line 170 | Line 174 | hunt_server(struct Client *client_p, str
174		if (parc <= server || EmptyString(parv[server]))
175		return HUNTED_ISME;
176
177	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
177	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
178		return HUNTED_ISME;
179
180		/* These are to pickup matches that would cause the following
#	Line 190 | Line 194 | hunt_server(struct Client *client_p, str
194		if (target_p->from == source_p->from && !MyConnect(target_p))
195		target_p = NULL;
196
193	–	collapse(parv[server]);
197		wilds = has_wildcards(parv[server]);
198
199		/* Again, if there are no wild cards involved in the server
#	Line 204 | Line 207 | hunt_server(struct Client *client_p, str
207		{
208		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
209		me.name, source_p->name, parv[server]);
210	<	return(HUNTED_NOSUCH);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 213 | Line 216 | hunt_server(struct Client *client_p, str
216		{
217		target_tmp = ptr->data;
218
219	<	if (match(parv[server], target_tmp->name))
219	>	if (!match(parv[server], target_tmp->name))
220		{
221		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
222		continue;
#	Line 238 | Line 241 | hunt_server(struct Client *client_p, str
241		if (IsMe(target_p) || MyClient(target_p))
242		return HUNTED_ISME;
243
244	<	if (!match(target_p->name, parv[server]))
244	>	if (match(target_p->name, parv[server]))
245		parv[server] = target_p->name;
246
247		/* This is a little kludgy but should work... */
#	Line 250 | Line 253 | hunt_server(struct Client *client_p, str
253		sendto_one(target_p, command, parv[0],
254		parv[1], parv[2], parv[3], parv[4],
255		parv[5], parv[6], parv[7], parv[8]);
256	<	return(HUNTED_PASS);
257	<	}
256	>	return HUNTED_PASS;
257	>	}
258
259		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
260		me.name, source_p->name, parv[server]);
261	<	return(HUNTED_NOSUCH);
261	>	return HUNTED_NOSUCH;
262		}
263
264		/* try_connections()
#	Line 271 | Line 274 | hunt_server(struct Client *client_p, str
274		void
275		try_connections(void *unused)
276		{
277	<	dlink_node *ptr;
278	<	struct ConfItem *conf;
276	<	struct AccessItem *aconf;
277	<	struct ClassItem *cltmp;
277	>	dlink_node *ptr = NULL;
278	>	struct MaskItem *conf;
279		int confrq;
280
281		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 284 | Line 285 | try_connections(void *unused)
285		DLINK_FOREACH(ptr, server_items.head)
286		{
287		conf = ptr->data;
287	–	aconf = map_to_conf(conf);
288
289	<	/* Also when already connecting! (update holdtimes) --SRB
289	>	assert(conf->type == CONF_SERVER);
290	>
291	>	/* Also when already connecting! (update holdtimes) --SRB
292		*/
293	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
292	<	!(IsConfAllowAutoConn(aconf)))
293	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
294		continue;
295
295	–	cltmp = map_to_conf(aconf->class_ptr);
296
297		/* Skip this entry if the use of it is still on hold until
298		* future. Otherwise handle this entry (and set it on hold
#	Line 300 | Line 300 | try_connections(void *unused)
300		* made one successfull connection... [this algorithm is
301		* a bit fuzzy... -- msa >;) ]
302		*/
303	<	if (aconf->hold > CurrentTime)
303	>	if (conf->until > CurrentTime)
304		continue;
305
306	<	if (cltmp == NULL)
306	>	if (conf->class == NULL)
307		confrq = DEFAULT_CONNECTFREQUENCY;
308		else
309		{
310	<	confrq = cltmp->con_freq;
310	>	confrq = conf->class->con_freq;
311		if (confrq < MIN_CONN_FREQ)
312	<	confrq = MIN_CONN_FREQ;
312	>	confrq = MIN_CONN_FREQ;
313		}
314
315	<	aconf->hold = CurrentTime + confrq;
315	>	conf->until = CurrentTime + confrq;
316
317		/* Found a CONNECT config with port specified, scan clients
318		* and see if this server is already connected?
#	Line 320 | Line 320 | try_connections(void *unused)
320		if (hash_find_server(conf->name) != NULL)
321		continue;
322
323	<	if (cltmp->curr_user_count < cltmp->max_total)
323	>	if (conf->class->ref_count < conf->class->max_total)
324		{
325		/* Go to the end of the list, if not already last */
326		if (ptr->next != NULL)
#	Line 341 | Line 341 | try_connections(void *unused)
341		*   -- adrian
342		*/
343		if (ConfigServerHide.hide_server_ips)
344	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
344	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
345	>	"Connection to %s activated.",
346		conf->name);
347		else
348	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
349	<	conf->name, aconf->host);
348	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
349	>	"Connection to %s[%s] activated.",
350	>	conf->name, conf->host);
351
352	<	serv_connect(aconf, NULL);
352	>	serv_connect(conf, NULL);
353		/* We connect only one at time... */
354		return;
355		}
#	Line 379 | Line 381 | int
381		check_server(const char *name, struct Client *client_p)
382		{
383		dlink_node *ptr;
384	<	struct ConfItem *conf           = NULL;
385	<	struct ConfItem *server_conf    = NULL;
384	<	struct AccessItem *server_aconf = NULL;
385	<	struct AccessItem *aconf        = NULL;
384	>	struct MaskItem *conf        = NULL;
385	>	struct MaskItem *server_conf = NULL;
386		int error = -1;
387
388		assert(client_p != NULL);
#	Line 391 | Line 391 | check_server(const char *name, struct Cl
391		DLINK_FOREACH(ptr, server_items.head)
392		{
393		conf = ptr->data;
394	–	aconf = map_to_conf(conf);
394
395	<	if (!match(name, conf->name))
395	>	if (match(name, conf->name))
396		continue;
397
398		error = -3;
399
400		/* XXX: Fix me for IPv6                    */
401		/* XXX sockhost is the IPv4 ip as a string */
402	<	if (match(aconf->host, client_p->host) ||
403	<	match(aconf->host, client_p->sockhost))
402	>	if (!match(conf->host, client_p->host) ||
403	>	!match(conf->host, client_p->sockhost))
404		{
405		error = -2;
406
407	<	if (!match_conf_password(client_p->localClient->passwd, aconf))
407	>	if (!match_conf_password(client_p->localClient->passwd, conf))
408		return -2;
409
410	+	if (!EmptyString(conf->certfp))
411	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
412	+	return -4;
413	+
414		server_conf = conf;
415		}
416		}
417
418		if (server_conf == NULL)
419	<	return(error);
419	>	return error;
420
421		attach_conf(client_p, server_conf);
422
420	–	server_aconf = map_to_conf(server_conf);
423
424	<	if (aconf != NULL)
424	>	if (server_conf != NULL)
425		{
426		struct sockaddr_in *v4;
427		#ifdef IPV6
428		struct sockaddr_in6 *v6;
429		#endif
430	<	switch (aconf->aftype)
430	>	switch (server_conf->aftype)
431		{
432		#ifdef IPV6
433	<	case AF_INET6:
434	<	v6 = (struct sockaddr_in6 *)&aconf->addr;
433	>	case AF_INET6:
434	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
435
436		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
437	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
437	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
438		break;
439		#endif
440		case AF_INET:
441	<	v4 = (struct sockaddr_in *)&aconf->addr;
441	>	v4 = (struct sockaddr_in *)&server_conf->addr;
442
443		if (v4->sin_addr.s_addr == INADDR_NONE)
444	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
444	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
445		break;
446		}
447		}
448
449	<	return(0);
449	>	return 0;
450		}
451
452		/* add_capability()
#	Line 461 | Line 463 | add_capability(const char *capab_name, i
463		{
464		struct Capability *cap = MyMalloc(sizeof(*cap));
465
466	<	DupString(cap->name, capab_name);
466	>	cap->name = xstrdup(capab_name);
467		cap->cap = cap_flag;
468		dlinkAdd(cap, &cap->node, &cap_list);
469
#	Line 490 | Line 492 | delete_capability(const char *capab_name
492		{
493		if (irccmp(cap->name, capab_name) == 0)
494		{
495	<	default_server_capabs &= ~(cap->cap);
496	<	dlinkDelete(ptr, &cap_list);
497	<	MyFree(cap->name);
498	<	cap->name = NULL;
497	<	MyFree(cap);
495	>	default_server_capabs &= ~(cap->cap);
496	>	dlinkDelete(ptr, &cap_list);
497	>	MyFree(cap->name);
498	>	MyFree(cap);
499		}
500		}
501		}
#	Line 509 | Line 510 | delete_capability(const char *capab_name
510		* output       - 0 if not found CAPAB otherwise
511		* side effects - none
512		*/
513	<	int
513	>	unsigned int
514		find_capability(const char *capab)
515		{
516		const dlink_node *ptr = NULL;
#	Line 528 | Line 529 | find_capability(const char *capab)
529		/* send_capabilities()
530		*
531		* inputs       - Client pointer to send to
531	–	*              - Pointer to AccessItem (for crypt)
532		*              - int flag of capabilities that this server can send
533		* output       - NONE
534		* side effects - send the CAPAB line to a server  -orabidoo
535		*
536		*/
537		void
538	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
539	<	int cap_can_send)
538	>	send_capabilities(struct Client *client_p, int cap_can_send)
539		{
540		struct Capability *cap=NULL;
541		char msgbuf[IRCD_BUFSIZE];
#	Line 552 | Line 551 | send_capabilities(struct Client *client_
551
552		if (cap->cap & (cap_can_send|default_server_capabs))
553		{
554	<	tl = ircsprintf(t, "%s ", cap->name);
554	>	tl = sprintf(t, "%s ", cap->name);
555		t += tl;
556		}
557		}
#	Line 562 | Line 561 | send_capabilities(struct Client *client_
561		}
562
563		/* sendnick_TS()
564	<	*
564	>	*
565		* inputs       - client (server) to send nick towards
566		*          - client to send nick for
567		* output       - NONE
#	Line 571 | Line 570 | send_capabilities(struct Client *client_
570		void
571		sendnick_TS(struct Client *client_p, struct Client *target_p)
572		{
573	<	static char ubuf[12];
573	>	char ubuf[IRCD_BUFSIZE];
574
575		if (!IsClient(target_p))
576		return;
#	Line 587 | Line 586 | sendnick_TS(struct Client *client_p, str
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 %lu :%s",
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	<	(unsigned long)target_p->servicestamp, target_p->info);
596	>	target_p->svid, target_p->info);
597		else
598	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
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, (unsigned long)target_p->servicestamp,
602	>	target_p->servptr->name, target_p->svid,
603		target_p->info);
604		}
605		else
#	Line 621 | Line 620 | sendnick_TS(struct Client *client_p, str
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);
#	Line 635 | Line 638 | sendnick_TS(struct Client *client_p, str
638		* side effects - build up string representing capabilities of server listed
639		*/
640		const char *
641	<	show_capabilities(struct Client *target_p)
641	>	show_capabilities(const struct Client *target_p)
642		{
643	<	static char msgbuf[IRCD_BUFSIZE];
644	<	char *t = msgbuf;
642	<	dlink_node *ptr;
643	>	static char msgbuf[IRCD_BUFSIZE] = "";
644	>	const dlink_node *ptr = NULL;
645
646	<	t += ircsprintf(msgbuf, "TS ");
646	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
647
648		DLINK_FOREACH(ptr, cap_list.head)
649		{
650		const struct Capability *cap = ptr->data;
651
652	<	if (IsCapable(target_p, cap->cap))
653	<	t += ircsprintf(t, "%s ", cap->name);
652	>	if (!IsCapable(target_p, cap->cap))
653	>	continue;
654	>
655	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
656	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
657		}
658
654	–	*(t - 1) = '\0';
659		return msgbuf;
660		}
661
#	Line 681 | Line 685 | void
685		server_estab(struct Client *client_p)
686		{
687		struct Client *target_p;
688	<	struct ConfItem *conf;
685	<	struct AccessItem *aconf=NULL;
688	>	struct MaskItem *conf = NULL;
689		char *host;
690		const char *inpath;
691		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
#	Line 698 | Line 701 | server_estab(struct Client *client_p)
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, SERVER_TYPE))
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, "Warning: Lost connect{} block "
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;
#	Line 717 | Line 721 | server_estab(struct Client *client_p)
721		/* If there is something in the serv_list, it might be this
722		* connecting server..
723		*/
724	<	if (!ServerInfo.hub && serv_list.head)
724	>	if (!ServerInfo.hub && serv_list.head)
725		{
726		if (client_p != serv_list.head->data || serv_list.head->next)
727		{
#	Line 728 | Line 732 | server_estab(struct Client *client_p)
732		}
733		}
734
731	–	aconf = map_to_conf(conf);
732	–
735		if (IsUnknown(client_p))
736		{
737	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
736	<	*        2.  Check aconf->spasswd, not aconf->passwd.
737	<	*/
738	<	if (!EmptyString(aconf->spasswd))
739	<	sendto_one(client_p, "PASS %s TS %d %s",
740	<	aconf->spasswd, TS_CURRENT, me.id);
741	<
742	<	/* Pass my info to the new server
743	<	*
744	<	* Pass on ZIP if supported
745	<	* Pass on TB if supported.
746	<	* - Dianora
747	<	*/
737	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
738
739	<	send_capabilities(client_p, aconf, 0);
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);
#	Line 760 | Line 750 | server_estab(struct Client *client_p)
750		hash_add_id(client_p);
751
752		/* XXX Does this ever happen? I don't think so -db */
753	<	detach_conf(client_p, OPER_TYPE);
753	>	detach_conf(client_p, CONF_OPER);
754
755		/* *WARNING*
756		**    In the following code in place of plain server's
#	Line 802 | Line 792 | server_estab(struct Client *client_p)
792		/* fixing eob timings.. -gnp */
793		client_p->localClient->firsttime = CurrentTime;
794
795	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
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 */
#	Line 812 | Line 802 | server_estab(struct Client *client_p)
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,
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,
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",
#	Line 834 | Line 824 | server_estab(struct Client *client_p)
824		else
825		#endif
826		{
827	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
827	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
828		"Link with %s established: (Capabilities: %s)",
829	<	inpath_ip,show_capabilities(client_p));
829	>	inpath_ip, show_capabilities(client_p));
830		/* Now show the masked hostname/IP to opers */
831	<	sendto_realops_flags(UMODE_ALL, L_OPER,
831	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
832		"Link with %s established: (Capabilities: %s)",
833	<	inpath,show_capabilities(client_p));
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		}
#	Line 864 | Line 854 | server_estab(struct Client *client_p)
854		IsHidden(client_p) ? "(H) " : "",
855		client_p->info);
856		else
857	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
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	<	/* Pass on my client information to the new server
864	<	**
865	<	** First, pass only servers (idea is that if the link gets
866	<	** cancelled beacause the server was already there,
867	<	** there are no NICK's to be cancelled...). Of course,
868	<	** if cancellation occurs, all this info is sent anyway,
869	<	** and I guess the link dies when a read is attempted...? --msa
870	<	**
871	<	** Note: Link cancellation to occur at this point means
872	<	** that at least two servers from my fragment are building
873	<	** up connection this other fragment at the same time, it's
874	<	** a race condition, not the normal way of operation...
875	<	**
876	<	** ALSO NOTE: using the get_client_name for server names--
877	<	**    see previous *WARNING*!!! (Also, original inpath
878	<	**    is destroyed...)
879	<	*/
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		{
#	Line 909 | Line 900 | server_estab(struct Client *client_p)
900		IsHidden(target_p) ? "(H) " : "", target_p->info);
901		}
902		else
903	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
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(client_p, target_p));
909		}
910
911		server_burst(client_p);
#	Line 947 | Line 941 | server_burst(struct Client *client_p)
941
942		/* burst_all()
943		*
944	<	* inputs       - pointer to server to send burst to
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		*/
#	Line 966 | Line 960 | burst_all(struct Client *client_p)
960		send_channel_modes(client_p, chptr);
961
962		if (IsCapable(client_p, CAP_TBURST))
963	<	send_tb(client_p, chptr);
963	>	send_tb(client_p, chptr);
964		}
965		}
966
#	Line 978 | Line 972 | burst_all(struct Client *client_p)
972
973		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
974		sendnick_TS(client_p, target_p);
975	<
975	>
976		DelFlag(target_p, FLAGS_BURSTED);
977		}
978
985	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
986	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
987	–	*/
988	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
979		if (IsCapable(client_p, CAP_EOB))
980		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
981		}
#	Line 1060 | Line 1050 | burst_members(struct Client *client_p, s
1050
1051		/* serv_connect() - initiate a server connection
1052		*
1053	<	* inputs       - pointer to conf
1053	>	* inputs       - pointer to conf
1054		*              - pointer to client doing the connect
1055		* output       -
1056		* side effects -
#	Line 1075 | Line 1065 | burst_members(struct Client *client_p, s
1065		* it suceeded or not, and 0 if it fails in here somewhere.
1066		*/
1067		int
1068	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1068	>	serv_connect(struct MaskItem *conf, struct Client *by)
1069		{
1080	–	struct ConfItem *conf;
1070		struct Client *client_p;
1071		char buf[HOSTIPLEN + 1];
1072
1073		/* conversion structs */
1074		struct sockaddr_in *v4;
1075	<	/* Make sure aconf is useful */
1076	<	assert(aconf != NULL);
1075	>	/* Make sure conf is useful */
1076	>	assert(conf != NULL);
1077
1089	–	/* XXX should be passing struct ConfItem in the first place */
1090	–	conf = unmap_conf_item(aconf);
1078
1079	<	/* log */
1093	<	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1079	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1080		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1081	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
1081	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1082		buf);
1083
1084		/* Still processing a DNS lookup? -> exit */
1085	<	if (aconf->dns_pending)
1085	>	if (conf->dns_pending)
1086		{
1087	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1087	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1088		"Error connecting to %s: DNS lookup for connect{} in progress.",
1089		conf->name);
1090		return (0);
1091		}
1092
1093	<	if (aconf->dns_failed)
1093	>	if (conf->dns_failed)
1094		{
1095	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1095	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1096		"Error connecting to %s: DNS lookup for connect{} failed.",
1097		conf->name);
1098		return (0);
1099		}
1100
1101		/* Make sure this server isn't already connected
1102	<	* Note: aconf should ALWAYS be a valid C: line
1102	>	* Note: conf should ALWAYS be a valid C: line
1103		*/
1104		if ((client_p = hash_find_server(conf->name)) != NULL)
1105	<	{
1106	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1107	<	"Server %s already present from %s",
1108	<	conf->name, get_client_name(client_p, SHOW_IP));
1109	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1110	<	"Server %s already present from %s",
1111	<	conf->name, get_client_name(client_p, MASK_IP));
1105	>	{
1106	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1107	>	"Server %s already present from %s",
1108	>	conf->name, get_client_name(client_p, SHOW_IP));
1109	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1110	>	"Server %s already present from %s",
1111	>	conf->name, get_client_name(client_p, MASK_IP));
1112		if (by && IsClient(by) && !MyClient(by))
1113		sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1114	<	me.name, by->name, conf->name,
1115	<	get_client_name(client_p, MASK_IP));
1116	<	return (0);
1114	>	me.name, by->name, conf->name,
1115	>	get_client_name(client_p, MASK_IP));
1116	>	return 0;
1117		}
1118	<
1118	>
1119		/* Create a local client */
1120		client_p = make_client(NULL);
1121
1122		/* Copy in the server, hostname, fd */
1123		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1124	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1124	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1125
1126		/* We already converted the ip once, so lets use it - stu */
1127		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1128
1129	<	/* create a socket for the server connection */
1130	<	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1129	>	/* create a socket for the server connection */
1130	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1131		SOCK_STREAM, 0, NULL) < 0)
1132		{
1133		/* Eek, failure to create the socket */
1134	<	report_error(L_ALL,
1135	<	"opening stream socket to %s: %s", conf->name, errno);
1134	>	report_error(L_ALL, "opening stream socket to %s: %s",
1135	>	conf->name, errno);
1136		SetDead(client_p);
1137		exit_client(client_p, &me, "Connection failed");
1138	<	return (0);
1138	>	return 0;
1139		}
1140
1141		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1158 | Line 1144 | serv_connect(struct AccessItem *aconf, s
1144		/* Attach config entries to client here rather than in
1145		* serv_connect_callback(). This to avoid null pointer references.
1146		*/
1147	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1147	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1148		{
1149	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1150	<	"Host %s is not enabled for connecting:no C/N-line",
1151	<	conf->name);
1152	<	if (by && IsClient(by) && !MyClient(by))
1149	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1150	>	"Host %s is not enabled for connecting: no connect{} block",
1151	>	conf->name);
1152	>	if (by && IsClient(by) && !MyClient(by))
1153		sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1154	<	me.name, by->name, client_p->name);
1154	>	me.name, by->name, client_p->name);
1155		SetDead(client_p);
1156		exit_client(client_p, client_p, "Connection failed");
1157	<	return (0);
1157	>	return 0;
1158		}
1159
1160		/* at this point we have a connection in progress and C/N lines
#	Line 1187 | Line 1173 | serv_connect(struct AccessItem *aconf, s
1173		SetConnecting(client_p);
1174		dlinkAdd(client_p, &client_p->node, &global_client_list);
1175		/* from def_fam */
1176	<	client_p->localClient->aftype = aconf->aftype;
1176	>	client_p->localClient->aftype = conf->aftype;
1177
1178		/* Now, initiate the connection */
1179	<	/* XXX assume that a non 0 type means a specific bind address
1179	>	/* XXX assume that a non 0 type means a specific bind address
1180		* for this connect.
1181		*/
1182	<	switch (aconf->aftype)
1182	>	switch (conf->aftype)
1183		{
1184		case AF_INET:
1185	<	v4 = (struct sockaddr_in*)&aconf->bind;
1185	>	v4 = (struct sockaddr_in*)&conf->bind;
1186		if (v4->sin_addr.s_addr != 0)
1187		{
1188		struct irc_ssaddr ipn;
1189		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1190		ipn.ss.ss_family = AF_INET;
1191		ipn.ss_port = 0;
1192	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1193	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1194	<	(struct sockaddr *)&ipn, ipn.ss_len,
1195	<	serv_connect_callback, client_p, aconf->aftype,
1196	<	CONNECTTIMEOUT);
1192	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1193	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1194	>	(struct sockaddr *)&ipn, ipn.ss_len,
1195	>	serv_connect_callback, client_p, conf->aftype,
1196	>	CONNECTTIMEOUT);
1197		}
1198		else if (ServerInfo.specific_ipv4_vhost)
1199		{
#	Line 1216 | Line 1202 | serv_connect(struct AccessItem *aconf, s
1202		ipn.ss.ss_family = AF_INET;
1203		ipn.ss_port = 0;
1204		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1205	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1205	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1206		(struct sockaddr *)&ipn, ipn.ss_len,
1207	<	serv_connect_callback, client_p, aconf->aftype,
1208	<	CONNECTTIMEOUT);
1207	>	serv_connect_callback, client_p, conf->aftype,
1208	>	CONNECTTIMEOUT);
1209		}
1210		else
1211	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1212	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1211	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1212	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1213		CONNECTTIMEOUT);
1214		break;
1215		#ifdef IPV6
1216		case AF_INET6:
1217		{
1218	<	struct irc_ssaddr ipn;
1219	<	struct sockaddr_in6 *v6;
1220	<	struct sockaddr_in6 *v6conf;
1221	<
1222	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	<	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1224	<	v6 = (struct sockaddr_in6 *)&ipn;
1225	<
1226	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1227	<	sizeof(struct in6_addr)) != 0)
1228	<	{
1229	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1230	<	ipn.ss.ss_family = AF_INET6;
1231	<	ipn.ss_port = 0;
1232	<	comm_connect_tcp(&client_p->localClient->fd,
1233	<	aconf->host, aconf->port,
1234	<	(struct sockaddr *)&ipn, ipn.ss_len,
1235	<	serv_connect_callback, client_p,
1236	<	aconf->aftype, CONNECTTIMEOUT);
1237	<	}
1252	<	else if (ServerInfo.specific_ipv6_vhost)
1218	>	struct irc_ssaddr ipn;
1219	>	struct sockaddr_in6 *v6;
1220	>	struct sockaddr_in6 *v6conf;
1221	>
1222	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1224	>	v6 = (struct sockaddr_in6 *)&ipn;
1225	>
1226	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1227	>	{
1228	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1229	>	ipn.ss.ss_family = AF_INET6;
1230	>	ipn.ss_port = 0;
1231	>	comm_connect_tcp(&client_p->localClient->fd,
1232	>	conf->host, conf->port,
1233	>	(struct sockaddr *)&ipn, ipn.ss_len,
1234	>	serv_connect_callback, client_p,
1235	>	conf->aftype, CONNECTTIMEOUT);
1236	>	}
1237	>	else if (ServerInfo.specific_ipv6_vhost)
1238		{
1239	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1240	<	ipn.ss.ss_family = AF_INET6;
1241	<	ipn.ss_port = 0;
1242	<	comm_connect_tcp(&client_p->localClient->fd,
1243	<	aconf->host, aconf->port,
1244	<	(struct sockaddr *)&ipn, ipn.ss_len,
1245	<	serv_connect_callback, client_p,
1246	<	aconf->aftype, CONNECTTIMEOUT);
1247	<	}
1248	<	else
1249	<	comm_connect_tcp(&client_p->localClient->fd,
1250	<	aconf->host, aconf->port,
1251	<	NULL, 0, serv_connect_callback, client_p,
1252	<	aconf->aftype, CONNECTTIMEOUT);
1239	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1240	>	ipn.ss.ss_family = AF_INET6;
1241	>	ipn.ss_port = 0;
1242	>	comm_connect_tcp(&client_p->localClient->fd,
1243	>	conf->host, conf->port,
1244	>	(struct sockaddr *)&ipn, ipn.ss_len,
1245	>	serv_connect_callback, client_p,
1246	>	conf->aftype, CONNECTTIMEOUT);
1247	>	}
1248	>	else
1249	>	comm_connect_tcp(&client_p->localClient->fd,
1250	>	conf->host, conf->port,
1251	>	NULL, 0, serv_connect_callback, client_p,
1252	>	conf->aftype, CONNECTTIMEOUT);
1253		}
1254		#endif
1255		}
1256	<	return (1);
1256	>	return 1;
1257		}
1258
1259		#ifdef HAVE_LIBCRYPTO
1260		static void
1261		finish_ssl_server_handshake(struct Client *client_p)
1262		{
1263	<	struct ConfItem *conf=NULL;
1279	<	struct AccessItem *aconf=NULL;
1263	>	struct MaskItem *conf = NULL;
1264
1265		conf = find_conf_name(&client_p->localClient->confs,
1266	<	client_p->name, SERVER_TYPE);
1266	>	client_p->name, CONF_SERVER);
1267		if (conf == NULL)
1268		{
1269	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1269	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1270		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1271	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1271	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1272		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1273
1274		exit_client(client_p, &me, "Lost connect{} block");
1275		return;
1276		}
1277
1278	<	aconf = map_to_conf(conf);
1295	<
1296	<	/* jdc -- Check and send spasswd, not passwd. */
1297	<	if (!EmptyString(aconf->spasswd))
1298	<	sendto_one(client_p, "PASS %s TS %d %s",
1299	<	aconf->spasswd, TS_CURRENT, me.id);
1278	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1279
1280	<	send_capabilities(client_p, aconf, 0);
1280	>	send_capabilities(client_p, 0);
1281
1282		sendto_one(client_p, "SERVER %s 1 :%s%s",
1283		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1309 | Line 1288 | finish_ssl_server_handshake(struct Clien
1288		*/
1289		if (IsDead(client_p))
1290		{
1291	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1291	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1292		"%s[%s] went dead during handshake",
1293		client_p->name,
1294		client_p->host);
1295	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1295	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1296		"%s went dead during handshake", client_p->name);
1297		return;
1298		}
#	Line 1326 | Line 1305 | finish_ssl_server_handshake(struct Clien
1305		static void
1306		ssl_server_handshake(fde_t *fd, struct Client *client_p)
1307		{
1308	<	int ret;
1309	<	int err;
1331	<
1332	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1308	>	X509 *cert = NULL;
1309	>	int ret = 0;
1310
1311	<	if (ret <= 0)
1311	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1312		{
1313	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1313	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1314		{
1315		case SSL_ERROR_WANT_WRITE:
1316		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1346 | Line 1323 | ssl_server_handshake(fde_t *fd, struct C
1323		default:
1324		{
1325		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1326	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1326	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1327		"Error connecting to %s: %s", client_p->name,
1328		sslerr ? sslerr : "unknown SSL error");
1329		exit_client(client_p, client_p, "Error during SSL handshake");
#	Line 1355 | Line 1332 | ssl_server_handshake(fde_t *fd, struct C
1332		}
1333		}
1334
1335	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1336	+	{
1337	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1338	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1339	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1340	+
1341	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1342	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1343	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1344	+	{
1345	+	unsigned int i = 0, n = 0;
1346	+
1347	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1348	+	{
1349	+	for (; i < n; ++i)
1350	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1351	+	client_p->certfp = xstrdup(buf);
1352	+	}
1353	+	}
1354	+	else
1355	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1356	+	client_p->name, client_p->username, client_p->host, res);
1357	+	X509_free(cert);
1358	+	}
1359	+
1360		finish_ssl_server_handshake(client_p);
1361		}
1362
1363		static void
1364	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1364	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1365		{
1366		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1367		{
#	Line 1372 | Line 1374 | ssl_connect_init(struct Client *client_p
1374
1375		SSL_set_fd(fd->ssl, fd->fd);
1376
1377	<	if (!EmptyString(aconf->cipher_list))
1378	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1377	>	if (!EmptyString(conf->cipher_list))
1378	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1379
1380		ssl_server_handshake(NULL, client_p);
1381		}
1382		#endif
1383
1384		/* serv_connect_callback() - complete a server connection.
1385	<	*
1385	>	*
1386		* This routine is called after the server connection attempt has
1387		* completed. If unsucessful, an error is sent to ops and the client
1388		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1391 | Line 1393 | static void
1393		serv_connect_callback(fde_t *fd, int status, void *data)
1394		{
1395		struct Client *client_p = data;
1396	<	struct ConfItem *conf=NULL;
1395	<	struct AccessItem *aconf=NULL;
1396	>	struct MaskItem *conf = NULL;
1397
1398		/* First, make sure its a real client! */
1399		assert(client_p != NULL);
#	Line 1408 | Line 1409 | serv_connect_callback(fde_t *fd, int sta
1409		* Admins get to see any IP, mere opers don't *sigh*
1410		*/
1411		if (ConfigServerHide.hide_server_ips)
1412	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1412	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1413		"Error connecting to %s: %s",
1414		client_p->name, comm_errstr(status));
1415		else
1416	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1417	<	"Error connecting to %s[%s]: %s", client_p->name,
1418	<	client_p->host, comm_errstr(status));
1419	<
1420	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1421	<	"Error connecting to %s: %s",
1422	<	client_p->name, comm_errstr(status));
1416	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1417	>	"Error connecting to %s[%s]: %s", client_p->name,
1418	>	client_p->host, comm_errstr(status));
1419	>
1420	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1421	>	"Error connecting to %s: %s",
1422	>	client_p->name, comm_errstr(status));
1423
1424		/* If a fd goes bad, call dead_link() the socket is no
1425		* longer valid for reading or writing.
#	Line 1430 | Line 1431 | serv_connect_callback(fde_t *fd, int sta
1431		/* COMM_OK, so continue the connection procedure */
1432		/* Get the C/N lines */
1433		conf = find_conf_name(&client_p->localClient->confs,
1434	<	client_p->name, SERVER_TYPE);
1434	>	client_p->name, CONF_SERVER);
1435		if (conf == NULL)
1436		{
1437	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1438	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1439	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1440	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1437	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1438	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1439	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1440	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1441
1442		exit_client(client_p, &me, "Lost connect{} block");
1443		return;
1444		}
1445
1445	–	aconf = map_to_conf(conf);
1446		/* Next, send the initial handshake */
1447		SetHandshake(client_p);
1448
1449		#ifdef HAVE_LIBCRYPTO
1450	<	if (IsConfSSL(aconf))
1450	>	if (IsConfSSL(conf))
1451		{
1452	<	ssl_connect_init(client_p, aconf, fd);
1452	>	ssl_connect_init(client_p, conf, fd);
1453		return;
1454		}
1455		#endif
1456
1457	<	/* jdc -- Check and send spasswd, not passwd. */
1458	<	if (!EmptyString(aconf->spasswd))
1459	<	sendto_one(client_p, "PASS %s TS %d %s",
1460	<	aconf->spasswd, TS_CURRENT, me.id);
1457	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1458
1459	<	send_capabilities(client_p, aconf, 0);
1459	>	send_capabilities(client_p, 0);
1460
1461	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1462	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1466	<	me.info);
1461	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1462	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1463
1464		/* If we've been marked dead because a send failed, just exit
1465		* here now and save everyone the trouble of us ever existing.
1466		*/
1467	<	if (IsDead(client_p))
1467	>	if (IsDead(client_p))
1468		{
1469	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1470	<	"%s[%s] went dead during handshake",
1469	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1470	>	"%s[%s] went dead during handshake",
1471		client_p->name,
1472	<	client_p->host);
1473	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1474	<	"%s went dead during handshake", client_p->name);
1472	>	client_p->host);
1473	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1474	>	"%s went dead during handshake", client_p->name);
1475		return;
1476		}
1477
#	Line 1495 | Line 1491 | find_servconn_in_progress(const char *na
1491		cptr = ptr->data;
1492
1493		if (cptr && cptr->name[0])
1494	<	if (match(name, cptr->name))
1494	>	if (!match(name, cptr->name))
1495		return cptr;
1496		}
1497	<
1497	>
1498		return NULL;
1499		}

Diff Legend

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