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/branches/8.2.x/src/server.c (file contents), Revision 4112 by michael, Tue Jul 1 16:02:36 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);
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
121	–	if (MessageFileptr->contentsOfFile)
122	–	{
123	–	if (currentMessageLine)
124	–	currentMessageLine->next = newMessageLine;
125	–	currentMessageLine = newMessageLine;
126	–	}
127	–	else
128	–	{
129	–	MessageFileptr->contentsOfFile = newMessageLine;
130	–	currentMessageLine = newMessageLine;
131	–	}
132	–
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;
161		dlink_node *ptr;
167	–	int wilds;
162
163		/* Assume it's me, if no server */
164		if (parc <= server || EmptyString(parv[server]))
165		return HUNTED_ISME;
166
167	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
167	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
168		return HUNTED_ISME;
169
170		/* These are to pickup matches that would cause the following
#	Line 180 | Line 174 | hunt_server(struct Client *client_p, str
174		if (MyClient(source_p))
175		target_p = hash_find_client(parv[server]);
176		else
177	<	target_p = find_person(client_p, parv[server]);
177	>	target_p = find_person(source_p, parv[server]);
178
179		if (target_p)
180		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 190 | Line 184 | hunt_server(struct Client *client_p, str
184		if (target_p->from == source_p->from && !MyConnect(target_p))
185		target_p = NULL;
186
193	–	collapse(parv[server]);
194	–	wilds = has_wildcards(parv[server]);
195	–
187		/* Again, if there are no wild cards involved in the server
188		* name, use the hash lookup
189		*/
190		if (target_p == NULL)
191		{
192	<	if (!wilds)
192	>	if (!has_wildcards(parv[server]))
193		{
194		if (!(target_p = hash_find_server(parv[server])))
195		{
196	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
197	<	me.name, source_p->name, parv[server]);
207	<	return(HUNTED_NOSUCH);
196	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
197	>	return HUNTED_NOSUCH;
198		}
199		}
200		else
#	Line 213 | Line 203 | hunt_server(struct Client *client_p, str
203		{
204		target_tmp = ptr->data;
205
206	<	if (match(parv[server], target_tmp->name))
206	>	if (!match(parv[server], target_tmp->name))
207		{
208		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
209		continue;
210		target_p = ptr->data;
211
212	<	if (IsRegistered(target_p) && (target_p != client_p))
212	>	if (IsRegistered(target_p) && (target_p != source_p->from))
213		break;
214		}
215		}
216		}
217		}
218
219	<	if (target_p != NULL)
219	>	if (target_p)
220		{
221	<	if(!IsRegistered(target_p))
221	>	if (!IsRegistered(target_p))
222		{
223	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
234	<	me.name, source_p->name, parv[server]);
223	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
224		return HUNTED_NOSUCH;
225		}
226
227		if (IsMe(target_p) || MyClient(target_p))
228		return HUNTED_ISME;
229
230	<	if (!match(target_p->name, parv[server]))
230	>	if (match(target_p->name, parv[server]))
231		parv[server] = target_p->name;
232
233		/* This is a little kludgy but should work... */
234	<	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],
234	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
235		parv[1], parv[2], parv[3], parv[4],
236		parv[5], parv[6], parv[7], parv[8]);
237	<	return(HUNTED_PASS);
238	<	}
237	>	return HUNTED_PASS;
238	>	}
239
240	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
241	<	me.name, source_p->name, parv[server]);
258	<	return(HUNTED_NOSUCH);
240	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
241	>	return HUNTED_NOSUCH;
242		}
243
244		/* try_connections()
#	Line 272 | Line 255 | void
255		try_connections(void *unused)
256		{
257		dlink_node *ptr = NULL;
258	<	struct MaskItem *conf;
276	<	int confrq;
258	>	int confrq = 0;
259
260		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
261		if (GlobalSetOptions.autoconn == 0)
#	Line 281 | Line 263 | try_connections(void *unused)
263
264		DLINK_FOREACH(ptr, server_items.head)
265		{
266	<	conf = ptr->data;
266	>	struct MaskItem *conf = ptr->data;
267
268		assert(conf->type == CONF_SERVER);
269
270	<	/* Also when already connecting! (update holdtimes) --SRB
270	>	/* Also when already connecting! (update holdtimes) --SRB
271		*/
272		if (!conf->port ||!IsConfAllowAutoConn(conf))
273		continue;
#	Line 297 | Line 279 | try_connections(void *unused)
279		* made one successfull connection... [this algorithm is
280		* a bit fuzzy... -- msa >;) ]
281		*/
282	<	if (conf->hold > CurrentTime)
282	>	if (conf->until > CurrentTime)
283		continue;
284
285	<	if (conf->class == NULL)
304	<	confrq = DEFAULT_CONNECTFREQUENCY;
305	<	else
306	<	{
307	<	confrq = conf->class->con_freq;
308	<	if (confrq < MIN_CONN_FREQ)
309	<	confrq = MIN_CONN_FREQ;
310	<	}
285	>	assert(conf->class);
286
287	<	conf->hold = CurrentTime + confrq;
287	>	confrq = conf->class->con_freq;
288	>	if (confrq < MIN_CONN_FREQ)
289	>	confrq = MIN_CONN_FREQ;
290
291	<	/* Found a CONNECT config with port specified, scan clients
291	>	conf->until = CurrentTime + confrq;
292	>
293	>	/*
294	>	* Found a CONNECT config with port specified, scan clients
295		* and see if this server is already connected?
296		*/
297	<	if (hash_find_server(conf->name) != NULL)
297	>	if (hash_find_server(conf->name))
298		continue;
299
300		if (conf->class->ref_count < conf->class->max_total)
301		{
302		/* Go to the end of the list, if not already last */
303	<	if (ptr->next != NULL)
303	>	if (ptr->next)
304		{
305		dlinkDelete(ptr, &server_items);
306		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 329 | Line 309 | try_connections(void *unused)
309		if (find_servconn_in_progress(conf->name))
310		return;
311
312	<	/* We used to only print this if serv_connect() actually
312	>	/*
313	>	* We used to only print this if serv_connect() actually
314		* succeeded, but since comm_tcp_connect() can call the callback
315		* immediately if there is an error, we were getting error messages
316		* in the wrong order. SO, we just print out the activated line,
#	Line 356 | Line 337 | try_connections(void *unused)
337		int
338		valid_servname(const char *name)
339		{
340	<	unsigned int length = 0;
360	<	unsigned int dots   = 0;
340	>	unsigned int dots = 0;
341		const char *p = name;
342
343		for (; *p; ++p)
#	Line 365 | Line 345 | valid_servname(const char *name)
345		if (!IsServChar(*p))
346		return 0;
347
368	–	++length;
369	–
348		if (*p == '.')
349		++dots;
350		}
351
352	<	return dots != 0 && length <= HOSTLEN;
352	>	return dots && (p - name) <= HOSTLEN;
353		}
354
355		int
#	Line 382 | Line 360 | check_server(const char *name, struct Cl
360		struct MaskItem *server_conf = NULL;
361		int error = -1;
362
363	<	assert(client_p != NULL);
363	>	assert(client_p);
364
365		/* loop through looking for all possible connect items that might work */
366		DLINK_FOREACH(ptr, server_items.head)
367		{
368		conf = ptr->data;
369
370	<	if (!match(name, conf->name))
370	>	if (match(name, conf->name))
371		continue;
372
373		error = -3;
374
375		/* XXX: Fix me for IPv6                    */
376		/* XXX sockhost is the IPv4 ip as a string */
377	<	if (match(conf->host, client_p->host) ||
378	<	match(conf->host, client_p->sockhost))
377	>	if (!match(conf->host, client_p->host) ||
378	>	!match(conf->host, client_p->sockhost))
379		{
380		error = -2;
381
382		if (!match_conf_password(client_p->localClient->passwd, conf))
383		return -2;
384
385	+	if (!EmptyString(conf->certfp))
386	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
387	+	return -4;
388	+
389		server_conf = conf;
390		}
391		}
392
393		if (server_conf == NULL)
394	<	return(error);
394	>	return error;
395
396		attach_conf(client_p, server_conf);
397
398
399	<	if (server_conf != NULL)
399	>	if (server_conf)
400		{
401		struct sockaddr_in *v4;
402		#ifdef IPV6
#	Line 423 | Line 405 | check_server(const char *name, struct Cl
405		switch (server_conf->aftype)
406		{
407		#ifdef IPV6
408	<	case AF_INET6:
408	>	case AF_INET6:
409		v6 = (struct sockaddr_in6 *)&server_conf->addr;
410
411		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
#	Line 434 | Line 416 | check_server(const char *name, struct Cl
416		v4 = (struct sockaddr_in *)&server_conf->addr;
417
418		if (v4->sin_addr.s_addr == INADDR_NONE)
419	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
419	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
420		break;
421		}
422		}
423
424	<	return(0);
424	>	return 0;
425		}
426
427		/* add_capability()
#	Line 454 | Line 436 | check_server(const char *name, struct Cl
436		void
437		add_capability(const char *capab_name, int cap_flag, int add_to_default)
438		{
439	<	struct Capability *cap = MyMalloc(sizeof(*cap));
439	>	struct Capability *cap = MyCalloc(sizeof(*cap));
440
441	<	DupString(cap->name, capab_name);
441	>	cap->name = xstrdup(capab_name);
442		cap->cap = cap_flag;
443		dlinkAdd(cap, &cap->node, &cap_list);
444
#	Line 473 | Line 455 | add_capability(const char *capab_name, i
455		int
456		delete_capability(const char *capab_name)
457		{
458	<	dlink_node *ptr;
477	<	dlink_node *next_ptr;
478	<	struct Capability *cap;
458	>	dlink_node *ptr = NULL, *ptr_next = NULL;
459
460	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
460	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
461		{
462	<	cap = ptr->data;
462	>	struct Capability *cap = ptr->data;
463
464	<	if (cap->cap != 0)
464	>	if (cap->cap)
465		{
466	<	if (irccmp(cap->name, capab_name) == 0)
466	>	if (!irccmp(cap->name, capab_name))
467		{
468	<	default_server_capabs &= ~(cap->cap);
469	<	dlinkDelete(ptr, &cap_list);
470	<	MyFree(cap->name);
471	<	cap->name = NULL;
492	<	MyFree(cap);
468	>	default_server_capabs &= ~(cap->cap);
469	>	dlinkDelete(ptr, &cap_list);
470	>	MyFree(cap->name);
471	>	MyFree(cap);
472		}
473		}
474		}
#	Line 504 | Line 483 | delete_capability(const char *capab_name
483		* output       - 0 if not found CAPAB otherwise
484		* side effects - none
485		*/
486	<	int
486	>	unsigned int
487		find_capability(const char *capab)
488		{
489		const dlink_node *ptr = NULL;
#	Line 531 | Line 510 | find_capability(const char *capab)
510		void
511		send_capabilities(struct Client *client_p, int cap_can_send)
512		{
513	<	struct Capability *cap=NULL;
514	<	char msgbuf[IRCD_BUFSIZE];
536	<	char *t;
537	<	int tl;
538	<	dlink_node *ptr;
539	<
540	<	t = msgbuf;
513	>	char buf[IRCD_BUFSIZE] = "";
514	>	const dlink_node *ptr = NULL;
515
516		DLINK_FOREACH(ptr, cap_list.head)
517		{
518	<	cap = ptr->data;
518	>	const struct Capability *cap = ptr->data;
519
520		if (cap->cap & (cap_can_send|default_server_capabs))
521		{
522	<	tl = ircsprintf(t, "%s ", cap->name);
523	<	t += tl;
522	>	strlcat(buf, cap->name, sizeof(buf));
523	>	if (ptr->next)
524	>	strlcat(buf, " ", sizeof(buf));
525		}
526		}
527
528	<	*(t - 1) = '\0';
554	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
555	<	}
556	<
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	<
528	>	sendto_one(client_p, "CAPAB :%s", buf);
529		}
530
531		/*
#	Line 628 | Line 536 | sendnick_TS(struct Client *client_p, str
536		* side effects - build up string representing capabilities of server listed
537		*/
538		const char *
539	<	show_capabilities(struct Client *target_p)
539	>	show_capabilities(const struct Client *target_p)
540		{
541	<	static char msgbuf[IRCD_BUFSIZE];
542	<	char *t = msgbuf;
635	<	dlink_node *ptr;
541	>	static char msgbuf[IRCD_BUFSIZE] = "";
542	>	const dlink_node *ptr = NULL;
543
544	<	t += ircsprintf(msgbuf, "TS ");
544	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
545
546		DLINK_FOREACH(ptr, cap_list.head)
547		{
548		const struct Capability *cap = ptr->data;
549
550	<	if (IsCapable(target_p, cap->cap))
551	<	t += ircsprintf(t, "%s ", cap->name);
550	>	if (!IsCapable(target_p, cap->cap))
551	>	continue;
552	>
553	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
554	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
555		}
556
647	–	*(t - 1) = '\0';
557		return msgbuf;
558		}
559
#	Line 659 | Line 568 | struct Server *
568		make_server(struct Client *client_p)
569		{
570		if (client_p->serv == NULL)
571	<	client_p->serv = MyMalloc(sizeof(struct Server));
571	>	client_p->serv = MyCalloc(sizeof(struct Server));
572
573		return client_p->serv;
574		}
575
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	–
576		/* New server connection code
577		* Based upon the stuff floating about in s_bsd.c
578		*   -- adrian
#	Line 1044 | Line 580 | burst_members(struct Client *client_p, s
580
581		/* serv_connect() - initiate a server connection
582		*
583	<	* inputs       - pointer to conf
583	>	* inputs       - pointer to conf
584		*              - pointer to client doing the connect
585		* output       -
586		* side effects -
#	Line 1061 | Line 597 | burst_members(struct Client *client_p, s
597		int
598		serv_connect(struct MaskItem *conf, struct Client *by)
599		{
600	<	struct Client *client_p;
601	<	char buf[HOSTIPLEN + 1];
600	>	struct Client *client_p = NULL;
601	>	char buf[HOSTIPLEN + 1] = "";
602
603		/* conversion structs */
604		struct sockaddr_in *v4;
1069	–	/* Make sure conf is useful */
1070	–	assert(conf != NULL);
605
606	+	/* Make sure conf is useful */
607	+	assert(conf);
608
609		getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
610		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
#	Line 1081 | Line 617 | serv_connect(struct MaskItem *conf, stru
617		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
618		"Error connecting to %s: DNS lookup for connect{} in progress.",
619		conf->name);
620	<	return (0);
620	>	return 0;
621		}
622
623		if (conf->dns_failed)
#	Line 1089 | Line 625 | serv_connect(struct MaskItem *conf, stru
625		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
626		"Error connecting to %s: DNS lookup for connect{} failed.",
627		conf->name);
628	<	return (0);
628	>	return 0;
629		}
630
631		/* Make sure this server isn't already connected
632		* Note: conf should ALWAYS be a valid C: line
633		*/
634	<	if ((client_p = hash_find_server(conf->name)) != NULL)
635	<	{
634	>	if ((client_p = hash_find_server(conf->name)))
635	>	{
636		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
637	<	"Server %s already present from %s",
638	<	conf->name, get_client_name(client_p, SHOW_IP));
637	>	"Server %s already present from %s",
638	>	conf->name, get_client_name(client_p, SHOW_IP));
639		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
640	<	"Server %s already present from %s",
641	<	conf->name, get_client_name(client_p, MASK_IP));
640	>	"Server %s already present from %s",
641	>	conf->name, get_client_name(client_p, MASK_IP));
642		if (by && IsClient(by) && !MyClient(by))
643	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
644	<	me.name, by->name, conf->name,
645	<	get_client_name(client_p, MASK_IP));
1110	<	return (0);
643	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
644	>	conf->name, get_client_name(client_p, MASK_IP));
645	>	return 0;
646		}
647	<
647	>
648		/* Create a local client */
649		client_p = make_client(NULL);
650
#	Line 1120 | Line 655 | serv_connect(struct MaskItem *conf, stru
655		/* We already converted the ip once, so lets use it - stu */
656		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
657
658	<	/* create a socket for the server connection */
659	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1125	<	SOCK_STREAM, 0, NULL) < 0)
658	>	/* create a socket for the server connection */
659	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
660		{
661		/* Eek, failure to create the socket */
662	<	report_error(L_ALL,
663	<	"opening stream socket to %s: %s", conf->name, errno);
662	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
663	>
664		SetDead(client_p);
665	<	exit_client(client_p, &me, "Connection failed");
666	<	return (0);
665	>	exit_client(client_p, "Connection failed");
666	>	return 0;
667		}
668
669		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1141 | Line 675 | serv_connect(struct MaskItem *conf, stru
675		if (!attach_connect_block(client_p, conf->name, conf->host))
676		{
677		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
678	<	"Host %s is not enabled for connecting: no connect{} block",
679	<	conf->name);
680	<	if (by && IsClient(by) && !MyClient(by))
681	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
682	<	me.name, by->name, client_p->name);
678	>	"Host %s is not enabled for connecting: no connect{} block",
679	>	conf->name);
680	>	if (by && IsClient(by) && !MyClient(by))
681	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
682	>
683		SetDead(client_p);
684	<	exit_client(client_p, client_p, "Connection failed");
685	<	return (0);
684	>	exit_client(client_p, "Connection failed");
685	>	return 0;
686		}
687
688		/* at this point we have a connection in progress and C/N lines
#	Line 1166 | Line 700 | serv_connect(struct MaskItem *conf, stru
700
701		SetConnecting(client_p);
702		dlinkAdd(client_p, &client_p->node, &global_client_list);
703	<	/* from def_fam */
703	>
704		client_p->localClient->aftype = conf->aftype;
705
706		/* Now, initiate the connection */
707	<	/* XXX assume that a non 0 type means a specific bind address
707	>	/* XXX assume that a non 0 type means a specific bind address
708		* for this connect.
709		*/
710		switch (conf->aftype)
711		{
712		case AF_INET:
713		v4 = (struct sockaddr_in*)&conf->bind;
714	<	if (v4->sin_addr.s_addr != 0)
714	>	if (v4->sin_addr.s_addr)
715		{
716		struct irc_ssaddr ipn;
717		memset(&ipn, 0, sizeof(struct irc_ssaddr));
718		ipn.ss.ss_family = AF_INET;
719		ipn.ss_port = 0;
720		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
721	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
722	<	(struct sockaddr *)&ipn, ipn.ss_len,
723	<	serv_connect_callback, client_p, conf->aftype,
724	<	CONNECTTIMEOUT);
721	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
722	>	(struct sockaddr *)&ipn, ipn.ss_len,
723	>	serv_connect_callback, client_p, conf->aftype,
724	>	CONNECTTIMEOUT);
725		}
726		else if (ServerInfo.specific_ipv4_vhost)
727		{
#	Line 1199 | Line 733 | serv_connect(struct MaskItem *conf, stru
733		comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
734		(struct sockaddr *)&ipn, ipn.ss_len,
735		serv_connect_callback, client_p, conf->aftype,
736	<	CONNECTTIMEOUT);
736	>	CONNECTTIMEOUT);
737		}
738		else
739	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
740	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
739	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
740	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
741		CONNECTTIMEOUT);
742		break;
743		#ifdef IPV6
744		case AF_INET6:
745		{
746	<	struct irc_ssaddr ipn;
747	<	struct sockaddr_in6 *v6;
748	<	struct sockaddr_in6 *v6conf;
749	<
750	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
751	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
752	<	v6 = (struct sockaddr_in6 *)&ipn;
753	<
754	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
755	<	sizeof(struct in6_addr)) != 0)
756	<	{
757	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
758	<	ipn.ss.ss_family = AF_INET6;
759	<	ipn.ss_port = 0;
760	<	comm_connect_tcp(&client_p->localClient->fd,
761	<	conf->host, conf->port,
762	<	(struct sockaddr *)&ipn, ipn.ss_len,
763	<	serv_connect_callback, client_p,
764	<	conf->aftype, CONNECTTIMEOUT);
765	<	}
1232	<	else if (ServerInfo.specific_ipv6_vhost)
746	>	struct irc_ssaddr ipn;
747	>	struct sockaddr_in6 *v6;
748	>	struct sockaddr_in6 *v6conf;
749	>
750	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
751	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
752	>	v6 = (struct sockaddr_in6 *)&ipn;
753	>
754	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
755	>	{
756	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
757	>	ipn.ss.ss_family = AF_INET6;
758	>	ipn.ss_port = 0;
759	>	comm_connect_tcp(&client_p->localClient->fd,
760	>	conf->host, conf->port,
761	>	(struct sockaddr *)&ipn, ipn.ss_len,
762	>	serv_connect_callback, client_p,
763	>	conf->aftype, CONNECTTIMEOUT);
764	>	}
765	>	else if (ServerInfo.specific_ipv6_vhost)
766		{
767	<	memcpy(&ipn, &ServerInfo.ip6, 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
777	<	comm_connect_tcp(&client_p->localClient->fd,
778	<	conf->host, conf->port,
779	<	NULL, 0, serv_connect_callback, client_p,
780	<	conf->aftype, CONNECTTIMEOUT);
767	>	memcpy(&ipn, &ServerInfo.ip6, 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
777	>	comm_connect_tcp(&client_p->localClient->fd,
778	>	conf->host, conf->port,
779	>	NULL, 0, serv_connect_callback, client_p,
780	>	conf->aftype, CONNECTTIMEOUT);
781		}
782		#endif
783		}
784	<	return (1);
784	>	return 1;
785		}
786
787		#ifdef HAVE_LIBCRYPTO
#	Line 1266 | Line 799 | finish_ssl_server_handshake(struct Clien
799		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
800		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
801
802	<	exit_client(client_p, &me, "Lost connect{} block");
802	>	exit_client(client_p, "Lost connect{} block");
803		return;
804		}
805
806	<	/* 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);
806	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
807
808		send_capabilities(client_p, 0);
809
#	Line 1303 | Line 833 | finish_ssl_server_handshake(struct Clien
833		static void
834		ssl_server_handshake(fde_t *fd, struct Client *client_p)
835		{
836	<	int ret;
837	<	int err;
1308	<
1309	<	ret = SSL_connect(client_p->localClient->fd.ssl);
836	>	X509 *cert = NULL;
837	>	int ret = 0;
838
839	<	if (ret <= 0)
839	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
840		{
841	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
841	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
842		{
843		case SSL_ERROR_WANT_WRITE:
844		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1326 | Line 854 | ssl_server_handshake(fde_t *fd, struct C
854		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
855		"Error connecting to %s: %s", client_p->name,
856		sslerr ? sslerr : "unknown SSL error");
857	<	exit_client(client_p, client_p, "Error during SSL handshake");
857	>	exit_client(client_p, "Error during SSL handshake");
858		return;
859		}
860		}
861		}
862
863	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
864	+	{
865	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
866	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
867	+	unsigned char md[EVP_MAX_MD_SIZE] = "";
868	+
869	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
870	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
871	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
872	+	{
873	+	unsigned int n = 0;
874	+
875	+	if (X509_digest(cert, EVP_sha256(), md, &n))
876	+	{
877	+	binary_to_hex(md, buf, n);
878	+	client_p->certfp = xstrdup(buf);
879	+	}
880	+	}
881	+	else
882	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
883	+	client_p->name, client_p->username, client_p->host, res);
884	+	X509_free(cert);
885	+	}
886	+
887		finish_ssl_server_handshake(client_p);
888		}
889
#	Line 1343 | Line 895 | ssl_connect_init(struct Client *client_p
895		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
896		ERR_error_string(ERR_get_error(), NULL));
897		SetDead(client_p);
898	<	exit_client(client_p, client_p, "SSL_new failed");
898	>	exit_client(client_p, "SSL_new failed");
899		return;
900		}
901
#	Line 1357 | Line 909 | ssl_connect_init(struct Client *client_p
909		#endif
910
911		/* serv_connect_callback() - complete a server connection.
912	<	*
912	>	*
913		* This routine is called after the server connection attempt has
914		* completed. If unsucessful, an error is sent to ops and the client
915		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1371 | Line 923 | serv_connect_callback(fde_t *fd, int sta
923		struct MaskItem *conf = NULL;
924
925		/* First, make sure its a real client! */
926	<	assert(client_p != NULL);
926	>	assert(client_p);
927		assert(&client_p->localClient->fd == fd);
928
929		/* Next, for backward purposes, record the ip of the server */
930		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
931		sizeof(struct irc_ssaddr));
932	+
933		/* Check the status */
934		if (status != COMM_OK)
935		{
#	Line 1389 | Line 942 | serv_connect_callback(fde_t *fd, int sta
942		client_p->name, comm_errstr(status));
943		else
944		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
945	<	"Error connecting to %s[%s]: %s", client_p->name,
946	<	client_p->host, comm_errstr(status));
945	>	"Error connecting to %s[%s]: %s", client_p->name,
946	>	client_p->host, comm_errstr(status));
947
948		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
949	<	"Error connecting to %s: %s",
950	<	client_p->name, comm_errstr(status));
949	>	"Error connecting to %s: %s",
950	>	client_p->name, comm_errstr(status));
951
952		/* If a fd goes bad, call dead_link() the socket is no
953		* longer valid for reading or writing.
#	Line 1406 | Line 959 | serv_connect_callback(fde_t *fd, int sta
959		/* COMM_OK, so continue the connection procedure */
960		/* Get the C/N lines */
961		conf = find_conf_name(&client_p->localClient->confs,
962	<	client_p->name, CONF_SERVER);
962	>	client_p->name, CONF_SERVER);
963		if (conf == NULL)
964		{
965		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
966	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
966	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
967		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
968	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
968	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
969
970	<	exit_client(client_p, &me, "Lost connect{} block");
970	>	exit_client(client_p, "Lost connect{} block");
971		return;
972		}
973
#	Line 1429 | Line 982 | serv_connect_callback(fde_t *fd, int sta
982		}
983		#endif
984
985	<	/* 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);
985	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
986
987		send_capabilities(client_p, 0);
988
989	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
990	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1441	<	me.info);
989	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
990	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
991
992		/* If we've been marked dead because a send failed, just exit
993		* here now and save everyone the trouble of us ever existing.
994		*/
995	<	if (IsDead(client_p))
995	>	if (IsDead(client_p))
996		{
997		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
998	<	"%s[%s] went dead during handshake",
998	>	"%s[%s] went dead during handshake",
999		client_p->name,
1000	<	client_p->host);
1000	>	client_p->host);
1001		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1002	<	"%s went dead during handshake", client_p->name);
1002	>	"%s went dead during handshake", client_p->name);
1003		return;
1004		}
1005
#	Line 1470 | Line 1019 | find_servconn_in_progress(const char *na
1019		cptr = ptr->data;
1020
1021		if (cptr && cptr->name[0])
1022	<	if (match(name, cptr->name))
1022	>	if (!match(name, cptr->name))
1023		return cptr;
1024		}
1025	<
1025	>
1026		return NULL;
1027		}

Diff Legend

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