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 1514 by michael, Sun Aug 26 09:11:17 2012 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3303 by michael, Sun Apr 13 11:19:36 2014 UTC

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

Diff Legend

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