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

Diff Legend

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