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 1483 by michael, Wed Jul 25 19:15:48 2012 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 6725 by michael, Tue Nov 3 19:56:23 2015 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-2015 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
56	–	#define MIN_CONN_FREQ 300
51
52	<	static dlink_list cap_list = { NULL, NULL, 0 };
53	<	static void server_burst(struct Client *);
54	<	static void burst_all(struct Client *);
61	<	static void send_tb(struct Client *client_p, struct Channel *chptr);
52	>	dlink_list flatten_links;
53	>	static dlink_list server_capabilities_list;
54	>	static void serv_connect_callback(fde_t *, int, void *);
55
63	–	static CNCB serv_connect_callback;
64	–
65	–	static void burst_members(struct Client *, struct Channel *);
56
57		/*
58		* write_links_file
#	Line 73 | Line 63 | static void burst_members(struct Client
63		*                but in no particular order.
64		*/
65		void
66	<	write_links_file(void* notused)
66	>	write_links_file(void *unused)
67		{
68	<	MessageFileLine *next_mptr = 0;
69	<	MessageFileLine *mptr = 0;
70	<	MessageFileLine *currentMessageLine = 0;
81	<	MessageFileLine *newMessageLine = 0;
82	<	MessageFile *MessageFileptr;
83	<	const char *p;
84	<	FILE *file;
85	<	char buff[512];
86	<	dlink_node *ptr;
87	<
88	<	MessageFileptr = &ConfigFileEntry.linksfile;
68	>	FILE *file = NULL;
69	>	dlink_node *node = NULL, *node_next = NULL;
70	>	char buff[IRCD_BUFSIZE] = "";
71
72	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
72	>	if (EmptyString(ConfigServerHide.flatten_links_file))
73		return;
74
75	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
75	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "w")) == NULL)
76		{
77	<	next_mptr = mptr->next;
78	<	MyFree(mptr);
77	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
78	>	strerror(errno));
79	>	return;
80		}
81
82	<	MessageFileptr->contentsOfFile = NULL;
83	<	currentMessageLine             = NULL;
82	>	DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
83	>	{
84	>	dlinkDelete(node, &flatten_links);
85	>	MyFree(node->data);
86	>	free_dlink_node(node);
87	>	}
88
89	<	DLINK_FOREACH(ptr, global_serv_list.head)
89	>	DLINK_FOREACH(node, global_server_list.head)
90		{
91	<	const struct Client *target_p = ptr->data;
91	>	const struct Client *target_p = node->data;
92
93	<	/* skip ourselves, we send ourselves in /links */
94	<	if (IsMe(target_p))
93	>	/*
94	>	* Skip hidden servers, aswell as ourselves, since we already send
95	>	* ourselves in /links
96	>	*/
97	>	if (IsHidden(target_p) || IsMe(target_p))
98		continue;
99
100	<	/* skip hidden servers */
111	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
100	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
101		continue;
102
103	<	if (target_p->info[0])
104	<	p = target_p->info;
116	<	else
117	<	p = "(Unknown Location)";
118	<
119	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
120	<
121	<	/* Attempt to format the file in such a way it follows the usual links output
103	>	/*
104	>	* Attempt to format the file in such a way it follows the usual links output
105		* ie  "servername uplink :hops info"
106		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
107		* - madmax
108		*/
109	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
110	+	me.name, target_p->info);
111	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
112	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
113	+	me.name, target_p->info);
114
115	<	/*
116	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
129	<	* default config but it is configurable..
130	<	* This should be changed to an snprintf at some point, but I'm wanting to
131	<	* know if this is a cause of a bug - cryogen
132	<	*/
133	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
134	<	MESSAGELINELEN);
135	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
136	<	target_p->name, me.name, p);
137	<	newMessageLine->next = NULL;
115	>	fputs(buff, file);
116	>	}
117
118	<	if (MessageFileptr->contentsOfFile)
119	<	{
141	<	if (currentMessageLine)
142	<	currentMessageLine->next = newMessageLine;
143	<	currentMessageLine = newMessageLine;
144	<	}
145	<	else
146	<	{
147	<	MessageFileptr->contentsOfFile = newMessageLine;
148	<	currentMessageLine = newMessageLine;
149	<	}
118	>	fclose(file);
119	>	}
120
121	<	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
122	<	fputs(buff, file);
121	>	void
122	>	read_links_file(void)
123	>	{
124	>	FILE *file = NULL;
125	>	char *p = NULL;
126	>	char buff[IRCD_BUFSIZE] = "";
127	>
128	>	if (EmptyString(ConfigServerHide.flatten_links_file))
129	>	return;
130	>
131	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "r")) == NULL)
132	>	{
133	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
134	>	strerror(errno));
135	>	return;
136	>	}
137	>
138	>	while (fgets(buff, sizeof(buff), file))
139	>	{
140	>	if ((p = strchr(buff, '\n')))
141	>	*p = '\0';
142	>
143	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
144		}
145
146		fclose(file);
#	Line 175 | Line 166 | write_links_file(void* notused)
166		*      returns: (see #defines)
167		*/
168		int
169	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
170	<	int server, int parc, char *parv[])
169	>	hunt_server(struct Client *source_p, const char *command,
170	>	const int server, const int parc, char *parv[])
171		{
172		struct Client *target_p = NULL;
173	<	struct Client *target_tmp = NULL;
183	<	dlink_node *ptr;
184	<	int wilds;
173	>	dlink_node *node = NULL;
174
175		/* Assume it's me, if no server */
176		if (parc <= server || EmptyString(parv[server]))
177		return HUNTED_ISME;
178
179	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
180	<	return HUNTED_ISME;
179	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
180	>	target_p = hash_find_server(parv[server]);
181
182	<	/* These are to pickup matches that would cause the following
182	>	/*
183	>	* These are to pickup matches that would cause the following
184		* message to go in the wrong direction while doing quick fast
185		* non-matching lookups.
186		*/
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	–
187		if (target_p)
188		if (target_p->from == source_p->from && !MyConnect(target_p))
189		target_p = NULL;
190
191	<	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)
191	>	if (!target_p && has_wildcards(parv[server]))
192		{
193	<	if (!wilds)
193	>	DLINK_FOREACH(node, global_server_list.head)
194		{
195	<	if (!(target_p = hash_find_server(parv[server])))
195	>	struct Client *tmp = node->data;
196	>
197	>	assert(IsMe(tmp) || IsServer(tmp));
198	>	if (!match(parv[server], tmp->name))
199		{
200	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
201	<	me.name, source_p->name, parv[server]);
202	<	return(HUNTED_NOSUCH);
200	>	if (tmp->from == source_p->from && !MyConnect(tmp))
201	>	continue;
202	>
203	>	target_p = node->data;
204	>	break;
205		}
206		}
207	<	else
207	>
208	>	if (!target_p)
209		{
210	<	DLINK_FOREACH(ptr, global_client_list.head)
210	>	DLINK_FOREACH(node, global_client_list.head)
211		{
212	<	target_tmp = ptr->data;
212	>	struct Client *tmp = node->data;
213
214	<	if (match(parv[server], target_tmp->name))
214	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
215	>	if (!match(parv[server], tmp->name))
216		{
217	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
217	>	if (tmp->from == source_p->from && !MyConnect(tmp))
218		continue;
237	–	target_p = ptr->data;
219
220	<	if (IsRegistered(target_p) && (target_p != client_p))
221	<	break;
220	>	target_p = node->data;
221	>	break;
222		}
223		}
224		}
225		}
226
227	<	if (target_p != NULL)
227	>	if (target_p)
228		{
229	<	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	<
229	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
230		if (IsMe(target_p) || MyClient(target_p))
231		return HUNTED_ISME;
232
233	<	if (!match(target_p->name, parv[server]))
234	<	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],
233	>	parv[server] = target_p->id;
234	>	sendto_one(target_p, command, source_p->id,
235		parv[1], parv[2], parv[3], parv[4],
236		parv[5], parv[6], parv[7], parv[8]);
237	<	return(HUNTED_PASS);
238	<	}
237	>	return HUNTED_PASS;
238	>	}
239
240	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
241	<	me.name, source_p->name, parv[server]);
275	<	return(HUNTED_NOSUCH);
240	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
241	>	return HUNTED_NOSUCH;
242		}
243
244		/* try_connections()
#	Line 288 | Line 254 | hunt_server(struct Client *client_p, str
254		void
255		try_connections(void *unused)
256		{
257	<	dlink_node *ptr;
292	<	struct ConfItem *conf;
293	<	struct AccessItem *aconf;
294	<	struct ClassItem *cltmp;
295	<	int confrq;
257	>	dlink_node *node = NULL;
258
297	–	/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
259		if (GlobalSetOptions.autoconn == 0)
260		return;
261
262	<	DLINK_FOREACH(ptr, server_items.head)
262	>	DLINK_FOREACH(node, server_items.head)
263		{
264	<	conf = ptr->data;
304	<	aconf = map_to_conf(conf);
264	>	struct MaskItem *conf = node->data;
265
266	<	/* Also when already connecting! (update holdtimes) --SRB
307	<	*/
308	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
309	<	!(IsConfAllowAutoConn(aconf)))
310	<	continue;
266	>	assert(conf->type == CONF_SERVER);
267
268	<	cltmp = map_to_conf(aconf->class_ptr);
268	>	/* Also when already connecting! (update holdtimes) --SRB */
269	>	if (!conf->port || !IsConfAllowAutoConn(conf))
270	>	continue;
271
272	<	/* Skip this entry if the use of it is still on hold until
272	>	/*
273	>	* Skip this entry if the use of it is still on hold until
274		* future. Otherwise handle this entry (and set it on hold
275		* until next time). Will reset only hold times, if already
276		* made one successfull connection... [this algorithm is
277		* a bit fuzzy... -- msa >;) ]
278		*/
279	<	if (aconf->hold > CurrentTime)
279	>	if (conf->until > CurrentTime)
280		continue;
281
282	<	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	<	}
282	>	assert(conf->class);
283
284	<	aconf->hold = CurrentTime + confrq;
284	>	conf->until = CurrentTime + conf->class->con_freq;
285
286	<	/* Found a CONNECT config with port specified, scan clients
286	>	/*
287	>	* Found a CONNECT config with port specified, scan clients
288		* and see if this server is already connected?
289		*/
290	<	if (hash_find_server(conf->name) != NULL)
290	>	if (hash_find_server(conf->name))
291		continue;
292
293	<	if (cltmp->curr_user_count < cltmp->max_total)
293	>	if (conf->class->ref_count < conf->class->max_total)
294		{
295	<	/* Go to the end of the list, if not already last */
296	<	if (ptr->next != NULL)
295	>	/* Move this entry to the end of the list, if not already last */
296	>	if (node->next)
297		{
298	<	dlinkDelete(ptr, &server_items);
298	>	dlinkDelete(node, &server_items);
299		dlinkAddTail(conf, &conf->node, &server_items);
300		}
301
302		if (find_servconn_in_progress(conf->name))
303		return;
304
305	<	/* We used to only print this if serv_connect() actually
305	>	/*
306	>	* We used to only print this if serv_connect() actually
307		* succeeded, but since comm_tcp_connect() can call the callback
308		* immediately if there is an error, we were getting error messages
309		* in the wrong order. SO, we just print out the activated line,
#	Line 358 | Line 312 | try_connections(void *unused)
312		*   -- adrian
313		*/
314		if (ConfigServerHide.hide_server_ips)
315	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
315	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
316	>	"Connection to %s activated.",
317		conf->name);
318		else
319	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
320	<	conf->name, aconf->host);
319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
320	>	"Connection to %s[%s] activated.",
321	>	conf->name, conf->host);
322
323	<	serv_connect(aconf, NULL);
323	>	serv_connect(conf, NULL);
324		/* We connect only one at time... */
325		return;
326		}
#	Line 374 | Line 330 | try_connections(void *unused)
330		int
331		valid_servname(const char *name)
332		{
333	<	unsigned int length = 0;
378	<	unsigned int dots   = 0;
333	>	unsigned int dots = 0;
334		const char *p = name;
335
336		for (; *p; ++p)
#	Line 383 | Line 338 | valid_servname(const char *name)
338		if (!IsServChar(*p))
339		return 0;
340
386	–	++length;
387	–
341		if (*p == '.')
342		++dots;
343		}
344
345	<	return dots != 0 && length <= HOSTLEN;
345	>	return dots && (p - name) <= HOSTLEN;
346		}
347
348		int
349		check_server(const char *name, struct Client *client_p)
350		{
351	<	dlink_node *ptr;
352	<	struct ConfItem *conf           = NULL;
353	<	struct ConfItem *server_conf    = NULL;
401	<	struct AccessItem *server_aconf = NULL;
402	<	struct AccessItem *aconf        = NULL;
351	>	dlink_node *node = NULL;
352	>	struct MaskItem *conf        = NULL;
353	>	struct MaskItem *server_conf = NULL;
354		int error = -1;
355
356	<	assert(client_p != NULL);
356	>	assert(client_p);
357
358	<	/* loop through looking for all possible connect items that might work */
359	<	DLINK_FOREACH(ptr, server_items.head)
358	>	/* Loop through looking for all possible connect items that might work */
359	>	DLINK_FOREACH(node, server_items.head)
360		{
361	<	conf = ptr->data;
411	<	aconf = map_to_conf(conf);
361	>	conf = node->data;
362
363	<	if (!match(name, conf->name))
363	>	if (match(name, conf->name))
364		continue;
365
366		error = -3;
367
368	<	/* XXX: Fix me for IPv6                    */
369	<	/* XXX sockhost is the IPv4 ip as a string */
420	<	if (match(aconf->host, client_p->host) ||
421	<	match(aconf->host, client_p->sockhost))
368	>	if (!match(conf->host, client_p->host) ||
369	>	!match(conf->host, client_p->sockhost))
370		{
371		error = -2;
372
373	<	if (!match_conf_password(client_p->localClient->passwd, aconf))
373	>	if (!match_conf_password(client_p->connection->password, conf))
374		return -2;
375
376	+	if (!EmptyString(conf->certfp))
377	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
378	+	return -4;
379	+
380		server_conf = conf;
381		}
382		}
383
384		if (server_conf == NULL)
385	<	return(error);
385	>	return error;
386
387		attach_conf(client_p, server_conf);
388
389	<	server_aconf = map_to_conf(server_conf);
438	<
439	<	if (!IsConfTopicBurst(server_aconf))
440	<	ClearCap(client_p, CAP_TBURST);
441	<
442	<	if (aconf != NULL)
389	>	switch (server_conf->aftype)
390		{
391	<	struct sockaddr_in *v4;
445	<	#ifdef IPV6
446	<	struct sockaddr_in6 *v6;
447	<	#endif
448	<	switch (aconf->aftype)
391	>	case AF_INET6:
392		{
393	<	#ifdef IPV6
451	<	case AF_INET6:
452	<	v6 = (struct sockaddr_in6 *)&aconf->addr;
393	>	const struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&server_conf->addr;
394
395	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
396	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
397	<	break;
398	<	#endif
399	<	case AF_INET:
400	<	v4 = (struct sockaddr_in *)&aconf->addr;
395	>	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
396	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
397	>	break;
398	>	}
399	>	case AF_INET:
400	>	{
401	>	const struct sockaddr_in *v4 = (struct sockaddr_in *)&server_conf->addr;
402
403	<	if (v4->sin_addr.s_addr == INADDR_NONE)
404	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
405	<	break;
403	>	if (v4->sin_addr.s_addr == INADDR_NONE)
404	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
405	>	break;
406		}
407		}
408
409	<	return(0);
409	>	return 0;
410		}
411
412		/* add_capability()
#	Line 477 | Line 419 | check_server(const char *name, struct Cl
419		*                modules to dynamically add or subtract their capability.
420		*/
421		void
422	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
422	>	add_capability(const char *name, unsigned int flag)
423		{
424	<	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);
424	>	struct Capability *cap = MyCalloc(sizeof(*cap));
425
426	<	if (add_to_default)
427	<	default_server_capabs |= cap_flag;
426	>	cap->name = xstrdup(name);
427	>	cap->cap = flag;
428	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
429		}
430
431		/* delete_capability()
#	Line 495 | Line 434 | add_capability(const char *capab_name, i
434		* output       - NONE
435		* side effects - delete given capability from ones known.
436		*/
437	<	int
438	<	delete_capability(const char *capab_name)
437	>	void
438	>	delete_capability(const char *name)
439		{
440	<	dlink_node *ptr;
502	<	dlink_node *next_ptr;
503	<	struct Capability *cap;
440	>	dlink_node *node = NULL, *node_next = NULL;
441
442	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
442	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
443		{
444	<	cap = ptr->data;
444	>	struct Capability *cap = node->data;
445
446	<	if (cap->cap != 0)
446	>	if (!irccmp(cap->name, name))
447		{
448	<	if (irccmp(cap->name, capab_name) == 0)
449	<	{
450	<	default_server_capabs &= ~(cap->cap);
514	<	dlinkDelete(ptr, &cap_list);
515	<	MyFree(cap->name);
516	<	cap->name = NULL;
517	<	MyFree(cap);
518	<	}
448	>	dlinkDelete(node, &server_capabilities_list);
449	>	MyFree(cap->name);
450	>	MyFree(cap);
451		}
452		}
521	–
522	–	return 0;
453		}
454
455		/*
#	Line 529 | Line 459 | delete_capability(const char *capab_name
459		* output       - 0 if not found CAPAB otherwise
460		* side effects - none
461		*/
462	<	int
463	<	find_capability(const char *capab)
462	>	unsigned int
463	>	find_capability(const char *name)
464		{
465	<	const dlink_node *ptr = NULL;
465	>	const dlink_node *node = NULL;
466
467	<	DLINK_FOREACH(ptr, cap_list.head)
467	>	DLINK_FOREACH(node, server_capabilities_list.head)
468		{
469	<	const struct Capability *cap = ptr->data;
469	>	const struct Capability *cap = node->data;
470
471	<	if (cap->cap && !irccmp(cap->name, capab))
471	>	if (!irccmp(cap->name, name))
472		return cap->cap;
473		}
474
#	Line 548 | Line 478 | find_capability(const char *capab)
478		/* send_capabilities()
479		*
480		* inputs       - Client pointer to send to
551	–	*              - Pointer to AccessItem (for crypt)
481		*              - int flag of capabilities that this server can send
482		* output       - NONE
483		* side effects - send the CAPAB line to a server  -orabidoo
484		*
485		*/
486		void
487	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
559	<	int cap_can_send)
487	>	send_capabilities(struct Client *client_p)
488		{
489	<	struct Capability *cap=NULL;
490	<	char msgbuf[IRCD_BUFSIZE];
563	<	char *t;
564	<	int tl;
565	<	dlink_node *ptr;
489	>	char buf[IRCD_BUFSIZE] = "";
490	>	const dlink_node *node = NULL;
491
492	<	t = msgbuf;
568	<
569	<	DLINK_FOREACH(ptr, cap_list.head)
492	>	DLINK_FOREACH(node, server_capabilities_list.head)
493		{
494	<	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];
595	<
596	<	if (!IsClient(target_p))
597	<	return;
494	>	const struct Capability *cap = node->data;
495
496	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
496	>	strlcat(buf, cap->name, sizeof(buf));
497
498	<	if (ubuf[0] == '\0')
499	<	{
603	<	ubuf[0] = '+';
604	<	ubuf[1] = '\0';
498	>	if (node->next)
499	>	strlcat(buf, " ", sizeof(buf));
500		}
501
502	<	/* 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	<
502	>	sendto_one(client_p, "CAPAB :%s", buf);
503		}
504
505		/*
#	Line 657 | Line 510 | sendnick_TS(struct Client *client_p, str
510		* side effects - build up string representing capabilities of server listed
511		*/
512		const char *
513	<	show_capabilities(struct Client *target_p)
513	>	show_capabilities(const struct Client *target_p)
514		{
515	<	static char msgbuf[IRCD_BUFSIZE];
516	<	char *t = msgbuf;
664	<	dlink_node *ptr;
515	>	static char msgbuf[IRCD_BUFSIZE] = "";
516	>	const dlink_node *node = NULL;
517
518	<	t += ircsprintf(msgbuf, "TS ");
518	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
519
520	<	DLINK_FOREACH(ptr, cap_list.head)
520	>	DLINK_FOREACH(node, server_capabilities_list.head)
521		{
522	<	const struct Capability *cap = ptr->data;
522	>	const struct Capability *cap = node->data;
523	>
524	>	if (!IsCapable(target_p, cap->cap))
525	>	continue;
526
527	<	if (IsCapable(target_p, cap->cap))
528	<	t += ircsprintf(t, "%s ", cap->name);
527	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
528	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
529		}
530
676	–	*(t - 1) = '\0';
531		return msgbuf;
532		}
533
#	Line 688 | Line 542 | struct Server *
542		make_server(struct Client *client_p)
543		{
544		if (client_p->serv == NULL)
545	<	client_p->serv = MyMalloc(sizeof(struct Server));
545	>	client_p->serv = MyCalloc(sizeof(struct Server));
546
547		return client_p->serv;
548		}
549
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	–
550		/* New server connection code
551		* Based upon the stuff floating about in s_bsd.c
552		*   -- adrian
#	Line 1083 | Line 554 | burst_members(struct Client *client_p, s
554
555		/* serv_connect() - initiate a server connection
556		*
557	<	* inputs       - pointer to conf
557	>	* inputs       - pointer to conf
558		*              - pointer to client doing the connect
559		* output       -
560		* side effects -
#	Line 1098 | Line 569 | burst_members(struct Client *client_p, s
569		* it suceeded or not, and 0 if it fails in here somewhere.
570		*/
571		int
572	<	serv_connect(struct AccessItem *aconf, struct Client *by)
572	>	serv_connect(struct MaskItem *conf, struct Client *by)
573		{
574	<	struct ConfItem *conf;
575	<	struct Client *client_p;
1105	<	char buf[HOSTIPLEN + 1];
574	>	struct Client *client_p = NULL;
575	>	char buf[HOSTIPLEN + 1] = "";
576
577		/* conversion structs */
578		struct sockaddr_in *v4;
1109	–	/* Make sure aconf is useful */
1110	–	assert(aconf != NULL);
579
580	<	/* XXX should be passing struct ConfItem in the first place */
581	<	conf = unmap_conf_item(aconf);
580	>	/* Make sure conf is useful */
581	>	assert(conf);
582
583	<	/* log */
1116	<	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
583	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
584		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
585	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
585	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
586		buf);
587
588		/* Still processing a DNS lookup? -> exit */
589	<	if (aconf->dns_pending)
589	>	if (conf->dns_pending)
590		{
591	<	sendto_realops_flags(UMODE_ALL, L_ALL,
591	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
592		"Error connecting to %s: DNS lookup for connect{} in progress.",
593		conf->name);
594	<	return (0);
594	>	return 0;
595		}
596
597	<	if (aconf->dns_failed)
597	>	if (conf->dns_failed)
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{} failed.",
601		conf->name);
602	<	return (0);
602	>	return 0;
603		}
604
605	<	/* Make sure this server isn't already connected
606	<	* Note: aconf should ALWAYS be a valid C: line
605	>	/*
606	>	* Make sure this server isn't already connected.
607	>	* Note: conf should ALWAYS be a valid connect {} block
608		*/
609	<	if ((client_p = hash_find_server(conf->name)) != NULL)
610	<	{
611	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
612	<	"Server %s already present from %s",
613	<	conf->name, get_client_name(client_p, SHOW_IP));
614	<	sendto_realops_flags(UMODE_ALL, L_OPER,
615	<	"Server %s already present from %s",
616	<	conf->name, get_client_name(client_p, MASK_IP));
609	>	if ((client_p = hash_find_server(conf->name)))
610	>	{
611	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
612	>	"Server %s already present from %s",
613	>	conf->name, get_client_name(client_p, SHOW_IP));
614	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
615	>	"Server %s already present from %s",
616	>	conf->name, get_client_name(client_p, MASK_IP));
617		if (by && IsClient(by) && !MyClient(by))
618	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
619	<	me.name, by->name, conf->name,
620	<	get_client_name(client_p, MASK_IP));
1153	<	return (0);
618	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
619	>	conf->name, get_client_name(client_p, MASK_IP));
620	>	return 0;
621		}
622	<
622	>
623		/* Create a local client */
624		client_p = make_client(NULL);
625
626		/* Copy in the server, hostname, fd */
627		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
628	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
628	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
629
630		/* We already converted the ip once, so lets use it - stu */
631		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
632
633	<	/* create a socket for the server connection */
634	<	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1168	<	SOCK_STREAM, 0, NULL) < 0)
633	>	/* Create a socket for the server connection */
634	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
635		{
636		/* Eek, failure to create the socket */
637	<	report_error(L_ALL,
638	<	"opening stream socket to %s: %s", conf->name, errno);
637	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
638	>
639		SetDead(client_p);
640	<	exit_client(client_p, &me, "Connection failed");
641	<	return (0);
640	>	exit_client(client_p, "Connection failed");
641	>	return 0;
642		}
643
644	<	/* servernames are always guaranteed under HOSTLEN chars */
645	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
644	>	/* Server names are always guaranteed under HOSTLEN chars */
645	>	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
646
647	<	/* Attach config entries to client here rather than in
648	<	* serv_connect_callback(). This to avoid null pointer references.
647	>	/*
648	>	* Attach config entries to client here rather than in serv_connect_callback().
649	>	* This to avoid null pointer references.
650		*/
651	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
651	>	if (!attach_connect_block(client_p, conf->name, conf->host))
652		{
653	<	sendto_realops_flags(UMODE_ALL, L_ALL,
654	<	"Host %s is not enabled for connecting:no C/N-line",
655	<	conf->name);
656	<	if (by && IsClient(by) && !MyClient(by))
657	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
658	<	me.name, by->name, client_p->name);
653	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
654	>	"Host %s is not enabled for connecting: no connect {} block",
655	>	conf->name);
656	>	if (by && IsClient(by) && !MyClient(by))
657	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
658	>
659		SetDead(client_p);
660	<	exit_client(client_p, client_p, "Connection failed");
661	<	return (0);
660	>	exit_client(client_p, "Connection failed");
661	>	return 0;
662		}
663
664	<	/* at this point we have a connection in progress and C/N lines
665	<	* attached to the client, the socket info should be saved in the
666	<	* client and it should either be resolved or have a valid address.
664	>	/*
665	>	* At this point we have a connection in progress and a connect {} block
666	>	* attached to the client, the socket info should be saved in the client
667	>	* and it should either be resolved or have a valid address.
668		*
669		* The socket has been connected or connect is in progress.
670		*/
#	Line 1208 | Line 676 | serv_connect(struct AccessItem *aconf, s
676		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
677
678		SetConnecting(client_p);
679	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1212	<	/* from def_fam */
1213	<	client_p->localClient->aftype = aconf->aftype;
679	>	client_p->connection->aftype = conf->aftype;
680
681		/* Now, initiate the connection */
682	<	/* XXX assume that a non 0 type means a specific bind address
682	>	/* XXX assume that a non 0 type means a specific bind address
683		* for this connect.
684		*/
685	<	switch (aconf->aftype)
685	>	switch (conf->aftype)
686		{
687		case AF_INET:
688	<	v4 = (struct sockaddr_in*)&aconf->bind;
689	<	if (v4->sin_addr.s_addr != 0)
688	>	v4 = (struct sockaddr_in*)&conf->bind;
689	>	if (v4->sin_addr.s_addr)
690		{
691		struct irc_ssaddr ipn;
692		memset(&ipn, 0, sizeof(struct irc_ssaddr));
693		ipn.ss.ss_family = AF_INET;
694		ipn.ss_port = 0;
695	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
696	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
697	<	(struct sockaddr *)&ipn, ipn.ss_len,
698	<	serv_connect_callback, client_p, aconf->aftype,
699	<	CONNECTTIMEOUT);
695	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
696	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
697	>	(struct sockaddr *)&ipn, ipn.ss_len,
698	>	serv_connect_callback, client_p, conf->aftype,
699	>	CONNECTTIMEOUT);
700		}
701	<	else if (ServerInfo.specific_ipv4_vhost)
701	>	else if (ConfigServerInfo.specific_ipv4_vhost)
702		{
703		struct irc_ssaddr ipn;
704		memset(&ipn, 0, sizeof(struct irc_ssaddr));
705		ipn.ss.ss_family = AF_INET;
706		ipn.ss_port = 0;
707	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
708	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
707	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
708	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
709		(struct sockaddr *)&ipn, ipn.ss_len,
710	<	serv_connect_callback, client_p, aconf->aftype,
711	<	CONNECTTIMEOUT);
710	>	serv_connect_callback, client_p, conf->aftype,
711	>	CONNECTTIMEOUT);
712		}
713		else
714	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
715	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
714	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
715	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
716		CONNECTTIMEOUT);
717		break;
1252	–	#ifdef IPV6
718		case AF_INET6:
719		{
720	<	struct irc_ssaddr ipn;
721	<	struct sockaddr_in6 *v6;
722	<	struct sockaddr_in6 *v6conf;
723	<
724	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
725	<	v6conf = (struct sockaddr_in6 *)&aconf->bind;
726	<	v6 = (struct sockaddr_in6 *)&ipn;
727	<
728	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1264	<	sizeof(struct in6_addr)) != 0)
1265	<	{
1266	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1267	<	ipn.ss.ss_family = AF_INET6;
1268	<	ipn.ss_port = 0;
1269	<	comm_connect_tcp(&client_p->localClient->fd,
1270	<	aconf->host, aconf->port,
1271	<	(struct sockaddr *)&ipn, ipn.ss_len,
1272	<	serv_connect_callback, client_p,
1273	<	aconf->aftype, CONNECTTIMEOUT);
1274	<	}
1275	<	else if (ServerInfo.specific_ipv6_vhost)
720	>	struct irc_ssaddr ipn;
721	>	struct sockaddr_in6 *v6;
722	>	struct sockaddr_in6 *v6conf;
723	>
724	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
725	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
726	>	v6 = (struct sockaddr_in6 *)&ipn;
727	>
728	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
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, &conf->bind, 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 if (ConfigServerInfo.specific_ipv6_vhost)
740	>	{
741	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
742	>	ipn.ss.ss_family = AF_INET6;
743	>	ipn.ss_port = 0;
744	>	comm_connect_tcp(&client_p->connection->fd,
745	>	conf->host, conf->port,
746	>	(struct sockaddr *)&ipn, ipn.ss_len,
747	>	serv_connect_callback, client_p,
748	>	conf->aftype, CONNECTTIMEOUT);
749	>	}
750	>	else
751	>	comm_connect_tcp(&client_p->connection->fd,
752	>	conf->host, conf->port,
753	>	NULL, 0, serv_connect_callback, client_p,
754	>	conf->aftype, CONNECTTIMEOUT);
755		}
1292	–	#endif
756		}
757	<	return (1);
757	>
758	>	return 1;
759		}
760
761		#ifdef HAVE_LIBCRYPTO
762		static void
763		finish_ssl_server_handshake(struct Client *client_p)
764		{
765	<	struct ConfItem *conf=NULL;
1302	<	struct AccessItem *aconf=NULL;
765	>	struct MaskItem *conf = NULL;
766
767	<	conf = find_conf_name(&client_p->localClient->confs,
768	<	client_p->name, SERVER_TYPE);
767	>	conf = find_conf_name(&client_p->connection->confs,
768	>	client_p->name, CONF_SERVER);
769		if (conf == NULL)
770		{
771	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
772	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
773	<	sendto_realops_flags(UMODE_ALL, L_OPER,
771	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
772	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
773	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
774		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
775
776	<	exit_client(client_p, &me, "Lost connect{} block");
776	>	exit_client(client_p, "Lost connect{} block");
777		return;
778		}
779
780	<	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);
780	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
781
782	<	send_capabilities(client_p, aconf,
1325	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
782	>	send_capabilities(client_p);
783
784		sendto_one(client_p, "SERVER %s 1 :%s%s",
785		me.name, ConfigServerHide.hidden ? "(H) " : "",
786		me.info);
787
788	<	/* If we've been marked dead because a send failed, just exit
788	>	/*
789	>	* If we've been marked dead because a send failed, just exit
790		* here now and save everyone the trouble of us ever existing.
791		*/
792		if (IsDead(client_p))
793		{
794	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
795	<	"%s[%s] went dead during handshake",
796	<	client_p->name,
797	<	client_p->host);
798	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1341	<	"%s went dead during handshake", client_p->name);
1342	<	return;
794	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
795	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
796	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
797	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
798	>	return;
799		}
800
801		/* don't move to serv_list yet -- we haven't sent a burst! */
802		/* If we get here, we're ok, so lets start reading some data */
803	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
803	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
804		}
805
806		static void
807	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
807	>	ssl_server_handshake(fde_t *fd, void *data)
808		{
809	<	int ret;
810	<	int err;
811	<
1356	<	ret = SSL_connect(client_p->localClient->fd.ssl);
809	>	struct Client *client_p = data;
810	>	X509 *cert = NULL;
811	>	int ret = 0;
812
813	<	if (ret <= 0)
813	>	if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
814		{
815	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
815	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
816	>	{
817	>	exit_client(client_p, "Timeout during SSL handshake");
818	>	return;
819	>	}
820	>
821	>	switch (SSL_get_error(client_p->connection->fd.ssl, ret))
822		{
823		case SSL_ERROR_WANT_WRITE:
824	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
825	<	(PF *)ssl_server_handshake, client_p, 0);
824	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
825	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
826		return;
827		case SSL_ERROR_WANT_READ:
828	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
829	<	(PF *)ssl_server_handshake, client_p, 0);
828	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
829	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
830		return;
831		default:
832		{
833		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
834	<	sendto_realops_flags(UMODE_ALL, L_ALL,
834	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
835		"Error connecting to %s: %s", client_p->name,
836		sslerr ? sslerr : "unknown SSL error");
837	<	exit_client(client_p, client_p, "Error during SSL handshake");
837	>	exit_client(client_p, "Error during SSL handshake");
838		return;
839		}
840		}
841		}
842
843	+	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
844	+
845	+	if ((cert = SSL_get_peer_certificate(client_p->connection->fd.ssl)))
846	+	{
847	+	int res = SSL_get_verify_result(client_p->connection->fd.ssl);
848	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
849	+	unsigned char md[EVP_MAX_MD_SIZE] = "";
850	+
851	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
852	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
853	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
854	+	{
855	+	unsigned int n = 0;
856	+
857	+	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
858	+	{
859	+	binary_to_hex(md, buf, n);
860	+	client_p->certfp = xstrdup(buf);
861	+	}
862	+	}
863	+	else
864	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
865	+	client_p->name, client_p->username, client_p->host, res);
866	+	X509_free(cert);
867	+	}
868	+
869		finish_ssl_server_handshake(client_p);
870		}
871
872		static void
873	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
873	>	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
874		{
875	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
875	>	if ((client_p->connection->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
876		{
877		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
878		ERR_error_string(ERR_get_error(), NULL));
879		SetDead(client_p);
880	<	exit_client(client_p, client_p, "SSL_new failed");
880	>	exit_client(client_p, "SSL_new failed");
881		return;
882		}
883
884		SSL_set_fd(fd->ssl, fd->fd);
885
886	<	if (!EmptyString(aconf->cipher_list))
887	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
886	>	if (!EmptyString(conf->cipher_list))
887	>	SSL_set_cipher_list(client_p->connection->fd.ssl, conf->cipher_list);
888
889		ssl_server_handshake(NULL, client_p);
890		}
891		#endif
892
893		/* serv_connect_callback() - complete a server connection.
894	<	*
894	>	*
895		* This routine is called after the server connection attempt has
896		* completed. If unsucessful, an error is sent to ops and the client
897		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1414 | Line 901 | ssl_connect_init(struct Client *client_p
901		static void
902		serv_connect_callback(fde_t *fd, int status, void *data)
903		{
904	<	struct Client *client_p = data;
905	<	struct ConfItem *conf=NULL;
1419	<	struct AccessItem *aconf=NULL;
904	>	struct Client *const client_p = data;
905	>	const struct MaskItem *conf = NULL;
906
907	<	/* First, make sure its a real client! */
908	<	assert(client_p != NULL);
909	<	assert(&client_p->localClient->fd == fd);
907	>	/* First, make sure it's a real client! */
908	>	assert(client_p);
909	>	assert(&client_p->connection->fd == fd);
910
911		/* Next, for backward purposes, record the ip of the server */
912	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
912	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
913		sizeof(struct irc_ssaddr));
914	+
915		/* Check the status */
916		if (status != COMM_OK)
917		{
918	<	/* We have an error, so report it and quit
919	<	* Admins get to see any IP, mere opers don't *sigh*
918	>	/* We have an error, so report it and quit */
919	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
920	>	"Error connecting to %s: %s",
921	>	get_client_name(client_p, SHOW_IP), comm_errstr(status));
922	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
923	>	"Error connecting to %s: %s",
924	>	get_client_name(client_p, MASK_IP), comm_errstr(status));
925	>
926	>	/*
927	>	* If a fd goes bad, call dead_link() the socket is no
928	>	* longer valid for reading or writing.
929		*/
930	<	if (ConfigServerHide.hide_server_ips)
931	<	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;
930	>	dead_link_on_write(client_p, 0);
931	>	return;
932		}
933
934		/* COMM_OK, so continue the connection procedure */
935		/* Get the C/N lines */
936	<	conf = find_conf_name(&client_p->localClient->confs,
937	<	client_p->name, SERVER_TYPE);
936	>	conf = find_conf_name(&client_p->connection->confs,
937	>	client_p->name, CONF_SERVER);
938		if (conf == NULL)
939		{
940	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
941	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
942	<	sendto_realops_flags(UMODE_ALL, L_OPER,
943	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
940	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
941	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
942	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
943	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
944
945	<	exit_client(client_p, &me, "Lost connect{} block");
945	>	exit_client(client_p, "Lost connect{} block");
946		return;
947		}
948
1469	–	aconf = map_to_conf(conf);
949		/* Next, send the initial handshake */
950		SetHandshake(client_p);
951
952		#ifdef HAVE_LIBCRYPTO
953	<	if (IsConfSSL(aconf))
953	>	if (IsConfSSL(conf))
954		{
955	<	ssl_connect_init(client_p, aconf, fd);
955	>	ssl_connect_init(client_p, conf, fd);
956		return;
957		}
958		#endif
959
960	<	/* 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);
960	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
961
962	<	send_capabilities(client_p, aconf,
1487	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
962	>	send_capabilities(client_p);
963
964	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
965	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1491	<	me.info);
964	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
965	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
966
967	<	/* If we've been marked dead because a send failed, just exit
967	>	/*
968	>	* If we've been marked dead because a send failed, just exit
969		* here now and save everyone the trouble of us ever existing.
970		*/
971	<	if (IsDead(client_p))
971	>	if (IsDead(client_p))
972		{
973	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
974	<	"%s[%s] went dead during handshake",
975	<	client_p->name,
976	<	client_p->host);
977	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1503	<	"%s went dead during handshake", client_p->name);
1504	<	return;
973	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
974	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
975	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
976	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
977	>	return;
978		}
979
980		/* don't move to serv_list yet -- we haven't sent a burst! */
#	Line 1520 | Line 993 | find_servconn_in_progress(const char *na
993		cptr = ptr->data;
994
995		if (cptr && cptr->name[0])
996	<	if (match(name, cptr->name))
996	>	if (!match(name, cptr->name))
997		return cptr;
998		}
999	<
999	>
1000		return NULL;
1001		}

Diff Legend

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