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 1325 by michael, Sat Mar 31 10:29:02 2012 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 7668 by michael, Wed Jul 20 17:09:49 2016 UTC

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

Comparing:
ircd-hybrid-8/src/s_serv.c (property svn:keywords), Revision 1325 by michael, Sat Mar 31 10:29:02 2012 UTC vs.
ircd-hybrid/trunk/src/server.c (property svn:keywords), Revision 7668 by michael, Wed Jul 20 17:09:49 2016 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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