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 6723 by michael, Tue Nov 3 19:49:29 2015 UTC vs.
Revision 8512 by michael, Fri Apr 6 19:28:05 2018 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2018 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 19 | Line 19
19		*  USA
20		*/
21
22	<	/*! \file s_serv.c
22	>	/*! \file server.c
23		* \brief Server related functions.
24		* \version $Id$
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 "server_capab.h"
40		#include "log.h"
45	–	#include "user.h"
41		#include "send.h"
42		#include "memory.h"
48	–	#include "channel.h"
43		#include "parse.h"
44
45
46		dlink_list flatten_links;
47	<	static dlink_list server_capabilities_list;
54	<	static void serv_connect_callback(fde_t *, int, void *);
47	>	static void server_connect_callback(fde_t *, int, void *);
48
49
50		/*
#	Line 66 | Line 59 | void
59		write_links_file(void *unused)
60		{
61		FILE *file = NULL;
62	<	dlink_node *node = NULL, *node_next = NULL;
62	>	dlink_node *node, *node_next;
63		char buff[IRCD_BUFSIZE] = "";
64
65		if (EmptyString(ConfigServerHide.flatten_links_file))
#	Line 82 | Line 75 | write_links_file(void *unused)
75		DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
76		{
77		dlinkDelete(node, &flatten_links);
78	<	MyFree(node->data);
78	>	xfree(node->data);
79		free_dlink_node(node);
80		}
81
#	Line 146 | Line 139 | read_links_file(void)
139		fclose(file);
140		}
141
142	<	/* hunt_server()
142	>	/* server_hunt()
143		*      Do the basic thing in delivering the message (command)
144		*      across the relays to the specific server (server) for
145		*      actions.
#	Line 165 | Line 158 | read_links_file(void)
158		*
159		*      returns: (see #defines)
160		*/
161	<	int
162	<	hunt_server(struct Client *source_p, const char *command,
161	>	const struct server_hunt *
162	>	server_hunt(struct Client *source_p, const char *command,
163		const int server, const int parc, char *parv[])
164		{
165	<	struct Client *target_p = NULL;
166	<	dlink_node *node = NULL;
165	>	static struct server_hunt hunt;
166	>	struct server_hunt *const h = &hunt;
167	>	dlink_node *node;
168
169		/* Assume it's me, if no server */
170		if (parc <= server || EmptyString(parv[server]))
171	<	return HUNTED_ISME;
171	>	{
172	>	h->target_p = &me;
173	>	h->ret = HUNTED_ISME;
174	>	return h;
175	>	}
176
177	<	if ((target_p = find_person(source_p, parv[server])) == NULL)
178	<	target_p = hash_find_server(parv[server]);
177	>	if ((h->target_p = find_person(source_p, parv[server])) == NULL)
178	>	h->target_p = hash_find_server(parv[server]);
179
180		/*
181		* These are to pickup matches that would cause the following
182		* message to go in the wrong direction while doing quick fast
183		* non-matching lookups.
184		*/
185	<	if (target_p)
186	<	if (target_p->from == source_p->from && !MyConnect(target_p))
187	<	target_p = NULL;
185	>	if (h->target_p)
186	>	if (h->target_p->from == source_p->from && !MyConnect(h->target_p))
187	>	h->target_p = NULL;
188
189	<	if (!target_p && has_wildcards(parv[server]))
189	>	if (h->target_p == NULL && has_wildcards(parv[server]))
190		{
191		DLINK_FOREACH(node, global_server_list.head)
192		{
193		struct Client *tmp = node->data;
194
195		assert(IsMe(tmp) || IsServer(tmp));
196	<	if (!match(parv[server], tmp->name))
196	>	if (match(parv[server], tmp->name) == 0)
197		{
198		if (tmp->from == source_p->from && !MyConnect(tmp))
199		continue;
200
201	<	target_p = node->data;
201	>	h->target_p = tmp;
202		break;
203		}
204		}
205
206	<	if (!target_p)
206	>	if (h->target_p == NULL)
207		{
208		DLINK_FOREACH(node, global_client_list.head)
209		{
210		struct Client *tmp = node->data;
211
212	<	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
213	<	if (!match(parv[server], tmp->name))
212	>	assert(IsClient(tmp));
213	>	if (match(parv[server], tmp->name) == 0)
214		{
215		if (tmp->from == source_p->from && !MyConnect(tmp))
216		continue;
217
218	<	target_p = node->data;
218	>	h->target_p = tmp;
219		break;
220		}
221		}
222		}
223		}
224
225	<	if (target_p)
225	>	if (h->target_p)
226		{
227	<	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
228	<	if (IsMe(target_p) || MyClient(target_p))
229	<	return HUNTED_ISME;
227	>	assert(IsMe(h->target_p) || IsServer(h->target_p) || IsClient(h->target_p));
228	>	if (IsMe(h->target_p) || MyClient(h->target_p))
229	>	{
230	>	h->ret = HUNTED_ISME;
231	>	return h;
232	>	}
233
234	<	parv[server] = target_p->id;
235	<	sendto_one(target_p, command, source_p->id,
234	>	parv[server] = h->target_p->id;
235	>	sendto_one(h->target_p, command, source_p->id,
236		parv[1], parv[2], parv[3], parv[4],
237		parv[5], parv[6], parv[7], parv[8]);
238	<	return HUNTED_PASS;
238	>	h->ret = HUNTED_PASS;
239	>	return h;
240		}
241
242		sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
243	<	return HUNTED_NOSUCH;
243	>	h->ret = HUNTED_NOSUCH;
244	>	return h;
245		}
246
247		/* try_connections()
#	Line 254 | Line 257 | hunt_server(struct Client *source_p, con
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *node = NULL;
260	>	dlink_node *node;
261
262		if (GlobalSetOptions.autoconn == 0)
263		return;
264
265	<	DLINK_FOREACH(node, server_items.head)
265	>	DLINK_FOREACH(node, connect_items.head)
266		{
267		struct MaskItem *conf = node->data;
268
269		assert(conf->type == CONF_SERVER);
270	+	assert(conf->class);
271
272		/* Also when already connecting! (update holdtimes) --SRB */
273	<	if (!conf->port || !IsConfAllowAutoConn(conf))
273	>	if (conf->port == 0 || !IsConfAllowAutoConn(conf))
274		continue;
275
276		/*
#	Line 279 | Line 283 | try_connections(void *unused)
283		if (conf->until > CurrentTime)
284		continue;
285
282	–	assert(conf->class);
283	–
286		conf->until = CurrentTime + conf->class->con_freq;
287
288		/*
#	Line 295 | Line 297 | try_connections(void *unused)
297		/* Move this entry to the end of the list, if not already last */
298		if (node->next)
299		{
300	<	dlinkDelete(node, &server_items);
301	<	dlinkAddTail(conf, &conf->node, &server_items);
300	>	dlinkDelete(node, &connect_items);
301	>	dlinkAddTail(conf, &conf->node, &connect_items);
302		}
303
304		if (find_servconn_in_progress(conf->name))
305		return;
306
307		/*
308	<	* We used to only print this if serv_connect() actually
308	>	* We used to only print this if server_connect() actually
309		* succeeded, but since comm_tcp_connect() can call the callback
310		* immediately if there is an error, we were getting error messages
311		* in the wrong order. SO, we just print out the activated line,
312	<	* and let serv_connect() / serv_connect_callback() print an
312	>	* and let server_connect() / server_connect_callback() print an
313		* error afterwards if it fails.
314		*   -- adrian
315		*/
#	Line 320 | Line 322 | try_connections(void *unused)
322		"Connection to %s[%s] activated.",
323		conf->name, conf->host);
324
325	<	serv_connect(conf, NULL);
325	>	server_connect(conf, NULL);
326		/* We connect only one at time... */
327		return;
328		}
#	Line 328 | Line 330 | try_connections(void *unused)
330		}
331
332		int
333	<	valid_servname(const char *name)
333	>	server_valid_name(const char *name)
334		{
335		unsigned int dots = 0;
336		const char *p = name;
#	Line 345 | Line 347 | valid_servname(const char *name)
347		return dots && (p - name) <= HOSTLEN;
348		}
349
350	<	int
349	<	check_server(const char *name, struct Client *client_p)
350	<	{
351	<	dlink_node *node = NULL;
352	<	struct MaskItem *conf        = NULL;
353	<	struct MaskItem *server_conf = NULL;
354	<	int error = -1;
355	<
356	<	assert(client_p);
357	<
358	<	/* Loop through looking for all possible connect items that might work */
359	<	DLINK_FOREACH(node, server_items.head)
360	<	{
361	<	conf = node->data;
362	<
363	<	if (match(name, conf->name))
364	<	continue;
365	<
366	<	error = -3;
367	<
368	<	if (!match(conf->host, client_p->host) ||
369	<	!match(conf->host, client_p->sockhost))
370	<	{
371	<	error = -2;
372	<
373	<	if (!match_conf_password(client_p->connection->password, conf))
374	<	return -2;
375	<
376	<	if (!EmptyString(conf->certfp))
377	<	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
378	<	return -4;
379	<
380	<	server_conf = conf;
381	<	}
382	<	}
383	<
384	<	if (server_conf == NULL)
385	<	return error;
386	<
387	<	attach_conf(client_p, server_conf);
388	<
389	<	switch (server_conf->aftype)
390	<	{
391	<	case AF_INET6:
392	<	{
393	<	const struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&server_conf->addr;
394	<
395	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
396	<	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
397	<	break;
398	<	}
399	<	case AF_INET:
400	<	{
401	<	const struct sockaddr_in *v4 = (struct sockaddr_in *)&server_conf->addr;
402	<
403	<	if (v4->sin_addr.s_addr == INADDR_NONE)
404	<	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
405	<	break;
406	<	}
407	<	}
408	<
409	<	return 0;
410	<	}
411	<
412	<	/* add_capability()
413	<	*
414	<	* inputs       - string name of CAPAB
415	<	*              - int flag of capability
416	<	* output       - NONE
417	<	* side effects - Adds given capability name and bit mask to
418	<	*                current supported capabilities. This allows
419	<	*                modules to dynamically add or subtract their capability.
420	<	*/
421	<	void
422	<	add_capability(const char *name, unsigned int flag)
423	<	{
424	<	struct Capability *cap = MyCalloc(sizeof(*cap));
425	<
426	<	cap->name = xstrdup(name);
427	<	cap->cap = flag;
428	<	dlinkAdd(cap, &cap->node, &server_capabilities_list);
429	<	}
430	<
431	<	/* delete_capability()
432	<	*
433	<	* inputs       - string name of CAPAB
434	<	* output       - NONE
435	<	* side effects - delete given capability from ones known.
436	<	*/
437	<	void
438	<	delete_capability(const char *name)
439	<	{
440	<	dlink_node *node = NULL, *node_next = NULL;
441	<
442	<	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
443	<	{
444	<	struct Capability *cap = node->data;
445	<
446	<	if (!irccmp(cap->name, name))
447	<	{
448	<	dlinkDelete(node, &server_capabilities_list);
449	<	MyFree(cap->name);
450	<	MyFree(cap);
451	<	}
452	<	}
453	<	}
454	<
455	<	/*
456	<	* find_capability()
457	<	*
458	<	* inputs       - string name of capab to find
459	<	* output       - 0 if not found CAPAB otherwise
460	<	* side effects - none
461	<	*/
462	<	unsigned int
463	<	find_capability(const char *name)
464	<	{
465	<	const dlink_node *node = NULL;
466	<
467	<	DLINK_FOREACH(node, server_capabilities_list.head)
468	<	{
469	<	const struct Capability *cap = node->data;
470	<
471	<	if (!irccmp(cap->name, name))
472	<	return cap->cap;
473	<	}
474	<
475	<	return 0;
476	<	}
477	<
478	<	/* send_capabilities()
479	<	*
480	<	* inputs       - Client pointer to send to
481	<	*              - int flag of capabilities that this server can send
482	<	* output       - NONE
483	<	* side effects - send the CAPAB line to a server  -orabidoo
484	<	*
485	<	*/
486	<	void
487	<	send_capabilities(struct Client *client_p)
488	<	{
489	<	char buf[IRCD_BUFSIZE] = "";
490	<	const dlink_node *node = NULL;
491	<
492	<	DLINK_FOREACH(node, server_capabilities_list.head)
493	<	{
494	<	const struct Capability *cap = node->data;
495	<
496	<	strlcat(buf, cap->name, sizeof(buf));
497	<
498	<	if (node->next)
499	<	strlcat(buf, " ", sizeof(buf));
500	<	}
501	<
502	<	sendto_one(client_p, "CAPAB :%s", buf);
503	<	}
504	<
505	<	/*
506	<	* show_capabilities - show current server capabilities
507	<	*
508	<	* inputs       - pointer to a struct Client
509	<	* output       - pointer to static string
510	<	* side effects - build up string representing capabilities of server listed
511	<	*/
512	<	const char *
513	<	show_capabilities(const struct Client *target_p)
514	<	{
515	<	static char msgbuf[IRCD_BUFSIZE] = "";
516	<	const dlink_node *node = NULL;
517	<
518	<	strlcpy(msgbuf, "TS", sizeof(msgbuf));
519	<
520	<	DLINK_FOREACH(node, server_capabilities_list.head)
521	<	{
522	<	const struct Capability *cap = node->data;
523	<
524	<	if (!IsCapable(target_p, cap->cap))
525	<	continue;
526	<
527	<	strlcat(msgbuf,       " ", sizeof(msgbuf));
528	<	strlcat(msgbuf, cap->name, sizeof(msgbuf));
529	<	}
530	<
531	<	return msgbuf;
532	<	}
533	<
534	<	/* make_server()
350	>	/* server_make()
351		*
352		* inputs       - pointer to client struct
353		* output       - pointer to struct Server
#	Line 539 | Line 355 | show_capabilities(const struct Client *t
355		*                if it was not previously allocated.
356		*/
357		struct Server *
358	<	make_server(struct Client *client_p)
358	>	server_make(struct Client *client_p)
359		{
360		if (client_p->serv == NULL)
361	<	client_p->serv = MyCalloc(sizeof(struct Server));
361	>	client_p->serv = xcalloc(sizeof(*client_p->serv));
362
363		return client_p->serv;
364		}
365
366	<	/* New server connection code
551	<	* Based upon the stuff floating about in s_bsd.c
552	<	*   -- adrian
553	<	*/
554	<
555	<	/* serv_connect() - initiate a server connection
366	>	/* server_connect() - initiate a server connection
367		*
368		* inputs       - pointer to conf
369		*              - pointer to client doing the connect
#	Line 569 | Line 380 | make_server(struct Client *client_p)
380		* it suceeded or not, and 0 if it fails in here somewhere.
381		*/
382		int
383	<	serv_connect(struct MaskItem *conf, struct Client *by)
383	>	server_connect(struct MaskItem *conf, struct Client *by)
384		{
574	–	struct Client *client_p = NULL;
385		char buf[HOSTIPLEN + 1] = "";
386
387		/* conversion structs */
#	Line 579 | Line 389 | serv_connect(struct MaskItem *conf, stru
389
390		/* Make sure conf is useful */
391		assert(conf);
392	+	assert(conf->type == CONF_SERVER);
393	+	assert(hash_find_server(conf->name) == NULL);  /* This should have been checked by the caller */
394
395		getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
396		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
397	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
586	<	buf);
397	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host, buf);
398
399		/* Still processing a DNS lookup? -> exit */
400		if (conf->dns_pending)
#	Line 602 | Line 413 | serv_connect(struct MaskItem *conf, stru
413		return 0;
414		}
415
416	<	/* Make sure this server isn't already connected
417	<	* Note: conf should ALWAYS be a valid C: line
418	<	*/
608	<	if ((client_p = hash_find_server(conf->name)))
416	>	/* Create a socket for the server connection */
417	>	int fd = comm_socket(conf->addr.ss.ss_family, SOCK_STREAM, 0);
418	>	if (fd == -1)
419		{
420	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
421	<	"Server %s already present from %s",
612	<	conf->name, get_client_name(client_p, SHOW_IP));
613	<	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
614	<	"Server %s already present from %s",
615	<	conf->name, get_client_name(client_p, MASK_IP));
616	<	if (by && IsClient(by) && !MyClient(by))
617	<	sendto_one_notice(by, &me, ":Server %s already present from %s",
618	<	conf->name, get_client_name(client_p, MASK_IP));
420	>	/* Eek, failure to create the socket */
421	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
422		return 0;
423		}
424
425		/* Create a local client */
426	<	client_p = make_client(NULL);
426	>	struct Client *client_p = client_make(NULL);
427
428		/* Copy in the server, hostname, fd */
429		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
#	Line 629 | Line 432 | serv_connect(struct MaskItem *conf, stru
432		/* We already converted the ip once, so lets use it - stu */
433		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
434
435	<	/* create a socket for the server connection */
633	<	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
634	<	{
635	<	/* Eek, failure to create the socket */
636	<	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
637	<
638	<	SetDead(client_p);
639	<	exit_client(client_p, "Connection failed");
640	<	return 0;
641	<	}
435	>	client_p->connection->fd = fd_open(fd, 1, NULL);
436
437	<	/* servernames are always guaranteed under HOSTLEN chars */
438	<	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
437	>	/* Server names are always guaranteed under HOSTLEN chars */
438	>	fd_note(client_p->connection->fd, "Server: %s", client_p->name);
439
440	<	/* Attach config entries to client here rather than in
441	<	* serv_connect_callback(). This to avoid null pointer references.
440	>	/*
441	>	* Attach config entries to client here rather than in server_connect_callback().
442	>	* This to avoid null pointer references.
443		*/
444	<	if (!attach_connect_block(client_p, conf->name, conf->host))
650	<	{
651	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
652	<	"Host %s is not enabled for connecting: no connect {} block",
653	<	conf->name);
654	<	if (by && IsClient(by) && !MyClient(by))
655	<	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
656	<
657	<	SetDead(client_p);
658	<	exit_client(client_p, "Connection failed");
659	<	return 0;
660	<	}
444	>	conf_attach(client_p, conf);
445
446	<	/* at this point we have a connection in progress and C/N lines
663	<	* attached to the client, the socket info should be saved in the
664	<	* client and it should either be resolved or have a valid address.
665	<	*
666	<	* The socket has been connected or connect is in progress.
667	<	*/
668	<	make_server(client_p);
446	>	server_make(client_p);
447
448		if (by && IsClient(by))
449		strlcpy(client_p->serv->by, by->name, sizeof(client_p->serv->by));
#	Line 673 | Line 451 | serv_connect(struct MaskItem *conf, stru
451		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
452
453		SetConnecting(client_p);
454	<	client_p->connection->aftype = conf->aftype;
454	>	client_p->ip.ss.ss_family = conf->aftype;
455
456		/* Now, initiate the connection */
457		/* XXX assume that a non 0 type means a specific bind address
#	Line 683 | Line 461 | serv_connect(struct MaskItem *conf, stru
461		{
462		case AF_INET:
463		v4 = (struct sockaddr_in*)&conf->bind;
464	+
465		if (v4->sin_addr.s_addr)
466		{
467		struct irc_ssaddr ipn;
468	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
468	>
469	>	memset(&ipn, 0, sizeof(ipn));
470		ipn.ss.ss_family = AF_INET;
471		ipn.ss_port = 0;
472	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
473	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
472	>	memcpy(&ipn, &conf->bind, sizeof(ipn));
473	>
474	>	comm_connect_tcp(client_p->connection->fd, conf->host, conf->port,
475		(struct sockaddr *)&ipn, ipn.ss_len,
476	<	serv_connect_callback, client_p, conf->aftype,
476	>	server_connect_callback, client_p, conf->aftype,
477		CONNECTTIMEOUT);
478		}
479		else if (ConfigServerInfo.specific_ipv4_vhost)
480		{
481		struct irc_ssaddr ipn;
482	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
482	>
483	>	memset(&ipn, 0, sizeof(ipn));
484		ipn.ss.ss_family = AF_INET;
485		ipn.ss_port = 0;
486	<	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
487	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
486	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(ipn));
487	>
488	>	comm_connect_tcp(client_p->connection->fd, conf->host, conf->port,
489		(struct sockaddr *)&ipn, ipn.ss_len,
490	<	serv_connect_callback, client_p, conf->aftype,
490	>	server_connect_callback, client_p, conf->aftype,
491		CONNECTTIMEOUT);
492		}
493		else
494	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
495	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
494	>	comm_connect_tcp(client_p->connection->fd, conf->host, conf->port,
495	>	NULL, 0, server_connect_callback, client_p, conf->aftype,
496		CONNECTTIMEOUT);
497		break;
498		case AF_INET6:
#	Line 718 | Line 501 | serv_connect(struct MaskItem *conf, stru
501		struct sockaddr_in6 *v6;
502		struct sockaddr_in6 *v6conf;
503
504	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
504	>	memset(&ipn, 0, sizeof(ipn));
505		v6conf = (struct sockaddr_in6 *)&conf->bind;
506		v6 = (struct sockaddr_in6 *)&ipn;
507
508		if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
509		{
510	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
510	>	memcpy(&ipn, &conf->bind, sizeof(ipn));
511		ipn.ss.ss_family = AF_INET6;
512		ipn.ss_port = 0;
513	<	comm_connect_tcp(&client_p->connection->fd,
513	>
514	>	comm_connect_tcp(client_p->connection->fd,
515		conf->host, conf->port,
516		(struct sockaddr *)&ipn, ipn.ss_len,
517	<	serv_connect_callback, client_p,
517	>	server_connect_callback, client_p,
518		conf->aftype, CONNECTTIMEOUT);
519		}
520		else if (ConfigServerInfo.specific_ipv6_vhost)
521		{
522	<	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
522	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(ipn));
523		ipn.ss.ss_family = AF_INET6;
524		ipn.ss_port = 0;
525	<	comm_connect_tcp(&client_p->connection->fd,
525	>
526	>	comm_connect_tcp(client_p->connection->fd,
527		conf->host, conf->port,
528		(struct sockaddr *)&ipn, ipn.ss_len,
529	<	serv_connect_callback, client_p,
529	>	server_connect_callback, client_p,
530		conf->aftype, CONNECTTIMEOUT);
531		}
532		else
533	<	comm_connect_tcp(&client_p->connection->fd,
533	>	comm_connect_tcp(client_p->connection->fd,
534		conf->host, conf->port,
535	<	NULL, 0, serv_connect_callback, client_p,
535	>	NULL, 0, server_connect_callback, client_p,
536		conf->aftype, CONNECTTIMEOUT);
537		}
538		}
539
540	+	/*
541	+	* At this point we have a connection in progress and a connect {} block
542	+	* attached to the client, the socket info should be saved in the client
543	+	* and it should either be resolved or have a valid address.
544	+	*
545	+	* The socket has been connected or connect is in progress.
546	+	*/
547		return 1;
548		}
549
758	–	#ifdef HAVE_LIBCRYPTO
550		static void
551	<	finish_ssl_server_handshake(struct Client *client_p)
551	>	server_finish_tls_handshake(struct Client *client_p)
552		{
553	<	struct MaskItem *conf = NULL;
554	<
555	<	conf = find_conf_name(&client_p->connection->confs,
765	<	client_p->name, CONF_SERVER);
766	<	if (conf == NULL)
553	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
554	>	client_p->name, CONF_SERVER);
555	>	if (!conf)
556		{
557		sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
558	<	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
558	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
559		sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
560	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
560	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
561
562		exit_client(client_p, "Lost connect{} block");
563		return;
564		}
565
566	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
566	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
567
568	<	send_capabilities(client_p);
568	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
569
570		sendto_one(client_p, "SERVER %s 1 :%s%s",
571		me.name, ConfigServerHide.hidden ? "(H) " : "",
572		me.info);
573
785	–	/*
786	–	* If we've been marked dead because a send failed, just exit
787	–	* here now and save everyone the trouble of us ever existing.
788	–	*/
789	–	if (IsDead(client_p))
790	–	{
791	–	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
792	–	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
793	–	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
794	–	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
795	–	return;
796	–	}
797	–
798	–	/* don't move to serv_list yet -- we haven't sent a burst! */
574		/* If we get here, we're ok, so lets start reading some data */
575	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
575	>	read_packet(client_p->connection->fd, client_p);
576		}
577
578		static void
579	<	ssl_server_handshake(fde_t *fd, void *data)
579	>	server_tls_handshake(fde_t *F, void *data)
580		{
581		struct Client *client_p = data;
582	<	X509 *cert = NULL;
808	<	int ret = 0;
582	>	const char *sslerr = NULL;
583
584	<	if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
584	>	assert(client_p);
585	>	assert(client_p->connection);
586	>	assert(client_p->connection->fd);
587	>	assert(client_p->connection->fd == F);
588	>
589	>	tls_handshake_status_t ret = tls_handshake(&F->ssl, TLS_ROLE_CLIENT, &sslerr);
590	>	if (ret != TLS_HANDSHAKE_DONE)
591		{
592		if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
593		{
594	<	exit_client(client_p, "Timeout during SSL handshake");
594	>	exit_client(client_p, "Timeout during TLS handshake");
595		return;
596		}
597
598	<	switch (SSL_get_error(client_p->connection->fd.ssl, ret))
598	>	switch (ret)
599		{
600	<	case SSL_ERROR_WANT_WRITE:
601	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
602	<	ssl_server_handshake, client_p, CONNECTTIMEOUT);
600	>	case TLS_HANDSHAKE_WANT_WRITE:
601	>	comm_setselect(F, COMM_SELECT_WRITE,
602	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
603		return;
604	<	case SSL_ERROR_WANT_READ:
605	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
606	<	ssl_server_handshake, client_p, CONNECTTIMEOUT);
604	>	case TLS_HANDSHAKE_WANT_READ:
605	>	comm_setselect(F, COMM_SELECT_READ,
606	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
607		return;
608		default:
609		{
830	–	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
610		sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
611		"Error connecting to %s: %s", client_p->name,
612	<	sslerr ? sslerr : "unknown SSL error");
613	<	exit_client(client_p, "Error during SSL handshake");
612	>	sslerr ? sslerr : "unknown TLS error");
613	>	exit_client(client_p, "Error during TLS handshake");
614		return;
615		}
616		}
617		}
618
619	<	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
841	<
842	<	if ((cert = SSL_get_peer_certificate(client_p->connection->fd.ssl)))
843	<	{
844	<	int res = SSL_get_verify_result(client_p->connection->fd.ssl);
845	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
846	<	unsigned char md[EVP_MAX_MD_SIZE] = "";
619	>	comm_settimeout(F, 0, NULL, NULL);
620
621	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
622	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
623	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
851	<	{
852	<	unsigned int n = 0;
621	>	if (!tls_verify_cert(&F->ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp))
622	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
623	>	client_p->name, client_p->username, client_p->host);
624
625	<	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
855	<	{
856	<	binary_to_hex(md, buf, n);
857	<	client_p->certfp = xstrdup(buf);
858	<	}
859	<	}
860	<	else
861	<	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
862	<	client_p->name, client_p->username, client_p->host, res);
863	<	X509_free(cert);
864	<	}
865	<
866	<	finish_ssl_server_handshake(client_p);
625	>	server_finish_tls_handshake(client_p);
626		}
627
628		static void
629	<	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
629	>	server_tls_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *F)
630		{
631	<	if ((client_p->connection->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
631	>	assert(client_p);
632	>	assert(client_p->connection);
633	>	assert(client_p->connection->fd);
634	>	assert(client_p->connection->fd == F);
635	>
636	>	if (!tls_new(&F->ssl, F->fd, TLS_ROLE_CLIENT))
637		{
874	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
875	–	ERR_error_string(ERR_get_error(), NULL));
638		SetDead(client_p);
639	<	exit_client(client_p, "SSL_new failed");
639	>	exit_client(client_p, "TLS context initialization failed");
640		return;
641		}
642
881	–	SSL_set_fd(fd->ssl, fd->fd);
882	–
643		if (!EmptyString(conf->cipher_list))
644	<	SSL_set_cipher_list(client_p->connection->fd.ssl, conf->cipher_list);
644	>	tls_set_ciphers(&F->ssl, conf->cipher_list);
645
646	<	ssl_server_handshake(NULL, client_p);
646	>	server_tls_handshake(F, client_p);
647		}
888	–	#endif
648
649	<	/* serv_connect_callback() - complete a server connection.
649	>	/* server_connect_callback() - complete a server connection.
650		*
651		* This routine is called after the server connection attempt has
652		* completed. If unsucessful, an error is sent to ops and the client
#	Line 896 | Line 655 | ssl_connect_init(struct Client *client_p
655		* marked for reading.
656		*/
657		static void
658	<	serv_connect_callback(fde_t *fd, int status, void *data)
658	>	server_connect_callback(fde_t *F, int status, void *data)
659		{
660		struct Client *const client_p = data;
902	–	const struct MaskItem *conf = NULL;
661
662		/* First, make sure it's a real client! */
663		assert(client_p);
664	<	assert(&client_p->connection->fd == fd);
664	>	assert(client_p->connection);
665	>	assert(client_p->connection->fd);
666	>	assert(client_p->connection->fd == F);
667
668		/* Next, for backward purposes, record the ip of the server */
669	<	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
910	<	sizeof(struct irc_ssaddr));
669	>	memcpy(&client_p->ip, &F->connect.hostaddr, sizeof(client_p->ip));
670
671		/* Check the status */
672		if (status != COMM_OK)
#	Line 915 | Line 674 | serv_connect_callback(fde_t *fd, int sta
674		/* We have an error, so report it and quit */
675		sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
676		"Error connecting to %s: %s",
677	<	get_client_name(client_p, SHOW_IP), comm_errstr(status));
677	>	client_get_name(client_p, SHOW_IP), comm_errstr(status));
678		sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
679		"Error connecting to %s: %s",
680	<	get_client_name(client_p, MASK_IP), comm_errstr(status));
680	>	client_get_name(client_p, MASK_IP), comm_errstr(status));
681
682		/*
683		* If a fd goes bad, call dead_link() the socket is no
#	Line 929 | Line 688 | serv_connect_callback(fde_t *fd, int sta
688		}
689
690		/* COMM_OK, so continue the connection procedure */
691	<	/* Get the C/N lines */
692	<	conf = find_conf_name(&client_p->connection->confs,
693	<	client_p->name, CONF_SERVER);
694	<	if (conf == NULL)
691	>	/* Get the connect {} block */
692	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
693	>	client_p->name, CONF_SERVER);
694	>	if (!conf)
695		{
696		sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
697	<	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
697	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
698		sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
699	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
699	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
700
701		exit_client(client_p, "Lost connect{} block");
702		return;
#	Line 946 | Line 705 | serv_connect_callback(fde_t *fd, int sta
705		/* Next, send the initial handshake */
706		SetHandshake(client_p);
707
949	–	#ifdef HAVE_LIBCRYPTO
708		if (IsConfSSL(conf))
709		{
710	<	ssl_connect_init(client_p, conf, fd);
710	>	server_tls_connect_init(client_p, conf, F);
711		return;
712		}
955	–	#endif
713
714	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
714	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
715
716	<	send_capabilities(client_p);
716	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
717
718		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
719		ConfigServerHide.hidden ? "(H) " : "", me.info);
720
964	–	/*
965	–	* If we've been marked dead because a send failed, just exit
966	–	* here now and save everyone the trouble of us ever existing.
967	–	*/
968	–	if (IsDead(client_p))
969	–	{
970	–	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
971	–	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
972	–	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
973	–	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
974	–	return;
975	–	}
976	–
977	–	/* don't move to serv_list yet -- we haven't sent a burst! */
721		/* If we get here, we're ok, so lets start reading some data */
722	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
722	>	read_packet(client_p->connection->fd, client_p);
723		}
724
725		struct Client *
726		find_servconn_in_progress(const char *name)
727		{
728		dlink_node *ptr;
986	–	struct Client *cptr;
729
730		DLINK_FOREACH(ptr, unknown_list.head)
731		{
732	<	cptr = ptr->data;
732	>	struct Client *cptr = ptr->data;
733
734	<	if (cptr && cptr->name[0])
735	<	if (!match(name, cptr->name))
734	>	if (cptr->name[0])
735	>	if (!irccmp(name, cptr->name))
736		return cptr;
737		}
738

Comparing ircd-hybrid/trunk/src/server.c (property svn:keywords):
Revision 6723 by michael, Tue Nov 3 19:49:29 2015 UTC vs.
Revision 8512 by michael, Fri Apr 6 19:28:05 2018 UTC

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

Diff Legend

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