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 1321 by michael, Fri Mar 30 11:23:16 2012 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 7401 by michael, Sun Mar 6 16:15:22 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	<	FBFILE *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 = fbopen(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	<	size_t nbytes = 0;
105	<	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 */
112	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
93	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
94		continue;
95
96	<	if (target_p->info[0])
97	<	p = target_p->info;
117	<	else
118	<	p = "(Unknown Location)";
119	<
120	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
121	<
122	<	/* 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
130	<	* default config but it is configurable..
131	<	* This should be changed to an snprintf at some point, but I'm wanting to
132	<	* know if this is a cause of a bug - cryogen
133	<	*/
134	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
135	<	MESSAGELINELEN);
136	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
137	<	target_p->name, me.name, p);
138	<	newMessageLine->next = NULL;
108	>	fputs(buff, file);
109	>	}
110
111	<	if (MessageFileptr->contentsOfFile)
112	<	{
142	<	if (currentMessageLine)
143	<	currentMessageLine->next = newMessageLine;
144	<	currentMessageLine = newMessageLine;
145	<	}
146	<	else
147	<	{
148	<	MessageFileptr->contentsOfFile = newMessageLine;
149	<	currentMessageLine = newMessageLine;
150	<	}
111	>	fclose(file);
112	>	}
113
114	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
115	<	fbputs(buff, file, nbytes);
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	<	fbclose(file);
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);
140		}
141
142		/* hunt_server()
#	Line 176 | 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;
184	<	dlink_node *ptr;
185	<	int wilds;
166	>	dlink_node *node = NULL;
167
168	<	/* Assume it's me, if no server
169	<	*/
170	<	if (parc <= server || EmptyString(parv[server]) ||
190	<	match(me.name, parv[server]) ||
191	<	match(parv[server], me.name) ||
192	<	!strcmp(parv[server], me.id))
193	<	return(HUNTED_ISME);
168	>	/* Assume it's me, if no server */
169	>	if (parc <= server || EmptyString(parv[server]))
170	>	return HUNTED_ISME;
171
172	<	/* These are to pickup matches that would cause the following
172	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
173	>	target_p = hash_find_server(parv[server]);
174	>
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		*/
199	–	if (MyClient(source_p))
200	–	target_p = hash_find_client(parv[server]);
201	–	else
202	–	target_p = find_person(client_p, parv[server]);
203	–
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])))
209	<	if (target_p->from == source_p->from && !MyConnect(target_p))
210	<	target_p = NULL;
211	<
212	<	collapse(parv[server]);
213	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
214	<
215	<	/* Again, if there are no wild cards involved in the server
216	<	* name, use the hash lookup
217	<	*/
218	<	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;
239	–	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))
251	<	{
252	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
253	<	me.name, source_p->name, parv[server]);
254	<	return HUNTED_NOSUCH;
255	<	}
256	<
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;
262	<
263	<	/* This is a little kludgy but should work... */
264	<	if (IsClient(source_p) &&
265	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
266	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
267	<	parv[0] = ID(source_p);
268	<
269	<	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]);
277	<	return(HUNTED_NOSUCH);
233	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
234	>	return HUNTED_NOSUCH;
235		}
236
237		/* try_connections()
#	Line 290 | Line 247 | hunt_server(struct Client *client_p, str
247		void
248		try_connections(void *unused)
249		{
250	<	dlink_node *ptr;
294	<	struct ConfItem *conf;
295	<	struct AccessItem *aconf;
296	<	struct ClassItem *cltmp;
297	<	int confrq;
250	>	dlink_node *node = NULL;
251
299	–	/* 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;
306	<	aconf = map_to_conf(conf);
257	>	struct MaskItem *conf = node->data;
258
259	<	/* Also when already connecting! (update holdtimes) --SRB
309	<	*/
310	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
311	<	!(IsConfAllowAutoConn(aconf)))
312	<	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)
326	<	confrq = DEFAULT_CONNECTFREQUENCY;
327	<	else
328	<	{
329	<	confrq = ConFreq(cltmp);
330	<	if (confrq < MIN_CONN_FREQ )
331	<	confrq = MIN_CONN_FREQ;
332	<	}
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 (CurrUserCount(cltmp) < MaxTotal(cltmp))
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 360 | 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 376 | Line 323 | try_connections(void *unused)
323		int
324		valid_servname(const char *name)
325		{
326	<	unsigned int length = 0;
380	<	unsigned int dots   = 0;
326	>	unsigned int dots = 0;
327		const char *p = name;
328
329		for (; *p; ++p)
#	Line 385 | Line 331 | valid_servname(const char *name)
331		if (!IsServChar(*p))
332		return 0;
333
388	–	++length;
389	–
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;
346	<	struct ConfItem *server_conf    = NULL;
403	<	struct AccessItem *server_aconf = NULL;
404	<	struct AccessItem *aconf        = NULL;
344	>	dlink_node *node = NULL;
345	>	struct MaskItem *conf        = NULL;
346	>	struct MaskItem *server_conf = NULL;
347		int error = -1;
348
349	<	assert(client_p != NULL);
408	<
409	<	if (client_p == NULL)
410	<	return(error);
411	<
412	<	if (strlen(name) > HOSTLEN)
413	<	return(-4);
349	>	assert(client_p);
350
351	<	/* loop through looking for all possible connect items that might work */
352	<	DLINK_FOREACH(ptr, server_items.head)
351	>	/* Loop through looking for all possible connect items that might work */
352	>	DLINK_FOREACH(node, connect_items.head)
353		{
354	<	conf = ptr->data;
419	<	aconf = map_to_conf(conf);
354	>	conf = node->data;
355
356	<	if (!match(name, conf->name))
356	>	if (match(name, conf->name))
357		continue;
358
359		error = -3;
360
361	<	/* XXX: Fix me for IPv6                    */
362	<	/* XXX sockhost is the IPv4 ip as a string */
428	<	if (match(aconf->host, client_p->host) ||
429	<	match(aconf->host, client_p->sockhost))
361	>	if (!match(conf->host, client_p->host) ||
362	>	!match(conf->host, client_p->sockhost))
363		{
364		error = -2;
432	–	{
433	–	/* A NULL password is as good as a bad one */
434	–	if (EmptyString(client_p->localClient->passwd))
435	–	return(-2);
436	–
437	–	/* code in s_conf.c should not have allowed this to be NULL */
438	–	if (aconf->passwd == NULL)
439	–	return(-2);
365
366	<	if (IsConfEncrypted(aconf))
367	<	{
368	<	if (strcmp(aconf->passwd,
369	<	(const char *)crypt(client_p->localClient->passwd,
370	<	aconf->passwd)) == 0)
371	<	server_conf = conf;
372	<	}
373	<	else
449	<	{
450	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
451	<	server_conf = conf;
452	<	}
453	<	}
366	>	if (!match_conf_password(client_p->connection->password, conf))
367	>	return -2;
368	>
369	>	if (!EmptyString(conf->certfp))
370	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
371	>	return -4;
372	>
373	>	server_conf = conf;
374		}
375		}
376
377		if (server_conf == NULL)
378	<	return(error);
378	>	return error;
379
380		attach_conf(client_p, server_conf);
381
382	<	/* Now find all leaf or hub config items for this server */
463	<	DLINK_FOREACH(ptr, hub_items.head)
382	>	switch (server_conf->aftype)
383		{
384	<	conf = ptr->data;
466	<
467	<	if (!match(name, conf->name))
468	<	continue;
469	<	attach_conf(client_p, conf);
470	<	}
471	<
472	<	DLINK_FOREACH(ptr, leaf_items.head)
473	<	{
474	<	conf = ptr->data;
475	<
476	<	if (!match(name, conf->name))
477	<	continue;
478	<	attach_conf(client_p, conf);
479	<	}
480	<
481	<	server_aconf = map_to_conf(server_conf);
482	<
483	<	if (!IsConfTopicBurst(server_aconf))
484	<	{
485	<	ClearCap(client_p, CAP_TB);
486	<	ClearCap(client_p, CAP_TBURST);
487	<	}
488	<
489	<	if (aconf != NULL)
490	<	{
491	<	struct sockaddr_in *v4;
492	<	#ifdef IPV6
493	<	struct sockaddr_in6 *v6;
494	<	#endif
495	<	switch (aconf->aftype)
384	>	case AF_INET6:
385		{
386	<	#ifdef IPV6
498	<	case AF_INET6:
499	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
386	>	const struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&server_conf->addr;
387
388	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
389	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
390	<	break;
391	<	#endif
392	<	case AF_INET:
393	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
388	>	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
389	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
390	>	break;
391	>	}
392	>	case AF_INET:
393	>	{
394	>	const struct sockaddr_in *v4 = (struct sockaddr_in *)&server_conf->addr;
395
396	<	if (v4->sin_addr.s_addr == INADDR_NONE)
397	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
398	<	break;
396	>	if (v4->sin_addr.s_addr == INADDR_NONE)
397	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
398	>	break;
399		}
400		}
401
402	<	return(0);
402	>	return 0;
403		}
404
405		/* add_capability()
#	Line 524 | Line 412 | check_server(const char *name, struct Cl
412		*                modules to dynamically add or subtract their capability.
413		*/
414		void
415	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
415	>	add_capability(const char *name, unsigned int flag)
416		{
417	<	struct Capability *cap = MyMalloc(sizeof(*cap));
417	>	struct Capability *cap = xcalloc(sizeof(*cap));
418
419	<	DupString(cap->name, capab_name);
420	<	cap->cap = cap_flag;
421	<	dlinkAdd(cap, &cap->node, &cap_list);
534	<
535	<	if (add_to_default)
536	<	default_server_capabs |= cap_flag;
419	>	cap->name = xstrdup(name);
420	>	cap->cap = flag;
421	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
422		}
423
424		/* delete_capability()
#	Line 542 | Line 427 | add_capability(const char *capab_name, i
427		* output       - NONE
428		* side effects - delete given capability from ones known.
429		*/
430	<	int
431	<	delete_capability(const char *capab_name)
430	>	void
431	>	delete_capability(const char *name)
432		{
433	<	dlink_node *ptr;
549	<	dlink_node *next_ptr;
550	<	struct Capability *cap;
433	>	dlink_node *node = NULL, *node_next = NULL;
434
435	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
435	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
436		{
437	<	cap = ptr->data;
437	>	struct Capability *cap = node->data;
438
439	<	if (cap->cap != 0)
439	>	if (!irccmp(cap->name, name))
440		{
441	<	if (irccmp(cap->name, capab_name) == 0)
442	<	{
443	<	default_server_capabs &= ~(cap->cap);
561	<	dlinkDelete(ptr, &cap_list);
562	<	MyFree(cap->name);
563	<	cap->name = NULL;
564	<	MyFree(cap);
565	<	}
441	>	dlinkDelete(node, &server_capabilities_list);
442	>	xfree(cap->name);
443	>	xfree(cap);
444		}
445		}
568	–
569	–	return 0;
446		}
447
448		/*
#	Line 576 | Line 452 | delete_capability(const char *capab_name
452		* output       - 0 if not found CAPAB otherwise
453		* side effects - none
454		*/
455	<	int
456	<	find_capability(const char *capab)
455	>	unsigned int
456	>	find_capability(const char *name)
457		{
458	<	const dlink_node *ptr = NULL;
458	>	const dlink_node *node = NULL;
459
460	<	DLINK_FOREACH(ptr, cap_list.head)
460	>	DLINK_FOREACH(node, server_capabilities_list.head)
461		{
462	<	const struct Capability *cap = ptr->data;
462	>	const struct Capability *cap = node->data;
463
464	<	if (cap->cap && !irccmp(cap->name, capab))
464	>	if (!irccmp(cap->name, name))
465		return cap->cap;
466		}
467
#	Line 595 | Line 471 | find_capability(const char *capab)
471		/* send_capabilities()
472		*
473		* inputs       - Client pointer to send to
598	–	*              - Pointer to AccessItem (for crypt)
474		*              - int flag of capabilities that this server can send
475		* output       - NONE
476		* side effects - send the CAPAB line to a server  -orabidoo
477		*
478		*/
479		void
480	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
606	<	int cap_can_send)
480	>	send_capabilities(struct Client *client_p)
481		{
482	<	struct Capability *cap=NULL;
483	<	char msgbuf[IRCD_BUFSIZE];
610	<	char *t;
611	<	int tl;
612	<	dlink_node *ptr;
613	<
614	<	t = msgbuf;
482	>	char buf[IRCD_BUFSIZE] = "";
483	>	const dlink_node *node = NULL;
484
485	<	DLINK_FOREACH(ptr, cap_list.head)
485	>	DLINK_FOREACH(node, server_capabilities_list.head)
486		{
487	<	cap = ptr->data;
619	<
620	<	if (cap->cap & (cap_can_send|default_server_capabs))
621	<	{
622	<	tl = ircsprintf(t, "%s ", cap->name);
623	<	t += tl;
624	<	}
625	<	}
626	<
627	<	*(t - 1) = '\0';
628	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
629	<	}
630	<
631	<	/* sendnick_TS()
632	<	*
633	<	* inputs       - client (server) to send nick towards
634	<	*          - client to send nick for
635	<	* output       - NONE
636	<	* side effects - NICK message is sent towards given client_p
637	<	*/
638	<	void
639	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
640	<	{
641	<	static char ubuf[12];
642	<
643	<	if (!IsClient(target_p))
644	<	return;
487	>	const struct Capability *cap = node->data;
488
489	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
489	>	strlcat(buf, cap->name, sizeof(buf));
490
491	<	if (ubuf[0] == '\0')
492	<	{
650	<	ubuf[0] = '+';
651	<	ubuf[1] = '\0';
491	>	if (node->next)
492	>	strlcat(buf, " ", sizeof(buf));
493		}
494
495	<	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
655	<	if (IsCapable(client_p, CAP_SVS))
656	<	{
657	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
658	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
659	<	target_p->servptr->id,
660	<	target_p->name, target_p->hopcount + 1,
661	<	(unsigned long) target_p->tsinfo,
662	<	ubuf, target_p->username, target_p->host,
663	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
664	<	"0" : target_p->sockhost, target_p->id,
665	<	(unsigned long)target_p->servicestamp, target_p->info);
666	<	else
667	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
668	<	target_p->name, target_p->hopcount + 1,
669	<	(unsigned long) target_p->tsinfo,
670	<	ubuf, target_p->username, target_p->host,
671	<	target_p->servptr->name, (unsigned long)target_p->servicestamp,
672	<	target_p->info);
673	<	}
674	<	else
675	<	{
676	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
677	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
678	<	target_p->servptr->id,
679	<	target_p->name, target_p->hopcount + 1,
680	<	(unsigned long) target_p->tsinfo,
681	<	ubuf, target_p->username, target_p->host,
682	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
683	<	"0" : target_p->sockhost, target_p->id, target_p->info);
684	<	else
685	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
686	<	target_p->name, target_p->hopcount + 1,
687	<	(unsigned long) target_p->tsinfo,
688	<	ubuf, target_p->username, target_p->host,
689	<	target_p->servptr->name, target_p->info);
690	<	}
691	<
692	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
693	<	if (!EmptyString(target_p->away))
694	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
695	<	target_p->away);
696	<
495	>	sendto_one(client_p, "CAPAB :%s", buf);
496		}
497
498		/*
#	Line 704 | Line 503 | sendnick_TS(struct Client *client_p, str
503		* side effects - build up string representing capabilities of server listed
504		*/
505		const char *
506	<	show_capabilities(struct Client *target_p)
506	>	show_capabilities(const struct Client *target_p)
507		{
508	<	static char msgbuf[IRCD_BUFSIZE];
509	<	char *t = msgbuf;
711	<	dlink_node *ptr;
508	>	static char msgbuf[IRCD_BUFSIZE] = "";
509	>	const dlink_node *node = NULL;
510
511	<	t += ircsprintf(msgbuf, "TS ");
511	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
512
513	<	DLINK_FOREACH(ptr, cap_list.head)
513	>	DLINK_FOREACH(node, server_capabilities_list.head)
514		{
515	<	const struct Capability *cap = ptr->data;
515	>	const struct Capability *cap = node->data;
516
517	<	if (IsCapable(target_p, cap->cap))
518	<	t += ircsprintf(t, "%s ", cap->name);
517	>	if (!IsCapable(target_p, cap->cap))
518	>	continue;
519	>
520	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
521	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
522		}
523
723	–	*(t - 1) = '\0';
524		return msgbuf;
525		}
526
#	Line 735 | Line 535 | struct Server *
535		make_server(struct Client *client_p)
536		{
537		if (client_p->serv == NULL)
538	<	client_p->serv = MyMalloc(sizeof(struct Server));
538	>	client_p->serv = xcalloc(sizeof(struct Server));
539
540		return client_p->serv;
541		}
542
743	–	/* server_estab()
744	–	*
745	–	* inputs       - pointer to a struct Client
746	–	* output       -
747	–	* side effects -
748	–	*/
749	–	void
750	–	server_estab(struct Client *client_p)
751	–	{
752	–	struct Client *target_p;
753	–	struct ConfItem *conf;
754	–	struct AccessItem *aconf=NULL;
755	–	char *host;
756	–	const char *inpath;
757	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
758	–	dlink_node *ptr;
759	–	#ifdef HAVE_LIBCRYPTO
760	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
761	–	#endif
762	–
763	–	assert(client_p != NULL);
764	–
765	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
766	–
767	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
768	–	host   = client_p->name;
769	–
770	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
771	–	== NULL)
772	–	{
773	–	/* This shouldn't happen, better tell the ops... -A1kmm */
774	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
775	–	"for server %s(this shouldn't happen)!", host);
776	–	exit_client(client_p, &me, "Lost connect{} block!");
777	–	return;
778	–	}
779	–
780	–	MyFree(client_p->localClient->passwd);
781	–	client_p->localClient->passwd = NULL;
782	–
783	–	/* Its got identd, since its a server */
784	–	SetGotId(client_p);
785	–
786	–	/* If there is something in the serv_list, it might be this
787	–	* connecting server..
788	–	*/
789	–	if (!ServerInfo.hub && serv_list.head)
790	–	{
791	–	if (client_p != serv_list.head->data || serv_list.head->next)
792	–	{
793	–	++ServerStats.is_ref;
794	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
795	–	exit_client(client_p, &me, "I'm a leaf");
796	–	return;
797	–	}
798	–	}
799	–
800	–	aconf = map_to_conf(conf);
801	–
802	–	if (IsUnknown(client_p))
803	–	{
804	–	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
805	–	*        2.  Check aconf->spasswd, not aconf->passwd.
806	–	*/
807	–	if (!EmptyString(aconf->spasswd))
808	–	sendto_one(client_p, "PASS %s TS %d %s",
809	–	aconf->spasswd, TS_CURRENT, me.id);
810	–
811	–	/* Pass my info to the new server
812	–	*
813	–	* Pass on ZIP if supported
814	–	* Pass on TB if supported.
815	–	* - Dianora
816	–	*/
817	–
818	–	send_capabilities(client_p, aconf,
819	–	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
820	–
821	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
822	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
823	–	}
824	–
825	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
826	–	(unsigned long)CurrentTime);
827	–
828	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
829	–	if (IsCapable(client_p, CAP_TS6))
830	–	hash_add_id(client_p);
831	–
832	–	/* XXX Does this ever happen? I don't think so -db */
833	–	detach_conf(client_p, OPER_TYPE);
834	–
835	–	/* *WARNING*
836	–	**    In the following code in place of plain server's
837	–	**    name we send what is returned by get_client_name
838	–	**    which may add the "sockhost" after the name. It's
839	–	**    *very* *important* that there is a SPACE between
840	–	**    the name and sockhost (if present). The receiving
841	–	**    server will start the information field from this
842	–	**    first blank and thus puts the sockhost into info.
843	–	**    ...a bit tricky, but you have been warned, besides
844	–	**    code is more neat this way...  --msa
845	–	*/
846	–	client_p->servptr = &me;
847	–
848	–	if (IsClosing(client_p))
849	–	return;
850	–
851	–	SetServer(client_p);
852	–
853	–	/* Update the capability combination usage counts. -A1kmm */
854	–	set_chcap_usage_counts(client_p);
855	–
856	–	/* Some day, all these lists will be consolidated *sigh* */
857	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
858	–
859	–	assert(dlinkFind(&unknown_list, client_p));
860	–
861	–	dlink_move_node(&client_p->localClient->lclient_node,
862	–	&unknown_list, &serv_list);
863	–
864	–	Count.myserver++;
865	–
866	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
867	–	hash_add_client(client_p);
868	–
869	–	/* doesnt duplicate client_p->serv if allocated this struct already */
870	–	make_server(client_p);
871	–
872	–	/* fixing eob timings.. -gnp */
873	–	client_p->localClient->firsttime = CurrentTime;
874	–
875	–	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
876	–	AddFlag(client_p, FLAGS_SERVICE);
877	–
878	–	/* Show the real host/IP to admins */
879	–	#ifdef HAVE_LIBCRYPTO
880	–	if (client_p->localClient->fd.ssl)
881	–	{
882	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
883	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
884	–
885	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
886	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
887	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
888	–	compression ? SSL_COMP_get_name(compression) : "NONE",
889	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
890	–	show_capabilities(client_p));
891	–	/* Now show the masked hostname/IP to opers */
892	–	sendto_realops_flags(UMODE_ALL, L_OPER,
893	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
894	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
895	–	compression ? SSL_COMP_get_name(compression) : "NONE",
896	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
897	–	show_capabilities(client_p));
898	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
899	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
900	–	compression ? SSL_COMP_get_name(compression) : "NONE",
901	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
902	–	show_capabilities(client_p));
903	–	}
904	–	else
905	–	#endif
906	–	{
907	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
908	–	"Link with %s established: (Capabilities: %s)",
909	–	inpath_ip,show_capabilities(client_p));
910	–	/* Now show the masked hostname/IP to opers */
911	–	sendto_realops_flags(UMODE_ALL, L_OPER,
912	–	"Link with %s established: (Capabilities: %s)",
913	–	inpath,show_capabilities(client_p));
914	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
915	–	inpath_ip, show_capabilities(client_p));
916	–	}
917	–
918	–	client_p->serv->sconf = conf;
919	–
920	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
921	–
922	–	/* Old sendto_serv_but_one() call removed because we now
923	–	** need to send different names to different servers
924	–	** (domain name matching) Send new server to other servers.
925	–	*/
926	–	DLINK_FOREACH(ptr, serv_list.head)
927	–	{
928	–	target_p = ptr->data;
929	–
930	–	if (target_p == client_p)
931	–	continue;
932	–
933	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
934	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
935	–	me.id, client_p->name, client_p->id,
936	–	IsHidden(client_p) ? "(H) " : "",
937	–	client_p->info);
938	–	else
939	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
940	–	me.name, client_p->name,
941	–	IsHidden(client_p) ? "(H) " : "",
942	–	client_p->info);
943	–	}
944	–
945	–	/* Pass on my client information to the new server
946	–	**
947	–	** First, pass only servers (idea is that if the link gets
948	–	** cancelled beacause the server was already there,
949	–	** there are no NICK's to be cancelled...). Of course,
950	–	** if cancellation occurs, all this info is sent anyway,
951	–	** and I guess the link dies when a read is attempted...? --msa
952	–	**
953	–	** Note: Link cancellation to occur at this point means
954	–	** that at least two servers from my fragment are building
955	–	** up connection this other fragment at the same time, it's
956	–	** a race condition, not the normal way of operation...
957	–	**
958	–	** ALSO NOTE: using the get_client_name for server names--
959	–	**    see previous *WARNING*!!! (Also, original inpath
960	–	**    is destroyed...)
961	–	*/
962	–
963	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
964	–	{
965	–	target_p = ptr->data;
966	–
967	–	/* target_p->from == target_p for target_p == client_p */
968	–	if (IsMe(target_p) || target_p->from == client_p)
969	–	continue;
970	–
971	–	if (IsCapable(client_p, CAP_TS6))
972	–	{
973	–	if (HasID(target_p))
974	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
975	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
976	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
977	–	target_p->info);
978	–	else  /* introducing non-ts6 server */
979	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
980	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
981	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
982	–	}
983	–	else
984	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
985	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
986	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
987	–	}
988	–
989	–	server_burst(client_p);
990	–	}
991	–
992	–	/* server_burst()
993	–	*
994	–	* inputs       - struct Client pointer server
995	–	*              -
996	–	* output       - none
997	–	* side effects - send a server burst
998	–	* bugs         - still too long
999	–	*/
1000	–	static void
1001	–	server_burst(struct Client *client_p)
1002	–	{
1003	–	/* Send it in the shortened format with the TS, if
1004	–	** it's a TS server; walk the list of channels, sending
1005	–	** all the nicks that haven't been sent yet for each
1006	–	** channel, then send the channel itself -- it's less
1007	–	** obvious than sending all nicks first, but on the
1008	–	** receiving side memory will be allocated more nicely
1009	–	** saving a few seconds in the handling of a split
1010	–	** -orabidoo
1011	–	*/
1012	–
1013	–	burst_all(client_p);
1014	–
1015	–	/* EOB stuff is now in burst_all */
1016	–	/* Always send a PING after connect burst is done */
1017	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
1018	–	}
1019	–
1020	–	/* burst_all()
1021	–	*
1022	–	* inputs       - pointer to server to send burst to
1023	–	* output       - NONE
1024	–	* side effects - complete burst of channels/nicks is sent to client_p
1025	–	*/
1026	–	static void
1027	–	burst_all(struct Client *client_p)
1028	–	{
1029	–	dlink_node *ptr = NULL;
1030	–
1031	–	DLINK_FOREACH(ptr, global_channel_list.head)
1032	–	{
1033	–	struct Channel *chptr = ptr->data;
1034	–
1035	–	if (dlink_list_length(&chptr->members) != 0)
1036	–	{
1037	–	burst_members(client_p, chptr);
1038	–	send_channel_modes(client_p, chptr);
1039	–
1040	–	if (IsCapable(client_p, CAP_TBURST) ||
1041	–	IsCapable(client_p, CAP_TB))
1042	–	send_tb(client_p, chptr);
1043	–	}
1044	–	}
1045	–
1046	–	/* also send out those that are not on any channel
1047	–	*/
1048	–	DLINK_FOREACH(ptr, global_client_list.head)
1049	–	{
1050	–	struct Client *target_p = ptr->data;
1051	–
1052	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
1053	–	sendnick_TS(client_p, target_p);
1054	–
1055	–	DelFlag(target_p, FLAGS_BURSTED);
1056	–	}
1057	–
1058	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1059	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1060	–	*/
1061	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1062	–	if (IsCapable(client_p, CAP_EOB))
1063	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1064	–	}
1065	–
1066	–	/*
1067	–	* send_tb
1068	–	*
1069	–	* inputs       - pointer to Client
1070	–	*              - pointer to channel
1071	–	* output       - NONE
1072	–	* side effects - Called on a server burst when
1073	–	*                server is CAP_TB|CAP_TBURST capable
1074	–	*/
1075	–	static void
1076	–	send_tb(struct Client *client_p, struct Channel *chptr)
1077	–	{
1078	–	/*
1079	–	* We may also send an empty topic here, but only if topic_time isn't 0,
1080	–	* i.e. if we had a topic that got unset.  This is required for syncing
1081	–	* topics properly.
1082	–	*
1083	–	* Imagine the following scenario: Our downlink introduces a channel
1084	–	* to us with a TS that is equal to ours, but the channel topic on
1085	–	* their side got unset while the servers were in splitmode, which means
1086	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1087	–	* deal with it in a more sophisticated fashion instead of just resetting
1088	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1089	–	* for further information   -Michael
1090	–	*/
1091	–	if (chptr->topic_time != 0)
1092	–	{
1093	–	if (IsCapable(client_p, CAP_TBURST))
1094	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1095	–	me.name, (unsigned long)chptr->channelts, chptr->chname,
1096	–	(unsigned long)chptr->topic_time,
1097	–	chptr->topic_info,
1098	–	chptr->topic);
1099	–	else if (IsCapable(client_p, CAP_TB))
1100	–	{
1101	–	if (ConfigChannel.burst_topicwho)
1102	–	{
1103	–	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1104	–	me.name, chptr->chname,
1105	–	(unsigned long)chptr->topic_time,
1106	–	chptr->topic_info, chptr->topic);
1107	–	}
1108	–	else
1109	–	{
1110	–	sendto_one(client_p, ":%s TB %s %lu :%s",
1111	–	me.name, chptr->chname,
1112	–	(unsigned long)chptr->topic_time,
1113	–	chptr->topic);
1114	–	}
1115	–	}
1116	–	}
1117	–	}
1118	–
1119	–	/* burst_members()
1120	–	*
1121	–	* inputs       - pointer to server to send members to
1122	–	*              - dlink_list pointer to membership list to send
1123	–	* output       - NONE
1124	–	* side effects -
1125	–	*/
1126	–	static void
1127	–	burst_members(struct Client *client_p, struct Channel *chptr)
1128	–	{
1129	–	struct Client *target_p;
1130	–	struct Membership *ms;
1131	–	dlink_node *ptr;
1132	–
1133	–	DLINK_FOREACH(ptr, chptr->members.head)
1134	–	{
1135	–	ms       = ptr->data;
1136	–	target_p = ms->client_p;
1137	–
1138	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1139	–	{
1140	–	AddFlag(target_p, FLAGS_BURSTED);
1141	–
1142	–	if (target_p->from != client_p)
1143	–	sendnick_TS(client_p, target_p);
1144	–	}
1145	–	}
1146	–	}
1147	–
543		/* New server connection code
544		* Based upon the stuff floating about in s_bsd.c
545		*   -- adrian
#	Line 1152 | Line 547 | burst_members(struct Client *client_p, s
547
548		/* serv_connect() - initiate a server connection
549		*
550	<	* inputs       - pointer to conf
550	>	* inputs       - pointer to conf
551		*              - pointer to client doing the connect
552		* output       -
553		* side effects -
#	Line 1167 | Line 562 | burst_members(struct Client *client_p, s
562		* it suceeded or not, and 0 if it fails in here somewhere.
563		*/
564		int
565	<	serv_connect(struct AccessItem *aconf, struct Client *by)
565	>	serv_connect(struct MaskItem *conf, struct Client *by)
566		{
567	<	struct ConfItem *conf;
568	<	struct Client *client_p;
1174	<	char buf[HOSTIPLEN];
567	>	struct Client *client_p = NULL;
568	>	char buf[HOSTIPLEN + 1] = "";
569
570		/* conversion structs */
571		struct sockaddr_in *v4;
1178	–	/* Make sure aconf is useful */
1179	–	assert(aconf != NULL);
572
573	<	if(aconf == NULL)
574	<	return (0);
573	>	/* Make sure conf is useful */
574	>	assert(conf);
575
576	<	/* XXX should be passing struct ConfItem in the first place */
1185	<	conf = unmap_conf_item(aconf);
1186	<
1187	<	/* log */
1188	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
576	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
577		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
578	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", aconf->user, aconf->host,
578	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
579		buf);
580
581		/* Still processing a DNS lookup? -> exit */
582	<	if (aconf->dns_pending)
582	>	if (conf->dns_pending)
583		{
584	<	sendto_realops_flags(UMODE_ALL, L_ALL,
584	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
585		"Error connecting to %s: DNS lookup for connect{} in progress.",
586		conf->name);
587	<	return (0);
587	>	return 0;
588		}
589
590	<	if (aconf->dns_failed)
590	>	if (conf->dns_failed)
591		{
592	<	sendto_realops_flags(UMODE_ALL, L_ALL,
592	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
593		"Error connecting to %s: DNS lookup for connect{} failed.",
594		conf->name);
595	<	return (0);
595	>	return 0;
596		}
597
598	<	/* Make sure this server isn't already connected
599	<	* Note: aconf should ALWAYS be a valid C: line
598	>	/*
599	>	* Make sure this server isn't already connected.
600	>	* Note: conf should ALWAYS be a valid connect {} block
601		*/
602	<	if ((client_p = hash_find_server(conf->name)) != NULL)
603	<	{
604	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
605	<	"Server %s already present from %s",
606	<	conf->name, get_client_name(client_p, SHOW_IP));
607	<	sendto_realops_flags(UMODE_ALL, L_OPER,
608	<	"Server %s already present from %s",
609	<	conf->name, get_client_name(client_p, MASK_IP));
602	>	if ((client_p = hash_find_server(conf->name)))
603	>	{
604	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
605	>	"Server %s already present from %s",
606	>	conf->name, get_client_name(client_p, SHOW_IP));
607	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
608	>	"Server %s already present from %s",
609	>	conf->name, get_client_name(client_p, MASK_IP));
610		if (by && IsClient(by) && !MyClient(by))
611	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
612	<	me.name, by->name, conf->name,
613	<	get_client_name(client_p, MASK_IP));
1225	<	return (0);
611	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
612	>	conf->name, get_client_name(client_p, MASK_IP));
613	>	return 0;
614		}
615	<
615	>
616		/* Create a local client */
617		client_p = make_client(NULL);
618
619		/* Copy in the server, hostname, fd */
620		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
621	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
621	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
622
623		/* We already converted the ip once, so lets use it - stu */
624		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
625
626	<	/* create a socket for the server connection */
627	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1240	<	SOCK_STREAM, 0, NULL) < 0)
626	>	/* Create a socket for the server connection */
627	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
628		{
629		/* Eek, failure to create the socket */
630	<	report_error(L_ALL,
631	<	"opening stream socket to %s: %s", conf->name, errno);
630	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
631	>
632		SetDead(client_p);
633	<	exit_client(client_p, &me, "Connection failed");
634	<	return (0);
633	>	exit_client(client_p, "Connection failed");
634	>	return 0;
635		}
636
637	<	/* servernames are always guaranteed under HOSTLEN chars */
638	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
637	>	/* Server names are always guaranteed under HOSTLEN chars */
638	>	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
639
640	<	/* Attach config entries to client here rather than in
641	<	* serv_connect_callback(). This to avoid null pointer references.
640	>	/*
641	>	* Attach config entries to client here rather than in serv_connect_callback().
642	>	* This to avoid null pointer references.
643		*/
644	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
644	>	if (!attach_connect_block(client_p, conf->name, conf->host))
645		{
646	<	sendto_realops_flags(UMODE_ALL, L_ALL,
647	<	"Host %s is not enabled for connecting:no C/N-line",
648	<	conf->name);
649	<	if (by && IsClient(by) && !MyClient(by))
650	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
651	<	me.name, by->name, client_p->name);
646	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
647	>	"Host %s is not enabled for connecting: no connect {} block",
648	>	conf->name);
649	>	if (by && IsClient(by) && !MyClient(by))
650	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
651	>
652		SetDead(client_p);
653	<	exit_client(client_p, client_p, "Connection failed");
654	<	return (0);
653	>	exit_client(client_p, "Connection failed");
654	>	return 0;
655		}
656
657	<	/* at this point we have a connection in progress and C/N lines
658	<	* attached to the client, the socket info should be saved in the
659	<	* client and it should either be resolved or have a valid address.
657	>	/*
658	>	* At this point we have a connection in progress and a connect {} block
659	>	* attached to the client, the socket info should be saved in the client
660	>	* and it should either be resolved or have a valid address.
661		*
662		* The socket has been connected or connect is in progress.
663		*/
#	Line 1280 | Line 669 | serv_connect(struct AccessItem *aconf, s
669		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
670
671		SetConnecting(client_p);
672	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1284	<	/* from def_fam */
1285	<	client_p->localClient->aftype = aconf->aftype;
672	>	client_p->connection->aftype = conf->aftype;
673
674		/* Now, initiate the connection */
675	<	/* XXX assume that a non 0 type means a specific bind address
675	>	/* XXX assume that a non 0 type means a specific bind address
676		* for this connect.
677		*/
678	<	switch (aconf->aftype)
678	>	switch (conf->aftype)
679		{
680		case AF_INET:
681	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
682	<	if (v4->sin_addr.s_addr != 0)
681	>	v4 = (struct sockaddr_in*)&conf->bind;
682	>	if (v4->sin_addr.s_addr)
683		{
684		struct irc_ssaddr ipn;
685		memset(&ipn, 0, sizeof(struct irc_ssaddr));
686		ipn.ss.ss_family = AF_INET;
687		ipn.ss_port = 0;
688	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
689	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
690	<	(struct sockaddr *)&ipn, ipn.ss_len,
691	<	serv_connect_callback, client_p, aconf->aftype,
692	<	CONNECTTIMEOUT);
688	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
689	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
690	>	(struct sockaddr *)&ipn, ipn.ss_len,
691	>	serv_connect_callback, client_p, conf->aftype,
692	>	CONNECTTIMEOUT);
693		}
694	<	else if (ServerInfo.specific_ipv4_vhost)
694	>	else if (ConfigServerInfo.specific_ipv4_vhost)
695		{
696		struct irc_ssaddr ipn;
697		memset(&ipn, 0, sizeof(struct irc_ssaddr));
698		ipn.ss.ss_family = AF_INET;
699		ipn.ss_port = 0;
700	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
701	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
700	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
701	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
702		(struct sockaddr *)&ipn, ipn.ss_len,
703	<	serv_connect_callback, client_p, aconf->aftype,
704	<	CONNECTTIMEOUT);
703	>	serv_connect_callback, client_p, conf->aftype,
704	>	CONNECTTIMEOUT);
705		}
706		else
707	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
708	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
707	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
708	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
709		CONNECTTIMEOUT);
710		break;
1324	–	#ifdef IPV6
711		case AF_INET6:
712		{
713	<	struct irc_ssaddr ipn;
714	<	struct sockaddr_in6 *v6;
715	<	struct sockaddr_in6 *v6conf;
716	<
717	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
718	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
719	<	v6 = (struct sockaddr_in6 *)&ipn;
720	<
721	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
722	<	sizeof(struct in6_addr)) != 0)
723	<	{
724	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
725	<	ipn.ss.ss_family = AF_INET6;
726	<	ipn.ss_port = 0;
727	<	comm_connect_tcp(&client_p->localClient->fd,
728	<	aconf->host, aconf->port,
729	<	(struct sockaddr *)&ipn, ipn.ss_len,
730	<	serv_connect_callback, client_p,
731	<	aconf->aftype, CONNECTTIMEOUT);
732	<	}
1347	<	else if (ServerInfo.specific_ipv6_vhost)
713	>	struct irc_ssaddr ipn;
714	>	struct sockaddr_in6 *v6;
715	>	struct sockaddr_in6 *v6conf;
716	>
717	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
718	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
719	>	v6 = (struct sockaddr_in6 *)&ipn;
720	>
721	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
722	>	{
723	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
724	>	ipn.ss.ss_family = AF_INET6;
725	>	ipn.ss_port = 0;
726	>	comm_connect_tcp(&client_p->connection->fd,
727	>	conf->host, conf->port,
728	>	(struct sockaddr *)&ipn, ipn.ss_len,
729	>	serv_connect_callback, client_p,
730	>	conf->aftype, CONNECTTIMEOUT);
731	>	}
732	>	else if (ConfigServerInfo.specific_ipv6_vhost)
733		{
734	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
735	<	ipn.ss.ss_family = AF_INET6;
736	<	ipn.ss_port = 0;
737	<	comm_connect_tcp(&client_p->localClient->fd,
738	<	aconf->host, aconf->port,
739	<	(struct sockaddr *)&ipn, ipn.ss_len,
740	<	serv_connect_callback, client_p,
741	<	aconf->aftype, CONNECTTIMEOUT);
742	<	}
743	<	else
744	<	comm_connect_tcp(&client_p->localClient->fd,
745	<	aconf->host, aconf->port,
746	<	NULL, 0, serv_connect_callback, client_p,
747	<	aconf->aftype, CONNECTTIMEOUT);
734	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
735	>	ipn.ss.ss_family = AF_INET6;
736	>	ipn.ss_port = 0;
737	>	comm_connect_tcp(&client_p->connection->fd,
738	>	conf->host, conf->port,
739	>	(struct sockaddr *)&ipn, ipn.ss_len,
740	>	serv_connect_callback, client_p,
741	>	conf->aftype, CONNECTTIMEOUT);
742	>	}
743	>	else
744	>	comm_connect_tcp(&client_p->connection->fd,
745	>	conf->host, conf->port,
746	>	NULL, 0, serv_connect_callback, client_p,
747	>	conf->aftype, CONNECTTIMEOUT);
748		}
1364	–	#endif
749		}
750	<	return (1);
750	>
751	>	return 1;
752		}
753
1369	–	#ifdef HAVE_LIBCRYPTO
754		static void
755		finish_ssl_server_handshake(struct Client *client_p)
756		{
757	<	struct ConfItem *conf=NULL;
1374	<	struct AccessItem *aconf=NULL;
757	>	struct MaskItem *conf = NULL;
758
759	<	conf = find_conf_name(&client_p->localClient->confs,
760	<	client_p->name, SERVER_TYPE);
759	>	conf = find_conf_name(&client_p->connection->confs,
760	>	client_p->name, CONF_SERVER);
761		if (conf == NULL)
762		{
763	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
764	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
765	<	sendto_realops_flags(UMODE_ALL, L_OPER,
763	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
764	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
765	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
766		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
767
768	<	exit_client(client_p, &me, "Lost connect{} block");
768	>	exit_client(client_p, "Lost connect{} block");
769		return;
770		}
771
772	<	aconf = map_to_conf(conf);
772	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
773
774	<	/* jdc -- Check and send spasswd, not passwd. */
1392	<	if (!EmptyString(aconf->spasswd))
1393	<	sendto_one(client_p, "PASS %s TS %d %s",
1394	<	aconf->spasswd, TS_CURRENT, me.id);
1395	<
1396	<	send_capabilities(client_p, aconf,
1397	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
774	>	send_capabilities(client_p);
775
776		sendto_one(client_p, "SERVER %s 1 :%s%s",
777		me.name, ConfigServerHide.hidden ? "(H) " : "",
778		me.info);
779
780	<	/* If we've been marked dead because a send failed, just exit
780	>	/*
781	>	* If we've been marked dead because a send failed, just exit
782		* here now and save everyone the trouble of us ever existing.
783		*/
784		if (IsDead(client_p))
785		{
786	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
787	<	"%s[%s] went dead during handshake",
788	<	client_p->name,
789	<	client_p->host);
790	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1413	<	"%s went dead during handshake", client_p->name);
1414	<	return;
786	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
787	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
788	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
789	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
790	>	return;
791		}
792
793		/* don't move to serv_list yet -- we haven't sent a burst! */
794		/* If we get here, we're ok, so lets start reading some data */
795	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
795	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
796		}
797
798		static void
799	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
799	>	ssl_server_handshake(fde_t *fd, void *data)
800		{
801	<	int ret;
802	<	int err;
1427	<
1428	<	ret = SSL_connect(client_p->localClient->fd.ssl);
801	>	struct Client *client_p = data;
802	>	const char *sslerr = NULL;
803
804	<	if (ret <= 0)
804	>	tls_handshake_status_t ret = tls_handshake(&client_p->connection->fd.ssl, TLS_ROLE_CLIENT, &sslerr);
805	>	if (ret != TLS_HANDSHAKE_DONE)
806		{
807	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
807	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
808		{
809	<	case SSL_ERROR_WANT_WRITE:
810	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
811	<	(PF *)ssl_server_handshake, client_p, 0);
809	>	exit_client(client_p, "Timeout during TLS handshake");
810	>	return;
811	>	}
812	>
813	>	switch (ret)
814	>	{
815	>	case TLS_HANDSHAKE_WANT_WRITE:
816	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
817	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
818		return;
819	<	case SSL_ERROR_WANT_READ:
820	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
821	<	(PF *)ssl_server_handshake, client_p, 0);
819	>	case TLS_HANDSHAKE_WANT_READ:
820	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
821	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
822		return;
823		default:
824		{
825	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1445	<	sendto_realops_flags(UMODE_ALL, L_ALL,
825	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
826		"Error connecting to %s: %s", client_p->name,
827	<	sslerr ? sslerr : "unknown SSL error");
828	<	exit_client(client_p, client_p, "Error during SSL handshake");
827	>	sslerr ? sslerr : "unknown TLS error");
828	>	exit_client(client_p, "Error during TLS handshake");
829		return;
830		}
831		}
832		}
833
834	+	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
835	+
836	+	if (!tls_verify_cert(&client_p->connection->fd.ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp))
837	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
838	+	client_p->name, client_p->username, client_p->host);
839	+
840		finish_ssl_server_handshake(client_p);
841		}
842
843		static void
844	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
844	>	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
845		{
846	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
846	>	if (!tls_new(&client_p->connection->fd.ssl, fd->fd, TLS_ROLE_CLIENT))
847		{
1462	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1463	–	ERR_error_string(ERR_get_error(), NULL));
848		SetDead(client_p);
849	<	exit_client(client_p, client_p, "SSL_new failed");
849	>	exit_client(client_p, "TLS context initialization failed");
850		return;
851		}
852
853	<	SSL_set_fd(fd->ssl, fd->fd);
854	<
1471	<	if (!EmptyString(aconf->cipher_list))
1472	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
853	>	if (!EmptyString(conf->cipher_list))
854	>	tls_set_ciphers(&client_p->connection->fd.ssl, conf->cipher_list);
855
856		ssl_server_handshake(NULL, client_p);
857		}
1476	–	#endif
858
859		/* serv_connect_callback() - complete a server connection.
860	<	*
860	>	*
861		* This routine is called after the server connection attempt has
862		* completed. If unsucessful, an error is sent to ops and the client
863		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1486 | Line 867 | ssl_connect_init(struct Client *client_p
867		static void
868		serv_connect_callback(fde_t *fd, int status, void *data)
869		{
870	<	struct Client *client_p = data;
871	<	struct ConfItem *conf=NULL;
1491	<	struct AccessItem *aconf=NULL;
870	>	struct Client *const client_p = data;
871	>	const struct MaskItem *conf = NULL;
872
873	<	/* First, make sure its a real client! */
874	<	assert(client_p != NULL);
875	<	assert(&client_p->localClient->fd == fd);
873	>	/* First, make sure it's a real client! */
874	>	assert(client_p);
875	>	assert(&client_p->connection->fd == fd);
876
877		/* Next, for backward purposes, record the ip of the server */
878	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
878	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
879		sizeof(struct irc_ssaddr));
880	+
881		/* Check the status */
882		if (status != COMM_OK)
883		{
884	<	/* We have an error, so report it and quit
885	<	* Admins get to see any IP, mere opers don't *sigh*
884	>	/* We have an error, so report it and quit */
885	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
886	>	"Error connecting to %s: %s",
887	>	get_client_name(client_p, SHOW_IP), comm_errstr(status));
888	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
889	>	"Error connecting to %s: %s",
890	>	get_client_name(client_p, MASK_IP), comm_errstr(status));
891	>
892	>	/*
893	>	* If a fd goes bad, call dead_link() the socket is no
894	>	* longer valid for reading or writing.
895		*/
896	<	if (ConfigServerHide.hide_server_ips)
897	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1508	<	"Error connecting to %s: %s",
1509	<	client_p->name, comm_errstr(status));
1510	<	else
1511	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1512	<	"Error connecting to %s[%s]: %s", client_p->name,
1513	<	client_p->host, comm_errstr(status));
1514	<
1515	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1516	<	"Error connecting to %s: %s",
1517	<	client_p->name, comm_errstr(status));
1518	<
1519	<	/* If a fd goes bad, call dead_link() the socket is no
1520	<	* longer valid for reading or writing.
1521	<	*/
1522	<	dead_link_on_write(client_p, 0);
1523	<	return;
896	>	dead_link_on_write(client_p, 0);
897	>	return;
898		}
899
900		/* COMM_OK, so continue the connection procedure */
901		/* Get the C/N lines */
902	<	conf = find_conf_name(&client_p->localClient->confs,
903	<	client_p->name, SERVER_TYPE);
902	>	conf = find_conf_name(&client_p->connection->confs,
903	>	client_p->name, CONF_SERVER);
904		if (conf == NULL)
905		{
906	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
907	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
908	<	sendto_realops_flags(UMODE_ALL, L_OPER,
909	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
906	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
907	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
908	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
909	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
910
911	<	exit_client(client_p, &me, "Lost connect{} block");
911	>	exit_client(client_p, "Lost connect{} block");
912		return;
913		}
914
1541	–	aconf = map_to_conf(conf);
915		/* Next, send the initial handshake */
916		SetHandshake(client_p);
917
918	<	#ifdef HAVE_LIBCRYPTO
1546	<	if (IsConfSSL(aconf))
918	>	if (IsConfSSL(conf))
919		{
920	<	ssl_connect_init(client_p, aconf, fd);
920	>	ssl_connect_init(client_p, conf, fd);
921		return;
922		}
1551	–	#endif
923
924	<	/* jdc -- Check and send spasswd, not passwd. */
1554	<	if (!EmptyString(aconf->spasswd))
1555	<	sendto_one(client_p, "PASS %s TS %d %s",
1556	<	aconf->spasswd, TS_CURRENT, me.id);
924	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
925
926	<	send_capabilities(client_p, aconf,
1559	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
926	>	send_capabilities(client_p);
927
928	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
929	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1563	<	me.info);
928	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
929	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
930
931	<	/* If we've been marked dead because a send failed, just exit
931	>	/*
932	>	* If we've been marked dead because a send failed, just exit
933		* here now and save everyone the trouble of us ever existing.
934		*/
935	<	if (IsDead(client_p))
935	>	if (IsDead(client_p))
936		{
937	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
938	<	"%s[%s] went dead during handshake",
939	<	client_p->name,
940	<	client_p->host);
941	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1575	<	"%s went dead during handshake", client_p->name);
1576	<	return;
937	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
938	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
939	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
940	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
941	>	return;
942		}
943
944		/* don't move to serv_list yet -- we haven't sent a burst! */
#	Line 1592 | Line 957 | find_servconn_in_progress(const char *na
957		cptr = ptr->data;
958
959		if (cptr && cptr->name[0])
960	<	if (match(name, cptr->name))
960	>	if (!match(name, cptr->name))
961		return cptr;
962		}
963	<
963	>
964		return NULL;
965		}

Diff Legend

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