ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/server.c

Comparing:
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2156 by michael, Fri May 31 20:53:11 2013 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"
33		#include "ircd.h"
34		#include "ircd_defs.h"
35		#include "s_bsd.h"
42	–	#include "numeric.h"
36		#include "packet.h"
44	–	#include "irc_res.h"
37		#include "conf.h"
38	<	#include "s_serv.h"
38	>	#include "server.h"
39		#include "log.h"
48	–	#include "s_misc.h"
49	–	#include "s_user.h"
40		#include "send.h"
41		#include "memory.h"
52	–	#include "channel.h" /* chcap_usage_counts stuff...*/
42		#include "parse.h"
43
55	–	#define MIN_CONN_FREQ 300
44
45		dlink_list flatten_links;
46	<	static dlink_list cap_list = { NULL, NULL, 0 };
47	<	static void server_burst(struct Client *);
60	<	static void burst_all(struct Client *);
61	<	static void send_tb(struct Client *client_p, struct Channel *chptr);
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		FILE *file = NULL;
62	<	dlink_node *ptr = NULL, *ptr_next = NULL;;
63	<	char buff[IRCD_BUFSIZE] = { '\0' };
62	>	dlink_node *node = NULL, *node_next = NULL;
63	>	char buff[IRCD_BUFSIZE] = "";
64
65	<	if ((file = fopen(LIPATH, "w")) == NULL)
65	>	if (EmptyString(ConfigServerHide.flatten_links_file))
66		return;
67
68	<	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
68	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "w")) == NULL)
69		{
70	<	dlinkDelete(ptr, &flatten_links);
71	<	MyFree(ptr->data);
72	<	free_dlink_node(ptr);
70	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
71	>	strerror(errno));
72	>	return;
73		}
74
75	<	DLINK_FOREACH(ptr, global_serv_list.head)
75	>	DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
76		{
77	<	const struct Client *target_p = ptr->data;
77	>	dlinkDelete(node, &flatten_links);
78	>	xfree(node->data);
79	>	free_dlink_node(node);
80	>	}
81	>
82	>	DLINK_FOREACH(node, global_server_list.head)
83	>	{
84	>	const struct Client *target_p = node->data;
85
86		/*
87		* Skip hidden servers, aswell as ourselves, since we already send
#	Line 111 | Line 101 | write_links_file(void *notused)
101		*/
102		snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
103		me.name, target_p->info);
104	<	dlinkAdd(xstrdup(buff), make_dlink_node(), &flatten_links);
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
#	Line 121 | Line 111 | write_links_file(void *notused)
111		fclose(file);
112		}
113
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);
140	+	}
141	+
142		/* hunt_server()
143		*      Do the basic thing in delivering the message (command)
144		*      across the relays to the specific server (server) for
#	Line 141 | 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,
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;
149	<	dlink_node *ptr;
150	<	int wilds;
166	>	dlink_node *node = NULL;
167
168		/* Assume it's me, if no server */
169		if (parc <= server || EmptyString(parv[server]))
170		return HUNTED_ISME;
171
172	<	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
173	<	return HUNTED_ISME;
172	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
173	>	target_p = hash_find_server(parv[server]);
174
175	<	/* These are to pickup matches that would cause the following
175	>	/*
176	>	* These are to pickup matches that would cause the following
177		* message to go in the wrong direction while doing quick fast
178		* non-matching lookups.
179		*/
163	–	if (MyClient(source_p))
164	–	target_p = hash_find_client(parv[server]);
165	–	else
166	–	target_p = find_person(client_p, parv[server]);
167	–
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])))
173	<	if (target_p->from == source_p->from && !MyConnect(target_p))
174	<	target_p = NULL;
175	<
176	<	wilds = has_wildcards(parv[server]);
177	<
178	<	/* Again, if there are no wild cards involved in the server
179	<	* name, use the hash lookup
180	<	*/
181	<	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;
202	–	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))
214	<	{
215	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
216	<	me.name, source_p->name, parv[server]);
217	<	return HUNTED_NOSUCH;
218	<	}
219	<
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;
225	<
226	<	/* This is a little kludgy but should work... */
227	<	if (IsClient(source_p) &&
228	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
229	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
230	<	parv[0] = ID(source_p);
231	<
232	<	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	<	}
231	>	}
232
233	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
239	<	me.name, source_p->name, parv[server]);
233	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
234		return HUNTED_NOSUCH;
235		}
236
#	Line 253 | Line 247 | hunt_server(struct Client *client_p, str
247		void
248		try_connections(void *unused)
249		{
250	<	dlink_node *ptr = NULL;
257	<	struct MaskItem *conf;
258	<	int confrq;
250	>	dlink_node *node = NULL;
251
260	–	/* 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;
257	>	struct MaskItem *conf = node->data;
258
259		assert(conf->type == CONF_SERVER);
260
261	<	/* Also when already connecting! (update holdtimes) --SRB
262	<	*/
272	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
261	>	/* Also when already connecting! (update holdtimes) --SRB */
262	>	if (!conf->port || !IsConfAllowAutoConn(conf))
263		continue;
264
265	<
266	<	/* 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
#	Line 282 | Line 272 | try_connections(void *unused)
272		if (conf->until > CurrentTime)
273		continue;
274
275	<	if (conf->class == NULL)
286	<	confrq = DEFAULT_CONNECTFREQUENCY;
287	<	else
288	<	{
289	<	confrq = conf->class->con_freq;
290	<	if (confrq < MIN_CONN_FREQ)
291	<	confrq = MIN_CONN_FREQ;
292	<	}
275	>	assert(conf->class);
276
277	<	conf->until = 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 (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 320 | Line 305 | try_connections(void *unused)
305		*   -- adrian
306		*/
307		if (ConfigServerHide.hide_server_ips)
308	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
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, SEND_NOTICE,
312	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
313		"Connection to %s[%s] activated.",
314		conf->name, conf->host);
315
#	Line 338 | Line 323 | try_connections(void *unused)
323		int
324		valid_servname(const char *name)
325		{
326	<	unsigned int length = 0;
342	<	unsigned int dots   = 0;
326	>	unsigned int dots = 0;
327		const char *p = name;
328
329		for (; *p; ++p)
#	Line 347 | Line 331 | valid_servname(const char *name)
331		if (!IsServChar(*p))
332		return 0;
333
350	–	++length;
351	–
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;
363	<	struct MaskItem *conf        = NULL;
344	>	dlink_node *node = NULL;
345		struct MaskItem *server_conf = NULL;
346		int error = -1;
347
348	<	assert(client_p != NULL);
348	>	assert(client_p);
349
350	<	/* loop through looking for all possible connect items that might work */
351	<	DLINK_FOREACH(ptr, server_items.head)
350	>	/* Loop through looking for all possible connect items that might work */
351	>	DLINK_FOREACH(node, connect_items.head)
352		{
353	<	conf = ptr->data;
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 */
381	<	if (!match(conf->host, client_p->host) ||
382	<	!match(conf->host, client_p->sockhost))
360	>	if (!irccmp(conf->host, client_p->host) ||
361	>	!irccmp(conf->host, client_p->sockhost))
362		{
363		error = -2;
364
365	<	if (!match_conf_password(client_p->localClient->passwd, conf))
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	<
399	<	if (server_conf != NULL)
381	>	switch (server_conf->aftype)
382		{
383	<	struct sockaddr_in *v4;
402	<	#ifdef IPV6
403	<	struct sockaddr_in6 *v6;
404	<	#endif
405	<	switch (server_conf->aftype)
383	>	case AF_INET6:
384		{
385	<	#ifdef IPV6
408	<	case AF_INET6:
409	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
385	>	const struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&server_conf->addr;
386
387	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
388	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
389	<	break;
390	<	#endif
391	<	case AF_INET:
392	<	v4 = (struct sockaddr_in *)&server_conf->addr;
387	>	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
388	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
389	>	break;
390	>	}
391	>	case AF_INET:
392	>	{
393	>	const struct sockaddr_in *v4 = (struct sockaddr_in *)&server_conf->addr;
394
395	<	if (v4->sin_addr.s_addr == INADDR_NONE)
396	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
397	<	break;
395	>	if (v4->sin_addr.s_addr == INADDR_NONE)
396	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
397	>	break;
398		}
399		}
400
401	<	return(0);
401	>	return 0;
402	>	}
403	>
404	>	/* server_capab_init()
405	>	*
406	>	* inputs       - none
407	>	* output       - none
408	>	*/
409	>	void
410	>	server_capab_init(void)
411	>	{
412	>	add_capability("QS", CAPAB_QS);
413	>	add_capability("EOB", CAPAB_EOB);
414	>	add_capability("CLUSTER", CAPAB_CLUSTER);
415	>	add_capability("SVS", CAPAB_SVS);
416	>	add_capability("CHW", CAPAB_CHW);
417	>	add_capability("HOPS", CAPAB_HOPS);
418		}
419
420		/* add_capability()
#	Line 434 | 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));
440	<
441	<	cap->name = xstrdup(capab_name);
442	<	cap->cap = cap_flag;
443	<	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 452 | 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;
459	<	dlink_node *next_ptr;
460	<	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);
471	<	dlinkDelete(ptr, &cap_list);
472	<	MyFree(cap->name);
473	<	MyFree(cap);
474	<	}
456	>	dlinkDelete(node, &server_capabilities_list);
457	>	xfree(cap->name);
458	>	xfree(cap);
459		}
460		}
477	–
478	–	return 0;
461		}
462
463		/*
#	Line 486 | Line 468 | delete_capability(const char *capab_name
468		* side effects - none
469		*/
470		unsigned int
471	<	find_capability(const char *capab)
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
504	–	/* send_capabilities()
505	–	*
506	–	* inputs       - Client pointer to send to
507	–	*              - int flag of capabilities that this server can send
508	–	* output       - NONE
509	–	* side effects - send the CAPAB line to a server  -orabidoo
510	–	*
511	–	*/
512	–	void
513	–	send_capabilities(struct Client *client_p, int cap_can_send)
514	–	{
515	–	struct Capability *cap=NULL;
516	–	char msgbuf[IRCD_BUFSIZE];
517	–	char *t;
518	–	int tl;
519	–	dlink_node *ptr;
520	–
521	–	t = msgbuf;
522	–
523	–	DLINK_FOREACH(ptr, cap_list.head)
524	–	{
525	–	cap = ptr->data;
526	–
527	–	if (cap->cap & (cap_can_send|default_server_capabs))
528	–	{
529	–	tl = sprintf(t, "%s ", cap->name);
530	–	t += tl;
531	–	}
532	–	}
533	–
534	–	*(t - 1) = '\0';
535	–	sendto_one(client_p, "CAPAB :%s", msgbuf);
536	–	}
537	–
538	–	/* sendnick_TS()
539	–	*
540	–	* inputs       - client (server) to send nick towards
541	–	*          - client to send nick for
542	–	* output       - NONE
543	–	* side effects - NICK message is sent towards given client_p
544	–	*/
545	–	void
546	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
547	–	{
548	–	static char ubuf[12];
549	–
550	–	if (!IsClient(target_p))
551	–	return;
552	–
553	–	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
554	–
555	–	if (ubuf[0] == '\0')
556	–	{
557	–	ubuf[0] = '+';
558	–	ubuf[1] = '\0';
559	–	}
560	–
561	–	if (IsCapable(client_p, CAP_SVS))
562	–	{
563	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
564	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
565	–	target_p->servptr->id,
566	–	target_p->name, target_p->hopcount + 1,
567	–	(unsigned long) target_p->tsinfo,
568	–	ubuf, target_p->username, target_p->host,
569	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
570	–	"0" : target_p->sockhost, target_p->id,
571	–	target_p->svid, target_p->info);
572	–	else
573	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
574	–	target_p->name, target_p->hopcount + 1,
575	–	(unsigned long) target_p->tsinfo,
576	–	ubuf, target_p->username, target_p->host,
577	–	target_p->servptr->name, target_p->svid,
578	–	target_p->info);
579	–	}
580	–	else
581	–	{
582	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
583	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
584	–	target_p->servptr->id,
585	–	target_p->name, target_p->hopcount + 1,
586	–	(unsigned long) target_p->tsinfo,
587	–	ubuf, target_p->username, target_p->host,
588	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
589	–	"0" : target_p->sockhost, target_p->id, target_p->info);
590	–	else
591	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
592	–	target_p->name, target_p->hopcount + 1,
593	–	(unsigned long) target_p->tsinfo,
594	–	ubuf, target_p->username, target_p->host,
595	–	target_p->servptr->name, target_p->info);
596	–	}
597	–
598	–	if (target_p->away[0])
599	–	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
600	–	target_p->away);
601	–
602	–	}
603	–
486		/*
487		* show_capabilities - show current server capabilities
488		*
#	Line 609 | 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;
616	<	dlink_node *ptr;
496	>	static char buf[IRCD_BUFSIZE] = "";
497	>	const dlink_node *node = NULL;
498
499	<	t += sprintf(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 (client_p && !IsCapable(client_p, cap->cap))
506	>	continue;
507
508	<	if (IsCapable(target_p, cap->cap))
509	<	t += sprintf(t, "%s ", cap->name);
508	>	strlcat(buf, cap->name, sizeof(buf));
509	>
510	>	if (node->next)
511	>	strlcat(buf, " ", sizeof(buf));
512		}
513
514	<	*(t - 1) = '\0';
629	<	return msgbuf;
514	>	return buf;
515		}
516
517		/* make_server()
#	Line 640 | 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
648	–	/* server_estab()
649	–	*
650	–	* inputs       - pointer to a struct Client
651	–	* output       -
652	–	* side effects -
653	–	*/
654	–	void
655	–	server_estab(struct Client *client_p)
656	–	{
657	–	struct Client *target_p;
658	–	struct MaskItem *conf = NULL;
659	–	char *host;
660	–	const char *inpath;
661	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
662	–	dlink_node *ptr;
663	–	#ifdef HAVE_LIBCRYPTO
664	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
665	–	#endif
666	–
667	–	assert(client_p != NULL);
668	–
669	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
670	–
671	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
672	–	host   = client_p->name;
673	–
674	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
675	–	== NULL)
676	–	{
677	–	/* This shouldn't happen, better tell the ops... -A1kmm */
678	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
679	–	"Warning: Lost connect{} block "
680	–	"for server %s(this shouldn't happen)!", host);
681	–	exit_client(client_p, &me, "Lost connect{} block!");
682	–	return;
683	–	}
684	–
685	–	MyFree(client_p->localClient->passwd);
686	–	client_p->localClient->passwd = NULL;
687	–
688	–	/* Its got identd, since its a server */
689	–	SetGotId(client_p);
690	–
691	–	/* If there is something in the serv_list, it might be this
692	–	* connecting server..
693	–	*/
694	–	if (!ServerInfo.hub && serv_list.head)
695	–	{
696	–	if (client_p != serv_list.head->data || serv_list.head->next)
697	–	{
698	–	++ServerStats.is_ref;
699	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
700	–	exit_client(client_p, &me, "I'm a leaf");
701	–	return;
702	–	}
703	–	}
704	–
705	–	if (IsUnknown(client_p))
706	–	{
707	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
708	–
709	–	send_capabilities(client_p, 0);
710	–
711	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
712	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
713	–	}
714	–
715	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
716	–	(unsigned long)CurrentTime);
717	–
718	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
719	–	if (IsCapable(client_p, CAP_TS6))
720	–	hash_add_id(client_p);
721	–
722	–	/* XXX Does this ever happen? I don't think so -db */
723	–	detach_conf(client_p, CONF_OPER);
724	–
725	–	/* *WARNING*
726	–	**    In the following code in place of plain server's
727	–	**    name we send what is returned by get_client_name
728	–	**    which may add the "sockhost" after the name. It's
729	–	**    *very* *important* that there is a SPACE between
730	–	**    the name and sockhost (if present). The receiving
731	–	**    server will start the information field from this
732	–	**    first blank and thus puts the sockhost into info.
733	–	**    ...a bit tricky, but you have been warned, besides
734	–	**    code is more neat this way...  --msa
735	–	*/
736	–	client_p->servptr = &me;
737	–
738	–	if (IsClosing(client_p))
739	–	return;
740	–
741	–	SetServer(client_p);
742	–
743	–	/* Update the capability combination usage counts. -A1kmm */
744	–	set_chcap_usage_counts(client_p);
745	–
746	–	/* Some day, all these lists will be consolidated *sigh* */
747	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
748	–
749	–	assert(dlinkFind(&unknown_list, client_p));
750	–
751	–	dlink_move_node(&client_p->localClient->lclient_node,
752	–	&unknown_list, &serv_list);
753	–
754	–	Count.myserver++;
755	–
756	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
757	–	hash_add_client(client_p);
758	–
759	–	/* doesnt duplicate client_p->serv if allocated this struct already */
760	–	make_server(client_p);
761	–
762	–	/* fixing eob timings.. -gnp */
763	–	client_p->localClient->firsttime = CurrentTime;
764	–
765	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
766	–	AddFlag(client_p, FLAGS_SERVICE);
767	–
768	–	/* Show the real host/IP to admins */
769	–	#ifdef HAVE_LIBCRYPTO
770	–	if (client_p->localClient->fd.ssl)
771	–	{
772	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
773	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
774	–
775	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
776	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
777	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
778	–	compression ? SSL_COMP_get_name(compression) : "NONE",
779	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
780	–	show_capabilities(client_p));
781	–	/* Now show the masked hostname/IP to opers */
782	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
783	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
784	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
785	–	compression ? SSL_COMP_get_name(compression) : "NONE",
786	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
787	–	show_capabilities(client_p));
788	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
789	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
790	–	compression ? SSL_COMP_get_name(compression) : "NONE",
791	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
792	–	show_capabilities(client_p));
793	–	}
794	–	else
795	–	#endif
796	–	{
797	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
798	–	"Link with %s established: (Capabilities: %s)",
799	–	inpath_ip, show_capabilities(client_p));
800	–	/* Now show the masked hostname/IP to opers */
801	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
802	–	"Link with %s established: (Capabilities: %s)",
803	–	inpath, show_capabilities(client_p));
804	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
805	–	inpath_ip, show_capabilities(client_p));
806	–	}
807	–
808	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
809	–
810	–	/* Old sendto_serv_but_one() call removed because we now
811	–	** need to send different names to different servers
812	–	** (domain name matching) Send new server to other servers.
813	–	*/
814	–	DLINK_FOREACH(ptr, serv_list.head)
815	–	{
816	–	target_p = ptr->data;
817	–
818	–	if (target_p == client_p)
819	–	continue;
820	–
821	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
822	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
823	–	me.id, client_p->name, client_p->id,
824	–	IsHidden(client_p) ? "(H) " : "",
825	–	client_p->info);
826	–	else
827	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
828	–	me.name, client_p->name,
829	–	IsHidden(client_p) ? "(H) " : "",
830	–	client_p->info);
831	–	}
832	–
833	–	/* Pass on my client information to the new server
834	–	**
835	–	** First, pass only servers (idea is that if the link gets
836	–	** cancelled beacause the server was already there,
837	–	** there are no NICK's to be cancelled...). Of course,
838	–	** if cancellation occurs, all this info is sent anyway,
839	–	** and I guess the link dies when a read is attempted...? --msa
840	–	**
841	–	** Note: Link cancellation to occur at this point means
842	–	** that at least two servers from my fragment are building
843	–	** up connection this other fragment at the same time, it's
844	–	** a race condition, not the normal way of operation...
845	–	**
846	–	** ALSO NOTE: using the get_client_name for server names--
847	–	**    see previous *WARNING*!!! (Also, original inpath
848	–	**    is destroyed...)
849	–	*/
850	–
851	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
852	–	{
853	–	target_p = ptr->data;
854	–
855	–	/* target_p->from == target_p for target_p == client_p */
856	–	if (IsMe(target_p) || target_p->from == client_p)
857	–	continue;
858	–
859	–	if (IsCapable(client_p, CAP_TS6))
860	–	{
861	–	if (HasID(target_p))
862	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
863	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
864	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
865	–	target_p->info);
866	–	else  /* introducing non-ts6 server */
867	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
868	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
869	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
870	–	}
871	–	else
872	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
873	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
874	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
875	–
876	–	if (HasFlag(target_p, FLAGS_EOB))
877	–	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
878	–	}
879	–
880	–	server_burst(client_p);
881	–	}
882	–
883	–	/* server_burst()
884	–	*
885	–	* inputs       - struct Client pointer server
886	–	*              -
887	–	* output       - none
888	–	* side effects - send a server burst
889	–	* bugs         - still too long
890	–	*/
891	–	static void
892	–	server_burst(struct Client *client_p)
893	–	{
894	–	/* Send it in the shortened format with the TS, if
895	–	** it's a TS server; walk the list of channels, sending
896	–	** all the nicks that haven't been sent yet for each
897	–	** channel, then send the channel itself -- it's less
898	–	** obvious than sending all nicks first, but on the
899	–	** receiving side memory will be allocated more nicely
900	–	** saving a few seconds in the handling of a split
901	–	** -orabidoo
902	–	*/
903	–
904	–	burst_all(client_p);
905	–
906	–	/* EOB stuff is now in burst_all */
907	–	/* Always send a PING after connect burst is done */
908	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
909	–	}
910	–
911	–	/* burst_all()
912	–	*
913	–	* inputs       - pointer to server to send burst to
914	–	* output       - NONE
915	–	* side effects - complete burst of channels/nicks is sent to client_p
916	–	*/
917	–	static void
918	–	burst_all(struct Client *client_p)
919	–	{
920	–	dlink_node *ptr = NULL;
921	–
922	–	DLINK_FOREACH(ptr, global_channel_list.head)
923	–	{
924	–	struct Channel *chptr = ptr->data;
925	–
926	–	if (dlink_list_length(&chptr->members) != 0)
927	–	{
928	–	burst_members(client_p, chptr);
929	–	send_channel_modes(client_p, chptr);
930	–
931	–	if (IsCapable(client_p, CAP_TBURST))
932	–	send_tb(client_p, chptr);
933	–	}
934	–	}
935	–
936	–	/* also send out those that are not on any channel
937	–	*/
938	–	DLINK_FOREACH(ptr, global_client_list.head)
939	–	{
940	–	struct Client *target_p = ptr->data;
941	–
942	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
943	–	sendnick_TS(client_p, target_p);
944	–
945	–	DelFlag(target_p, FLAGS_BURSTED);
946	–	}
947	–
948	–	if (IsCapable(client_p, CAP_EOB))
949	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
950	–	}
951	–
952	–	/*
953	–	* send_tb
954	–	*
955	–	* inputs       - pointer to Client
956	–	*              - pointer to channel
957	–	* output       - NONE
958	–	* side effects - Called on a server burst when
959	–	*                server is CAP_TBURST capable
960	–	*/
961	–	static void
962	–	send_tb(struct Client *client_p, struct Channel *chptr)
963	–	{
964	–	/*
965	–	* We may also send an empty topic here, but only if topic_time isn't 0,
966	–	* i.e. if we had a topic that got unset.  This is required for syncing
967	–	* topics properly.
968	–	*
969	–	* Imagine the following scenario: Our downlink introduces a channel
970	–	* to us with a TS that is equal to ours, but the channel topic on
971	–	* their side got unset while the servers were in splitmode, which means
972	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
973	–	* deal with it in a more sophisticated fashion instead of just resetting
974	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
975	–	* for further information   -Michael
976	–	*/
977	–	if (chptr->topic_time != 0)
978	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
979	–	ID_or_name(&me, client_p),
980	–	(unsigned long)chptr->channelts, chptr->chname,
981	–	(unsigned long)chptr->topic_time,
982	–	chptr->topic_info,
983	–	chptr->topic);
984	–	}
985	–
986	–	/* burst_members()
987	–	*
988	–	* inputs       - pointer to server to send members to
989	–	*              - dlink_list pointer to membership list to send
990	–	* output       - NONE
991	–	* side effects -
992	–	*/
993	–	static void
994	–	burst_members(struct Client *client_p, struct Channel *chptr)
995	–	{
996	–	struct Client *target_p;
997	–	struct Membership *ms;
998	–	dlink_node *ptr;
999	–
1000	–	DLINK_FOREACH(ptr, chptr->members.head)
1001	–	{
1002	–	ms       = ptr->data;
1003	–	target_p = ms->client_p;
1004	–
1005	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1006	–	{
1007	–	AddFlag(target_p, FLAGS_BURSTED);
1008	–
1009	–	if (target_p->from != client_p)
1010	–	sendnick_TS(client_p, target_p);
1011	–	}
1012	–	}
1013	–	}
1014	–
533		/* New server connection code
534		* Based upon the stuff floating about in s_bsd.c
535		*   -- adrian
#	Line 1019 | 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 1036 | Line 554 | burst_members(struct Client *client_p, s
554		int
555		serv_connect(struct MaskItem *conf, struct Client *by)
556		{
557	<	struct Client *client_p;
558	<	char buf[HOSTIPLEN + 1];
557	>	struct Client *client_p = NULL;
558	>	char buf[HOSTIPLEN + 1] = "";
559
560		/* conversion structs */
561		struct sockaddr_in *v4;
1044	–	/* Make sure conf is useful */
1045	–	assert(conf != NULL);
562
563	+	/* Make sure conf is useful */
564	+	assert(conf);
565
566	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.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", conf->name, conf->host,
569		buf);
#	Line 1053 | Line 571 | serv_connect(struct MaskItem *conf, stru
571		/* Still processing a DNS lookup? -> exit */
572		if (conf->dns_pending)
573		{
574	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
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 (conf->dns_failed)
581		{
582	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
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: conf 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, SEND_NOTICE,
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_ALL, L_OPER, SEND_NOTICE,
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,
1084	<	get_client_name(client_p, MASK_IP));
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
#	Line 1095 | Line 613 | serv_connect(struct MaskItem *conf, stru
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, conf->addr.ss.ss_family,
1100	<	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, "opening stream socket to %s: %s",
621	<	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");
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, conf->host))
635		{
636	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
637	<	"Host %s is not enabled for connecting: no connect{} block",
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(by, ":%s NOTICE %s :Connect to host %s failed.",
641	<	me.name, by->name, client_p->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");
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 1140 | Line 659 | serv_connect(struct MaskItem *conf, stru
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);
1144	<	/* from def_fam */
1145	<	client_p->localClient->aftype = conf->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 (conf->aftype)
669		{
670		case AF_INET:
671		v4 = (struct sockaddr_in*)&conf->bind;
672	<	if (v4->sin_addr.s_addr != 0)
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, &conf->bind, sizeof(struct irc_ssaddr));
679	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
680	<	(struct sockaddr *)&ipn, ipn.ss_len,
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, conf->host, conf->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, conf->aftype,
694		CONNECTTIMEOUT);
695		}
696		else
697	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
698	<	NULL, 0, serv_connect_callback, client_p, conf->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;
1184	–	#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 *)&conf->bind;
709	<	v6 = (struct sockaddr_in6 *)&ipn;
710	<
711	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
712	<	sizeof(struct in6_addr)) != 0)
713	<	{
714	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
715	<	ipn.ss.ss_family = AF_INET6;
716	<	ipn.ss_port = 0;
717	<	comm_connect_tcp(&client_p->localClient->fd,
718	<	conf->host, conf->port,
719	<	(struct sockaddr *)&ipn, ipn.ss_len,
720	<	serv_connect_callback, client_p,
721	<	conf->aftype, CONNECTTIMEOUT);
722	<	}
1207	<	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, &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, &ServerInfo.ip6, 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	<	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->localClient->fd,
735	<	conf->host, conf->port,
736	<	NULL, 0, serv_connect_callback, client_p,
737	<	conf->aftype, CONNECTTIMEOUT);
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		}
1224	–	#endif
739		}
740	<	return (1);
740	>
741	>	return 1;
742		}
743
1229	–	#ifdef HAVE_LIBCRYPTO
744		static void
745		finish_ssl_server_handshake(struct Client *client_p)
746		{
747	<	struct MaskItem *conf = NULL;
748	<
749	<	conf = find_conf_name(&client_p->localClient->confs,
750	<	client_p->name, CONF_SERVER);
751	<	if (conf == NULL)
752	<	{
753	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1240	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1241	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
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	<	sendto_one(client_p, "PASS %s TS %d %s", conf->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, 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, SEND_NOTICE,
775	<	"%s[%s] went dead during handshake",
776	<	client_p->name,
777	<	client_p->host);
778	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1266	<	"%s went dead during handshake", client_p->name);
1267	<	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;
1280	<
1281	<	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	<	case SSL_ERROR_WANT_WRITE:
798	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
799	<	(PF *)ssl_server_handshake, client_p, 0);
797	>	exit_client(client_p, "Timeout during TLS handshake");
798	>	return;
799	>	}
800	>
801	>	switch (ret)
802	>	{
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);
1298	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
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 MaskItem *conf, 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		{
1315	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1316	–	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
1322	–	SSL_set_fd(fd->ssl, fd->fd);
1323	–
841		if (!EmptyString(conf->cipher_list))
842	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
842	>	tls_set_ciphers(&client_p->connection->fd.ssl, conf->cipher_list);
843
844		ssl_server_handshake(NULL, client_p);
845		}
1329	–	#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 1339 | 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;
1343	<	struct MaskItem *conf = 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, SEND_NOTICE,
1360	<	"Error connecting to %s: %s",
1361	<	client_p->name, comm_errstr(status));
1362	<	else
1363	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1364	<	"Error connecting to %s[%s]: %s", client_p->name,
1365	<	client_p->host, comm_errstr(status));
1366	<
1367	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1368	<	"Error connecting to %s: %s",
1369	<	client_p->name, comm_errstr(status));
1370	<
1371	<	/* If a fd goes bad, call dead_link() the socket is no
1372	<	* longer valid for reading or writing.
1373	<	*/
1374	<	dead_link_on_write(client_p, 0);
1375	<	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, CONF_SERVER);
890	<	if (conf == NULL)
891	<	{
892	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
893	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
894	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
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
901		/* Next, send the initial handshake */
902		SetHandshake(client_p);
903
1396	–	#ifdef HAVE_LIBCRYPTO
904		if (IsConfSSL(conf))
905		{
906		ssl_connect_init(client_p, conf, fd);
907		return;
908		}
1402	–	#endif
909
910	<	sendto_one(client_p, "PASS %s TS %d %s", conf->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, 0);
912	>	sendto_one(client_p, "CAPAB :%s", get_capabilities(NULL));
913
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, SEND_NOTICE,
924	<	"%s[%s] went dead during handshake",
925	<	client_p->name,
926	<	client_p->host);
927	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1421	<	"%s went dead during handshake", client_p->name);
1422	<	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 1431 | Line 936 | struct Client *
936		find_servconn_in_progress(const char *name)
937		{
938		dlink_node *ptr;
1434	–	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/trunk/src/s_serv.c (property svn:keywords), Revision 2156 by michael, Fri May 31 20:53:11 2013 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)