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-8/src/s_serv.c (file contents), Revision 1303 by michael, Fri Mar 23 10:52:19 2012 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3137 by michael, Tue Mar 11 19:01:43 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"
43		#include "numeric.h"
44		#include "packet.h"
45		#include "irc_res.h"
46	<	#include "s_conf.h"
46	>	#include "conf.h"
47		#include "s_serv.h"
48	<	#include "s_log.h"
48	>	#include "log.h"
49		#include "s_misc.h"
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 62 | Line 63 | static void send_tb(struct Client *clien
63
64		static CNCB serv_connect_callback;
65
65	–	static void start_io(struct Client *);
66		static void burst_members(struct Client *, struct Channel *);
67
68		/*
#	Line 74 | 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;
82	<	MessageFileLine *newMessageLine = 0;
83	<	MessageFile *MessageFileptr;
84	<	const char *p;
85	<	FBFILE *file;
86	<	char buff[512];
87	<	dlink_node *ptr;
79	>	FILE *file = NULL;
80	>	dlink_node *ptr = NULL, *ptr_next = NULL;
81	>	char buff[IRCD_BUFSIZE] = { '\0' };
82
83	<	MessageFileptr = &ConfigFileEntry.linksfile;
90	<
91	<	if ((file = fbopen(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
100	–	MessageFileptr->contentsOfFile = NULL;
101	–	currentMessageLine             = NULL;
102	–
93		DLINK_FOREACH(ptr, global_serv_list.head)
94		{
95	<	size_t nbytes = 0;
106	<	struct Client *target_p = ptr->data;
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 */
113	<	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;
118	<	else
119	<	p = "(Unknown Location)";
120	<
121	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
122	<
123	<	/* 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
131	<	* default config but it is configurable..
132	<	* This should be changed to an snprintf at some point, but I'm wanting to
133	<	* know if this is a cause of a bug - cryogen
134	<	*/
135	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
136	<	MESSAGELINELEN);
137	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
138	<	target_p->name, me.name, p);
139	<	newMessageLine->next = NULL;
119	>	fputs(buff, file);
120	>	}
121
122	<	if (MessageFileptr->contentsOfFile)
123	<	{
143	<	if (currentMessageLine)
144	<	currentMessageLine->next = newMessageLine;
145	<	currentMessageLine = newMessageLine;
146	<	}
147	<	else
148	<	{
149	<	MessageFileptr->contentsOfFile = newMessageLine;
150	<	currentMessageLine = newMessageLine;
151	<	}
122	>	fclose(file);
123	>	}
124
125	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
126	<	fbputs(buff, file, nbytes);
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	<	fbclose(file);
143	>	fclose(file);
144		}
145
146		/* hunt_server()
#	Line 178 | 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;
171		dlink_node *ptr;
172		int wilds;
173
174	<	/* Assume it's me, if no server
175	<	*/
176	<	if (parc <= server || EmptyString(parv[server]) ||
177	<	match(me.name, parv[server]) ||
178	<	match(parv[server], me.name) ||
179	<	!strcmp(parv[server], me.id))
194	<	return(HUNTED_ISME);
174	>	/* Assume it's me, if no server */
175	>	if (parc <= server || EmptyString(parv[server]))
176	>	return HUNTED_ISME;
177	>
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
182		* message to go in the wrong direction while doing quick fast
#	Line 210 | 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
198	<	collapse(parv[server]);
214	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
198	>	wilds = has_wildcards(parv[server]);
199
200		/* Again, if there are no wild cards involved in the server
201		* name, use the hash lookup
#	Line 222 | 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]);
227	<	return(HUNTED_NOSUCH);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 233 | 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 250 | 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),
254	<	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) &&
266	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
267	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
268	<	parv[0] = ID(source_p);
269	<
270	<	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]);
278	<	return(HUNTED_NOSUCH);
253	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
254	>	return HUNTED_NOSUCH;
255		}
256
257		/* try_connections()
#	Line 291 | 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;
296	<	struct AccessItem *aconf;
297	<	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 304 | Line 278 | try_connections(void *unused)
278		DLINK_FOREACH(ptr, server_items.head)
279		{
280		conf = ptr->data;
307	–	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 ||
312	<	!(IsConfAllowAutoConn(aconf)))
286	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
287		continue;
288
315	–	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 320 | 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 = ConFreq(cltmp);
304	<	if (confrq < MIN_CONN_FREQ )
305	<	confrq = MIN_CONN_FREQ;
303	>	confrq = conf->class->con_freq;
304	>	if (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 340 | Line 313 | try_connections(void *unused)
313		if (hash_find_server(conf->name) != NULL)
314		continue;
315
316	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
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 361 | 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 399 | 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;
404	<	struct AccessItem *server_aconf = NULL;
405	<	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);
382
410	–	if (client_p == NULL)
411	–	return(error);
412	–
413	–	if (strlen(name) > HOSTLEN)
414	–	return(-4);
415	–
383		/* loop through looking for all possible connect items that might work */
384		DLINK_FOREACH(ptr, server_items.head)
385		{
386		conf = ptr->data;
420	–	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;
433	–	{
434	–	/* A NULL password is as good as a bad one */
435	–	if (EmptyString(client_p->localClient->passwd))
436	–	return(-2);
437	–
438	–	/* code in s_conf.c should not have allowed this to be NULL */
439	–	if (aconf->passwd == NULL)
440	–	return(-2);
399
400	<	if (IsConfEncrypted(aconf))
401	<	{
402	<	if (strcmp(aconf->passwd,
403	<	(const char *)crypt(client_p->localClient->passwd,
404	<	aconf->passwd)) == 0)
405	<	server_conf = conf;
406	<	}
407	<	else
450	<	{
451	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
452	<	server_conf = conf;
453	<	}
454	<	}
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
463	–	/* Now find all leaf or hub config items for this server */
464	–	DLINK_FOREACH(ptr, hub_items.head)
465	–	{
466	–	conf = ptr->data;
467	–
468	–	if (!match(name, conf->name))
469	–	continue;
470	–	attach_conf(client_p, conf);
471	–	}
472	–
473	–	DLINK_FOREACH(ptr, leaf_items.head)
474	–	{
475	–	conf = ptr->data;
476	–
477	–	if (!match(name, conf->name))
478	–	continue;
479	–	attach_conf(client_p, conf);
480	–	}
481	–
482	–	server_aconf = map_to_conf(server_conf);
483	–
484	–	if (!IsConfTopicBurst(server_aconf))
485	–	{
486	–	ClearCap(client_p, CAP_TB);
487	–	ClearCap(client_p, CAP_TBURST);
488	–	}
416
417	<	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->ipnum;
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->ipnum, &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->ipnum;
434	>	v4 = (struct sockaddr_in *)&server_conf->addr;
435
436		if (v4->sin_addr.s_addr == INADDR_NONE)
437	<	memcpy(&aconf->ipnum, &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 529 | 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 558 | 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;
565	<	MyFree(cap);
488	>	default_server_capabs &= ~(cap->cap);
489	>	dlinkDelete(ptr, &cap_list);
490	>	MyFree(cap->name);
491	>	MyFree(cap);
492		}
493		}
494		}
#	Line 577 | 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 596 | Line 522 | find_capability(const char *capab)
522		/* send_capabilities()
523		*
524		* inputs       - Client pointer to send to
599	–	*              - 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,
607	<	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 620 | 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 630 | 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 639 | 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 652 | Line 576 | sendnick_TS(struct Client *client_p, str
576		ubuf[1] = '\0';
577		}
578
655	–	/* 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)) ?
665	<	"0" : target_p->sockhost, target_p->id,
666	<	(unsigned long)target_p->servicestamp, target_p->info);
667	<	else
668	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
669	<	target_p->name, target_p->hopcount + 1,
670	<	(unsigned long) target_p->tsinfo,
671	<	ubuf, target_p->username, target_p->host,
672	<	target_p->servptr->name, (unsigned long)target_p->servicestamp,
673	<	target_p->info);
674	<	}
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);
691	<	}
692	<
693	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
694	<	if (!EmptyString(target_p->away))
695	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
696	<	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 705 | 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;
712	<	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
724	–	*(t - 1) = '\0';
633		return msgbuf;
634		}
635
#	Line 750 | Line 658 | make_server(struct Client *client_p)
658		void
659		server_estab(struct Client *client_p)
660		{
661	<	struct Client *target_p;
754	<	struct ConfItem *conf;
755	<	struct AccessItem *aconf=NULL;
661	>	struct MaskItem *conf = NULL;
662		char *host;
663		const char *inpath;
664		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
665		dlink_node *ptr;
666	+	#ifdef HAVE_LIBCRYPTO
667	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
668	+	#endif
669
670		assert(client_p != NULL);
671
#	Line 765 | Line 674 | server_estab(struct Client *client_p)
674		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
675		host   = client_p->name;
676
677	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
677	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
678		== NULL)
679		{
680		/* This shouldn't happen, better tell the ops... -A1kmm */
681	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
681	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
682	>	"Warning: Lost connect{} block "
683		"for server %s(this shouldn't happen)!", host);
684		exit_client(client_p, &me, "Lost connect{} block!");
685		return;
#	Line 784 | Line 694 | server_estab(struct Client *client_p)
694		/* If there is something in the serv_list, it might be this
695		* connecting server..
696		*/
697	<	if (!ServerInfo.hub && serv_list.head)
697	>	if (!ServerInfo.hub && serv_list.head)
698		{
699		if (client_p != serv_list.head->data || serv_list.head->next)
700		{
#	Line 795 | Line 705 | server_estab(struct Client *client_p)
705		}
706		}
707
798	–	aconf = map_to_conf(conf);
799	–
708		if (IsUnknown(client_p))
709		{
710	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
803	<	*        2.  Check aconf->spasswd, not aconf->passwd.
804	<	*/
805	<	if (!EmptyString(aconf->spasswd))
806	<	sendto_one(client_p, "PASS %s TS %d %s",
807	<	aconf->spasswd, TS_CURRENT, me.id);
808	<
809	<	/* Pass my info to the new server
810	<	*
811	<	* Pass on ZIP if supported
812	<	* Pass on TB if supported.
813	<	* - Dianora
814	<	*/
710	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
711
712	<	send_capabilities(client_p, aconf,
817	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
712	>	send_capabilities(client_p, 0);
713
714		sendto_one(client_p, "SERVER %s 1 :%s%s",
715		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
#	Line 823 | Line 718 | server_estab(struct Client *client_p)
718		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
719		(unsigned long)CurrentTime);
720
721	<	/* assumption here is if they passed the correct TS version, they also passed an SID */
827	<	if (IsCapable(client_p, CAP_TS6))
721	>	if (HasID(client_p))
722		hash_add_id(client_p);
723
724		/* XXX Does this ever happen? I don't think so -db */
725	<	detach_conf(client_p, OPER_TYPE);
725	>	detach_conf(client_p, CONF_OPER);
726
727		/* *WARNING*
728		**    In the following code in place of plain server's
#	Line 870 | Line 764 | server_estab(struct Client *client_p)
764		/* fixing eob timings.. -gnp */
765		client_p->localClient->firsttime = CurrentTime;
766
767	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
767	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
768		AddFlag(client_p, FLAGS_SERVICE);
769
770		/* Show the real host/IP to admins */
771	+	#ifdef HAVE_LIBCRYPTO
772		if (client_p->localClient->fd.ssl)
773		{
774	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
775	<	"Link with %s established: [SSL: %s] (Capabilities: %s)",
774	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
775	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
776	>
777	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
778	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
779		inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
780	+	compression ? SSL_COMP_get_name(compression) : "NONE",
781	+	expansion ? SSL_COMP_get_name(expansion) : "NONE",
782		show_capabilities(client_p));
783		/* Now show the masked hostname/IP to opers */
784	<	sendto_realops_flags(UMODE_ALL, L_OPER,
785	<	"Link with %s established: [SSL: %s] (Capabilities: %s)",
784	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
785	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
786		inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
787	+	compression ? SSL_COMP_get_name(compression) : "NONE",
788	+	expansion ? SSL_COMP_get_name(expansion) : "NONE",
789		show_capabilities(client_p));
790	<	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s] (Capabilities: %s)",
790	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
791		inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
792	+	compression ? SSL_COMP_get_name(compression) : "NONE",
793	+	expansion ? SSL_COMP_get_name(expansion) : "NONE",
794		show_capabilities(client_p));
795		}
796		else
797	+	#endif
798		{
799	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
799	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
800		"Link with %s established: (Capabilities: %s)",
801	<	inpath_ip,show_capabilities(client_p));
801	>	inpath_ip, show_capabilities(client_p));
802		/* Now show the masked hostname/IP to opers */
803	<	sendto_realops_flags(UMODE_ALL, L_OPER,
803	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
804		"Link with %s established: (Capabilities: %s)",
805	<	inpath,show_capabilities(client_p));
805	>	inpath, show_capabilities(client_p));
806		ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
807		inpath_ip, show_capabilities(client_p));
808		}
809
905	–	client_p->serv->sconf = conf;
906	–
810		fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
811
812	<	/* Old sendto_serv_but_one() call removed because we now
813	<	** need to send different names to different servers
814	<	** (domain name matching) Send new server to other servers.
912	<	*/
913	<	DLINK_FOREACH(ptr, serv_list.head)
914	<	{
915	<	target_p = ptr->data;
916	<
917	<	if (target_p == client_p)
918	<	continue;
812	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
813	>	me.id, client_p->name, client_p->id,
814	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
815
816	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
817	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
818	<	me.id, client_p->name, client_p->id,
819	<	IsHidden(client_p) ? "(H) " : "",
820	<	client_p->info);
821	<	else
822	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
823	<	me.name, client_p->name,
824	<	IsHidden(client_p) ? "(H) " : "",
825	<	client_p->info);
826	<	}
827	<
828	<	/* Pass on my client information to the new server
829	<	**
830	<	** First, pass only servers (idea is that if the link gets
831	<	** cancelled beacause the server was already there,
832	<	** there are no NICK's to be cancelled...). Of course,
833	<	** if cancellation occurs, all this info is sent anyway,
938	<	** and I guess the link dies when a read is attempted...? --msa
939	<	**
940	<	** Note: Link cancellation to occur at this point means
941	<	** that at least two servers from my fragment are building
942	<	** up connection this other fragment at the same time, it's
943	<	** a race condition, not the normal way of operation...
944	<	**
945	<	** ALSO NOTE: using the get_client_name for server names--
946	<	**    see previous *WARNING*!!! (Also, original inpath
947	<	**    is destroyed...)
948	<	*/
816	>	/*
817	>	* Pass on my client information to the new server
818	>	*
819	>	* First, pass only servers (idea is that if the link gets
820	>	* cancelled beacause the server was already there,
821	>	* there are no NICK's to be cancelled...). Of course,
822	>	* if cancellation occurs, all this info is sent anyway,
823	>	* and I guess the link dies when a read is attempted...? --msa
824	>	*
825	>	* Note: Link cancellation to occur at this point means
826	>	* that at least two servers from my fragment are building
827	>	* up connection this other fragment at the same time, it's
828	>	* a race condition, not the normal way of operation...
829	>	*
830	>	* ALSO NOTE: using the get_client_name for server names--
831	>	*    see previous *WARNING*!!! (Also, original inpath
832	>	*    is destroyed...)
833	>	*/
834
835		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
836		{
837	<	target_p = ptr->data;
837	>	struct Client *target_p = ptr->data;
838
839		/* target_p->from == target_p for target_p == client_p */
840		if (IsMe(target_p) || target_p->from == client_p)
841		continue;
842
843	<	if (IsCapable(client_p, CAP_TS6))
844	<	{
845	<	if (HasID(target_p))
846	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
847	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
848	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
849	<	target_p->info);
965	<	else  /* introducing non-ts6 server */
966	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
967	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
968	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
969	<	}
970	<	else
971	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
972	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
973	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
843	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
844	>	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
845	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
846	>	target_p->info);
847	>
848	>	if (HasFlag(target_p, FLAGS_EOB))
849	>	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
850		}
851
852		server_burst(client_p);
#	Line 1006 | Line 882 | server_burst(struct Client *client_p)
882
883		/* burst_all()
884		*
885	<	* inputs       - pointer to server to send burst to
885	>	* inputs       - pointer to server to send burst to
886		* output       - NONE
887		* side effects - complete burst of channels/nicks is sent to client_p
888		*/
#	Line 1024 | Line 900 | burst_all(struct Client *client_p)
900		burst_members(client_p, chptr);
901		send_channel_modes(client_p, chptr);
902
903	<	if (IsCapable(client_p, CAP_TBURST) ||
904	<	IsCapable(client_p, CAP_TB))
1029	<	send_tb(client_p, chptr);
903	>	if (IsCapable(client_p, CAP_TBURST))
904	>	send_tb(client_p, chptr);
905		}
906		}
907
#	Line 1038 | Line 913 | burst_all(struct Client *client_p)
913
914		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
915		sendnick_TS(client_p, target_p);
916	<
916	>
917		DelFlag(target_p, FLAGS_BURSTED);
918		}
919
1045	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1046	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1047	–	*/
1048	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
920		if (IsCapable(client_p, CAP_EOB))
921		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
922		}
#	Line 1057 | Line 928 | burst_all(struct Client *client_p)
928		*              - pointer to channel
929		* output       - NONE
930		* side effects - Called on a server burst when
931	<	*                server is CAP_TB|CAP_TBURST capable
931	>	*                server is CAP_TBURST capable
932		*/
933		static void
934		send_tb(struct Client *client_p, struct Channel *chptr)
#	Line 1076 | Line 947 | send_tb(struct Client *client_p, struct
947		* for further information   -Michael
948		*/
949		if (chptr->topic_time != 0)
950	<	{
951	<	if (IsCapable(client_p, CAP_TBURST))
952	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
953	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
954	<	(unsigned long)chptr->topic_time,
955	<	chptr->topic_info,
1085	<	chptr->topic);
1086	<	else if (IsCapable(client_p, CAP_TB))
1087	<	{
1088	<	if (ConfigChannel.burst_topicwho)
1089	<	{
1090	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1091	<	me.name, chptr->chname,
1092	<	(unsigned long)chptr->topic_time,
1093	<	chptr->topic_info, chptr->topic);
1094	<	}
1095	<	else
1096	<	{
1097	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1098	<	me.name, chptr->chname,
1099	<	(unsigned long)chptr->topic_time,
1100	<	chptr->topic);
1101	<	}
1102	<	}
1103	<	}
950	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
951	>	ID_or_name(&me, client_p),
952	>	(unsigned long)chptr->channelts, chptr->chname,
953	>	(unsigned long)chptr->topic_time,
954	>	chptr->topic_info,
955	>	chptr->topic);
956		}
957
958		/* burst_members()
#	Line 1139 | Line 991 | burst_members(struct Client *client_p, s
991
992		/* serv_connect() - initiate a server connection
993		*
994	<	* inputs       - pointer to conf
994	>	* inputs       - pointer to conf
995		*              - pointer to client doing the connect
996		* output       -
997		* side effects -
#	Line 1154 | Line 1006 | burst_members(struct Client *client_p, s
1006		* it suceeded or not, and 0 if it fails in here somewhere.
1007		*/
1008		int
1009	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1009	>	serv_connect(struct MaskItem *conf, struct Client *by)
1010		{
1159	–	struct ConfItem *conf;
1011		struct Client *client_p;
1012	<	char buf[HOSTIPLEN];
1012	>	char buf[HOSTIPLEN + 1];
1013
1014		/* conversion structs */
1015		struct sockaddr_in *v4;
1016	<	/* Make sure aconf is useful */
1017	<	assert(aconf != NULL);
1167	<
1168	<	if(aconf == NULL)
1169	<	return (0);
1016	>	/* Make sure conf is useful */
1017	>	assert(conf != NULL);
1018
1171	–	/* XXX should be passing struct ConfItem in the first place */
1172	–	conf = unmap_conf_item(aconf);
1019
1020	<	/* log */
1175	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
1020	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1021		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1022	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1022	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1023		buf);
1024
1025		/* Still processing a DNS lookup? -> exit */
1026	<	if (aconf->dns_pending)
1026	>	if (conf->dns_pending)
1027		{
1028	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1028	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1029		"Error connecting to %s: DNS lookup for connect{} in progress.",
1030		conf->name);
1031		return (0);
1032		}
1033
1034	<	if (aconf->dns_failed)
1034	>	if (conf->dns_failed)
1035		{
1036	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1036	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1037		"Error connecting to %s: DNS lookup for connect{} failed.",
1038		conf->name);
1039		return (0);
1040		}
1041
1042		/* Make sure this server isn't already connected
1043	<	* Note: aconf should ALWAYS be a valid C: line
1043	>	* Note: conf should ALWAYS be a valid C: line
1044		*/
1045		if ((client_p = hash_find_server(conf->name)) != NULL)
1046	<	{
1047	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1048	<	"Server %s already present from %s",
1049	<	conf->name, get_client_name(client_p, SHOW_IP));
1050	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1051	<	"Server %s already present from %s",
1052	<	conf->name, get_client_name(client_p, MASK_IP));
1046	>	{
1047	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1048	>	"Server %s already present from %s",
1049	>	conf->name, get_client_name(client_p, SHOW_IP));
1050	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1051	>	"Server %s already present from %s",
1052	>	conf->name, get_client_name(client_p, MASK_IP));
1053		if (by && IsClient(by) && !MyClient(by))
1054	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1055	<	me.name, by->name, conf->name,
1056	<	get_client_name(client_p, MASK_IP));
1212	<	return (0);
1054	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1055	>	conf->name, get_client_name(client_p, MASK_IP));
1056	>	return 0;
1057		}
1058	<
1058	>
1059		/* Create a local client */
1060		client_p = make_client(NULL);
1061
1062		/* Copy in the server, hostname, fd */
1063		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1064	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1064	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1065
1066		/* We already converted the ip once, so lets use it - stu */
1067		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1068
1069	<	/* create a socket for the server connection */
1070	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1069	>	/* create a socket for the server connection */
1070	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1071		SOCK_STREAM, 0, NULL) < 0)
1072		{
1073		/* Eek, failure to create the socket */
1074	<	report_error(L_ALL,
1075	<	"opening stream socket to %s: %s", conf->name, errno);
1074	>	report_error(L_ALL, "opening stream socket to %s: %s",
1075	>	conf->name, errno);
1076		SetDead(client_p);
1077		exit_client(client_p, &me, "Connection failed");
1078	<	return (0);
1078	>	return 0;
1079		}
1080
1081		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1240 | Line 1084 | serv_connect(struct AccessItem *aconf, s
1084		/* Attach config entries to client here rather than in
1085		* serv_connect_callback(). This to avoid null pointer references.
1086		*/
1087	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1087	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1088		{
1089	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1090	<	"Host %s is not enabled for connecting:no C/N-line",
1091	<	conf->name);
1092	<	if (by && IsClient(by) && !MyClient(by))
1093	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1094	<	me.name, by->name, client_p->name);
1089	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1090	>	"Host %s is not enabled for connecting: no connect{} block",
1091	>	conf->name);
1092	>	if (by && IsClient(by) && !MyClient(by))
1093	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1094	>
1095		SetDead(client_p);
1096		exit_client(client_p, client_p, "Connection failed");
1097	<	return (0);
1097	>	return 0;
1098		}
1099
1100		/* at this point we have a connection in progress and C/N lines
#	Line 1269 | Line 1113 | serv_connect(struct AccessItem *aconf, s
1113		SetConnecting(client_p);
1114		dlinkAdd(client_p, &client_p->node, &global_client_list);
1115		/* from def_fam */
1116	<	client_p->localClient->aftype = aconf->aftype;
1116	>	client_p->localClient->aftype = conf->aftype;
1117
1118		/* Now, initiate the connection */
1119	<	/* XXX assume that a non 0 type means a specific bind address
1119	>	/* XXX assume that a non 0 type means a specific bind address
1120		* for this connect.
1121		*/
1122	<	switch (aconf->aftype)
1122	>	switch (conf->aftype)
1123		{
1124		case AF_INET:
1125	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1125	>	v4 = (struct sockaddr_in*)&conf->bind;
1126		if (v4->sin_addr.s_addr != 0)
1127		{
1128		struct irc_ssaddr ipn;
1129		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1130		ipn.ss.ss_family = AF_INET;
1131		ipn.ss_port = 0;
1132	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1133	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1134	<	(struct sockaddr *)&ipn, ipn.ss_len,
1135	<	serv_connect_callback, client_p, aconf->aftype,
1136	<	CONNECTTIMEOUT);
1132	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1133	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1134	>	(struct sockaddr *)&ipn, ipn.ss_len,
1135	>	serv_connect_callback, client_p, conf->aftype,
1136	>	CONNECTTIMEOUT);
1137		}
1138		else if (ServerInfo.specific_ipv4_vhost)
1139		{
#	Line 1298 | Line 1142 | serv_connect(struct AccessItem *aconf, s
1142		ipn.ss.ss_family = AF_INET;
1143		ipn.ss_port = 0;
1144		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1145	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1145	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1146		(struct sockaddr *)&ipn, ipn.ss_len,
1147	<	serv_connect_callback, client_p, aconf->aftype,
1148	<	CONNECTTIMEOUT);
1147	>	serv_connect_callback, client_p, conf->aftype,
1148	>	CONNECTTIMEOUT);
1149		}
1150		else
1151	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1152	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1151	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1152	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1153		CONNECTTIMEOUT);
1154		break;
1155		#ifdef IPV6
1156		case AF_INET6:
1157		{
1158	<	struct irc_ssaddr ipn;
1159	<	struct sockaddr_in6 *v6;
1160	<	struct sockaddr_in6 *v6conf;
1161	<
1162	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1163	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1164	<	v6 = (struct sockaddr_in6 *)&ipn;
1165	<
1166	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1167	<	sizeof(struct in6_addr)) != 0)
1168	<	{
1169	<	memcpy(&ipn, &aconf->my_ipnum, 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	<	}
1334	<	else if (ServerInfo.specific_ipv6_vhost)
1158	>	struct irc_ssaddr ipn;
1159	>	struct sockaddr_in6 *v6;
1160	>	struct sockaddr_in6 *v6conf;
1161	>
1162	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1163	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1164	>	v6 = (struct sockaddr_in6 *)&ipn;
1165	>
1166	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1167	>	{
1168	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1169	>	ipn.ss.ss_family = AF_INET6;
1170	>	ipn.ss_port = 0;
1171	>	comm_connect_tcp(&client_p->localClient->fd,
1172	>	conf->host, conf->port,
1173	>	(struct sockaddr *)&ipn, ipn.ss_len,
1174	>	serv_connect_callback, client_p,
1175	>	conf->aftype, CONNECTTIMEOUT);
1176	>	}
1177	>	else if (ServerInfo.specific_ipv6_vhost)
1178		{
1179	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1180	<	ipn.ss.ss_family = AF_INET6;
1181	<	ipn.ss_port = 0;
1182	<	comm_connect_tcp(&client_p->localClient->fd,
1183	<	aconf->host, aconf->port,
1184	<	(struct sockaddr *)&ipn, ipn.ss_len,
1185	<	serv_connect_callback, client_p,
1186	<	aconf->aftype, CONNECTTIMEOUT);
1187	<	}
1188	<	else
1189	<	comm_connect_tcp(&client_p->localClient->fd,
1190	<	aconf->host, aconf->port,
1191	<	NULL, 0, serv_connect_callback, client_p,
1192	<	aconf->aftype, CONNECTTIMEOUT);
1179	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1180	>	ipn.ss.ss_family = AF_INET6;
1181	>	ipn.ss_port = 0;
1182	>	comm_connect_tcp(&client_p->localClient->fd,
1183	>	conf->host, conf->port,
1184	>	(struct sockaddr *)&ipn, ipn.ss_len,
1185	>	serv_connect_callback, client_p,
1186	>	conf->aftype, CONNECTTIMEOUT);
1187	>	}
1188	>	else
1189	>	comm_connect_tcp(&client_p->localClient->fd,
1190	>	conf->host, conf->port,
1191	>	NULL, 0, serv_connect_callback, client_p,
1192	>	conf->aftype, CONNECTTIMEOUT);
1193		}
1194		#endif
1195		}
1196	<	return (1);
1196	>	return 1;
1197		}
1198
1199		#ifdef HAVE_LIBCRYPTO
1200		static void
1201		finish_ssl_server_handshake(struct Client *client_p)
1202		{
1203	<	struct ConfItem *conf=NULL;
1361	<	struct AccessItem *aconf=NULL;
1203	>	struct MaskItem *conf = NULL;
1204
1205		conf = find_conf_name(&client_p->localClient->confs,
1206	<	client_p->name, SERVER_TYPE);
1206	>	client_p->name, CONF_SERVER);
1207		if (conf == NULL)
1208		{
1209	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1209	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1210		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1211	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1211	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1212		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1213
1214		exit_client(client_p, &me, "Lost connect{} block");
1215		return;
1216		}
1217
1218	<	aconf = map_to_conf(conf);
1218	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1219
1220	<	/* jdc -- Check and send spasswd, not passwd. */
1379	<	if (!EmptyString(aconf->spasswd))
1380	<	sendto_one(client_p, "PASS %s TS %d %s",
1381	<	aconf->spasswd, TS_CURRENT, me.id);
1382	<
1383	<	send_capabilities(client_p, aconf,
1384	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
1220	>	send_capabilities(client_p, 0);
1221
1222		sendto_one(client_p, "SERVER %s 1 :%s%s",
1223		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1392 | Line 1228 | finish_ssl_server_handshake(struct Clien
1228		*/
1229		if (IsDead(client_p))
1230		{
1231	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1231	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1232		"%s[%s] went dead during handshake",
1233		client_p->name,
1234		client_p->host);
1235	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1235	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1236		"%s went dead during handshake", client_p->name);
1237		return;
1238		}
#	Line 1407 | Line 1243 | finish_ssl_server_handshake(struct Clien
1243		}
1244
1245		static void
1246	<	ssl_server_handshake(struct Client *client_p)
1246	>	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1247		{
1248	<	int ret;
1249	<	int err;
1414	<
1415	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1248	>	X509 *cert = NULL;
1249	>	int ret = 0;
1250
1251	<	if (ret <= 0)
1251	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1252		{
1253	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1253	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1254		{
1255		case SSL_ERROR_WANT_WRITE:
1256		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1257	<	(PF *) ssl_server_handshake, client_p, 0);
1257	>	(PF *)ssl_server_handshake, client_p, 0);
1258		return;
1259		case SSL_ERROR_WANT_READ:
1260		comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1261	<	(PF *) ssl_server_handshake, client_p, 0);
1261	>	(PF *)ssl_server_handshake, client_p, 0);
1262		return;
1263		default:
1264	+	{
1265	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1266	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1267	+	"Error connecting to %s: %s", client_p->name,
1268	+	sslerr ? sslerr : "unknown SSL error");
1269		exit_client(client_p, client_p, "Error during SSL handshake");
1270		return;
1271	+	}
1272		}
1273		}
1274
1275	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1276	+	{
1277	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1278	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1279	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1280	+
1281	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1282	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1283	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1284	+	{
1285	+	unsigned int i = 0, n = 0;
1286	+
1287	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1288	+	{
1289	+	for (; i < n; ++i)
1290	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1291	+	client_p->certfp = xstrdup(buf);
1292	+	}
1293	+	}
1294	+	else
1295	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1296	+	client_p->name, client_p->username, client_p->host, res);
1297	+	X509_free(cert);
1298	+	}
1299	+
1300		finish_ssl_server_handshake(client_p);
1301		}
1302
1303		static void
1304	<	ssl_connect_init(struct Client *client_p, fde_t *fd)
1304	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1305		{
1306		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1307		{
#	Line 1448 | Line 1313 | ssl_connect_init(struct Client *client_p
1313		}
1314
1315		SSL_set_fd(fd->ssl, fd->fd);
1316	<	ssl_server_handshake(client_p);
1316	>
1317	>	if (!EmptyString(conf->cipher_list))
1318	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1319	>
1320	>	ssl_server_handshake(NULL, client_p);
1321		}
1322		#endif
1323
1324		/* serv_connect_callback() - complete a server connection.
1325	<	*
1325	>	*
1326		* This routine is called after the server connection attempt has
1327		* completed. If unsucessful, an error is sent to ops and the client
1328		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1464 | Line 1333 | static void
1333		serv_connect_callback(fde_t *fd, int status, void *data)
1334		{
1335		struct Client *client_p = data;
1336	<	struct ConfItem *conf=NULL;
1468	<	struct AccessItem *aconf=NULL;
1336	>	struct MaskItem *conf = NULL;
1337
1338		/* First, make sure its a real client! */
1339		assert(client_p != NULL);
#	Line 1481 | Line 1349 | serv_connect_callback(fde_t *fd, int sta
1349		* Admins get to see any IP, mere opers don't *sigh*
1350		*/
1351		if (ConfigServerHide.hide_server_ips)
1352	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1352	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1353		"Error connecting to %s: %s",
1354		client_p->name, comm_errstr(status));
1355		else
1356	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1357	<	"Error connecting to %s[%s]: %s", client_p->name,
1358	<	client_p->host, comm_errstr(status));
1359	<
1360	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1361	<	"Error connecting to %s: %s",
1362	<	client_p->name, comm_errstr(status));
1356	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1357	>	"Error connecting to %s[%s]: %s", client_p->name,
1358	>	client_p->host, comm_errstr(status));
1359	>
1360	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1361	>	"Error connecting to %s: %s",
1362	>	client_p->name, comm_errstr(status));
1363
1364		/* If a fd goes bad, call dead_link() the socket is no
1365		* longer valid for reading or writing.
#	Line 1503 | Line 1371 | serv_connect_callback(fde_t *fd, int sta
1371		/* COMM_OK, so continue the connection procedure */
1372		/* Get the C/N lines */
1373		conf = find_conf_name(&client_p->localClient->confs,
1374	<	client_p->name, SERVER_TYPE);
1374	>	client_p->name, CONF_SERVER);
1375		if (conf == NULL)
1376		{
1377	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1378	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1379	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1380	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1377	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1378	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1379	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1380	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1381
1382		exit_client(client_p, &me, "Lost connect{} block");
1383		return;
1384		}
1385
1518	–	aconf = map_to_conf(conf);
1386		/* Next, send the initial handshake */
1387		SetHandshake(client_p);
1388
1389		#ifdef HAVE_LIBCRYPTO
1390	<	if (IsConfSSL(aconf))
1390	>	if (IsConfSSL(conf))
1391		{
1392	<	ssl_connect_init(client_p, fd);
1392	>	ssl_connect_init(client_p, conf, fd);
1393		return;
1394		}
1395		#endif
1396
1397	<	/* jdc -- Check and send spasswd, not passwd. */
1531	<	if (!EmptyString(aconf->spasswd))
1532	<	sendto_one(client_p, "PASS %s TS %d %s",
1533	<	aconf->spasswd, TS_CURRENT, me.id);
1397	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1398
1399	<	send_capabilities(client_p, aconf,
1536	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
1399	>	send_capabilities(client_p, 0);
1400
1401	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1402	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1540	<	me.info);
1401	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1402	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1403
1404		/* If we've been marked dead because a send failed, just exit
1405		* here now and save everyone the trouble of us ever existing.
1406		*/
1407	<	if (IsDead(client_p))
1407	>	if (IsDead(client_p))
1408		{
1409	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1410	<	"%s[%s] went dead during handshake",
1409	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1410	>	"%s[%s] went dead during handshake",
1411		client_p->name,
1412	<	client_p->host);
1413	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1414	<	"%s went dead during handshake", client_p->name);
1412	>	client_p->host);
1413	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1414	>	"%s went dead during handshake", client_p->name);
1415		return;
1416		}
1417
#	Line 1569 | Line 1431 | find_servconn_in_progress(const char *na
1431		cptr = ptr->data;
1432
1433		if (cptr && cptr->name[0])
1434	<	if (match(name, cptr->name))
1434	>	if (!match(name, cptr->name))
1435		return cptr;
1436		}
1437	<
1437	>
1438		return NULL;
1439		}

Diff Legend

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