ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 1636 by michael, Sun Nov 4 17:09:47 2012 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 3347 by michael, Sun Apr 20 14:03:06 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_serv.c: Server related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_serv.c
23	>	* \brief Server related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 28 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
33		#include "client.h"
34	–	#include "dbuf.h"
34		#include "event.h"
36	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
37		#include "ircd.h"
38		#include "ircd_defs.h"
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" /* chcap_usage_counts stuff...*/
48	>	#include "channel.h"
49		#include "parse.h"
50
51		#define MIN_CONN_FREQ 300
52
53	+	dlink_list flatten_links;
54		static dlink_list cap_list = { NULL, NULL, 0 };
59	–	static void server_burst(struct Client *);
60	–	static void burst_all(struct Client *);
61	–	static void send_tb(struct Client *client_p, struct Channel *chptr);
62	–
55		static CNCB serv_connect_callback;
56
65	–	static void burst_members(struct Client *, struct Channel *);
57
58		/*
59		* write_links_file
#	Line 73 | 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 *notused)
68		{
69	<	MessageFileLine *next_mptr = NULL;
70	<	MessageFileLine *mptr = NULL;
71	<	MessageFileLine *currentMessageLine = NULL;
81	<	MessageFileLine *newMessageLine = NULL;
82	<	MessageFile *MessageFileptr = &ConfigFileEntry.linksfile;
83	<	FILE *file;
84	<	char buff[512];
85	<	dlink_node *ptr;
69	>	FILE *file = NULL;
70	>	dlink_node *ptr = NULL, *ptr_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
73	>	if ((file = fopen(LIPATH, "w")) == NULL)
74		return;
75
76	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
76	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
77		{
78	<	next_mptr = mptr->next;
79	<	MyFree(mptr);
78	>	dlinkDelete(ptr, &flatten_links);
79	>	MyFree(ptr->data);
80	>	free_dlink_node(ptr);
81		}
82
96	–	MessageFileptr->contentsOfFile = NULL;
97	–
83		DLINK_FOREACH(ptr, global_serv_list.head)
84		{
85		const struct Client *target_p = ptr->data;
86
87	<	/* skip ourselves, we send ourselves in /links */
88	<	if (IsMe(target_p))
87	>	/*
88	>	* Skip hidden servers, aswell as ourselves, since we already send
89	>	* ourselves in /links
90	>	*/
91	>	if (IsHidden(target_p) || IsMe(target_p))
92		continue;
93
94	<	/* skip hidden servers */
107	<	if (IsHidden(target_p))
94	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
95		continue;
96
110	–	newMessageLine = MyMalloc(sizeof(MessageFileLine));
111	–
97		/*
98		* Attempt to format the file in such a way it follows the usual links output
99		* ie  "servername uplink :hops info"
100		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
101		* - madmax
102		*/
103	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
104	<	target_p->name, me.name, target_p->info);
105	<
106	<	if (MessageFileptr->contentsOfFile)
107	<	{
123	<	if (currentMessageLine)
124	<	currentMessageLine->next = newMessageLine;
125	<	currentMessageLine = newMessageLine;
126	<	}
127	<	else
128	<	{
129	<	MessageFileptr->contentsOfFile = newMessageLine;
130	<	currentMessageLine = newMessageLine;
131	<	}
103	>	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
104	>	me.name, target_p->info);
105	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
106	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
107	>	me.name, target_p->info);
108
133	–	snprintf(buff, sizeof(buff), "%s %s :1 %s\n",
134	–	target_p->name, me.name, target_p->info);
109		fputs(buff, file);
110		}
111
112		fclose(file);
113		}
114
115	+	void
116	+	read_links_file(void)
117	+	{
118	+	FILE *file = NULL;
119	+	char *p = NULL;
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')))
128	+	*p = '\0';
129	+
130	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
131	+	}
132	+
133	+	fclose(file);
134	+	}
135	+
136		/* hunt_server()
137		*      Do the basic thing in delivering the message (command)
138		*      across the relays to the specific server (server) for
#	Line 158 | Line 153 | write_links_file(void* notused)
153		*      returns: (see #defines)
154		*/
155		int
156	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
157	<	int server, int parc, char *parv[])
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;
#	Line 170 | Line 165 | hunt_server(struct Client *client_p, str
165		if (parc <= server || EmptyString(parv[server]))
166		return HUNTED_ISME;
167
168	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
168	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
169		return HUNTED_ISME;
170
171		/* These are to pickup matches that would cause the following
#	Line 180 | Line 175 | hunt_server(struct Client *client_p, str
175		if (MyClient(source_p))
176		target_p = hash_find_client(parv[server]);
177		else
178	<	target_p = find_person(client_p, parv[server]);
178	>	target_p = find_person(source_p, parv[server]);
179
180		if (target_p)
181		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 190 | Line 185 | hunt_server(struct Client *client_p, str
185		if (target_p->from == source_p->from && !MyConnect(target_p))
186		target_p = NULL;
187
193	–	collapse(parv[server]);
188		wilds = has_wildcards(parv[server]);
189
190		/* Again, if there are no wild cards involved in the server
#	Line 202 | Line 196 | hunt_server(struct Client *client_p, str
196		{
197		if (!(target_p = hash_find_server(parv[server])))
198		{
199	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
200	<	me.name, source_p->name, parv[server]);
207	<	return(HUNTED_NOSUCH);
199	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
200	>	return HUNTED_NOSUCH;
201		}
202		}
203		else
#	Line 213 | Line 206 | hunt_server(struct Client *client_p, str
206		{
207		target_tmp = ptr->data;
208
209	<	if (match(parv[server], target_tmp->name))
209	>	if (!match(parv[server], target_tmp->name))
210		{
211		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
212		continue;
213		target_p = ptr->data;
214
215	<	if (IsRegistered(target_p) && (target_p != client_p))
215	>	if (IsRegistered(target_p) && (target_p != source_p->from))
216		break;
217		}
218		}
219		}
220		}
221
222	<	if (target_p != NULL)
222	>	if (target_p)
223		{
224	<	if(!IsRegistered(target_p))
224	>	if (!IsRegistered(target_p))
225		{
226	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
234	<	me.name, source_p->name, parv[server]);
226	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
227		return HUNTED_NOSUCH;
228		}
229
230		if (IsMe(target_p) || MyClient(target_p))
231		return HUNTED_ISME;
232
233	<	if (!match(target_p->name, parv[server]))
233	>	if (match(target_p->name, parv[server]))
234		parv[server] = target_p->name;
235
236		/* This is a little kludgy but should work... */
237	<	if (IsClient(source_p) &&
246	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
247	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
248	<	parv[0] = ID(source_p);
249	<
250	<	sendto_one(target_p, command, parv[0],
237	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
238		parv[1], parv[2], parv[3], parv[4],
239		parv[5], parv[6], parv[7], parv[8]);
240	<	return(HUNTED_PASS);
241	<	}
240	>	return HUNTED_PASS;
241	>	}
242
243	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
244	<	me.name, source_p->name, parv[server]);
258	<	return(HUNTED_NOSUCH);
243	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
244	>	return HUNTED_NOSUCH;
245		}
246
247		/* try_connections()
#	Line 272 | Line 258 | void
258		try_connections(void *unused)
259		{
260		dlink_node *ptr = NULL;
261	<	struct MaskItem *conf;
276	<	int confrq;
261	>	int confrq = 0;
262
263		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
264		if (GlobalSetOptions.autoconn == 0)
#	Line 281 | Line 266 | try_connections(void *unused)
266
267		DLINK_FOREACH(ptr, server_items.head)
268		{
269	<	conf = ptr->data;
269	>	struct MaskItem *conf = ptr->data;
270
271		assert(conf->type == CONF_SERVER);
272
273	<	/* Also when already connecting! (update holdtimes) --SRB
273	>	/* Also when already connecting! (update holdtimes) --SRB
274		*/
275		if (!conf->port ||!IsConfAllowAutoConn(conf))
276		continue;
#	Line 297 | Line 282 | try_connections(void *unused)
282		* made one successfull connection... [this algorithm is
283		* a bit fuzzy... -- msa >;) ]
284		*/
285	<	if (conf->hold > CurrentTime)
285	>	if (conf->until > CurrentTime)
286		continue;
287
288		if (conf->class == NULL)
#	Line 306 | Line 291 | try_connections(void *unused)
291		{
292		confrq = conf->class->con_freq;
293		if (confrq < MIN_CONN_FREQ)
294	<	confrq = MIN_CONN_FREQ;
294	>	confrq = MIN_CONN_FREQ;
295		}
296
297	<	conf->hold = CurrentTime + confrq;
297	>	conf->until = CurrentTime + confrq;
298
299	<	/* Found a CONNECT config with port specified, scan clients
299	>	/*
300	>	* Found a CONNECT config with port specified, scan clients
301		* and see if this server is already connected?
302		*/
303	<	if (hash_find_server(conf->name) != NULL)
303	>	if (hash_find_server(conf->name))
304		continue;
305
306		if (conf->class->ref_count < conf->class->max_total)
307		{
308		/* Go to the end of the list, if not already last */
309	<	if (ptr->next != NULL)
309	>	if (ptr->next)
310		{
311		dlinkDelete(ptr, &server_items);
312		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 329 | Line 315 | try_connections(void *unused)
315		if (find_servconn_in_progress(conf->name))
316		return;
317
318	<	/* We used to only print this if serv_connect() actually
318	>	/*
319	>	* We used to only print this if serv_connect() actually
320		* succeeded, but since comm_tcp_connect() can call the callback
321		* immediately if there is an error, we were getting error messages
322		* in the wrong order. SO, we just print out the activated line,
#	Line 371 | Line 358 | valid_servname(const char *name)
358		++dots;
359		}
360
361	<	return dots != 0 && length <= HOSTLEN;
361	>	return dots && length <= HOSTLEN;
362		}
363
364		int
#	Line 382 | Line 369 | check_server(const char *name, struct Cl
369		struct MaskItem *server_conf = NULL;
370		int error = -1;
371
372	<	assert(client_p != NULL);
372	>	assert(client_p);
373
374		/* loop through looking for all possible connect items that might work */
375		DLINK_FOREACH(ptr, server_items.head)
376		{
377		conf = ptr->data;
378
379	<	if (!match(name, conf->name))
379	>	if (match(name, conf->name))
380		continue;
381
382		error = -3;
383
384		/* XXX: Fix me for IPv6                    */
385		/* XXX sockhost is the IPv4 ip as a string */
386	<	if (match(conf->host, client_p->host) ||
387	<	match(conf->host, client_p->sockhost))
386	>	if (!match(conf->host, client_p->host) ||
387	>	!match(conf->host, client_p->sockhost))
388		{
389		error = -2;
390
391		if (!match_conf_password(client_p->localClient->passwd, conf))
392		return -2;
393
394	+	if (!EmptyString(conf->certfp))
395	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
396	+	return -4;
397	+
398		server_conf = conf;
399		}
400		}
401
402		if (server_conf == NULL)
403	<	return(error);
403	>	return error;
404
405		attach_conf(client_p, server_conf);
406
407
408	<	if (server_conf != NULL)
408	>	if (server_conf)
409		{
410		struct sockaddr_in *v4;
411		#ifdef IPV6
#	Line 423 | Line 414 | check_server(const char *name, struct Cl
414		switch (server_conf->aftype)
415		{
416		#ifdef IPV6
417	<	case AF_INET6:
417	>	case AF_INET6:
418		v6 = (struct sockaddr_in6 *)&server_conf->addr;
419
420		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
#	Line 434 | Line 425 | check_server(const char *name, struct Cl
425		v4 = (struct sockaddr_in *)&server_conf->addr;
426
427		if (v4->sin_addr.s_addr == INADDR_NONE)
428	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
428	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
429		break;
430		}
431		}
432
433	<	return(0);
433	>	return 0;
434		}
435
436		/* add_capability()
#	Line 456 | Line 447 | add_capability(const char *capab_name, i
447		{
448		struct Capability *cap = MyMalloc(sizeof(*cap));
449
450	<	DupString(cap->name, capab_name);
450	>	cap->name = xstrdup(capab_name);
451		cap->cap = cap_flag;
452		dlinkAdd(cap, &cap->node, &cap_list);
453
#	Line 473 | Line 464 | add_capability(const char *capab_name, i
464		int
465		delete_capability(const char *capab_name)
466		{
467	<	dlink_node *ptr;
477	<	dlink_node *next_ptr;
478	<	struct Capability *cap;
467	>	dlink_node *ptr = NULL, *ptr_next = NULL;
468
469	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
469	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
470		{
471	<	cap = ptr->data;
471	>	struct Capability *cap = ptr->data;
472
473	<	if (cap->cap != 0)
473	>	if (cap->cap)
474		{
475	<	if (irccmp(cap->name, capab_name) == 0)
475	>	if (!irccmp(cap->name, capab_name))
476		{
477	<	default_server_capabs &= ~(cap->cap);
478	<	dlinkDelete(ptr, &cap_list);
479	<	MyFree(cap->name);
480	<	cap->name = NULL;
492	<	MyFree(cap);
477	>	default_server_capabs &= ~(cap->cap);
478	>	dlinkDelete(ptr, &cap_list);
479	>	MyFree(cap->name);
480	>	MyFree(cap);
481		}
482		}
483		}
#	Line 504 | Line 492 | delete_capability(const char *capab_name
492		* output       - 0 if not found CAPAB otherwise
493		* side effects - none
494		*/
495	<	int
495	>	unsigned int
496		find_capability(const char *capab)
497		{
498		const dlink_node *ptr = NULL;
#	Line 531 | Line 519 | find_capability(const char *capab)
519		void
520		send_capabilities(struct Client *client_p, int cap_can_send)
521		{
522	<	struct Capability *cap=NULL;
523	<	char msgbuf[IRCD_BUFSIZE];
536	<	char *t;
522	>	char msgbuf[IRCD_BUFSIZE] = "";
523	>	char *t = msgbuf;
524		int tl;
525	<	dlink_node *ptr;
539	<
540	<	t = msgbuf;
525	>	dlink_node *ptr = NULL;
526
527		DLINK_FOREACH(ptr, cap_list.head)
528		{
529	<	cap = ptr->data;
529	>	struct Capability *cap = ptr->data;
530
531		if (cap->cap & (cap_can_send|default_server_capabs))
532		{
533	<	tl = ircsprintf(t, "%s ", cap->name);
533	>	tl = sprintf(t, "%s ", cap->name);
534		t += tl;
535		}
536		}
#	Line 554 | Line 539 | send_capabilities(struct Client *client_
539		sendto_one(client_p, "CAPAB :%s", msgbuf);
540		}
541
557	–	/* sendnick_TS()
558	–	*
559	–	* inputs       - client (server) to send nick towards
560	–	*          - client to send nick for
561	–	* output       - NONE
562	–	* side effects - NICK message is sent towards given client_p
563	–	*/
564	–	void
565	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
566	–	{
567	–	static char ubuf[12];
568	–
569	–	if (!IsClient(target_p))
570	–	return;
571	–
572	–	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
573	–
574	–	if (ubuf[0] == '\0')
575	–	{
576	–	ubuf[0] = '+';
577	–	ubuf[1] = '\0';
578	–	}
579	–
580	–	if (IsCapable(client_p, CAP_SVS))
581	–	{
582	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
583	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
584	–	target_p->servptr->id,
585	–	target_p->name, target_p->hopcount + 1,
586	–	(unsigned long) target_p->tsinfo,
587	–	ubuf, target_p->username, target_p->host,
588	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
589	–	"0" : target_p->sockhost, target_p->id,
590	–	target_p->svid, target_p->info);
591	–	else
592	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
593	–	target_p->name, target_p->hopcount + 1,
594	–	(unsigned long) target_p->tsinfo,
595	–	ubuf, target_p->username, target_p->host,
596	–	target_p->servptr->name, target_p->svid,
597	–	target_p->info);
598	–	}
599	–	else
600	–	{
601	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
602	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
603	–	target_p->servptr->id,
604	–	target_p->name, target_p->hopcount + 1,
605	–	(unsigned long) target_p->tsinfo,
606	–	ubuf, target_p->username, target_p->host,
607	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
608	–	"0" : target_p->sockhost, target_p->id, target_p->info);
609	–	else
610	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
611	–	target_p->name, target_p->hopcount + 1,
612	–	(unsigned long) target_p->tsinfo,
613	–	ubuf, target_p->username, target_p->host,
614	–	target_p->servptr->name, target_p->info);
615	–	}
616	–
617	–	if (target_p->away[0])
618	–	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
619	–	target_p->away);
620	–
621	–	}
622	–
542		/*
543		* show_capabilities - show current server capabilities
544		*
#	Line 628 | Line 547 | sendnick_TS(struct Client *client_p, str
547		* side effects - build up string representing capabilities of server listed
548		*/
549		const char *
550	<	show_capabilities(struct Client *target_p)
550	>	show_capabilities(const struct Client *target_p)
551		{
552	<	static char msgbuf[IRCD_BUFSIZE];
553	<	char *t = msgbuf;
635	<	dlink_node *ptr;
552	>	static char msgbuf[IRCD_BUFSIZE] = "";
553	>	const dlink_node *ptr = NULL;
554
555	<	t += ircsprintf(msgbuf, "TS ");
555	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
556
557		DLINK_FOREACH(ptr, cap_list.head)
558		{
559		const struct Capability *cap = ptr->data;
560
561	<	if (IsCapable(target_p, cap->cap))
562	<	t += ircsprintf(t, "%s ", cap->name);
561	>	if (!IsCapable(target_p, cap->cap))
562	>	continue;
563	>
564	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
565	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
566		}
567
647	–	*(t - 1) = '\0';
568		return msgbuf;
569		}
570
#	Line 664 | Line 584 | make_server(struct Client *client_p)
584		return client_p->serv;
585		}
586
667	–	/* server_estab()
668	–	*
669	–	* inputs       - pointer to a struct Client
670	–	* output       -
671	–	* side effects -
672	–	*/
673	–	void
674	–	server_estab(struct Client *client_p)
675	–	{
676	–	struct Client *target_p;
677	–	struct MaskItem *conf = NULL;
678	–	char *host;
679	–	const char *inpath;
680	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
681	–	dlink_node *ptr;
682	–	#ifdef HAVE_LIBCRYPTO
683	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
684	–	#endif
685	–
686	–	assert(client_p != NULL);
687	–
688	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
689	–
690	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
691	–	host   = client_p->name;
692	–
693	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
694	–	== NULL)
695	–	{
696	–	/* This shouldn't happen, better tell the ops... -A1kmm */
697	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
698	–	"Warning: Lost connect{} block "
699	–	"for server %s(this shouldn't happen)!", host);
700	–	exit_client(client_p, &me, "Lost connect{} block!");
701	–	return;
702	–	}
703	–
704	–	MyFree(client_p->localClient->passwd);
705	–	client_p->localClient->passwd = NULL;
706	–
707	–	/* Its got identd, since its a server */
708	–	SetGotId(client_p);
709	–
710	–	/* If there is something in the serv_list, it might be this
711	–	* connecting server..
712	–	*/
713	–	if (!ServerInfo.hub && serv_list.head)
714	–	{
715	–	if (client_p != serv_list.head->data || serv_list.head->next)
716	–	{
717	–	++ServerStats.is_ref;
718	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
719	–	exit_client(client_p, &me, "I'm a leaf");
720	–	return;
721	–	}
722	–	}
723	–
724	–	if (IsUnknown(client_p))
725	–	{
726	–	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
727	–	*        2.  Check conf->spasswd, not conf->passwd.
728	–	*/
729	–	if (!EmptyString(conf->spasswd))
730	–	sendto_one(client_p, "PASS %s TS %d %s",
731	–	conf->spasswd, TS_CURRENT, me.id);
732	–
733	–	send_capabilities(client_p, 0);
734	–
735	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
736	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
737	–	}
738	–
739	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
740	–	(unsigned long)CurrentTime);
741	–
742	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
743	–	if (IsCapable(client_p, CAP_TS6))
744	–	hash_add_id(client_p);
745	–
746	–	/* XXX Does this ever happen? I don't think so -db */
747	–	detach_conf(client_p, CONF_OPER);
748	–
749	–	/* *WARNING*
750	–	**    In the following code in place of plain server's
751	–	**    name we send what is returned by get_client_name
752	–	**    which may add the "sockhost" after the name. It's
753	–	**    *very* *important* that there is a SPACE between
754	–	**    the name and sockhost (if present). The receiving
755	–	**    server will start the information field from this
756	–	**    first blank and thus puts the sockhost into info.
757	–	**    ...a bit tricky, but you have been warned, besides
758	–	**    code is more neat this way...  --msa
759	–	*/
760	–	client_p->servptr = &me;
761	–
762	–	if (IsClosing(client_p))
763	–	return;
764	–
765	–	SetServer(client_p);
766	–
767	–	/* Update the capability combination usage counts. -A1kmm */
768	–	set_chcap_usage_counts(client_p);
769	–
770	–	/* Some day, all these lists will be consolidated *sigh* */
771	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
772	–
773	–	assert(dlinkFind(&unknown_list, client_p));
774	–
775	–	dlink_move_node(&client_p->localClient->lclient_node,
776	–	&unknown_list, &serv_list);
777	–
778	–	Count.myserver++;
779	–
780	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
781	–	hash_add_client(client_p);
782	–
783	–	/* doesnt duplicate client_p->serv if allocated this struct already */
784	–	make_server(client_p);
785	–
786	–	/* fixing eob timings.. -gnp */
787	–	client_p->localClient->firsttime = CurrentTime;
788	–
789	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
790	–	AddFlag(client_p, FLAGS_SERVICE);
791	–
792	–	/* Show the real host/IP to admins */
793	–	#ifdef HAVE_LIBCRYPTO
794	–	if (client_p->localClient->fd.ssl)
795	–	{
796	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
797	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
798	–
799	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
800	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
801	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
802	–	compression ? SSL_COMP_get_name(compression) : "NONE",
803	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
804	–	show_capabilities(client_p));
805	–	/* Now show the masked hostname/IP to opers */
806	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
807	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
808	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
809	–	compression ? SSL_COMP_get_name(compression) : "NONE",
810	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
811	–	show_capabilities(client_p));
812	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
813	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
814	–	compression ? SSL_COMP_get_name(compression) : "NONE",
815	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
816	–	show_capabilities(client_p));
817	–	}
818	–	else
819	–	#endif
820	–	{
821	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
822	–	"Link with %s established: (Capabilities: %s)",
823	–	inpath_ip, show_capabilities(client_p));
824	–	/* Now show the masked hostname/IP to opers */
825	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
826	–	"Link with %s established: (Capabilities: %s)",
827	–	inpath, show_capabilities(client_p));
828	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
829	–	inpath_ip, show_capabilities(client_p));
830	–	}
831	–
832	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
833	–
834	–	/* Old sendto_serv_but_one() call removed because we now
835	–	** need to send different names to different servers
836	–	** (domain name matching) Send new server to other servers.
837	–	*/
838	–	DLINK_FOREACH(ptr, serv_list.head)
839	–	{
840	–	target_p = ptr->data;
841	–
842	–	if (target_p == client_p)
843	–	continue;
844	–
845	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
846	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
847	–	me.id, client_p->name, client_p->id,
848	–	IsHidden(client_p) ? "(H) " : "",
849	–	client_p->info);
850	–	else
851	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
852	–	me.name, client_p->name,
853	–	IsHidden(client_p) ? "(H) " : "",
854	–	client_p->info);
855	–	}
856	–
857	–	/* Pass on my client information to the new server
858	–	**
859	–	** First, pass only servers (idea is that if the link gets
860	–	** cancelled beacause the server was already there,
861	–	** there are no NICK's to be cancelled...). Of course,
862	–	** if cancellation occurs, all this info is sent anyway,
863	–	** and I guess the link dies when a read is attempted...? --msa
864	–	**
865	–	** Note: Link cancellation to occur at this point means
866	–	** that at least two servers from my fragment are building
867	–	** up connection this other fragment at the same time, it's
868	–	** a race condition, not the normal way of operation...
869	–	**
870	–	** ALSO NOTE: using the get_client_name for server names--
871	–	**    see previous *WARNING*!!! (Also, original inpath
872	–	**    is destroyed...)
873	–	*/
874	–
875	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
876	–	{
877	–	target_p = ptr->data;
878	–
879	–	/* target_p->from == target_p for target_p == client_p */
880	–	if (IsMe(target_p) || target_p->from == client_p)
881	–	continue;
882	–
883	–	if (IsCapable(client_p, CAP_TS6))
884	–	{
885	–	if (HasID(target_p))
886	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
887	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
888	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
889	–	target_p->info);
890	–	else  /* introducing non-ts6 server */
891	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
892	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
893	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
894	–	}
895	–	else
896	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
897	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
898	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
899	–	}
900	–
901	–	server_burst(client_p);
902	–	}
903	–
904	–	/* server_burst()
905	–	*
906	–	* inputs       - struct Client pointer server
907	–	*              -
908	–	* output       - none
909	–	* side effects - send a server burst
910	–	* bugs         - still too long
911	–	*/
912	–	static void
913	–	server_burst(struct Client *client_p)
914	–	{
915	–	/* Send it in the shortened format with the TS, if
916	–	** it's a TS server; walk the list of channels, sending
917	–	** all the nicks that haven't been sent yet for each
918	–	** channel, then send the channel itself -- it's less
919	–	** obvious than sending all nicks first, but on the
920	–	** receiving side memory will be allocated more nicely
921	–	** saving a few seconds in the handling of a split
922	–	** -orabidoo
923	–	*/
924	–
925	–	burst_all(client_p);
926	–
927	–	/* EOB stuff is now in burst_all */
928	–	/* Always send a PING after connect burst is done */
929	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
930	–	}
931	–
932	–	/* burst_all()
933	–	*
934	–	* inputs       - pointer to server to send burst to
935	–	* output       - NONE
936	–	* side effects - complete burst of channels/nicks is sent to client_p
937	–	*/
938	–	static void
939	–	burst_all(struct Client *client_p)
940	–	{
941	–	dlink_node *ptr = NULL;
942	–
943	–	DLINK_FOREACH(ptr, global_channel_list.head)
944	–	{
945	–	struct Channel *chptr = ptr->data;
946	–
947	–	if (dlink_list_length(&chptr->members) != 0)
948	–	{
949	–	burst_members(client_p, chptr);
950	–	send_channel_modes(client_p, chptr);
951	–
952	–	if (IsCapable(client_p, CAP_TBURST))
953	–	send_tb(client_p, chptr);
954	–	}
955	–	}
956	–
957	–	/* also send out those that are not on any channel
958	–	*/
959	–	DLINK_FOREACH(ptr, global_client_list.head)
960	–	{
961	–	struct Client *target_p = ptr->data;
962	–
963	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
964	–	sendnick_TS(client_p, target_p);
965	–
966	–	DelFlag(target_p, FLAGS_BURSTED);
967	–	}
968	–
969	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
970	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
971	–	*/
972	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
973	–	if (IsCapable(client_p, CAP_EOB))
974	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
975	–	}
976	–
977	–	/*
978	–	* send_tb
979	–	*
980	–	* inputs       - pointer to Client
981	–	*              - pointer to channel
982	–	* output       - NONE
983	–	* side effects - Called on a server burst when
984	–	*                server is CAP_TBURST capable
985	–	*/
986	–	static void
987	–	send_tb(struct Client *client_p, struct Channel *chptr)
988	–	{
989	–	/*
990	–	* We may also send an empty topic here, but only if topic_time isn't 0,
991	–	* i.e. if we had a topic that got unset.  This is required for syncing
992	–	* topics properly.
993	–	*
994	–	* Imagine the following scenario: Our downlink introduces a channel
995	–	* to us with a TS that is equal to ours, but the channel topic on
996	–	* their side got unset while the servers were in splitmode, which means
997	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
998	–	* deal with it in a more sophisticated fashion instead of just resetting
999	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1000	–	* for further information   -Michael
1001	–	*/
1002	–	if (chptr->topic_time != 0)
1003	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1004	–	ID_or_name(&me, client_p),
1005	–	(unsigned long)chptr->channelts, chptr->chname,
1006	–	(unsigned long)chptr->topic_time,
1007	–	chptr->topic_info,
1008	–	chptr->topic);
1009	–	}
1010	–
1011	–	/* burst_members()
1012	–	*
1013	–	* inputs       - pointer to server to send members to
1014	–	*              - dlink_list pointer to membership list to send
1015	–	* output       - NONE
1016	–	* side effects -
1017	–	*/
1018	–	static void
1019	–	burst_members(struct Client *client_p, struct Channel *chptr)
1020	–	{
1021	–	struct Client *target_p;
1022	–	struct Membership *ms;
1023	–	dlink_node *ptr;
1024	–
1025	–	DLINK_FOREACH(ptr, chptr->members.head)
1026	–	{
1027	–	ms       = ptr->data;
1028	–	target_p = ms->client_p;
1029	–
1030	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1031	–	{
1032	–	AddFlag(target_p, FLAGS_BURSTED);
1033	–
1034	–	if (target_p->from != client_p)
1035	–	sendnick_TS(client_p, target_p);
1036	–	}
1037	–	}
1038	–	}
1039	–
587		/* New server connection code
588		* Based upon the stuff floating about in s_bsd.c
589		*   -- adrian
#	Line 1044 | Line 591 | burst_members(struct Client *client_p, s
591
592		/* serv_connect() - initiate a server connection
593		*
594	<	* inputs       - pointer to conf
594	>	* inputs       - pointer to conf
595		*              - pointer to client doing the connect
596		* output       -
597		* side effects -
#	Line 1061 | Line 608 | burst_members(struct Client *client_p, s
608		int
609		serv_connect(struct MaskItem *conf, struct Client *by)
610		{
611	<	struct Client *client_p;
612	<	char buf[HOSTIPLEN + 1];
611	>	struct Client *client_p = NULL;
612	>	char buf[HOSTIPLEN + 1] = "";
613
614		/* conversion structs */
615		struct sockaddr_in *v4;
1069	–	/* Make sure conf is useful */
1070	–	assert(conf != NULL);
616
617	+	/* Make sure conf is useful */
618	+	assert(conf);
619
620		getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
621		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
#	Line 1081 | Line 628 | serv_connect(struct MaskItem *conf, stru
628		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
629		"Error connecting to %s: DNS lookup for connect{} in progress.",
630		conf->name);
631	<	return (0);
631	>	return 0;
632		}
633
634		if (conf->dns_failed)
#	Line 1089 | Line 636 | serv_connect(struct MaskItem *conf, stru
636		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
637		"Error connecting to %s: DNS lookup for connect{} failed.",
638		conf->name);
639	<	return (0);
639	>	return 0;
640		}
641
642		/* Make sure this server isn't already connected
643		* Note: conf should ALWAYS be a valid C: line
644		*/
645	<	if ((client_p = hash_find_server(conf->name)) != NULL)
646	<	{
645	>	if ((client_p = hash_find_server(conf->name)))
646	>	{
647		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
648	<	"Server %s already present from %s",
649	<	conf->name, get_client_name(client_p, SHOW_IP));
648	>	"Server %s already present from %s",
649	>	conf->name, get_client_name(client_p, SHOW_IP));
650		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
651	<	"Server %s already present from %s",
652	<	conf->name, get_client_name(client_p, MASK_IP));
651	>	"Server %s already present from %s",
652	>	conf->name, get_client_name(client_p, MASK_IP));
653		if (by && IsClient(by) && !MyClient(by))
654	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
655	<	me.name, by->name, conf->name,
656	<	get_client_name(client_p, MASK_IP));
1110	<	return (0);
654	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
655	>	conf->name, get_client_name(client_p, MASK_IP));
656	>	return 0;
657		}
658	<
658	>
659		/* Create a local client */
660		client_p = make_client(NULL);
661
#	Line 1120 | Line 666 | serv_connect(struct MaskItem *conf, stru
666		/* We already converted the ip once, so lets use it - stu */
667		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
668
669	<	/* create a socket for the server connection */
670	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1125	<	SOCK_STREAM, 0, NULL) < 0)
669	>	/* create a socket for the server connection */
670	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
671		{
672		/* Eek, failure to create the socket */
673	<	report_error(L_ALL,
674	<	"opening stream socket to %s: %s", conf->name, errno);
673	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
674	>
675		SetDead(client_p);
676	<	exit_client(client_p, &me, "Connection failed");
677	<	return (0);
676	>	exit_client(client_p, "Connection failed");
677	>	return 0;
678		}
679
680		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1141 | Line 686 | serv_connect(struct MaskItem *conf, stru
686		if (!attach_connect_block(client_p, conf->name, conf->host))
687		{
688		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
689	<	"Host %s is not enabled for connecting: no connect{} block",
690	<	conf->name);
691	<	if (by && IsClient(by) && !MyClient(by))
692	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
693	<	me.name, by->name, client_p->name);
689	>	"Host %s is not enabled for connecting: no connect{} block",
690	>	conf->name);
691	>	if (by && IsClient(by) && !MyClient(by))
692	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
693	>
694		SetDead(client_p);
695	<	exit_client(client_p, client_p, "Connection failed");
696	<	return (0);
695	>	exit_client(client_p, "Connection failed");
696	>	return 0;
697		}
698
699		/* at this point we have a connection in progress and C/N lines
#	Line 1166 | Line 711 | serv_connect(struct MaskItem *conf, stru
711
712		SetConnecting(client_p);
713		dlinkAdd(client_p, &client_p->node, &global_client_list);
714	<	/* from def_fam */
714	>
715		client_p->localClient->aftype = conf->aftype;
716
717		/* Now, initiate the connection */
718	<	/* XXX assume that a non 0 type means a specific bind address
718	>	/* XXX assume that a non 0 type means a specific bind address
719		* for this connect.
720		*/
721		switch (conf->aftype)
722		{
723		case AF_INET:
724		v4 = (struct sockaddr_in*)&conf->bind;
725	<	if (v4->sin_addr.s_addr != 0)
725	>	if (v4->sin_addr.s_addr)
726		{
727		struct irc_ssaddr ipn;
728		memset(&ipn, 0, sizeof(struct irc_ssaddr));
729		ipn.ss.ss_family = AF_INET;
730		ipn.ss_port = 0;
731		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
732	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
733	<	(struct sockaddr *)&ipn, ipn.ss_len,
734	<	serv_connect_callback, client_p, conf->aftype,
735	<	CONNECTTIMEOUT);
732	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
733	>	(struct sockaddr *)&ipn, ipn.ss_len,
734	>	serv_connect_callback, client_p, conf->aftype,
735	>	CONNECTTIMEOUT);
736		}
737		else if (ServerInfo.specific_ipv4_vhost)
738		{
#	Line 1199 | Line 744 | serv_connect(struct MaskItem *conf, stru
744		comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
745		(struct sockaddr *)&ipn, ipn.ss_len,
746		serv_connect_callback, client_p, conf->aftype,
747	<	CONNECTTIMEOUT);
747	>	CONNECTTIMEOUT);
748		}
749		else
750	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
751	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
750	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
751	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
752		CONNECTTIMEOUT);
753		break;
754		#ifdef IPV6
755		case AF_INET6:
756		{
757	<	struct irc_ssaddr ipn;
758	<	struct sockaddr_in6 *v6;
759	<	struct sockaddr_in6 *v6conf;
760	<
761	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
762	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
763	<	v6 = (struct sockaddr_in6 *)&ipn;
764	<
765	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
766	<	sizeof(struct in6_addr)) != 0)
767	<	{
768	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
769	<	ipn.ss.ss_family = AF_INET6;
770	<	ipn.ss_port = 0;
771	<	comm_connect_tcp(&client_p->localClient->fd,
772	<	conf->host, conf->port,
773	<	(struct sockaddr *)&ipn, ipn.ss_len,
774	<	serv_connect_callback, client_p,
775	<	conf->aftype, CONNECTTIMEOUT);
776	<	}
1232	<	else if (ServerInfo.specific_ipv6_vhost)
757	>	struct irc_ssaddr ipn;
758	>	struct sockaddr_in6 *v6;
759	>	struct sockaddr_in6 *v6conf;
760	>
761	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
762	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
763	>	v6 = (struct sockaddr_in6 *)&ipn;
764	>
765	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
766	>	{
767	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
768	>	ipn.ss.ss_family = AF_INET6;
769	>	ipn.ss_port = 0;
770	>	comm_connect_tcp(&client_p->localClient->fd,
771	>	conf->host, conf->port,
772	>	(struct sockaddr *)&ipn, ipn.ss_len,
773	>	serv_connect_callback, client_p,
774	>	conf->aftype, CONNECTTIMEOUT);
775	>	}
776	>	else if (ServerInfo.specific_ipv6_vhost)
777		{
778	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
779	<	ipn.ss.ss_family = AF_INET6;
780	<	ipn.ss_port = 0;
781	<	comm_connect_tcp(&client_p->localClient->fd,
782	<	conf->host, conf->port,
783	<	(struct sockaddr *)&ipn, ipn.ss_len,
784	<	serv_connect_callback, client_p,
785	<	conf->aftype, CONNECTTIMEOUT);
786	<	}
787	<	else
788	<	comm_connect_tcp(&client_p->localClient->fd,
789	<	conf->host, conf->port,
790	<	NULL, 0, serv_connect_callback, client_p,
791	<	conf->aftype, CONNECTTIMEOUT);
778	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
779	>	ipn.ss.ss_family = AF_INET6;
780	>	ipn.ss_port = 0;
781	>	comm_connect_tcp(&client_p->localClient->fd,
782	>	conf->host, conf->port,
783	>	(struct sockaddr *)&ipn, ipn.ss_len,
784	>	serv_connect_callback, client_p,
785	>	conf->aftype, CONNECTTIMEOUT);
786	>	}
787	>	else
788	>	comm_connect_tcp(&client_p->localClient->fd,
789	>	conf->host, conf->port,
790	>	NULL, 0, serv_connect_callback, client_p,
791	>	conf->aftype, CONNECTTIMEOUT);
792		}
793		#endif
794		}
795	<	return (1);
795	>	return 1;
796		}
797
798		#ifdef HAVE_LIBCRYPTO
#	Line 1266 | Line 810 | finish_ssl_server_handshake(struct Clien
810		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
811		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
812
813	<	exit_client(client_p, &me, "Lost connect{} block");
813	>	exit_client(client_p, "Lost connect{} block");
814		return;
815		}
816
817	<	/* jdc -- Check and send spasswd, not passwd. */
1274	<	if (!EmptyString(conf->spasswd))
1275	<	sendto_one(client_p, "PASS %s TS %d %s",
1276	<	conf->spasswd, TS_CURRENT, me.id);
817	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
818
819		send_capabilities(client_p, 0);
820
#	Line 1303 | Line 844 | finish_ssl_server_handshake(struct Clien
844		static void
845		ssl_server_handshake(fde_t *fd, struct Client *client_p)
846		{
847	<	int ret;
848	<	int err;
847	>	X509 *cert = NULL;
848	>	int ret = 0;
849
850	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1310	<
1311	<	if (ret <= 0)
850	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
851		{
852	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
852	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
853		{
854		case SSL_ERROR_WANT_WRITE:
855		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1326 | Line 865 | ssl_server_handshake(fde_t *fd, struct C
865		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
866		"Error connecting to %s: %s", client_p->name,
867		sslerr ? sslerr : "unknown SSL error");
868	<	exit_client(client_p, client_p, "Error during SSL handshake");
868	>	exit_client(client_p, "Error during SSL handshake");
869		return;
870		}
871		}
872		}
873
874	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
875	+	{
876	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
877	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
878	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
879	+
880	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
881	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
882	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
883	+	{
884	+	unsigned int i = 0, n = 0;
885	+
886	+	if (X509_digest(cert, EVP_sha256(), md, &n))
887	+	{
888	+	for (; i < n; ++i)
889	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
890	+	client_p->certfp = xstrdup(buf);
891	+	}
892	+	}
893	+	else
894	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
895	+	client_p->name, client_p->username, client_p->host, res);
896	+	X509_free(cert);
897	+	}
898	+
899		finish_ssl_server_handshake(client_p);
900		}
901
#	Line 1343 | Line 907 | ssl_connect_init(struct Client *client_p
907		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
908		ERR_error_string(ERR_get_error(), NULL));
909		SetDead(client_p);
910	<	exit_client(client_p, client_p, "SSL_new failed");
910	>	exit_client(client_p, "SSL_new failed");
911		return;
912		}
913
#	Line 1357 | Line 921 | ssl_connect_init(struct Client *client_p
921		#endif
922
923		/* serv_connect_callback() - complete a server connection.
924	<	*
924	>	*
925		* This routine is called after the server connection attempt has
926		* completed. If unsucessful, an error is sent to ops and the client
927		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1371 | Line 935 | serv_connect_callback(fde_t *fd, int sta
935		struct MaskItem *conf = NULL;
936
937		/* First, make sure its a real client! */
938	<	assert(client_p != NULL);
938	>	assert(client_p);
939		assert(&client_p->localClient->fd == fd);
940
941		/* Next, for backward purposes, record the ip of the server */
942		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
943		sizeof(struct irc_ssaddr));
944	+
945		/* Check the status */
946		if (status != COMM_OK)
947		{
#	Line 1389 | Line 954 | serv_connect_callback(fde_t *fd, int sta
954		client_p->name, comm_errstr(status));
955		else
956		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
957	<	"Error connecting to %s[%s]: %s", client_p->name,
958	<	client_p->host, comm_errstr(status));
957	>	"Error connecting to %s[%s]: %s", client_p->name,
958	>	client_p->host, comm_errstr(status));
959
960		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
961	<	"Error connecting to %s: %s",
962	<	client_p->name, comm_errstr(status));
961	>	"Error connecting to %s: %s",
962	>	client_p->name, comm_errstr(status));
963
964		/* If a fd goes bad, call dead_link() the socket is no
965		* longer valid for reading or writing.
#	Line 1406 | Line 971 | serv_connect_callback(fde_t *fd, int sta
971		/* COMM_OK, so continue the connection procedure */
972		/* Get the C/N lines */
973		conf = find_conf_name(&client_p->localClient->confs,
974	<	client_p->name, CONF_SERVER);
974	>	client_p->name, CONF_SERVER);
975		if (conf == NULL)
976		{
977		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
978	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
978	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
979		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
980	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
980	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
981
982	<	exit_client(client_p, &me, "Lost connect{} block");
982	>	exit_client(client_p, "Lost connect{} block");
983		return;
984		}
985
#	Line 1429 | Line 994 | serv_connect_callback(fde_t *fd, int sta
994		}
995		#endif
996
997	<	/* jdc -- Check and send spasswd, not passwd. */
1433	<	if (!EmptyString(conf->spasswd))
1434	<	sendto_one(client_p, "PASS %s TS %d %s",
1435	<	conf->spasswd, TS_CURRENT, me.id);
997	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
998
999		send_capabilities(client_p, 0);
1000
1001	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1002	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1441	<	me.info);
1001	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1002	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1003
1004		/* If we've been marked dead because a send failed, just exit
1005		* here now and save everyone the trouble of us ever existing.
1006		*/
1007	<	if (IsDead(client_p))
1007	>	if (IsDead(client_p))
1008		{
1009		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1010	<	"%s[%s] went dead during handshake",
1010	>	"%s[%s] went dead during handshake",
1011		client_p->name,
1012	<	client_p->host);
1012	>	client_p->host);
1013		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1014	<	"%s went dead during handshake", client_p->name);
1014	>	"%s went dead during handshake", client_p->name);
1015		return;
1016		}
1017
#	Line 1470 | Line 1031 | find_servconn_in_progress(const char *na
1031		cptr = ptr->data;
1032
1033		if (cptr && cptr->name[0])
1034	<	if (match(name, cptr->name))
1034	>	if (!match(name, cptr->name))
1035		return cptr;
1036		}
1037	<
1037	>
1038		return NULL;
1039		}

Diff Legend

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