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

Diff Legend

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