ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1483 by michael, Wed Jul 25 19:15:48 2012 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3136 by michael, Tue Mar 11 18:24:03 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 31 | Line 33
33		#include "channel.h"
34		#include "channel_mode.h"
35		#include "client.h"
34	–	#include "dbuf.h"
36		#include "event.h"
37		#include "fdlist.h"
38		#include "hash.h"
39		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
40		#include "ircd.h"
41		#include "ircd_defs.h"
42		#include "s_bsd.h"
#	Line 50 | Line 50
50		#include "s_user.h"
51		#include "send.h"
52		#include "memory.h"
53	<	#include "channel.h" /* chcap_usage_counts stuff...*/
53	>	#include "channel.h"
54		#include "parse.h"
55
56		#define MIN_CONN_FREQ 300
57
58	+	dlink_list flatten_links;
59		static dlink_list cap_list = { NULL, NULL, 0 };
60		static void server_burst(struct Client *);
61		static void burst_all(struct Client *);
#	Line 73 | Line 74 | static void burst_members(struct Client
74		*                but in no particular order.
75		*/
76		void
77	<	write_links_file(void* notused)
77	>	write_links_file(void *notused)
78		{
79	<	MessageFileLine *next_mptr = 0;
80	<	MessageFileLine *mptr = 0;
81	<	MessageFileLine *currentMessageLine = 0;
81	<	MessageFileLine *newMessageLine = 0;
82	<	MessageFile *MessageFileptr;
83	<	const char *p;
84	<	FILE *file;
85	<	char buff[512];
86	<	dlink_node *ptr;
87	<
88	<	MessageFileptr = &ConfigFileEntry.linksfile;
79	>	FILE *file = NULL;
80	>	dlink_node *ptr = NULL, *ptr_next = NULL;
81	>	char buff[IRCD_BUFSIZE] = { '\0' };
82
83	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
83	>	if ((file = fopen(LIPATH, "w")) == NULL)
84		return;
85
86	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
86	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
87		{
88	<	next_mptr = mptr->next;
89	<	MyFree(mptr);
88	>	dlinkDelete(ptr, &flatten_links);
89	>	MyFree(ptr->data);
90	>	free_dlink_node(ptr);
91		}
92
99	–	MessageFileptr->contentsOfFile = NULL;
100	–	currentMessageLine             = NULL;
101	–
93		DLINK_FOREACH(ptr, global_serv_list.head)
94		{
95		const struct Client *target_p = ptr->data;
96
97	<	/* skip ourselves, we send ourselves in /links */
98	<	if (IsMe(target_p))
97	>	/*
98	>	* Skip hidden servers, aswell as ourselves, since we already send
99	>	* ourselves in /links
100	>	*/
101	>	if (IsHidden(target_p) || IsMe(target_p))
102		continue;
103
104	<	/* skip hidden servers */
111	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
104	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
105		continue;
106
107	<	if (target_p->info[0])
108	<	p = target_p->info;
116	<	else
117	<	p = "(Unknown Location)";
118	<
119	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
120	<
121	<	/* Attempt to format the file in such a way it follows the usual links output
107	>	/*
108	>	* Attempt to format the file in such a way it follows the usual links output
109		* ie  "servername uplink :hops info"
110		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
111		* - madmax
112		*/
113	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
114	+	me.name, target_p->info);
115	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
116	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
117	+	me.name, target_p->info);
118
119	<	/*
120	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
129	<	* default config but it is configurable..
130	<	* This should be changed to an snprintf at some point, but I'm wanting to
131	<	* know if this is a cause of a bug - cryogen
132	<	*/
133	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
134	<	MESSAGELINELEN);
135	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
136	<	target_p->name, me.name, p);
137	<	newMessageLine->next = NULL;
119	>	fputs(buff, file);
120	>	}
121
122	<	if (MessageFileptr->contentsOfFile)
123	<	{
141	<	if (currentMessageLine)
142	<	currentMessageLine->next = newMessageLine;
143	<	currentMessageLine = newMessageLine;
144	<	}
145	<	else
146	<	{
147	<	MessageFileptr->contentsOfFile = newMessageLine;
148	<	currentMessageLine = newMessageLine;
149	<	}
122	>	fclose(file);
123	>	}
124
125	<	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
126	<	fputs(buff, file);
125	>	void
126	>	read_links_file(void)
127	>	{
128	>	FILE *file = NULL;
129	>	char *p = NULL;
130	>	char buff[IRCD_BUFSIZE] = { '\0' };
131	>
132	>	if ((file = fopen(LIPATH, "r")) == NULL)
133	>	return;
134	>
135	>	while (fgets(buff, sizeof(buff), file))
136	>	{
137	>	if ((p = strchr(buff, '\n')) != NULL)
138	>	*p = '\0';
139	>
140	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
141		}
142
143		fclose(file);
#	Line 176 | Line 164 | write_links_file(void* notused)
164		*/
165		int
166		hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
167	<	int server, int parc, char *parv[])
167	>	const int server, const int parc, char *parv[])
168		{
169		struct Client *target_p = NULL;
170		struct Client *target_tmp = NULL;
#	Line 187 | Line 175 | hunt_server(struct Client *client_p, str
175		if (parc <= server || EmptyString(parv[server]))
176		return HUNTED_ISME;
177
178	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
178	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
179		return HUNTED_ISME;
180
181		/* These are to pickup matches that would cause the following
#	Line 207 | Line 195 | hunt_server(struct Client *client_p, str
195		if (target_p->from == source_p->from && !MyConnect(target_p))
196		target_p = NULL;
197
210	–	collapse(parv[server]);
198		wilds = has_wildcards(parv[server]);
199
200		/* Again, if there are no wild cards involved in the server
#	Line 219 | Line 206 | hunt_server(struct Client *client_p, str
206		{
207		if (!(target_p = hash_find_server(parv[server])))
208		{
209	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
210	<	me.name, source_p->name, parv[server]);
224	<	return(HUNTED_NOSUCH);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 230 | Line 216 | hunt_server(struct Client *client_p, str
216		{
217		target_tmp = ptr->data;
218
219	<	if (match(parv[server], target_tmp->name))
219	>	if (!match(parv[server], target_tmp->name))
220		{
221		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
222		continue;
#	Line 247 | Line 233 | hunt_server(struct Client *client_p, str
233		{
234		if(!IsRegistered(target_p))
235		{
236	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
251	<	me.name, source_p->name, parv[server]);
236	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237		return HUNTED_NOSUCH;
238		}
239
240		if (IsMe(target_p) || MyClient(target_p))
241		return HUNTED_ISME;
242
243	<	if (!match(target_p->name, parv[server]))
243	>	if (match(target_p->name, parv[server]))
244		parv[server] = target_p->name;
245
246		/* This is a little kludgy but should work... */
247	<	if (IsClient(source_p) &&
263	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
264	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
265	<	parv[0] = ID(source_p);
266	<
267	<	sendto_one(target_p, command, parv[0],
247	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
248		parv[1], parv[2], parv[3], parv[4],
249		parv[5], parv[6], parv[7], parv[8]);
250	<	return(HUNTED_PASS);
251	<	}
250	>	return HUNTED_PASS;
251	>	}
252
253	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
254	<	me.name, source_p->name, parv[server]);
275	<	return(HUNTED_NOSUCH);
253	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
254	>	return HUNTED_NOSUCH;
255		}
256
257		/* try_connections()
#	Line 288 | Line 267 | hunt_server(struct Client *client_p, str
267		void
268		try_connections(void *unused)
269		{
270	<	dlink_node *ptr;
271	<	struct ConfItem *conf;
293	<	struct AccessItem *aconf;
294	<	struct ClassItem *cltmp;
270	>	dlink_node *ptr = NULL;
271	>	struct MaskItem *conf;
272		int confrq;
273
274		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 301 | Line 278 | try_connections(void *unused)
278		DLINK_FOREACH(ptr, server_items.head)
279		{
280		conf = ptr->data;
304	–	aconf = map_to_conf(conf);
281
282	<	/* Also when already connecting! (update holdtimes) --SRB
282	>	assert(conf->type == CONF_SERVER);
283	>
284	>	/* Also when already connecting! (update holdtimes) --SRB
285		*/
286	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
309	<	!(IsConfAllowAutoConn(aconf)))
286	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
287		continue;
288
312	–	cltmp = map_to_conf(aconf->class_ptr);
289
290		/* Skip this entry if the use of it is still on hold until
291		* future. Otherwise handle this entry (and set it on hold
#	Line 317 | Line 293 | try_connections(void *unused)
293		* made one successfull connection... [this algorithm is
294		* a bit fuzzy... -- msa >;) ]
295		*/
296	<	if (aconf->hold > CurrentTime)
296	>	if (conf->until > CurrentTime)
297		continue;
298
299	<	if (cltmp == NULL)
299	>	if (conf->class == NULL)
300		confrq = DEFAULT_CONNECTFREQUENCY;
301		else
302		{
303	<	confrq = cltmp->con_freq;
303	>	confrq = conf->class->con_freq;
304		if (confrq < MIN_CONN_FREQ)
305	<	confrq = MIN_CONN_FREQ;
305	>	confrq = MIN_CONN_FREQ;
306		}
307
308	<	aconf->hold = CurrentTime + confrq;
308	>	conf->until = CurrentTime + confrq;
309
310		/* Found a CONNECT config with port specified, scan clients
311		* and see if this server is already connected?
#	Line 337 | Line 313 | try_connections(void *unused)
313		if (hash_find_server(conf->name) != NULL)
314		continue;
315
316	<	if (cltmp->curr_user_count < cltmp->max_total)
316	>	if (conf->class->ref_count < conf->class->max_total)
317		{
318		/* Go to the end of the list, if not already last */
319		if (ptr->next != NULL)
#	Line 358 | Line 334 | try_connections(void *unused)
334		*   -- adrian
335		*/
336		if (ConfigServerHide.hide_server_ips)
337	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
337	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
338	>	"Connection to %s activated.",
339		conf->name);
340		else
341	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
342	<	conf->name, aconf->host);
341	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
342	>	"Connection to %s[%s] activated.",
343	>	conf->name, conf->host);
344
345	<	serv_connect(aconf, NULL);
345	>	serv_connect(conf, NULL);
346		/* We connect only one at time... */
347		return;
348		}
#	Line 396 | Line 374 | int
374		check_server(const char *name, struct Client *client_p)
375		{
376		dlink_node *ptr;
377	<	struct ConfItem *conf           = NULL;
378	<	struct ConfItem *server_conf    = NULL;
401	<	struct AccessItem *server_aconf = NULL;
402	<	struct AccessItem *aconf        = NULL;
377	>	struct MaskItem *conf        = NULL;
378	>	struct MaskItem *server_conf = NULL;
379		int error = -1;
380
381		assert(client_p != NULL);
#	Line 408 | Line 384 | check_server(const char *name, struct Cl
384		DLINK_FOREACH(ptr, server_items.head)
385		{
386		conf = ptr->data;
411	–	aconf = map_to_conf(conf);
387
388	<	if (!match(name, conf->name))
388	>	if (match(name, conf->name))
389		continue;
390
391		error = -3;
392
393		/* XXX: Fix me for IPv6                    */
394		/* XXX sockhost is the IPv4 ip as a string */
395	<	if (match(aconf->host, client_p->host) ||
396	<	match(aconf->host, client_p->sockhost))
395	>	if (!match(conf->host, client_p->host) ||
396	>	!match(conf->host, client_p->sockhost))
397		{
398		error = -2;
399
400	<	if (!match_conf_password(client_p->localClient->passwd, aconf))
400	>	if (!match_conf_password(client_p->localClient->passwd, conf))
401		return -2;
402
403	+	if (!EmptyString(conf->certfp))
404	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
405	+	return -4;
406	+
407		server_conf = conf;
408		}
409		}
410
411		if (server_conf == NULL)
412	<	return(error);
412	>	return error;
413
414		attach_conf(client_p, server_conf);
415
437	–	server_aconf = map_to_conf(server_conf);
416
417	<	if (!IsConfTopicBurst(server_aconf))
440	<	ClearCap(client_p, CAP_TBURST);
441	<
442	<	if (aconf != NULL)
417	>	if (server_conf != NULL)
418		{
419		struct sockaddr_in *v4;
420		#ifdef IPV6
421		struct sockaddr_in6 *v6;
422		#endif
423	<	switch (aconf->aftype)
423	>	switch (server_conf->aftype)
424		{
425		#ifdef IPV6
426	<	case AF_INET6:
427	<	v6 = (struct sockaddr_in6 *)&aconf->addr;
426	>	case AF_INET6:
427	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
428
429		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
430	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
430	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
431		break;
432		#endif
433		case AF_INET:
434	<	v4 = (struct sockaddr_in *)&aconf->addr;
434	>	v4 = (struct sockaddr_in *)&server_conf->addr;
435
436		if (v4->sin_addr.s_addr == INADDR_NONE)
437	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
437	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
438		break;
439		}
440		}
441
442	<	return(0);
442	>	return 0;
443		}
444
445		/* add_capability()
#	Line 481 | Line 456 | add_capability(const char *capab_name, i
456		{
457		struct Capability *cap = MyMalloc(sizeof(*cap));
458
459	<	DupString(cap->name, capab_name);
459	>	cap->name = xstrdup(capab_name);
460		cap->cap = cap_flag;
461		dlinkAdd(cap, &cap->node, &cap_list);
462
#	Line 510 | Line 485 | delete_capability(const char *capab_name
485		{
486		if (irccmp(cap->name, capab_name) == 0)
487		{
488	<	default_server_capabs &= ~(cap->cap);
489	<	dlinkDelete(ptr, &cap_list);
490	<	MyFree(cap->name);
491	<	cap->name = NULL;
517	<	MyFree(cap);
488	>	default_server_capabs &= ~(cap->cap);
489	>	dlinkDelete(ptr, &cap_list);
490	>	MyFree(cap->name);
491	>	MyFree(cap);
492		}
493		}
494		}
#	Line 529 | Line 503 | delete_capability(const char *capab_name
503		* output       - 0 if not found CAPAB otherwise
504		* side effects - none
505		*/
506	<	int
506	>	unsigned int
507		find_capability(const char *capab)
508		{
509		const dlink_node *ptr = NULL;
#	Line 548 | Line 522 | find_capability(const char *capab)
522		/* send_capabilities()
523		*
524		* inputs       - Client pointer to send to
551	–	*              - Pointer to AccessItem (for crypt)
525		*              - int flag of capabilities that this server can send
526		* output       - NONE
527		* side effects - send the CAPAB line to a server  -orabidoo
528		*
529		*/
530		void
531	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
559	<	int cap_can_send)
531	>	send_capabilities(struct Client *client_p, int cap_can_send)
532		{
533		struct Capability *cap=NULL;
534		char msgbuf[IRCD_BUFSIZE];
#	Line 572 | Line 544 | send_capabilities(struct Client *client_
544
545		if (cap->cap & (cap_can_send|default_server_capabs))
546		{
547	<	tl = ircsprintf(t, "%s ", cap->name);
547	>	tl = sprintf(t, "%s ", cap->name);
548		t += tl;
549		}
550		}
#	Line 582 | Line 554 | send_capabilities(struct Client *client_
554		}
555
556		/* sendnick_TS()
557	<	*
557	>	*
558		* inputs       - client (server) to send nick towards
559		*          - client to send nick for
560		* output       - NONE
#	Line 591 | Line 563 | send_capabilities(struct Client *client_
563		void
564		sendnick_TS(struct Client *client_p, struct Client *target_p)
565		{
566	<	static char ubuf[12];
566	>	char ubuf[IRCD_BUFSIZE];
567
568		if (!IsClient(target_p))
569		return;
#	Line 604 | Line 576 | sendnick_TS(struct Client *client_p, str
576		ubuf[1] = '\0';
577		}
578
607	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
579		if (IsCapable(client_p, CAP_SVS))
580	<	{
581	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
582	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
583	<	target_p->servptr->id,
584	<	target_p->name, target_p->hopcount + 1,
585	<	(unsigned long) target_p->tsinfo,
586	<	ubuf, target_p->username, target_p->host,
587	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
617	<	"0" : target_p->sockhost, target_p->id,
618	<	(unsigned long)target_p->servicestamp, target_p->info);
619	<	else
620	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
621	<	target_p->name, target_p->hopcount + 1,
622	<	(unsigned long) target_p->tsinfo,
623	<	ubuf, target_p->username, target_p->host,
624	<	target_p->servptr->name, (unsigned long)target_p->servicestamp,
625	<	target_p->info);
626	<	}
580	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
581	>	target_p->servptr->id,
582	>	target_p->name, target_p->hopcount + 1,
583	>	(unsigned long) target_p->tsinfo,
584	>	ubuf, target_p->username, target_p->host,
585	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
586	>	"0" : target_p->sockhost, target_p->id,
587	>	target_p->svid, target_p->info);
588		else
589	<	{
590	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
591	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
592	<	target_p->servptr->id,
593	<	target_p->name, target_p->hopcount + 1,
594	<	(unsigned long) target_p->tsinfo,
595	<	ubuf, target_p->username, target_p->host,
596	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
597	<	"0" : target_p->sockhost, target_p->id, target_p->info);
598	<	else
599	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
600	<	target_p->name, target_p->hopcount + 1,
601	<	(unsigned long) target_p->tsinfo,
602	<	ubuf, target_p->username, target_p->host,
603	<	target_p->servptr->name, target_p->info);
643	<	}
644	<
645	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->localClient->confs.head->data)))
646	<	if (target_p->away[0])
647	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
648	<	target_p->away);
589	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	>	target_p->servptr->id,
591	>	target_p->name, target_p->hopcount + 1,
592	>	(unsigned long) target_p->tsinfo,
593	>	ubuf, target_p->username, target_p->host,
594	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
595	>	"0" : target_p->sockhost, target_p->id, target_p->info);
596	>
597	>	if (!EmptyString(target_p->certfp))
598	>	sendto_one(client_p, ":%s CERTFP %s",
599	>	ID_or_name(target_p, client_p), target_p->certfp);
600	>
601	>	if (target_p->away[0])
602	>	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
603	>	target_p->away);
604
605		}
606
#	Line 657 | Line 612 | sendnick_TS(struct Client *client_p, str
612		* side effects - build up string representing capabilities of server listed
613		*/
614		const char *
615	<	show_capabilities(struct Client *target_p)
615	>	show_capabilities(const struct Client *target_p)
616		{
617	<	static char msgbuf[IRCD_BUFSIZE];
618	<	char *t = msgbuf;
664	<	dlink_node *ptr;
617	>	static char msgbuf[IRCD_BUFSIZE] = "";
618	>	const dlink_node *ptr = NULL;
619
620	<	t += ircsprintf(msgbuf, "TS ");
620	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
621
622		DLINK_FOREACH(ptr, cap_list.head)
623		{
624		const struct Capability *cap = ptr->data;
625
626	<	if (IsCapable(target_p, cap->cap))
627	<	t += ircsprintf(t, "%s ", cap->name);
626	>	if (!IsCapable(target_p, cap->cap))
627	>	continue;
628	>
629	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
630	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
631		}
632
676	–	*(t - 1) = '\0';
633		return msgbuf;
634		}
635
#	Line 703 | Line 659 | void
659		server_estab(struct Client *client_p)
660		{
661		struct Client *target_p;
662	<	struct ConfItem *conf;
707	<	struct AccessItem *aconf=NULL;
662	>	struct MaskItem *conf = NULL;
663		char *host;
664		const char *inpath;
665		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
#	Line 720 | Line 675 | server_estab(struct Client *client_p)
675		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
676		host   = client_p->name;
677
678	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
678	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
679		== NULL)
680		{
681		/* This shouldn't happen, better tell the ops... -A1kmm */
682	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
682	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
683	>	"Warning: Lost connect{} block "
684		"for server %s(this shouldn't happen)!", host);
685		exit_client(client_p, &me, "Lost connect{} block!");
686		return;
#	Line 739 | Line 695 | server_estab(struct Client *client_p)
695		/* If there is something in the serv_list, it might be this
696		* connecting server..
697		*/
698	<	if (!ServerInfo.hub && serv_list.head)
698	>	if (!ServerInfo.hub && serv_list.head)
699		{
700		if (client_p != serv_list.head->data || serv_list.head->next)
701		{
#	Line 750 | Line 706 | server_estab(struct Client *client_p)
706		}
707		}
708
753	–	aconf = map_to_conf(conf);
754	–
709		if (IsUnknown(client_p))
710		{
711	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
758	<	*        2.  Check aconf->spasswd, not aconf->passwd.
759	<	*/
760	<	if (!EmptyString(aconf->spasswd))
761	<	sendto_one(client_p, "PASS %s TS %d %s",
762	<	aconf->spasswd, TS_CURRENT, me.id);
763	<
764	<	/* Pass my info to the new server
765	<	*
766	<	* Pass on ZIP if supported
767	<	* Pass on TB if supported.
768	<	* - Dianora
769	<	*/
711	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
712
713	<	send_capabilities(client_p, aconf,
772	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
713	>	send_capabilities(client_p, 0);
714
715		sendto_one(client_p, "SERVER %s 1 :%s%s",
716		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
#	Line 778 | Line 719 | server_estab(struct Client *client_p)
719		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
720		(unsigned long)CurrentTime);
721
722	<	/* assumption here is if they passed the correct TS version, they also passed an SID */
782	<	if (IsCapable(client_p, CAP_TS6))
722	>	if (HasID(client_p))
723		hash_add_id(client_p);
724
725		/* XXX Does this ever happen? I don't think so -db */
726	<	detach_conf(client_p, OPER_TYPE);
726	>	detach_conf(client_p, CONF_OPER);
727
728		/* *WARNING*
729		**    In the following code in place of plain server's
#	Line 825 | Line 765 | server_estab(struct Client *client_p)
765		/* fixing eob timings.. -gnp */
766		client_p->localClient->firsttime = CurrentTime;
767
768	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
768	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
769		AddFlag(client_p, FLAGS_SERVICE);
770
771		/* Show the real host/IP to admins */
#	Line 835 | Line 775 | server_estab(struct Client *client_p)
775		compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
776		expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
777
778	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
778	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
779		"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
780		inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
781		compression ? SSL_COMP_get_name(compression) : "NONE",
782		expansion ? SSL_COMP_get_name(expansion) : "NONE",
783		show_capabilities(client_p));
784		/* Now show the masked hostname/IP to opers */
785	<	sendto_realops_flags(UMODE_ALL, L_OPER,
785	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
786		"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
787		inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
788		compression ? SSL_COMP_get_name(compression) : "NONE",
#	Line 857 | Line 797 | server_estab(struct Client *client_p)
797		else
798		#endif
799		{
800	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
800	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
801		"Link with %s established: (Capabilities: %s)",
802	<	inpath_ip,show_capabilities(client_p));
802	>	inpath_ip, show_capabilities(client_p));
803		/* Now show the masked hostname/IP to opers */
804	<	sendto_realops_flags(UMODE_ALL, L_OPER,
804	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
805		"Link with %s established: (Capabilities: %s)",
806	<	inpath,show_capabilities(client_p));
806	>	inpath, show_capabilities(client_p));
807		ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
808		inpath_ip, show_capabilities(client_p));
809		}
810
811		fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
812
813	<	/* Old sendto_serv_but_one() call removed because we now
814	<	** need to send different names to different servers
815	<	** (domain name matching) Send new server to other servers.
876	<	*/
877	<	DLINK_FOREACH(ptr, serv_list.head)
878	<	{
879	<	target_p = ptr->data;
880	<
881	<	if (target_p == client_p)
882	<	continue;
813	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
814	>	me.id, client_p->name, client_p->id,
815	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
816
817	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
818	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
819	<	me.id, client_p->name, client_p->id,
820	<	IsHidden(client_p) ? "(H) " : "",
821	<	client_p->info);
822	<	else
823	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
824	<	me.name, client_p->name,
825	<	IsHidden(client_p) ? "(H) " : "",
826	<	client_p->info);
827	<	}
828	<
829	<	/* Pass on my client information to the new server
830	<	**
831	<	** First, pass only servers (idea is that if the link gets
832	<	** cancelled beacause the server was already there,
833	<	** there are no NICK's to be cancelled...). Of course,
834	<	** if cancellation occurs, all this info is sent anyway,
902	<	** and I guess the link dies when a read is attempted...? --msa
903	<	**
904	<	** Note: Link cancellation to occur at this point means
905	<	** that at least two servers from my fragment are building
906	<	** up connection this other fragment at the same time, it's
907	<	** a race condition, not the normal way of operation...
908	<	**
909	<	** ALSO NOTE: using the get_client_name for server names--
910	<	**    see previous *WARNING*!!! (Also, original inpath
911	<	**    is destroyed...)
912	<	*/
817	>	/*
818	>	* Pass on my client information to the new server
819	>	*
820	>	* First, pass only servers (idea is that if the link gets
821	>	* cancelled beacause the server was already there,
822	>	* there are no NICK's to be cancelled...). Of course,
823	>	* if cancellation occurs, all this info is sent anyway,
824	>	* and I guess the link dies when a read is attempted...? --msa
825	>	*
826	>	* Note: Link cancellation to occur at this point means
827	>	* that at least two servers from my fragment are building
828	>	* up connection this other fragment at the same time, it's
829	>	* a race condition, not the normal way of operation...
830	>	*
831	>	* ALSO NOTE: using the get_client_name for server names--
832	>	*    see previous *WARNING*!!! (Also, original inpath
833	>	*    is destroyed...)
834	>	*/
835
836		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
837		{
#	Line 919 | Line 841 | server_estab(struct Client *client_p)
841		if (IsMe(target_p) || target_p->from == client_p)
842		continue;
843
844	<	if (IsCapable(client_p, CAP_TS6))
845	<	{
846	<	if (HasID(target_p))
847	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
848	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
849	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
850	<	target_p->info);
929	<	else  /* introducing non-ts6 server */
930	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
931	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
932	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
933	<	}
934	<	else
935	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
936	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
937	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
844	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
845	>	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
846	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
847	>	target_p->info);
848	>
849	>	if (HasFlag(target_p, FLAGS_EOB))
850	>	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
851		}
852
853		server_burst(client_p);
#	Line 970 | Line 883 | server_burst(struct Client *client_p)
883
884		/* burst_all()
885		*
886	<	* inputs       - pointer to server to send burst to
886	>	* inputs       - pointer to server to send burst to
887		* output       - NONE
888		* side effects - complete burst of channels/nicks is sent to client_p
889		*/
#	Line 989 | Line 902 | burst_all(struct Client *client_p)
902		send_channel_modes(client_p, chptr);
903
904		if (IsCapable(client_p, CAP_TBURST))
905	<	send_tb(client_p, chptr);
905	>	send_tb(client_p, chptr);
906		}
907		}
908
#	Line 1001 | Line 914 | burst_all(struct Client *client_p)
914
915		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
916		sendnick_TS(client_p, target_p);
917	<
917	>
918		DelFlag(target_p, FLAGS_BURSTED);
919		}
920
1008	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1009	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1010	–	*/
1011	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
921		if (IsCapable(client_p, CAP_EOB))
922		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
923		}
#	Line 1083 | Line 992 | burst_members(struct Client *client_p, s
992
993		/* serv_connect() - initiate a server connection
994		*
995	<	* inputs       - pointer to conf
995	>	* inputs       - pointer to conf
996		*              - pointer to client doing the connect
997		* output       -
998		* side effects -
#	Line 1098 | Line 1007 | burst_members(struct Client *client_p, s
1007		* it suceeded or not, and 0 if it fails in here somewhere.
1008		*/
1009		int
1010	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1010	>	serv_connect(struct MaskItem *conf, struct Client *by)
1011		{
1103	–	struct ConfItem *conf;
1012		struct Client *client_p;
1013		char buf[HOSTIPLEN + 1];
1014
1015		/* conversion structs */
1016		struct sockaddr_in *v4;
1017	<	/* Make sure aconf is useful */
1018	<	assert(aconf != NULL);
1017	>	/* Make sure conf is useful */
1018	>	assert(conf != NULL);
1019
1112	–	/* XXX should be passing struct ConfItem in the first place */
1113	–	conf = unmap_conf_item(aconf);
1020
1021	<	/* log */
1116	<	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1021	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1022		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1023	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
1023	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1024		buf);
1025
1026		/* Still processing a DNS lookup? -> exit */
1027	<	if (aconf->dns_pending)
1027	>	if (conf->dns_pending)
1028		{
1029	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1029	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1030		"Error connecting to %s: DNS lookup for connect{} in progress.",
1031		conf->name);
1032		return (0);
1033		}
1034
1035	<	if (aconf->dns_failed)
1035	>	if (conf->dns_failed)
1036		{
1037	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1037	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038		"Error connecting to %s: DNS lookup for connect{} failed.",
1039		conf->name);
1040		return (0);
1041		}
1042
1043		/* Make sure this server isn't already connected
1044	<	* Note: aconf should ALWAYS be a valid C: line
1044	>	* Note: conf should ALWAYS be a valid C: line
1045		*/
1046		if ((client_p = hash_find_server(conf->name)) != NULL)
1047	<	{
1048	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1049	<	"Server %s already present from %s",
1050	<	conf->name, get_client_name(client_p, SHOW_IP));
1051	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1052	<	"Server %s already present from %s",
1053	<	conf->name, get_client_name(client_p, MASK_IP));
1047	>	{
1048	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1049	>	"Server %s already present from %s",
1050	>	conf->name, get_client_name(client_p, SHOW_IP));
1051	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1052	>	"Server %s already present from %s",
1053	>	conf->name, get_client_name(client_p, MASK_IP));
1054		if (by && IsClient(by) && !MyClient(by))
1055	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1056	<	me.name, by->name, conf->name,
1057	<	get_client_name(client_p, MASK_IP));
1153	<	return (0);
1055	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1056	>	conf->name, get_client_name(client_p, MASK_IP));
1057	>	return 0;
1058		}
1059	<
1059	>
1060		/* Create a local client */
1061		client_p = make_client(NULL);
1062
1063		/* Copy in the server, hostname, fd */
1064		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1065	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1065	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1066
1067		/* We already converted the ip once, so lets use it - stu */
1068		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1069
1070	<	/* create a socket for the server connection */
1071	<	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1070	>	/* create a socket for the server connection */
1071	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1072		SOCK_STREAM, 0, NULL) < 0)
1073		{
1074		/* Eek, failure to create the socket */
1075	<	report_error(L_ALL,
1076	<	"opening stream socket to %s: %s", conf->name, errno);
1075	>	report_error(L_ALL, "opening stream socket to %s: %s",
1076	>	conf->name, errno);
1077		SetDead(client_p);
1078		exit_client(client_p, &me, "Connection failed");
1079	<	return (0);
1079	>	return 0;
1080		}
1081
1082		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1181 | Line 1085 | serv_connect(struct AccessItem *aconf, s
1085		/* Attach config entries to client here rather than in
1086		* serv_connect_callback(). This to avoid null pointer references.
1087		*/
1088	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1088	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1089		{
1090	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1091	<	"Host %s is not enabled for connecting:no C/N-line",
1092	<	conf->name);
1093	<	if (by && IsClient(by) && !MyClient(by))
1094	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1095	<	me.name, by->name, client_p->name);
1090	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1091	>	"Host %s is not enabled for connecting: no connect{} block",
1092	>	conf->name);
1093	>	if (by && IsClient(by) && !MyClient(by))
1094	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1095	>
1096		SetDead(client_p);
1097		exit_client(client_p, client_p, "Connection failed");
1098	<	return (0);
1098	>	return 0;
1099		}
1100
1101		/* at this point we have a connection in progress and C/N lines
#	Line 1210 | Line 1114 | serv_connect(struct AccessItem *aconf, s
1114		SetConnecting(client_p);
1115		dlinkAdd(client_p, &client_p->node, &global_client_list);
1116		/* from def_fam */
1117	<	client_p->localClient->aftype = aconf->aftype;
1117	>	client_p->localClient->aftype = conf->aftype;
1118
1119		/* Now, initiate the connection */
1120	<	/* XXX assume that a non 0 type means a specific bind address
1120	>	/* XXX assume that a non 0 type means a specific bind address
1121		* for this connect.
1122		*/
1123	<	switch (aconf->aftype)
1123	>	switch (conf->aftype)
1124		{
1125		case AF_INET:
1126	<	v4 = (struct sockaddr_in*)&aconf->bind;
1126	>	v4 = (struct sockaddr_in*)&conf->bind;
1127		if (v4->sin_addr.s_addr != 0)
1128		{
1129		struct irc_ssaddr ipn;
1130		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1131		ipn.ss.ss_family = AF_INET;
1132		ipn.ss_port = 0;
1133	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1134	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1135	<	(struct sockaddr *)&ipn, ipn.ss_len,
1136	<	serv_connect_callback, client_p, aconf->aftype,
1137	<	CONNECTTIMEOUT);
1133	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1134	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1135	>	(struct sockaddr *)&ipn, ipn.ss_len,
1136	>	serv_connect_callback, client_p, conf->aftype,
1137	>	CONNECTTIMEOUT);
1138		}
1139		else if (ServerInfo.specific_ipv4_vhost)
1140		{
#	Line 1239 | Line 1143 | serv_connect(struct AccessItem *aconf, s
1143		ipn.ss.ss_family = AF_INET;
1144		ipn.ss_port = 0;
1145		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1146	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1146	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1147		(struct sockaddr *)&ipn, ipn.ss_len,
1148	<	serv_connect_callback, client_p, aconf->aftype,
1149	<	CONNECTTIMEOUT);
1148	>	serv_connect_callback, client_p, conf->aftype,
1149	>	CONNECTTIMEOUT);
1150		}
1151		else
1152	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1153	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1152	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1153	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1154		CONNECTTIMEOUT);
1155		break;
1156		#ifdef IPV6
1157		case AF_INET6:
1158		{
1159	<	struct irc_ssaddr ipn;
1160	<	struct sockaddr_in6 *v6;
1161	<	struct sockaddr_in6 *v6conf;
1162	<
1163	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1164	<	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1165	<	v6 = (struct sockaddr_in6 *)&ipn;
1166	<
1167	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1264	<	sizeof(struct in6_addr)) != 0)
1265	<	{
1266	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1267	<	ipn.ss.ss_family = AF_INET6;
1268	<	ipn.ss_port = 0;
1269	<	comm_connect_tcp(&client_p->localClient->fd,
1270	<	aconf->host, aconf->port,
1271	<	(struct sockaddr *)&ipn, ipn.ss_len,
1272	<	serv_connect_callback, client_p,
1273	<	aconf->aftype, CONNECTTIMEOUT);
1274	<	}
1275	<	else if (ServerInfo.specific_ipv6_vhost)
1159	>	struct irc_ssaddr ipn;
1160	>	struct sockaddr_in6 *v6;
1161	>	struct sockaddr_in6 *v6conf;
1162	>
1163	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1164	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1165	>	v6 = (struct sockaddr_in6 *)&ipn;
1166	>
1167	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1168		{
1169	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1170	<	ipn.ss.ss_family = AF_INET6;
1171	<	ipn.ss_port = 0;
1172	<	comm_connect_tcp(&client_p->localClient->fd,
1173	<	aconf->host, aconf->port,
1174	<	(struct sockaddr *)&ipn, ipn.ss_len,
1175	<	serv_connect_callback, client_p,
1176	<	aconf->aftype, CONNECTTIMEOUT);
1177	<	}
1178	<	else
1179	<	comm_connect_tcp(&client_p->localClient->fd,
1180	<	aconf->host, aconf->port,
1181	<	NULL, 0, serv_connect_callback, client_p,
1182	<	aconf->aftype, CONNECTTIMEOUT);
1169	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1170	>	ipn.ss.ss_family = AF_INET6;
1171	>	ipn.ss_port = 0;
1172	>	comm_connect_tcp(&client_p->localClient->fd,
1173	>	conf->host, conf->port,
1174	>	(struct sockaddr *)&ipn, ipn.ss_len,
1175	>	serv_connect_callback, client_p,
1176	>	conf->aftype, CONNECTTIMEOUT);
1177	>	}
1178	>	else if (ServerInfo.specific_ipv6_vhost)
1179	>	{
1180	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1181	>	ipn.ss.ss_family = AF_INET6;
1182	>	ipn.ss_port = 0;
1183	>	comm_connect_tcp(&client_p->localClient->fd,
1184	>	conf->host, conf->port,
1185	>	(struct sockaddr *)&ipn, ipn.ss_len,
1186	>	serv_connect_callback, client_p,
1187	>	conf->aftype, CONNECTTIMEOUT);
1188	>	}
1189	>	else
1190	>	comm_connect_tcp(&client_p->localClient->fd,
1191	>	conf->host, conf->port,
1192	>	NULL, 0, serv_connect_callback, client_p,
1193	>	conf->aftype, CONNECTTIMEOUT);
1194		}
1195		#endif
1196		}
1197	<	return (1);
1197	>	return 1;
1198		}
1199
1200		#ifdef HAVE_LIBCRYPTO
1201		static void
1202		finish_ssl_server_handshake(struct Client *client_p)
1203		{
1204	<	struct ConfItem *conf=NULL;
1302	<	struct AccessItem *aconf=NULL;
1204	>	struct MaskItem *conf = NULL;
1205
1206		conf = find_conf_name(&client_p->localClient->confs,
1207	<	client_p->name, SERVER_TYPE);
1207	>	client_p->name, CONF_SERVER);
1208		if (conf == NULL)
1209		{
1210	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1210	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1211		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1212	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1212	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1213		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1214
1215		exit_client(client_p, &me, "Lost connect{} block");
1216		return;
1217		}
1218
1219	<	aconf = map_to_conf(conf);
1219	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1220
1221	<	/* jdc -- Check and send spasswd, not passwd. */
1320	<	if (!EmptyString(aconf->spasswd))
1321	<	sendto_one(client_p, "PASS %s TS %d %s",
1322	<	aconf->spasswd, TS_CURRENT, me.id);
1323	<
1324	<	send_capabilities(client_p, aconf,
1325	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1221	>	send_capabilities(client_p, 0);
1222
1223		sendto_one(client_p, "SERVER %s 1 :%s%s",
1224		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1333 | Line 1229 | finish_ssl_server_handshake(struct Clien
1229		*/
1230		if (IsDead(client_p))
1231		{
1232	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1232	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1233		"%s[%s] went dead during handshake",
1234		client_p->name,
1235		client_p->host);
1236	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1236	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1237		"%s went dead during handshake", client_p->name);
1238		return;
1239		}
#	Line 1350 | Line 1246 | finish_ssl_server_handshake(struct Clien
1246		static void
1247		ssl_server_handshake(fde_t *fd, struct Client *client_p)
1248		{
1249	<	int ret;
1250	<	int err;
1355	<
1356	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1249	>	X509 *cert = NULL;
1250	>	int ret = 0;
1251
1252	<	if (ret <= 0)
1252	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1253		{
1254	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1254	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1255		{
1256		case SSL_ERROR_WANT_WRITE:
1257		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1370 | Line 1264 | ssl_server_handshake(fde_t *fd, struct C
1264		default:
1265		{
1266		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1267	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1267	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1268		"Error connecting to %s: %s", client_p->name,
1269		sslerr ? sslerr : "unknown SSL error");
1270		exit_client(client_p, client_p, "Error during SSL handshake");
#	Line 1379 | Line 1273 | ssl_server_handshake(fde_t *fd, struct C
1273		}
1274		}
1275
1276	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1277	+	{
1278	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1279	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1280	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1281	+
1282	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1283	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1284	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1285	+	{
1286	+	unsigned int i = 0, n = 0;
1287	+
1288	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1289	+	{
1290	+	for (; i < n; ++i)
1291	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1292	+	client_p->certfp = xstrdup(buf);
1293	+	}
1294	+	}
1295	+	else
1296	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1297	+	client_p->name, client_p->username, client_p->host, res);
1298	+	X509_free(cert);
1299	+	}
1300	+
1301		finish_ssl_server_handshake(client_p);
1302		}
1303
1304		static void
1305	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1305	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1306		{
1307		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1308		{
#	Line 1396 | Line 1315 | ssl_connect_init(struct Client *client_p
1315
1316		SSL_set_fd(fd->ssl, fd->fd);
1317
1318	<	if (!EmptyString(aconf->cipher_list))
1319	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1318	>	if (!EmptyString(conf->cipher_list))
1319	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1320
1321		ssl_server_handshake(NULL, client_p);
1322		}
1323		#endif
1324
1325		/* serv_connect_callback() - complete a server connection.
1326	<	*
1326	>	*
1327		* This routine is called after the server connection attempt has
1328		* completed. If unsucessful, an error is sent to ops and the client
1329		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1415 | Line 1334 | static void
1334		serv_connect_callback(fde_t *fd, int status, void *data)
1335		{
1336		struct Client *client_p = data;
1337	<	struct ConfItem *conf=NULL;
1419	<	struct AccessItem *aconf=NULL;
1337	>	struct MaskItem *conf = NULL;
1338
1339		/* First, make sure its a real client! */
1340		assert(client_p != NULL);
#	Line 1432 | Line 1350 | serv_connect_callback(fde_t *fd, int sta
1350		* Admins get to see any IP, mere opers don't *sigh*
1351		*/
1352		if (ConfigServerHide.hide_server_ips)
1353	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1353	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1354		"Error connecting to %s: %s",
1355		client_p->name, comm_errstr(status));
1356		else
1357	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1358	<	"Error connecting to %s[%s]: %s", client_p->name,
1359	<	client_p->host, comm_errstr(status));
1360	<
1361	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1362	<	"Error connecting to %s: %s",
1363	<	client_p->name, comm_errstr(status));
1357	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1358	>	"Error connecting to %s[%s]: %s", client_p->name,
1359	>	client_p->host, comm_errstr(status));
1360	>
1361	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1362	>	"Error connecting to %s: %s",
1363	>	client_p->name, comm_errstr(status));
1364
1365		/* If a fd goes bad, call dead_link() the socket is no
1366		* longer valid for reading or writing.
#	Line 1454 | Line 1372 | serv_connect_callback(fde_t *fd, int sta
1372		/* COMM_OK, so continue the connection procedure */
1373		/* Get the C/N lines */
1374		conf = find_conf_name(&client_p->localClient->confs,
1375	<	client_p->name, SERVER_TYPE);
1375	>	client_p->name, CONF_SERVER);
1376		if (conf == NULL)
1377		{
1378	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1379	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1380	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1381	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1378	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1379	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1380	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1381	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1382
1383		exit_client(client_p, &me, "Lost connect{} block");
1384		return;
1385		}
1386
1469	–	aconf = map_to_conf(conf);
1387		/* Next, send the initial handshake */
1388		SetHandshake(client_p);
1389
1390		#ifdef HAVE_LIBCRYPTO
1391	<	if (IsConfSSL(aconf))
1391	>	if (IsConfSSL(conf))
1392		{
1393	<	ssl_connect_init(client_p, aconf, fd);
1393	>	ssl_connect_init(client_p, conf, fd);
1394		return;
1395		}
1396		#endif
1397
1398	<	/* jdc -- Check and send spasswd, not passwd. */
1482	<	if (!EmptyString(aconf->spasswd))
1483	<	sendto_one(client_p, "PASS %s TS %d %s",
1484	<	aconf->spasswd, TS_CURRENT, me.id);
1398	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1399
1400	<	send_capabilities(client_p, aconf,
1487	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1400	>	send_capabilities(client_p, 0);
1401
1402	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1403	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1491	<	me.info);
1402	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1403	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1404
1405		/* If we've been marked dead because a send failed, just exit
1406		* here now and save everyone the trouble of us ever existing.
1407		*/
1408	<	if (IsDead(client_p))
1408	>	if (IsDead(client_p))
1409		{
1410	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1411	<	"%s[%s] went dead during handshake",
1410	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1411	>	"%s[%s] went dead during handshake",
1412		client_p->name,
1413	<	client_p->host);
1414	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1415	<	"%s went dead during handshake", client_p->name);
1413	>	client_p->host);
1414	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1415	>	"%s went dead during handshake", client_p->name);
1416		return;
1417		}
1418
#	Line 1520 | Line 1432 | find_servconn_in_progress(const char *na
1432		cptr = ptr->data;
1433
1434		if (cptr && cptr->name[0])
1435	<	if (match(name, cptr->name))
1435	>	if (!match(name, cptr->name))
1436		return cptr;
1437		}
1438	<
1438	>
1439		return NULL;
1440		}

Diff Legend

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