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 1472 by michael, Sun Jul 22 12:03:18 2012 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3274 by michael, Sun Apr 6 12:22:23 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_serv.c: Server related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_serv.c
23	>	* \brief Server related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 28 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
33		#include "client.h"
34	–	#include "dbuf.h"
34		#include "event.h"
36	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
37		#include "ircd.h"
38		#include "ircd_defs.h"
39		#include "s_bsd.h"
40		#include "numeric.h"
41		#include "packet.h"
45	–	#include "irc_res.h"
42		#include "conf.h"
43		#include "s_serv.h"
44		#include "log.h"
#	Line 50 | Line 46
46		#include "s_user.h"
47		#include "send.h"
48		#include "memory.h"
49	<	#include "channel.h" /* chcap_usage_counts stuff...*/
49	>	#include "channel.h"
50		#include "parse.h"
51
52		#define MIN_CONN_FREQ 300
53
54	+	dlink_list flatten_links;
55		static dlink_list cap_list = { NULL, NULL, 0 };
56		static void server_burst(struct Client *);
57		static void burst_all(struct Client *);
#	Line 73 | Line 70 | static void burst_members(struct Client
70		*                but in no particular order.
71		*/
72		void
73	<	write_links_file(void* notused)
73	>	write_links_file(void *notused)
74		{
75	<	MessageFileLine *next_mptr = 0;
76	<	MessageFileLine *mptr = 0;
77	<	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;
75	>	FILE *file = NULL;
76	>	dlink_node *ptr = NULL, *ptr_next = NULL;
77	>	char buff[IRCD_BUFSIZE] = "";
78
79	<	MessageFileptr = &ConfigFileEntry.linksfile;
89	<
90	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
79	>	if ((file = fopen(LIPATH, "w")) == NULL)
80		return;
81
82	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
82	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
83		{
84	<	next_mptr = mptr->next;
85	<	MyFree(mptr);
84	>	dlinkDelete(ptr, &flatten_links);
85	>	MyFree(ptr->data);
86	>	free_dlink_node(ptr);
87		}
88
99	–	MessageFileptr->contentsOfFile = NULL;
100	–	currentMessageLine             = NULL;
101	–
89		DLINK_FOREACH(ptr, global_serv_list.head)
90		{
91		const struct Client *target_p = ptr->data;
92
93	<	/* skip ourselves, we send ourselves in /links */
94	<	if (IsMe(target_p))
93	>	/*
94	>	* Skip hidden servers, aswell as ourselves, since we already send
95	>	* ourselves in /links
96	>	*/
97	>	if (IsHidden(target_p) || IsMe(target_p))
98		continue;
99
100	<	/* skip hidden servers */
111	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
100	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
101		continue;
102
103	<	if (target_p->info[0])
104	<	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
103	>	/*
104	>	* Attempt to format the file in such a way it follows the usual links output
105		* ie  "servername uplink :hops info"
106		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
107		* - madmax
108		*/
109	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
110	+	me.name, target_p->info);
111	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
112	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
113	+	me.name, target_p->info);
114
115	<	/*
116	<	* 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;
115	>	fputs(buff, file);
116	>	}
117
118	<	if (MessageFileptr->contentsOfFile)
119	<	{
141	<	if (currentMessageLine)
142	<	currentMessageLine->next = newMessageLine;
143	<	currentMessageLine = newMessageLine;
144	<	}
145	<	else
146	<	{
147	<	MessageFileptr->contentsOfFile = newMessageLine;
148	<	currentMessageLine = newMessageLine;
149	<	}
118	>	fclose(file);
119	>	}
120
121	<	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
122	<	fputs(buff, file);
121	>	void
122	>	read_links_file(void)
123	>	{
124	>	FILE *file = NULL;
125	>	char *p = NULL;
126	>	char buff[IRCD_BUFSIZE] = "";
127	>
128	>	if ((file = fopen(LIPATH, "r")) == NULL)
129	>	return;
130	>
131	>	while (fgets(buff, sizeof(buff), file))
132	>	{
133	>	if ((p = strchr(buff, '\n')))
134	>	*p = '\0';
135	>
136	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
137		}
138
139		fclose(file);
#	Line 175 | Line 159 | write_links_file(void* notused)
159		*      returns: (see #defines)
160		*/
161		int
162	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
163	<	int server, int parc, char *parv[])
162	>	hunt_server(struct Client *source_p, const char *command,
163	>	const int server, const int parc, char *parv[])
164		{
165		struct Client *target_p = NULL;
166		struct Client *target_tmp = NULL;
#	Line 187 | Line 171 | hunt_server(struct Client *client_p, str
171		if (parc <= server || EmptyString(parv[server]))
172		return HUNTED_ISME;
173
174	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
174	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
175		return HUNTED_ISME;
176
177		/* These are to pickup matches that would cause the following
#	Line 197 | Line 181 | hunt_server(struct Client *client_p, str
181		if (MyClient(source_p))
182		target_p = hash_find_client(parv[server]);
183		else
184	<	target_p = find_person(client_p, parv[server]);
184	>	target_p = find_person(source_p, parv[server]);
185
186		if (target_p)
187		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 207 | Line 191 | hunt_server(struct Client *client_p, str
191		if (target_p->from == source_p->from && !MyConnect(target_p))
192		target_p = NULL;
193
210	–	collapse(parv[server]);
194		wilds = has_wildcards(parv[server]);
195
196		/* Again, if there are no wild cards involved in the server
#	Line 219 | Line 202 | hunt_server(struct Client *client_p, str
202		{
203		if (!(target_p = hash_find_server(parv[server])))
204		{
205	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
206	<	me.name, source_p->name, parv[server]);
224	<	return(HUNTED_NOSUCH);
205	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
206	>	return HUNTED_NOSUCH;
207		}
208		}
209		else
#	Line 230 | Line 212 | hunt_server(struct Client *client_p, str
212		{
213		target_tmp = ptr->data;
214
215	<	if (match(parv[server], target_tmp->name))
215	>	if (!match(parv[server], target_tmp->name))
216		{
217		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
218		continue;
219		target_p = ptr->data;
220
221	<	if (IsRegistered(target_p) && (target_p != client_p))
221	>	if (IsRegistered(target_p) && (target_p != source_p->from))
222		break;
223		}
224		}
225		}
226		}
227
228	<	if (target_p != NULL)
228	>	if (target_p)
229		{
230	<	if(!IsRegistered(target_p))
230	>	if (!IsRegistered(target_p))
231		{
232	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
251	<	me.name, source_p->name, parv[server]);
232	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
233		return HUNTED_NOSUCH;
234		}
235
236		if (IsMe(target_p) || MyClient(target_p))
237		return HUNTED_ISME;
238
239	<	if (!match(target_p->name, parv[server]))
239	>	if (match(target_p->name, parv[server]))
240		parv[server] = target_p->name;
241
242		/* This is a little kludgy but should work... */
243	<	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],
243	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
244		parv[1], parv[2], parv[3], parv[4],
245		parv[5], parv[6], parv[7], parv[8]);
246	<	return(HUNTED_PASS);
247	<	}
246	>	return HUNTED_PASS;
247	>	}
248
249	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
250	<	me.name, source_p->name, parv[server]);
275	<	return(HUNTED_NOSUCH);
249	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
250	>	return HUNTED_NOSUCH;
251		}
252
253		/* try_connections()
#	Line 288 | Line 263 | hunt_server(struct Client *client_p, str
263		void
264		try_connections(void *unused)
265		{
266	<	dlink_node *ptr;
267	<	struct ConfItem *conf;
293	<	struct AccessItem *aconf;
294	<	struct ClassItem *cltmp;
266	>	dlink_node *ptr = NULL;
267	>	struct MaskItem *conf;
268		int confrq;
269
270		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 301 | Line 274 | try_connections(void *unused)
274		DLINK_FOREACH(ptr, server_items.head)
275		{
276		conf = ptr->data;
304	–	aconf = map_to_conf(conf);
277
278	<	/* Also when already connecting! (update holdtimes) --SRB
278	>	assert(conf->type == CONF_SERVER);
279	>
280	>	/* Also when already connecting! (update holdtimes) --SRB
281		*/
282	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
309	<	!(IsConfAllowAutoConn(aconf)))
282	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
283		continue;
284
312	–	cltmp = map_to_conf(aconf->class_ptr);
285
286		/* Skip this entry if the use of it is still on hold until
287		* future. Otherwise handle this entry (and set it on hold
#	Line 317 | Line 289 | try_connections(void *unused)
289		* made one successfull connection... [this algorithm is
290		* a bit fuzzy... -- msa >;) ]
291		*/
292	<	if (aconf->hold > CurrentTime)
292	>	if (conf->until > CurrentTime)
293		continue;
294
295	<	if (cltmp == NULL)
295	>	if (conf->class == NULL)
296		confrq = DEFAULT_CONNECTFREQUENCY;
297		else
298		{
299	<	confrq = cltmp->con_freq;
299	>	confrq = conf->class->con_freq;
300		if (confrq < MIN_CONN_FREQ)
301	<	confrq = MIN_CONN_FREQ;
301	>	confrq = MIN_CONN_FREQ;
302		}
303
304	<	aconf->hold = CurrentTime + confrq;
304	>	conf->until = CurrentTime + confrq;
305
306	<	/* Found a CONNECT config with port specified, scan clients
306	>	/*
307	>	* Found a CONNECT config with port specified, scan clients
308		* and see if this server is already connected?
309		*/
310	<	if (hash_find_server(conf->name) != NULL)
310	>	if (hash_find_server(conf->name))
311		continue;
312
313	<	if (cltmp->curr_user_count < cltmp->max_total)
313	>	if (conf->class->ref_count < conf->class->max_total)
314		{
315		/* Go to the end of the list, if not already last */
316	<	if (ptr->next != NULL)
316	>	if (ptr->next)
317		{
318		dlinkDelete(ptr, &server_items);
319		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 349 | Line 322 | try_connections(void *unused)
322		if (find_servconn_in_progress(conf->name))
323		return;
324
325	<	/* We used to only print this if serv_connect() actually
325	>	/*
326	>	* We used to only print this if serv_connect() actually
327		* succeeded, but since comm_tcp_connect() can call the callback
328		* immediately if there is an error, we were getting error messages
329		* in the wrong order. SO, we just print out the activated line,
#	Line 358 | Line 332 | try_connections(void *unused)
332		*   -- adrian
333		*/
334		if (ConfigServerHide.hide_server_ips)
335	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
335	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
336	>	"Connection to %s activated.",
337		conf->name);
338		else
339	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
340	<	conf->name, aconf->host);
339	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
340	>	"Connection to %s[%s] activated.",
341	>	conf->name, conf->host);
342
343	<	serv_connect(aconf, NULL);
343	>	serv_connect(conf, NULL);
344		/* We connect only one at time... */
345		return;
346		}
#	Line 389 | Line 365 | valid_servname(const char *name)
365		++dots;
366		}
367
368	<	return dots != 0 && length <= HOSTLEN;
368	>	return dots && length <= HOSTLEN;
369		}
370
371		int
372		check_server(const char *name, struct Client *client_p)
373		{
374		dlink_node *ptr;
375	<	struct ConfItem *conf           = NULL;
376	<	struct ConfItem *server_conf    = NULL;
401	<	struct AccessItem *server_aconf = NULL;
402	<	struct AccessItem *aconf        = NULL;
375	>	struct MaskItem *conf        = NULL;
376	>	struct MaskItem *server_conf = NULL;
377		int error = -1;
378
379	<	assert(client_p != NULL);
379	>	assert(client_p);
380
381		/* loop through looking for all possible connect items that might work */
382		DLINK_FOREACH(ptr, server_items.head)
383		{
384		conf = ptr->data;
411	–	aconf = map_to_conf(conf);
385
386	<	if (!match(name, conf->name))
386	>	if (match(name, conf->name))
387		continue;
388
389		error = -3;
390
391		/* XXX: Fix me for IPv6                    */
392		/* XXX sockhost is the IPv4 ip as a string */
393	<	if (match(aconf->host, client_p->host) ||
394	<	match(aconf->host, client_p->sockhost))
393	>	if (!match(conf->host, client_p->host) ||
394	>	!match(conf->host, client_p->sockhost))
395		{
396		error = -2;
397
398	<	if (!match_conf_password(client_p->localClient->passwd, aconf))
398	>	if (!match_conf_password(client_p->localClient->passwd, conf))
399		return -2;
400
401	+	if (!EmptyString(conf->certfp))
402	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
403	+	return -4;
404	+
405		server_conf = conf;
406		}
407		}
408
409		if (server_conf == NULL)
410	<	return(error);
410	>	return error;
411
412		attach_conf(client_p, server_conf);
413
437	–	server_aconf = map_to_conf(server_conf);
438	–
439	–	if (!IsConfTopicBurst(server_aconf))
440	–	ClearCap(client_p, CAP_TBURST);
414
415	<	if (aconf != NULL)
415	>	if (server_conf)
416		{
417		struct sockaddr_in *v4;
418		#ifdef IPV6
419		struct sockaddr_in6 *v6;
420		#endif
421	<	switch (aconf->aftype)
421	>	switch (server_conf->aftype)
422		{
423		#ifdef IPV6
424	<	case AF_INET6:
425	<	v6 = (struct sockaddr_in6 *)&aconf->addr;
424	>	case AF_INET6:
425	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
426
427		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
428	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
428	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
429		break;
430		#endif
431		case AF_INET:
432	<	v4 = (struct sockaddr_in *)&aconf->addr;
432	>	v4 = (struct sockaddr_in *)&server_conf->addr;
433
434		if (v4->sin_addr.s_addr == INADDR_NONE)
435	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
435	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
436		break;
437		}
438		}
439
440	<	return(0);
440	>	return 0;
441		}
442
443		/* add_capability()
#	Line 481 | Line 454 | add_capability(const char *capab_name, i
454		{
455		struct Capability *cap = MyMalloc(sizeof(*cap));
456
457	<	DupString(cap->name, capab_name);
457	>	cap->name = xstrdup(capab_name);
458		cap->cap = cap_flag;
459		dlinkAdd(cap, &cap->node, &cap_list);
460
#	Line 510 | Line 483 | delete_capability(const char *capab_name
483		{
484		if (irccmp(cap->name, capab_name) == 0)
485		{
486	<	default_server_capabs &= ~(cap->cap);
487	<	dlinkDelete(ptr, &cap_list);
488	<	MyFree(cap->name);
489	<	cap->name = NULL;
517	<	MyFree(cap);
486	>	default_server_capabs &= ~(cap->cap);
487	>	dlinkDelete(ptr, &cap_list);
488	>	MyFree(cap->name);
489	>	MyFree(cap);
490		}
491		}
492		}
#	Line 529 | Line 501 | delete_capability(const char *capab_name
501		* output       - 0 if not found CAPAB otherwise
502		* side effects - none
503		*/
504	<	int
504	>	unsigned int
505		find_capability(const char *capab)
506		{
507		const dlink_node *ptr = NULL;
#	Line 548 | Line 520 | find_capability(const char *capab)
520		/* send_capabilities()
521		*
522		* inputs       - Client pointer to send to
551	–	*              - Pointer to AccessItem (for crypt)
523		*              - int flag of capabilities that this server can send
524		* output       - NONE
525		* side effects - send the CAPAB line to a server  -orabidoo
526		*
527		*/
528		void
529	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
559	<	int cap_can_send)
529	>	send_capabilities(struct Client *client_p, int cap_can_send)
530		{
531	<	struct Capability *cap=NULL;
532	<	char msgbuf[IRCD_BUFSIZE];
563	<	char *t;
531	>	char msgbuf[IRCD_BUFSIZE] = "";
532	>	char *t = msgbuf;
533		int tl;
534	<	dlink_node *ptr;
566	<
567	<	t = msgbuf;
534	>	dlink_node *ptr = NULL;
535
536		DLINK_FOREACH(ptr, cap_list.head)
537		{
538	<	cap = ptr->data;
538	>	struct Capability *cap = ptr->data;
539
540		if (cap->cap & (cap_can_send|default_server_capabs))
541		{
542	<	tl = ircsprintf(t, "%s ", cap->name);
542	>	tl = sprintf(t, "%s ", cap->name);
543		t += tl;
544		}
545		}
#	Line 582 | Line 549 | send_capabilities(struct Client *client_
549		}
550
551		/* sendnick_TS()
552	<	*
552	>	*
553		* inputs       - client (server) to send nick towards
554		*          - client to send nick for
555		* output       - NONE
#	Line 591 | Line 558 | send_capabilities(struct Client *client_
558		void
559		sendnick_TS(struct Client *client_p, struct Client *target_p)
560		{
561	<	static char ubuf[12];
561	>	char ubuf[IRCD_BUFSIZE] = "";
562
563		if (!IsClient(target_p))
564		return;
#	Line 604 | Line 571 | sendnick_TS(struct Client *client_p, str
571		ubuf[1] = '\0';
572		}
573
607	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
574		if (IsCapable(client_p, CAP_SVS))
575	<	{
576	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
577	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
578	<	target_p->servptr->id,
579	<	target_p->name, target_p->hopcount + 1,
580	<	(unsigned long) target_p->tsinfo,
581	<	ubuf, target_p->username, target_p->host,
582	<	(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	<	}
575	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
576	>	target_p->servptr->id,
577	>	target_p->name, target_p->hopcount + 1,
578	>	(unsigned long) target_p->tsinfo,
579	>	ubuf, target_p->username, target_p->host,
580	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
581	>	"0" : target_p->sockhost, target_p->id,
582	>	target_p->svid, target_p->info);
583		else
584	<	{
585	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
586	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
587	<	target_p->servptr->id,
588	<	target_p->name, target_p->hopcount + 1,
589	<	(unsigned long) target_p->tsinfo,
590	<	ubuf, target_p->username, target_p->host,
591	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
592	<	"0" : target_p->sockhost, target_p->id, target_p->info);
593	<	else
638	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
639	<	target_p->name, target_p->hopcount + 1,
640	<	(unsigned long) target_p->tsinfo,
641	<	ubuf, target_p->username, target_p->host,
642	<	target_p->servptr->name, target_p->info);
643	<	}
584	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
585	>	target_p->servptr->id,
586	>	target_p->name, target_p->hopcount + 1,
587	>	(unsigned long) target_p->tsinfo,
588	>	ubuf, target_p->username, target_p->host,
589	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
590	>	"0" : target_p->sockhost, target_p->id, target_p->info);
591	>
592	>	if (!EmptyString(target_p->certfp))
593	>	sendto_one(client_p, ":%s CERTFP %s", target_p->id, target_p->certfp);
594
595	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->localClient->confs.head->data)))
596	<	if (!EmptyString(target_p->away))
647	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
648	<	target_p->away);
595	>	if (target_p->away[0])
596	>	sendto_one(client_p, ":%s AWAY :%s", target_p->id, target_p->away);
597
598		}
599
#	Line 657 | Line 605 | sendnick_TS(struct Client *client_p, str
605		* side effects - build up string representing capabilities of server listed
606		*/
607		const char *
608	<	show_capabilities(struct Client *target_p)
608	>	show_capabilities(const struct Client *target_p)
609		{
610	<	static char msgbuf[IRCD_BUFSIZE];
611	<	char *t = msgbuf;
664	<	dlink_node *ptr;
610	>	static char msgbuf[IRCD_BUFSIZE] = "";
611	>	const dlink_node *ptr = NULL;
612
613	<	t += ircsprintf(msgbuf, "TS ");
613	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
614
615		DLINK_FOREACH(ptr, cap_list.head)
616		{
617		const struct Capability *cap = ptr->data;
618
619	<	if (IsCapable(target_p, cap->cap))
620	<	t += ircsprintf(t, "%s ", cap->name);
619	>	if (!IsCapable(target_p, cap->cap))
620	>	continue;
621	>
622	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
623	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
624		}
625
676	–	*(t - 1) = '\0';
626		return msgbuf;
627		}
628
#	Line 702 | Line 651 | make_server(struct Client *client_p)
651		void
652		server_estab(struct Client *client_p)
653		{
654	<	struct Client *target_p;
706	<	struct ConfItem *conf;
707	<	struct AccessItem *aconf=NULL;
654	>	struct MaskItem *conf = NULL;
655		char *host;
656		const char *inpath;
657		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
#	Line 713 | Line 660 | server_estab(struct Client *client_p)
660		const COMP_METHOD *compression = NULL, *expansion = NULL;
661		#endif
662
663	<	assert(client_p != NULL);
663	>	assert(client_p);
664
665		strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
666
667		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
668		host   = client_p->name;
669
670	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
670	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
671		== NULL)
672		{
673		/* This shouldn't happen, better tell the ops... -A1kmm */
674	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
674	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
675	>	"Warning: Lost connect{} block "
676		"for server %s(this shouldn't happen)!", host);
677	<	exit_client(client_p, &me, "Lost connect{} block!");
677	>	exit_client(client_p, "Lost connect{} block!");
678		return;
679		}
680
#	Line 739 | Line 687 | server_estab(struct Client *client_p)
687		/* If there is something in the serv_list, it might be this
688		* connecting server..
689		*/
690	<	if (!ServerInfo.hub && serv_list.head)
690	>	if (!ServerInfo.hub && serv_list.head)
691		{
692		if (client_p != serv_list.head->data || serv_list.head->next)
693		{
694		++ServerStats.is_ref;
695		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
696	<	exit_client(client_p, &me, "I'm a leaf");
696	>	exit_client(client_p, "I'm a leaf");
697		return;
698		}
699		}
700
753	–	aconf = map_to_conf(conf);
754	–
701		if (IsUnknown(client_p))
702		{
703	<	/* 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	<	*/
703	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
704
705	<	send_capabilities(client_p, aconf,
772	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
705	>	send_capabilities(client_p, 0);
706
707		sendto_one(client_p, "SERVER %s 1 :%s%s",
708		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
#	Line 778 | Line 711 | server_estab(struct Client *client_p)
711		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
712		(unsigned long)CurrentTime);
713
781	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
782	–	if (IsCapable(client_p, CAP_TS6))
783	–	hash_add_id(client_p);
784	–
714		/* XXX Does this ever happen? I don't think so -db */
715	<	detach_conf(client_p, OPER_TYPE);
715	>	detach_conf(client_p, CONF_OPER);
716
717		/* *WARNING*
718		**    In the following code in place of plain server's
#	Line 803 | Line 732 | server_estab(struct Client *client_p)
732
733		SetServer(client_p);
734
806	–	/* Update the capability combination usage counts. -A1kmm */
807	–	set_chcap_usage_counts(client_p);
808	–
735		/* Some day, all these lists will be consolidated *sigh* */
736		dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
737
#	Line 818 | Line 744 | server_estab(struct Client *client_p)
744
745		dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
746		hash_add_client(client_p);
747	+	hash_add_id(client_p);
748
749		/* doesnt duplicate client_p->serv if allocated this struct already */
750		make_server(client_p);
#	Line 825 | Line 752 | server_estab(struct Client *client_p)
752		/* fixing eob timings.. -gnp */
753		client_p->localClient->firsttime = CurrentTime;
754
755	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
755	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
756		AddFlag(client_p, FLAGS_SERVICE);
757
758		/* Show the real host/IP to admins */
#	Line 835 | Line 762 | server_estab(struct Client *client_p)
762		compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
763		expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
764
765	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
765	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
766		"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
767		inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
768		compression ? SSL_COMP_get_name(compression) : "NONE",
769		expansion ? SSL_COMP_get_name(expansion) : "NONE",
770		show_capabilities(client_p));
771		/* Now show the masked hostname/IP to opers */
772	<	sendto_realops_flags(UMODE_ALL, L_OPER,
772	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
773		"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
774		inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
775		compression ? SSL_COMP_get_name(compression) : "NONE",
#	Line 857 | Line 784 | server_estab(struct Client *client_p)
784		else
785		#endif
786		{
787	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
787	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
788		"Link with %s established: (Capabilities: %s)",
789	<	inpath_ip,show_capabilities(client_p));
789	>	inpath_ip, show_capabilities(client_p));
790		/* Now show the masked hostname/IP to opers */
791	<	sendto_realops_flags(UMODE_ALL, L_OPER,
791	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
792		"Link with %s established: (Capabilities: %s)",
793	<	inpath,show_capabilities(client_p));
793	>	inpath, show_capabilities(client_p));
794		ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
795		inpath_ip, show_capabilities(client_p));
796		}
797
798		fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
799
800	<	/* Old sendto_serv_but_one() call removed because we now
801	<	** need to send different names to different servers
802	<	** (domain name matching) Send new server to other servers.
876	<	*/
877	<	DLINK_FOREACH(ptr, serv_list.head)
878	<	{
879	<	target_p = ptr->data;
800	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
801	>	me.id, client_p->name, client_p->id,
802	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
803
804	<	if (target_p == client_p)
805	<	continue;
806	<
807	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
808	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
809	<	me.id, client_p->name, client_p->id,
810	<	IsHidden(client_p) ? "(H) " : "",
811	<	client_p->info);
812	<	else
813	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
814	<	me.name, client_p->name,
815	<	IsHidden(client_p) ? "(H) " : "",
816	<	client_p->info);
817	<	}
818	<
819	<	/* Pass on my client information to the new server
820	<	**
821	<	** First, pass only servers (idea is that if the link gets
899	<	** cancelled beacause the server was already there,
900	<	** there are no NICK's to be cancelled...). Of course,
901	<	** 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	<	*/
804	>	/*
805	>	* Pass on my client information to the new server
806	>	*
807	>	* First, pass only servers (idea is that if the link gets
808	>	* cancelled beacause the server was already there,
809	>	* there are no NICK's to be cancelled...). Of course,
810	>	* if cancellation occurs, all this info is sent anyway,
811	>	* and I guess the link dies when a read is attempted...? --msa
812	>	*
813	>	* Note: Link cancellation to occur at this point means
814	>	* that at least two servers from my fragment are building
815	>	* up connection this other fragment at the same time, it's
816	>	* a race condition, not the normal way of operation...
817	>	*
818	>	* ALSO NOTE: using the get_client_name for server names--
819	>	*    see previous *WARNING*!!! (Also, original inpath
820	>	*    is destroyed...)
821	>	*/
822
823		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
824		{
825	<	target_p = ptr->data;
825	>	struct Client *target_p = ptr->data;
826
827		/* target_p->from == target_p for target_p == client_p */
828		if (IsMe(target_p) || target_p->from == client_p)
829		continue;
830
831	<	if (IsCapable(client_p, CAP_TS6))
832	<	{
833	<	if (HasID(target_p))
834	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
835	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
836	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
837	<	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);
831	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
832	>	target_p->servptr->id, target_p->name, target_p->hopcount+1,
833	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
834	>	target_p->info);
835	>
836	>	if (HasFlag(target_p, FLAGS_EOB))
837	>	sendto_one(client_p, ":%s EOB", target_p->id, client_p);
838		}
839
840		server_burst(client_p);
#	Line 965 | Line 865 | server_burst(struct Client *client_p)
865
866		/* EOB stuff is now in burst_all */
867		/* Always send a PING after connect burst is done */
868	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
868	>	sendto_one(client_p, "PING :%s", me.id);
869		}
870
871		/* burst_all()
872		*
873	<	* inputs       - pointer to server to send burst to
873	>	* inputs       - pointer to server to send burst to
874		* output       - NONE
875		* side effects - complete burst of channels/nicks is sent to client_p
876		*/
#	Line 983 | Line 883 | burst_all(struct Client *client_p)
883		{
884		struct Channel *chptr = ptr->data;
885
886	<	if (dlink_list_length(&chptr->members) != 0)
886	>	if (dlink_list_length(&chptr->members))
887		{
888		burst_members(client_p, chptr);
889		send_channel_modes(client_p, chptr);
890
891		if (IsCapable(client_p, CAP_TBURST))
892	<	send_tb(client_p, chptr);
892	>	send_tb(client_p, chptr);
893		}
894		}
895
#	Line 1001 | Line 901 | burst_all(struct Client *client_p)
901
902		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
903		sendnick_TS(client_p, target_p);
904	<
904	>
905		DelFlag(target_p, FLAGS_BURSTED);
906		}
907
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_ */
908		if (IsCapable(client_p, CAP_EOB))
909	<	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
909	>	sendto_one(client_p, ":%s EOB", me.id);
910		}
911
912		/*
#	Line 1038 | Line 934 | send_tb(struct Client *client_p, struct
934		* it to their old topic they had before.  Read m_tburst.c:ms_tburst
935		* for further information   -Michael
936		*/
937	<	if (chptr->topic_time != 0)
938	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1043	<	ID_or_name(&me, client_p),
937	>	if (chptr->topic_time)
938	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s", me.id,
939		(unsigned long)chptr->channelts, chptr->chname,
940		(unsigned long)chptr->topic_time,
941		chptr->topic_info,
#	Line 1083 | Line 978 | burst_members(struct Client *client_p, s
978
979		/* serv_connect() - initiate a server connection
980		*
981	<	* inputs       - pointer to conf
981	>	* inputs       - pointer to conf
982		*              - pointer to client doing the connect
983		* output       -
984		* side effects -
#	Line 1098 | Line 993 | burst_members(struct Client *client_p, s
993		* it suceeded or not, and 0 if it fails in here somewhere.
994		*/
995		int
996	<	serv_connect(struct AccessItem *aconf, struct Client *by)
996	>	serv_connect(struct MaskItem *conf, struct Client *by)
997		{
998	<	struct ConfItem *conf;
999	<	struct Client *client_p;
1105	<	char buf[HOSTIPLEN + 1];
998	>	struct Client *client_p = NULL;
999	>	char buf[HOSTIPLEN + 1] = "";
1000
1001		/* conversion structs */
1002		struct sockaddr_in *v4;
1109	–	/* Make sure aconf is useful */
1110	–	assert(aconf != NULL);
1003
1004	<	/* XXX should be passing struct ConfItem in the first place */
1005	<	conf = unmap_conf_item(aconf);
1004	>	/* Make sure conf is useful */
1005	>	assert(conf);
1006
1007	<	/* log */
1116	<	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1007	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1008		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1009	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
1009	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1010		buf);
1011
1012		/* Still processing a DNS lookup? -> exit */
1013	<	if (aconf->dns_pending)
1013	>	if (conf->dns_pending)
1014		{
1015	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1015	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1016		"Error connecting to %s: DNS lookup for connect{} in progress.",
1017		conf->name);
1018	<	return (0);
1018	>	return 0;
1019		}
1020
1021	<	if (aconf->dns_failed)
1021	>	if (conf->dns_failed)
1022		{
1023	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1023	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1024		"Error connecting to %s: DNS lookup for connect{} failed.",
1025		conf->name);
1026	<	return (0);
1026	>	return 0;
1027		}
1028
1029		/* Make sure this server isn't already connected
1030	<	* Note: aconf should ALWAYS be a valid C: line
1030	>	* Note: conf should ALWAYS be a valid C: line
1031		*/
1032	<	if ((client_p = hash_find_server(conf->name)) != NULL)
1033	<	{
1034	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1035	<	"Server %s already present from %s",
1036	<	conf->name, get_client_name(client_p, SHOW_IP));
1037	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1038	<	"Server %s already present from %s",
1039	<	conf->name, get_client_name(client_p, MASK_IP));
1032	>	if ((client_p = hash_find_server(conf->name)))
1033	>	{
1034	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1035	>	"Server %s already present from %s",
1036	>	conf->name, get_client_name(client_p, SHOW_IP));
1037	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1038	>	"Server %s already present from %s",
1039	>	conf->name, get_client_name(client_p, MASK_IP));
1040		if (by && IsClient(by) && !MyClient(by))
1041	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1042	<	me.name, by->name, conf->name,
1043	<	get_client_name(client_p, MASK_IP));
1153	<	return (0);
1041	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1042	>	conf->name, get_client_name(client_p, MASK_IP));
1043	>	return 0;
1044		}
1045	<
1045	>
1046		/* Create a local client */
1047		client_p = make_client(NULL);
1048
1049		/* Copy in the server, hostname, fd */
1050		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1051	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1051	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1052
1053		/* We already converted the ip once, so lets use it - stu */
1054		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1055
1056	<	/* create a socket for the server connection */
1057	<	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1056	>	/* create a socket for the server connection */
1057	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1058		SOCK_STREAM, 0, NULL) < 0)
1059		{
1060		/* Eek, failure to create the socket */
1061	<	report_error(L_ALL,
1062	<	"opening stream socket to %s: %s", conf->name, errno);
1061	>	report_error(L_ALL, "opening stream socket to %s: %s",
1062	>	conf->name, errno);
1063		SetDead(client_p);
1064	<	exit_client(client_p, &me, "Connection failed");
1065	<	return (0);
1064	>	exit_client(client_p, "Connection failed");
1065	>	return 0;
1066		}
1067
1068		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1181 | Line 1071 | serv_connect(struct AccessItem *aconf, s
1071		/* Attach config entries to client here rather than in
1072		* serv_connect_callback(). This to avoid null pointer references.
1073		*/
1074	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1074	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1075		{
1076	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1077	<	"Host %s is not enabled for connecting:no C/N-line",
1078	<	conf->name);
1079	<	if (by && IsClient(by) && !MyClient(by))
1080	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1081	<	me.name, by->name, client_p->name);
1076	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1077	>	"Host %s is not enabled for connecting: no connect{} block",
1078	>	conf->name);
1079	>	if (by && IsClient(by) && !MyClient(by))
1080	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1081	>
1082		SetDead(client_p);
1083	<	exit_client(client_p, client_p, "Connection failed");
1084	<	return (0);
1083	>	exit_client(client_p, "Connection failed");
1084	>	return 0;
1085		}
1086
1087		/* at this point we have a connection in progress and C/N lines
#	Line 1210 | Line 1100 | serv_connect(struct AccessItem *aconf, s
1100		SetConnecting(client_p);
1101		dlinkAdd(client_p, &client_p->node, &global_client_list);
1102		/* from def_fam */
1103	<	client_p->localClient->aftype = aconf->aftype;
1103	>	client_p->localClient->aftype = conf->aftype;
1104
1105		/* Now, initiate the connection */
1106	<	/* XXX assume that a non 0 type means a specific bind address
1106	>	/* XXX assume that a non 0 type means a specific bind address
1107		* for this connect.
1108		*/
1109	<	switch (aconf->aftype)
1109	>	switch (conf->aftype)
1110		{
1111		case AF_INET:
1112	<	v4 = (struct sockaddr_in*)&aconf->bind;
1113	<	if (v4->sin_addr.s_addr != 0)
1112	>	v4 = (struct sockaddr_in*)&conf->bind;
1113	>	if (v4->sin_addr.s_addr)
1114		{
1115		struct irc_ssaddr ipn;
1116		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1117		ipn.ss.ss_family = AF_INET;
1118		ipn.ss_port = 0;
1119	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1120	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1121	<	(struct sockaddr *)&ipn, ipn.ss_len,
1122	<	serv_connect_callback, client_p, aconf->aftype,
1123	<	CONNECTTIMEOUT);
1119	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1120	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1121	>	(struct sockaddr *)&ipn, ipn.ss_len,
1122	>	serv_connect_callback, client_p, conf->aftype,
1123	>	CONNECTTIMEOUT);
1124		}
1125		else if (ServerInfo.specific_ipv4_vhost)
1126		{
#	Line 1239 | Line 1129 | serv_connect(struct AccessItem *aconf, s
1129		ipn.ss.ss_family = AF_INET;
1130		ipn.ss_port = 0;
1131		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1132	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1132	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1133		(struct sockaddr *)&ipn, ipn.ss_len,
1134	<	serv_connect_callback, client_p, aconf->aftype,
1135	<	CONNECTTIMEOUT);
1134	>	serv_connect_callback, client_p, conf->aftype,
1135	>	CONNECTTIMEOUT);
1136		}
1137		else
1138	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1139	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1138	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1139	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1140		CONNECTTIMEOUT);
1141		break;
1142		#ifdef IPV6
1143		case AF_INET6:
1144		{
1145	<	struct irc_ssaddr ipn;
1146	<	struct sockaddr_in6 *v6;
1147	<	struct sockaddr_in6 *v6conf;
1148	<
1149	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1150	<	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1151	<	v6 = (struct sockaddr_in6 *)&ipn;
1152	<
1153	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1154	<	sizeof(struct in6_addr)) != 0)
1155	<	{
1156	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1157	<	ipn.ss.ss_family = AF_INET6;
1158	<	ipn.ss_port = 0;
1159	<	comm_connect_tcp(&client_p->localClient->fd,
1160	<	aconf->host, aconf->port,
1161	<	(struct sockaddr *)&ipn, ipn.ss_len,
1162	<	serv_connect_callback, client_p,
1163	<	aconf->aftype, CONNECTTIMEOUT);
1164	<	}
1275	<	else if (ServerInfo.specific_ipv6_vhost)
1145	>	struct irc_ssaddr ipn;
1146	>	struct sockaddr_in6 *v6;
1147	>	struct sockaddr_in6 *v6conf;
1148	>
1149	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1150	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1151	>	v6 = (struct sockaddr_in6 *)&ipn;
1152	>
1153	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
1154	>	{
1155	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1156	>	ipn.ss.ss_family = AF_INET6;
1157	>	ipn.ss_port = 0;
1158	>	comm_connect_tcp(&client_p->localClient->fd,
1159	>	conf->host, conf->port,
1160	>	(struct sockaddr *)&ipn, ipn.ss_len,
1161	>	serv_connect_callback, client_p,
1162	>	conf->aftype, CONNECTTIMEOUT);
1163	>	}
1164	>	else if (ServerInfo.specific_ipv6_vhost)
1165		{
1166	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1167	<	ipn.ss.ss_family = AF_INET6;
1168	<	ipn.ss_port = 0;
1169	<	comm_connect_tcp(&client_p->localClient->fd,
1170	<	aconf->host, aconf->port,
1171	<	(struct sockaddr *)&ipn, ipn.ss_len,
1172	<	serv_connect_callback, client_p,
1173	<	aconf->aftype, CONNECTTIMEOUT);
1174	<	}
1175	<	else
1176	<	comm_connect_tcp(&client_p->localClient->fd,
1177	<	aconf->host, aconf->port,
1178	<	NULL, 0, serv_connect_callback, client_p,
1179	<	aconf->aftype, CONNECTTIMEOUT);
1166	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1167	>	ipn.ss.ss_family = AF_INET6;
1168	>	ipn.ss_port = 0;
1169	>	comm_connect_tcp(&client_p->localClient->fd,
1170	>	conf->host, conf->port,
1171	>	(struct sockaddr *)&ipn, ipn.ss_len,
1172	>	serv_connect_callback, client_p,
1173	>	conf->aftype, CONNECTTIMEOUT);
1174	>	}
1175	>	else
1176	>	comm_connect_tcp(&client_p->localClient->fd,
1177	>	conf->host, conf->port,
1178	>	NULL, 0, serv_connect_callback, client_p,
1179	>	conf->aftype, CONNECTTIMEOUT);
1180		}
1181		#endif
1182		}
1183	<	return (1);
1183	>	return 1;
1184		}
1185
1186		#ifdef HAVE_LIBCRYPTO
1187		static void
1188		finish_ssl_server_handshake(struct Client *client_p)
1189		{
1190	<	struct ConfItem *conf=NULL;
1302	<	struct AccessItem *aconf=NULL;
1190	>	struct MaskItem *conf = NULL;
1191
1192		conf = find_conf_name(&client_p->localClient->confs,
1193	<	client_p->name, SERVER_TYPE);
1193	>	client_p->name, CONF_SERVER);
1194		if (conf == NULL)
1195		{
1196	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1196	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1197		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1198	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1198	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1199		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1200
1201	<	exit_client(client_p, &me, "Lost connect{} block");
1201	>	exit_client(client_p, "Lost connect{} block");
1202		return;
1203		}
1204
1205	<	aconf = map_to_conf(conf);
1205	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1206
1207	<	/* 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));
1207	>	send_capabilities(client_p, 0);
1208
1209		sendto_one(client_p, "SERVER %s 1 :%s%s",
1210		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1333 | Line 1215 | finish_ssl_server_handshake(struct Clien
1215		*/
1216		if (IsDead(client_p))
1217		{
1218	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1218	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1219		"%s[%s] went dead during handshake",
1220		client_p->name,
1221		client_p->host);
1222	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1222	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1223		"%s went dead during handshake", client_p->name);
1224		return;
1225		}
#	Line 1350 | Line 1232 | finish_ssl_server_handshake(struct Clien
1232		static void
1233		ssl_server_handshake(fde_t *fd, struct Client *client_p)
1234		{
1235	<	int ret;
1236	<	int err;
1355	<
1356	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1235	>	X509 *cert = NULL;
1236	>	int ret = 0;
1237
1238	<	if (ret <= 0)
1238	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1239		{
1240	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1240	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1241		{
1242		case SSL_ERROR_WANT_WRITE:
1243		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1370 | Line 1250 | ssl_server_handshake(fde_t *fd, struct C
1250		default:
1251		{
1252		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1253	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1253	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1254		"Error connecting to %s: %s", client_p->name,
1255		sslerr ? sslerr : "unknown SSL error");
1256	<	exit_client(client_p, client_p, "Error during SSL handshake");
1256	>	exit_client(client_p, "Error during SSL handshake");
1257		return;
1258		}
1259		}
1260		}
1261
1262	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1263	+	{
1264	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1265	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1266	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1267	+
1268	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1269	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1270	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1271	+	{
1272	+	unsigned int i = 0, n = 0;
1273	+
1274	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1275	+	{
1276	+	for (; i < n; ++i)
1277	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1278	+	client_p->certfp = xstrdup(buf);
1279	+	}
1280	+	}
1281	+	else
1282	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1283	+	client_p->name, client_p->username, client_p->host, res);
1284	+	X509_free(cert);
1285	+	}
1286	+
1287		finish_ssl_server_handshake(client_p);
1288		}
1289
1290		static void
1291	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1291	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1292		{
1293		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1294		{
1295		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1296		ERR_error_string(ERR_get_error(), NULL));
1297		SetDead(client_p);
1298	<	exit_client(client_p, client_p, "SSL_new failed");
1298	>	exit_client(client_p, "SSL_new failed");
1299		return;
1300		}
1301
1302		SSL_set_fd(fd->ssl, fd->fd);
1303
1304	<	if (!EmptyString(aconf->cipher_list))
1305	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1304	>	if (!EmptyString(conf->cipher_list))
1305	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1306
1307		ssl_server_handshake(NULL, client_p);
1308		}
1309		#endif
1310
1311		/* serv_connect_callback() - complete a server connection.
1312	<	*
1312	>	*
1313		* This routine is called after the server connection attempt has
1314		* completed. If unsucessful, an error is sent to ops and the client
1315		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1415 | Line 1320 | static void
1320		serv_connect_callback(fde_t *fd, int status, void *data)
1321		{
1322		struct Client *client_p = data;
1323	<	struct ConfItem *conf=NULL;
1419	<	struct AccessItem *aconf=NULL;
1323	>	struct MaskItem *conf = NULL;
1324
1325		/* First, make sure its a real client! */
1326	<	assert(client_p != NULL);
1326	>	assert(client_p);
1327		assert(&client_p->localClient->fd == fd);
1328
1329		/* Next, for backward purposes, record the ip of the server */
1330		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
1331		sizeof(struct irc_ssaddr));
1332	+
1333		/* Check the status */
1334		if (status != COMM_OK)
1335		{
#	Line 1432 | Line 1337 | serv_connect_callback(fde_t *fd, int sta
1337		* Admins get to see any IP, mere opers don't *sigh*
1338		*/
1339		if (ConfigServerHide.hide_server_ips)
1340	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1340	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1341		"Error connecting to %s: %s",
1342		client_p->name, comm_errstr(status));
1343		else
1344	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1345	<	"Error connecting to %s[%s]: %s", client_p->name,
1346	<	client_p->host, comm_errstr(status));
1347	<
1348	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1349	<	"Error connecting to %s: %s",
1350	<	client_p->name, comm_errstr(status));
1344	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1345	>	"Error connecting to %s[%s]: %s", client_p->name,
1346	>	client_p->host, comm_errstr(status));
1347	>
1348	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1349	>	"Error connecting to %s: %s",
1350	>	client_p->name, comm_errstr(status));
1351
1352		/* If a fd goes bad, call dead_link() the socket is no
1353		* longer valid for reading or writing.
#	Line 1454 | Line 1359 | serv_connect_callback(fde_t *fd, int sta
1359		/* COMM_OK, so continue the connection procedure */
1360		/* Get the C/N lines */
1361		conf = find_conf_name(&client_p->localClient->confs,
1362	<	client_p->name, SERVER_TYPE);
1362	>	client_p->name, CONF_SERVER);
1363		if (conf == NULL)
1364		{
1365	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1366	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1367	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1368	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1365	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1366	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1367	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1368	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1369
1370	<	exit_client(client_p, &me, "Lost connect{} block");
1370	>	exit_client(client_p, "Lost connect{} block");
1371		return;
1372		}
1373
1469	–	aconf = map_to_conf(conf);
1374		/* Next, send the initial handshake */
1375		SetHandshake(client_p);
1376
1377		#ifdef HAVE_LIBCRYPTO
1378	<	if (IsConfSSL(aconf))
1378	>	if (IsConfSSL(conf))
1379		{
1380	<	ssl_connect_init(client_p, aconf, fd);
1380	>	ssl_connect_init(client_p, conf, fd);
1381		return;
1382		}
1383		#endif
1384
1385	<	/* 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);
1385	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1386
1387	<	send_capabilities(client_p, aconf,
1487	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1387	>	send_capabilities(client_p, 0);
1388
1389	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1390	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1491	<	me.info);
1389	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1390	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1391
1392		/* If we've been marked dead because a send failed, just exit
1393		* here now and save everyone the trouble of us ever existing.
1394		*/
1395	<	if (IsDead(client_p))
1395	>	if (IsDead(client_p))
1396		{
1397	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1398	<	"%s[%s] went dead during handshake",
1397	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1398	>	"%s[%s] went dead during handshake",
1399		client_p->name,
1400	<	client_p->host);
1401	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1402	<	"%s went dead during handshake", client_p->name);
1400	>	client_p->host);
1401	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1402	>	"%s went dead during handshake", client_p->name);
1403		return;
1404		}
1405
#	Line 1520 | Line 1419 | find_servconn_in_progress(const char *na
1419		cptr = ptr->data;
1420
1421		if (cptr && cptr->name[0])
1422	<	if (match(name, cptr->name))
1422	>	if (!match(name, cptr->name))
1423		return cptr;
1424		}
1425	<
1425	>
1426		return NULL;
1427		}

Diff Legend

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