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/server.c (file contents):
Revision 3347 by michael, Sun Apr 20 14:03:06 2014 UTC vs.
Revision 7668 by michael, Wed Jul 20 17:09:49 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
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 15 | 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
#	Line 25 | Line 25
25		*/
26
27		#include "stdinc.h"
28	–	#ifdef HAVE_LIBCRYPTO
29	–	#include <openssl/rsa.h>
30	–	#include "rsa.h"
31	–	#endif
28		#include "list.h"
29		#include "client.h"
30		#include "event.h"
#	Line 37 | Line 33
33		#include "ircd.h"
34		#include "ircd_defs.h"
35		#include "s_bsd.h"
40	–	#include "numeric.h"
36		#include "packet.h"
37		#include "conf.h"
38		#include "server.h"
39		#include "log.h"
45	–	#include "user.h"
40		#include "send.h"
41		#include "memory.h"
48	–	#include "channel.h"
42		#include "parse.h"
43
51	–	#define MIN_CONN_FREQ 300
44
45		dlink_list flatten_links;
46	<	static dlink_list cap_list = { NULL, NULL, 0 };
47	<	static CNCB serv_connect_callback;
46	>	static dlink_list server_capabilities_list;
47	>	static void serv_connect_callback(fde_t *, int, void *);
48
49
50		/*
#	Line 64 | Line 56 | static CNCB serv_connect_callback;
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;
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_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		/*
87		* Skip hidden servers, aswell as ourselves, since we already send
#	Line 119 | Line 118 | read_links_file(void)
118		char *p = NULL;
119		char buff[IRCD_BUFSIZE] = "";
120
121	<	if ((file = fopen(LIPATH, "r")) == NULL)
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		{
#	Line 157 | Line 163 | hunt_server(struct Client *source_p, con
163		const int server, const int parc, char *parv[])
164		{
165		struct Client *target_p = NULL;
166	<	struct Client *target_tmp = NULL;
161	<	dlink_node *ptr;
162	<	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		*/
175	–	if (MyClient(source_p))
176	–	target_p = hash_find_client(parv[server]);
177	–	else
178	–	target_p = find_person(source_p, parv[server]);
179	–
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])))
185	<	if (target_p->from == source_p->from && !MyConnect(target_p))
186	<	target_p = NULL;
187	<
188	<	wilds = has_wildcards(parv[server]);
189	<
190	<	/* Again, if there are no wild cards involved in the server
191	<	* name, use the hash lookup
192	<	*/
193	<	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_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
194	<	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;
213	–	target_p = ptr->data;
212
213	<	if (IsRegistered(target_p) && (target_p != source_p->from))
214	<	break;
213	>	target_p = node->data;
214	>	break;
215		}
216		}
217		}
#	Line 221 | Line 219 | hunt_server(struct Client *source_p, con
219
220		if (target_p)
221		{
222	<	if (!IsRegistered(target_p))
225	<	{
226	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
227	<	return HUNTED_NOSUCH;
228	<	}
229	<
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;
235	<
236	<	/* This is a little kludgy but should work... */
237	<	sendto_one(target_p, command, ID_or_name(source_p, target_p),
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;
#	Line 257 | Line 247 | hunt_server(struct Client *source_p, con
247		void
248		try_connections(void *unused)
249		{
250	<	dlink_node *ptr = NULL;
261	<	int confrq = 0;
250	>	dlink_node *node = NULL;
251
263	–	/* 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	<	struct MaskItem *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	<	*/
275	<	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 285 | Line 272 | try_connections(void *unused)
272		if (conf->until > CurrentTime)
273		continue;
274
275	<	if (conf->class == NULL)
289	<	confrq = DEFAULT_CONNECTFREQUENCY;
290	<	else
291	<	{
292	<	confrq = conf->class->con_freq;
293	<	if (confrq < MIN_CONN_FREQ)
294	<	confrq = MIN_CONN_FREQ;
295	<	}
275	>	assert(conf->class);
276
277	<	conf->until = CurrentTime + confrq;
277	>	conf->until = CurrentTime + conf->class->con_freq;
278
279		/*
280		* Found a CONNECT config with port specified, scan clients
#	Line 305 | Line 285 | try_connections(void *unused)
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)
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))
#	Line 325 | 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 343 | Line 323 | try_connections(void *unused)
323		int
324		valid_servname(const char *name)
325		{
326	<	unsigned int length = 0;
347	<	unsigned int dots   = 0;
326	>	unsigned int dots = 0;
327		const char *p = name;
328
329		for (; *p; ++p)
#	Line 352 | Line 331 | valid_servname(const char *name)
331		if (!IsServChar(*p))
332		return 0;
333
355	–	++length;
356	–
334		if (*p == '.')
335		++dots;
336		}
337
338	<	return dots && 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;
368	<	struct MaskItem *conf        = NULL;
344	>	dlink_node *node = NULL;
345		struct MaskItem *server_conf = NULL;
346		int error = -1;
347
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 */
386	<	if (!match(conf->host, client_p->host) ||
387	<	!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))
#	Line 404 | Line 378 | check_server(const char *name, struct Cl
378
379		attach_conf(client_p, server_conf);
380
381	<
408	<	if (server_conf)
381	>	switch (server_conf->aftype)
382		{
383	<	struct sockaddr_in *v4;
411	<	#ifdef IPV6
412	<	struct sockaddr_in6 *v6;
413	<	#endif
414	<	switch (server_conf->aftype)
383	>	case AF_INET6:
384		{
385	<	#ifdef IPV6
417	<	case AF_INET6:
418	<	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;
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()
421		*
422		* inputs       - string name of CAPAB
#	Line 443 | 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));
432	>	struct Capability *cap = xcalloc(sizeof(*cap));
433
434	<	cap->name = xstrdup(capab_name);
435	<	cap->cap = cap_flag;
436	<	dlinkAdd(cap, &cap->node, &cap_list);
453	<
454	<	if (add_to_default)
455	<	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 461 | 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 = NULL, *ptr_next = NULL;
448	>	dlink_node *node = NULL, *node_next = NULL;
449
450	<	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
450	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
451		{
452	<	struct Capability *cap = ptr->data;
452	>	struct Capability *cap = node->data;
453
454	<	if (cap->cap)
454	>	if (!irccmp(cap->name, name))
455		{
456	<	if (!irccmp(cap->name, capab_name))
457	<	{
458	<	default_server_capabs &= ~(cap->cap);
478	<	dlinkDelete(ptr, &cap_list);
479	<	MyFree(cap->name);
480	<	MyFree(cap);
481	<	}
456	>	dlinkDelete(node, &server_capabilities_list);
457	>	xfree(cap->name);
458	>	xfree(cap);
459		}
460		}
484	–
485	–	return 0;
461		}
462
463		/*
#	Line 493 | 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
511	–	/* send_capabilities()
512	–	*
513	–	* inputs       - Client pointer to send to
514	–	*              - int flag of capabilities that this server can send
515	–	* output       - NONE
516	–	* side effects - send the CAPAB line to a server  -orabidoo
517	–	*
518	–	*/
519	–	void
520	–	send_capabilities(struct Client *client_p, int cap_can_send)
521	–	{
522	–	char msgbuf[IRCD_BUFSIZE] = "";
523	–	char *t = msgbuf;
524	–	int tl;
525	–	dlink_node *ptr = NULL;
526	–
527	–	DLINK_FOREACH(ptr, cap_list.head)
528	–	{
529	–	struct Capability *cap = ptr->data;
530	–
531	–	if (cap->cap & (cap_can_send|default_server_capabs))
532	–	{
533	–	tl = sprintf(t, "%s ", cap->name);
534	–	t += tl;
535	–	}
536	–	}
537	–
538	–	*(t - 1) = '\0';
539	–	sendto_one(client_p, "CAPAB :%s", msgbuf);
540	–	}
541	–
486		/*
487		* show_capabilities - show current server capabilities
488		*
#	Line 547 | Line 491 | send_capabilities(struct Client *client_
491		* side effects - build up string representing capabilities of server listed
492		*/
493		const char *
494	<	show_capabilities(const struct Client *target_p)
494	>	get_capabilities(const struct Client *client_p)
495		{
496	<	static char msgbuf[IRCD_BUFSIZE] = "";
497	<	const dlink_node *ptr = NULL;
496	>	static char buf[IRCD_BUFSIZE] = "";
497	>	const dlink_node *node = NULL;
498
499	<	strlcpy(msgbuf, "TS", sizeof(msgbuf));
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))
505	>	if (client_p && !IsCapable(client_p, cap->cap))
506		continue;
507
508	<	strlcat(msgbuf,       " ", sizeof(msgbuf));
509	<	strlcat(msgbuf, cap->name, sizeof(msgbuf));
508	>	strlcat(buf, cap->name, sizeof(buf));
509	>
510	>	if (node->next)
511	>	strlcat(buf, " ", sizeof(buf));
512		}
513
514	<	return msgbuf;
514	>	return buf;
515		}
516
517		/* make_server()
#	Line 579 | 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		}
#	Line 617 | Line 563 | serv_connect(struct MaskItem *conf, stru
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 625 | 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;
#	Line 633 | Line 579 | serv_connect(struct MaskItem *conf, stru
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;
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)))
593		{
594	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
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))
#	Line 666 | 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, 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", conf->name, errno);
#	Line 677 | Line 624 | serv_connect(struct MaskItem *conf, stru
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_notice(by, &me, ":Connect to host %s failed.", client_p->name);
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, "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 710 | 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);
714	<
715	<	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
#	Line 729 | Line 676 | serv_connect(struct MaskItem *conf, stru
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,
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,
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;
754	–	#ifdef IPV6
701		case AF_INET6:
702		{
703		struct irc_ssaddr ipn;
#	Line 767 | Line 713 | serv_connect(struct MaskItem *conf, stru
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->localClient->fd,
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 (ServerInfo.specific_ipv6_vhost)
722	>	else if (ConfigServerInfo.specific_ipv6_vhost)
723		{
724	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
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->localClient->fd,
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->localClient->fd,
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		}
793	–	#endif
739		}
740	+
741		return 1;
742		}
743
798	–	#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,
809	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
810	<	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, "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,
835	<	"%s went dead during handshake", client_p->name);
836	<	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	<	X509 *cert = NULL;
790	<	int ret = 0;
789	>	struct Client *client_p = data;
790	>	const char *sslerr = NULL;
791
792	<	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 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 (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);
865	<	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, "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	<	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
875	<	{
876	<	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
877	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
878	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
879	<
880	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
881	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
882	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
883	<	{
884	<	unsigned int i = 0, n = 0;
822	>	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
823
824	<	if (X509_digest(cert, EVP_sha256(), md, &n))
825	<	{
826	<	for (; i < n; ++i)
889	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
890	<	client_p->certfp = xstrdup(buf);
891	<	}
892	<	}
893	<	else
894	<	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
895	<	client_p->name, client_p->username, client_p->host, res);
896	<	X509_free(cert);
897	<	}
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		{
907	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
908	–	ERR_error_string(ERR_get_error(), NULL));
836		SetDead(client_p);
837	<	exit_client(client_p, "SSL_new failed");
837	>	exit_client(client_p, "TLS context initialization failed");
838		return;
839		}
840
914	–	SSL_set_fd(fd->ssl, fd->fd);
915	–
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		}
921	–	#endif
846
847		/* serv_connect_callback() - complete a server connection.
848		*
#	Line 931 | 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;
935	<	struct MaskItem *conf = NULL;
858	>	struct Client *const client_p = data;
859
860	<	/* First, make sure its a real client! */
860	>	/* First, make sure it's a real client! */
861		assert(client_p);
862	<	assert(&client_p->localClient->fd == fd);
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,
943	<	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,
953	<	"Error connecting to %s: %s",
954	<	client_p->name, comm_errstr(status));
955	<	else
956	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
957	<	"Error connecting to %s[%s]: %s", client_p->name,
958	<	client_p->host, comm_errstr(status));
959	<
960	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
961	<	"Error connecting to %s: %s",
962	<	client_p->name, comm_errstr(status));
963	<
964	<	/* If a fd goes bad, call dead_link() the socket is no
965	<	* longer valid for reading or writing.
966	<	*/
967	<	dead_link_on_write(client_p, 0);
968	<	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, "Lost connect{} block");
#	Line 986 | Line 901 | serv_connect_callback(fde_t *fd, int sta
901		/* Next, send the initial handshake */
902		SetHandshake(client_p);
903
989	–	#ifdef HAVE_LIBCRYPTO
904		if (IsConfSSL(conf))
905		{
906		ssl_connect_init(client_p, conf, fd);
907		return;
908		}
995	–	#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))
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,
1014	<	"%s went dead during handshake", client_p->name);
1015	<	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 1024 | Line 936 | struct Client *
936		find_servconn_in_progress(const char *name)
937		{
938		dlink_node *ptr;
1027	–	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

Comparing ircd-hybrid/trunk/src/server.c (property svn:keywords):
Revision 3347 by michael, Sun Apr 20 14:03:06 2014 UTC vs.
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)