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 6159 by michael, Thu Jun 18 09:36:14 2015 UTC vs.
Revision 9096 by michael, Wed Dec 25 15:53:01 2019 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-2019 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
51	–	#define MIN_CONN_FREQ 300
45
46		dlink_list flatten_links;
47	<	static dlink_list server_capabilities_list;
55	<	static void serv_connect_callback(fde_t *, int, void *);
47	>	static void server_connect_callback(fde_t *, int, void *);
48
49
50		/*
#	Line 67 | 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 ((file = fopen(LIPATH, "w")) == NULL)
65	>	if (EmptyString(ConfigServerHide.flatten_links_file))
66		return;
67
68	+	if ((file = fopen(ConfigServerHide.flatten_links_file, "w")) == NULL)
69	+	{
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	<	MyFree(node->data);
78	>	xfree(node->data);
79		free_dlink_node(node);
80		}
81
#	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		{
133		if ((p = strchr(buff, '\n')))
#	Line 133 | 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 152 | 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 241 | Line 257 | hunt_server(struct Client *source_p, con
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *node = NULL;
245	<	int confrq = 0;
260	>	dlink_node *node;
261
262	<	/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
248	<	if (GlobalSetOptions.autoconn == 0)
262	>	if (GlobalSetOptions.autoconn == false)
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	<	*/
259	<	if (!conf->port || !IsConfAllowAutoConn(conf))
272	>	/* Also when already connecting! (update holdtimes) --SRB */
273	>	if (conf->port == 0 || !IsConfAllowAutoConn(conf))
274		continue;
275
276	<
277	<	/* Skip this entry if the use of it is still on hold until
276	>	/*
277	>	* Skip this entry if the use of it is still on hold until
278		* future. Otherwise handle this entry (and set it on hold
279		* until next time). Will reset only hold times, if already
280		* made one successfull connection... [this algorithm is
281		* a bit fuzzy... -- msa >;) ]
282		*/
283	<	if (conf->until > CurrentTime)
283	>	if (conf->until > event_base->time.sec_monotonic)
284		continue;
285
286	<	assert(conf->class);
273	<
274	<	confrq = conf->class->con_freq;
275	<	if (confrq < MIN_CONN_FREQ)
276	<	confrq = MIN_CONN_FREQ;
277	<
278	<	conf->until = CurrentTime + confrq;
286	>	conf->until = event_base->time.sec_monotonic + conf->class->con_freq;
287
288		/*
289		* Found a CONNECT config with port specified, scan clients
#	Line 286 | Line 294 | try_connections(void *unused)
294
295		if (conf->class->ref_count < conf->class->max_total)
296		{
297	<	/* Go to the end of the list, if not already last */
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		*/
316		if (ConfigServerHide.hide_server_ips)
317	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
317	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
318		"Connection to %s activated.",
319		conf->name);
320		else
321	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
321	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
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		}
329		}
330		}
331
332	<	int
333	<	valid_servname(const char *name)
332	>	bool
333	>	server_valid_name(const char *name)
334		{
335		unsigned int dots = 0;
336		const char *p = name;
#	Line 330 | Line 338 | valid_servname(const char *name)
338		for (; *p; ++p)
339		{
340		if (!IsServChar(*p))
341	<	return 0;
341	>	return false;
342
343		if (*p == '.')
344		++dots;
#	Line 339 | Line 347 | valid_servname(const char *name)
347		return dots && (p - name) <= HOSTLEN;
348		}
349
350	<	int
343	<	check_server(const char *name, struct Client *client_p)
344	<	{
345	<	dlink_node *node = NULL;
346	<	struct MaskItem *conf        = NULL;
347	<	struct MaskItem *server_conf = NULL;
348	<	int error = -1;
349	<
350	<	assert(client_p);
351	<
352	<	/* loop through looking for all possible connect items that might work */
353	<	DLINK_FOREACH(node, server_items.head)
354	<	{
355	<	conf = node->data;
356	<
357	<	if (match(name, conf->name))
358	<	continue;
359	<
360	<	error = -3;
361	<
362	<	/* XXX: Fix me for IPv6                    */
363	<	/* XXX sockhost is the IPv4 ip as a string */
364	<	if (!match(conf->host, client_p->host) ||
365	<	!match(conf->host, client_p->sockhost))
366	<	{
367	<	error = -2;
368	<
369	<	if (!match_conf_password(client_p->connection->password, conf))
370	<	return -2;
371	<
372	<	if (!EmptyString(conf->certfp))
373	<	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
374	<	return -4;
375	<
376	<	server_conf = conf;
377	<	}
378	<	}
379	<
380	<	if (server_conf == NULL)
381	<	return error;
382	<
383	<	attach_conf(client_p, server_conf);
384	<
385	<
386	<	if (server_conf)
387	<	{
388	<	struct sockaddr_in *v4;
389	<	struct sockaddr_in6 *v6;
390	<
391	<	switch (server_conf->aftype)
392	<	{
393	<	case AF_INET6:
394	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
395	<
396	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
397	<	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
398	<	break;
399	<	case AF_INET:
400	<	v4 = (struct sockaddr_in *)&server_conf->addr;
401	<
402	<	if (v4->sin_addr.s_addr == INADDR_NONE)
403	<	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
404	<	break;
405	<	}
406	<	}
407	<
408	<	return 0;
409	<	}
410	<
411	<	/* add_capability()
412	<	*
413	<	* inputs       - string name of CAPAB
414	<	*              - int flag of capability
415	<	* output       - NONE
416	<	* side effects - Adds given capability name and bit mask to
417	<	*                current supported capabilities. This allows
418	<	*                modules to dynamically add or subtract their capability.
419	<	*/
420	<	void
421	<	add_capability(const char *name, unsigned int flag)
422	<	{
423	<	struct Capability *cap = MyCalloc(sizeof(*cap));
424	<
425	<	cap->name = xstrdup(name);
426	<	cap->cap = flag;
427	<	dlinkAdd(cap, &cap->node, &server_capabilities_list);
428	<	}
429	<
430	<	/* delete_capability()
431	<	*
432	<	* inputs       - string name of CAPAB
433	<	* output       - NONE
434	<	* side effects - delete given capability from ones known.
435	<	*/
436	<	void
437	<	delete_capability(const char *name)
438	<	{
439	<	dlink_node *node = NULL, *node_next = NULL;
440	<
441	<	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
442	<	{
443	<	struct Capability *cap = node->data;
444	<
445	<	if (!irccmp(cap->name, name))
446	<	{
447	<	dlinkDelete(node, &server_capabilities_list);
448	<	MyFree(cap->name);
449	<	MyFree(cap);
450	<	}
451	<	}
452	<	}
453	<
454	<	/*
455	<	* find_capability()
456	<	*
457	<	* inputs       - string name of capab to find
458	<	* output       - 0 if not found CAPAB otherwise
459	<	* side effects - none
460	<	*/
461	<	unsigned int
462	<	find_capability(const char *name)
463	<	{
464	<	const dlink_node *node = NULL;
465	<
466	<	DLINK_FOREACH(node, server_capabilities_list.head)
467	<	{
468	<	const struct Capability *cap = node->data;
469	<
470	<	if (!irccmp(cap->name, name))
471	<	return cap->cap;
472	<	}
473	<
474	<	return 0;
475	<	}
476	<
477	<	/* send_capabilities()
478	<	*
479	<	* inputs       - Client pointer to send to
480	<	*              - int flag of capabilities that this server can send
481	<	* output       - NONE
482	<	* side effects - send the CAPAB line to a server  -orabidoo
483	<	*
484	<	*/
485	<	void
486	<	send_capabilities(struct Client *client_p)
487	<	{
488	<	char buf[IRCD_BUFSIZE] = "";
489	<	const dlink_node *node = NULL;
490	<
491	<	DLINK_FOREACH(node, server_capabilities_list.head)
492	<	{
493	<	const struct Capability *cap = node->data;
494	<
495	<	strlcat(buf, cap->name, sizeof(buf));
496	<
497	<	if (node->next)
498	<	strlcat(buf, " ", sizeof(buf));
499	<	}
500	<
501	<	sendto_one(client_p, "CAPAB :%s", buf);
502	<	}
503	<
504	<	/*
505	<	* show_capabilities - show current server capabilities
506	<	*
507	<	* inputs       - pointer to a struct Client
508	<	* output       - pointer to static string
509	<	* side effects - build up string representing capabilities of server listed
510	<	*/
511	<	const char *
512	<	show_capabilities(const struct Client *target_p)
513	<	{
514	<	static char msgbuf[IRCD_BUFSIZE] = "";
515	<	const dlink_node *node = NULL;
516	<
517	<	strlcpy(msgbuf, "TS", sizeof(msgbuf));
518	<
519	<	DLINK_FOREACH(node, server_capabilities_list.head)
520	<	{
521	<	const struct Capability *cap = node->data;
522	<
523	<	if (!IsCapable(target_p, cap->cap))
524	<	continue;
525	<
526	<	strlcat(msgbuf,       " ", sizeof(msgbuf));
527	<	strlcat(msgbuf, cap->name, sizeof(msgbuf));
528	<	}
529	<
530	<	return msgbuf;
531	<	}
532	<
533	<	/* make_server()
350	>	/* server_make()
351		*
352		* inputs       - pointer to client struct
353		* output       - pointer to struct Server
#	Line 538 | 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
550	<	* Based upon the stuff floating about in s_bsd.c
551	<	*   -- adrian
552	<	*/
553	<
554	<	/* 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 567 | Line 379 | make_server(struct Client *client_p)
379		* We return 1 if the connection is attempted, since we don't know whether
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)
382	>	bool
383	>	server_connect(struct MaskItem *conf, struct Client *by)
384		{
573	–	struct Client *client_p = NULL;
385		char buf[HOSTIPLEN + 1] = "";
386
576	–	/* conversion structs */
577	–	struct sockaddr_in *v4;
578	–
387		/* Make sure conf is useful */
388		assert(conf);
389	<
390	<	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
583	<	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
584	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
585	<	buf);
389	>	assert(conf->type == CONF_SERVER);
390	>	assert(hash_find_server(conf->name) == NULL);  /* This should have been checked by the caller */
391
392		/* Still processing a DNS lookup? -> exit */
393	<	if (conf->dns_pending)
393	>	if (conf->dns_pending == true)
394		{
395	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
395	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
396		"Error connecting to %s: DNS lookup for connect{} in progress.",
397		conf->name);
398	<	return 0;
398	>	return false;
399		}
400
401	<	if (conf->dns_failed)
401	>	if (conf->dns_failed == true)
402		{
403	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
403	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
404		"Error connecting to %s: DNS lookup for connect{} failed.",
405		conf->name);
406	<	return 0;
406	>	return false;
407		}
408
409	<	/* Make sure this server isn't already connected
410	<	* Note: conf should ALWAYS be a valid C: line
411	<	*/
412	<	if ((client_p = hash_find_server(conf->name)))
409	>	getnameinfo((const struct sockaddr *)conf->addr, conf->addr->ss_len,
410	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
411	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host, buf);
412	>
413	>	/* Create a socket for the server connection */
414	>	int fd = comm_socket(conf->addr->ss.ss_family, SOCK_STREAM, 0);
415	>	if (fd == -1)
416		{
417	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
418	<	"Server %s already present from %s",
419	<	conf->name, get_client_name(client_p, SHOW_IP));
612	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
613	<	"Server %s already present from %s",
614	<	conf->name, get_client_name(client_p, MASK_IP));
615	<	if (by && IsClient(by) && !MyClient(by))
616	<	sendto_one_notice(by, &me, ":Server %s already present from %s",
617	<	conf->name, get_client_name(client_p, MASK_IP));
618	<	return 0;
417	>	/* Eek, failure to create the socket */
418	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
419	>	return false;
420		}
421
422		/* Create a local client */
423	<	client_p = make_client(NULL);
423	>	struct Client *client_p = client_make(NULL);
424
425		/* Copy in the server, hostname, fd */
426		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
#	Line 628 | Line 429 | serv_connect(struct MaskItem *conf, stru
429		/* We already converted the ip once, so lets use it - stu */
430		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
431
432	<	/* create a socket for the server connection */
433	<	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
633	<	{
634	<	/* Eek, failure to create the socket */
635	<	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
636	<
637	<	SetDead(client_p);
638	<	exit_client(client_p, "Connection failed");
639	<	return 0;
640	<	}
432	>	client_p->ip = *conf->addr;
433	>	client_p->connection->fd = fd_open(fd, true, NULL);
434
435	<	/* servernames are always guaranteed under HOSTLEN chars */
436	<	fd_note(&client_p->connection->fd, "Server: %s", conf->name);
435	>	/* Server names are always guaranteed under HOSTLEN chars */
436	>	fd_note(client_p->connection->fd, "Server: %s", client_p->name);
437
438	<	/* Attach config entries to client here rather than in
439	<	* serv_connect_callback(). This to avoid null pointer references.
438	>	/*
439	>	* Attach config entries to client here rather than in server_connect_callback().
440	>	* This to avoid null pointer references.
441		*/
442	<	if (!attach_connect_block(client_p, conf->name, conf->host))
649	<	{
650	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
651	<	"Host %s is not enabled for connecting: no connect {} block",
652	<	conf->name);
653	<	if (by && IsClient(by) && !MyClient(by))
654	<	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
442	>	conf_attach(client_p, conf);
443
444	<	SetDead(client_p);
657	<	exit_client(client_p, "Connection failed");
658	<	return 0;
659	<	}
660	<
661	<	/* at this point we have a connection in progress and C/N lines
662	<	* attached to the client, the socket info should be saved in the
663	<	* client and it should either be resolved or have a valid address.
664	<	*
665	<	* The socket has been connected or connect is in progress.
666	<	*/
667	<	make_server(client_p);
444	>	server_make(client_p);
445
446		if (by && IsClient(by))
447		strlcpy(client_p->serv->by, by->name, sizeof(client_p->serv->by));
#	Line 672 | Line 449 | serv_connect(struct MaskItem *conf, stru
449		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
450
451		SetConnecting(client_p);
675	–	client_p->connection->aftype = conf->aftype;
452
453		/* Now, initiate the connection */
454	<	/* XXX assume that a non 0 type means a specific bind address
455	<	* for this connect.
680	<	*/
681	<	switch (conf->aftype)
682	<	{
683	<	case AF_INET:
684	<	v4 = (struct sockaddr_in*)&conf->bind;
685	<	if (v4->sin_addr.s_addr)
686	<	{
687	<	struct irc_ssaddr ipn;
688	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
689	<	ipn.ss.ss_family = AF_INET;
690	<	ipn.ss_port = 0;
691	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
692	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
693	<	(struct sockaddr *)&ipn, ipn.ss_len,
694	<	serv_connect_callback, client_p, conf->aftype,
695	<	CONNECTTIMEOUT);
696	<	}
697	<	else if (ConfigServerInfo.specific_ipv4_vhost)
698	<	{
699	<	struct irc_ssaddr ipn;
700	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
701	<	ipn.ss.ss_family = AF_INET;
702	<	ipn.ss_port = 0;
703	<	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
704	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
705	<	(struct sockaddr *)&ipn, ipn.ss_len,
706	<	serv_connect_callback, client_p, conf->aftype,
707	<	CONNECTTIMEOUT);
708	<	}
709	<	else
710	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
711	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
712	<	CONNECTTIMEOUT);
713	<	break;
714	<	case AF_INET6:
715	<	{
716	<	struct irc_ssaddr ipn;
717	<	struct sockaddr_in6 *v6;
718	<	struct sockaddr_in6 *v6conf;
719	<
720	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
721	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
722	<	v6 = (struct sockaddr_in6 *)&ipn;
454	>	comm_connect_tcp(client_p->connection->fd, conf->addr, conf->port, conf->bind,
455	>	server_connect_callback, client_p, conf->timeout);
456
457	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
458	<	{
459	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
460	<	ipn.ss.ss_family = AF_INET6;
461	<	ipn.ss_port = 0;
462	<	comm_connect_tcp(&client_p->connection->fd,
463	<	conf->host, conf->port,
464	<	(struct sockaddr *)&ipn, ipn.ss_len,
732	<	serv_connect_callback, client_p,
733	<	conf->aftype, CONNECTTIMEOUT);
734	<	}
735	<	else if (ConfigServerInfo.specific_ipv6_vhost)
736	<	{
737	<	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
738	<	ipn.ss.ss_family = AF_INET6;
739	<	ipn.ss_port = 0;
740	<	comm_connect_tcp(&client_p->connection->fd,
741	<	conf->host, conf->port,
742	<	(struct sockaddr *)&ipn, ipn.ss_len,
743	<	serv_connect_callback, client_p,
744	<	conf->aftype, CONNECTTIMEOUT);
745	<	}
746	<	else
747	<	comm_connect_tcp(&client_p->connection->fd,
748	<	conf->host, conf->port,
749	<	NULL, 0, serv_connect_callback, client_p,
750	<	conf->aftype, CONNECTTIMEOUT);
751	<	}
752	<	}
753	<
754	<	return 1;
457	>	/*
458	>	* At this point we have a connection in progress and a connect {} block
459	>	* attached to the client, the socket info should be saved in the client
460	>	* and it should either be resolved or have a valid address.
461	>	*
462	>	* The socket has been connected or connect is in progress.
463	>	*/
464	>	return true;
465		}
466
757	–	#ifdef HAVE_LIBCRYPTO
467		static void
468	<	finish_ssl_server_handshake(struct Client *client_p)
468	>	server_finish_tls_handshake(struct Client *client_p)
469		{
470	<	struct MaskItem *conf = NULL;
471	<
472	<	conf = find_conf_name(&client_p->connection->confs,
473	<	client_p->name, CONF_SERVER);
474	<	if (conf == NULL)
475	<	{
476	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
477	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
769	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
770	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
470	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
471	>	client_p->name, CONF_SERVER);
472	>	if (!conf)
473	>	{
474	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
475	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
476	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
477	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
478
479		exit_client(client_p, "Lost connect{} block");
480		return;
481		}
482
483	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
483	>	/* Next, send the initial handshake */
484	>	SetHandshake(client_p);
485	>
486	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
487
488	<	send_capabilities(client_p);
488	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
489
490		sendto_one(client_p, "SERVER %s 1 :%s%s",
491		me.name, ConfigServerHide.hidden ? "(H) " : "",
492		me.info);
493
784	–	/* If we've been marked dead because a send failed, just exit
785	–	* here now and save everyone the trouble of us ever existing.
786	–	*/
787	–	if (IsDead(client_p))
788	–	{
789	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
790	–	"%s[%s] went dead during handshake",
791	–	client_p->name,
792	–	client_p->host);
793	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
794	–	"%s went dead during handshake", client_p->name);
795	–	return;
796	–	}
797	–
798	–	/* don't move to serv_list yet -- we haven't sent a burst! */
494		/* If we get here, we're ok, so lets start reading some data */
495	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
495	>	read_packet(client_p->connection->fd, client_p);
496		}
497
498		static void
499	<	ssl_server_handshake(fde_t *fd, void *data)
499	>	server_tls_handshake(fde_t *F, void *data)
500		{
501		struct Client *client_p = data;
502	<	X509 *cert = NULL;
503	<	int ret = 0;
502	>	const char *sslerr = NULL;
503	>
504	>	assert(client_p);
505	>	assert(client_p->connection);
506	>	assert(client_p->connection->fd);
507	>	assert(client_p->connection->fd == F);
508
509	<	if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
509	>	tls_handshake_status_t ret = tls_handshake(&F->ssl, TLS_ROLE_CLIENT, &sslerr);
510	>	if (ret != TLS_HANDSHAKE_DONE)
511		{
512	<	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
512	>	if ((event_base->time.sec_monotonic - client_p->connection->created_monotonic) > TLS_HANDSHAKE_TIMEOUT)
513		{
514	<	exit_client(client_p, "Timeout during SSL handshake");
514	>	exit_client(client_p, "Timeout during TLS handshake");
515		return;
516		}
517
518	<	switch (SSL_get_error(client_p->connection->fd.ssl, ret))
518	>	switch (ret)
519		{
520	<	case SSL_ERROR_WANT_WRITE:
521	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
522	<	ssl_server_handshake, client_p, CONNECTTIMEOUT);
520	>	case TLS_HANDSHAKE_WANT_WRITE:
521	>	comm_setselect(F, COMM_SELECT_WRITE,
522	>	server_tls_handshake, client_p, TLS_HANDSHAKE_TIMEOUT);
523		return;
524	<	case SSL_ERROR_WANT_READ:
525	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
526	<	ssl_server_handshake, client_p, CONNECTTIMEOUT);
524	>	case TLS_HANDSHAKE_WANT_READ:
525	>	comm_setselect(F, COMM_SELECT_READ,
526	>	server_tls_handshake, client_p, TLS_HANDSHAKE_TIMEOUT);
527		return;
528		default:
529		{
530	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
831	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
530	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
531		"Error connecting to %s: %s", client_p->name,
532	<	sslerr ? sslerr : "unknown SSL error");
533	<	exit_client(client_p, "Error during SSL handshake");
532	>	sslerr ? sslerr : "unknown TLS error");
533	>	exit_client(client_p, "Error during TLS handshake");
534		return;
535		}
536		}
537		}
538
539	<	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] = "";
847	<
848	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
849	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
850	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
851	<	{
852	<	unsigned int n = 0;
539	>	comm_settimeout(F, 0, NULL, NULL);
540
541	<	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
542	<	{
543	<	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	<	}
541	>	if (tls_verify_cert(&F->ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp) == false)
542	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
543	>	client_p->name, client_p->username, client_p->host);
544
545	<	finish_ssl_server_handshake(client_p);
545	>	server_finish_tls_handshake(client_p);
546		}
547
548		static void
549	<	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
549	>	server_tls_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *F)
550		{
551	<	if ((client_p->connection->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
551	>	assert(client_p);
552	>	assert(client_p->connection);
553	>	assert(client_p->connection->fd);
554	>	assert(client_p->connection->fd == F);
555	>
556	>	if (tls_new(&F->ssl, F->fd, TLS_ROLE_CLIENT) == false)
557		{
874	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
875	–	ERR_error_string(ERR_get_error(), NULL));
558		SetDead(client_p);
559	<	exit_client(client_p, "SSL_new failed");
559	>	exit_client(client_p, "TLS context initialization failed");
560		return;
561		}
562
881	–	SSL_set_fd(fd->ssl, fd->fd);
882	–
563		if (!EmptyString(conf->cipher_list))
564	<	SSL_set_cipher_list(client_p->connection->fd.ssl, conf->cipher_list);
564	>	tls_set_ciphers(&F->ssl, conf->cipher_list);
565
566	<	ssl_server_handshake(NULL, client_p);
566	>	server_tls_handshake(F, client_p);
567		}
888	–	#endif
568
569	<	/* serv_connect_callback() - complete a server connection.
569	>	/* server_connect_callback() - complete a server connection.
570		*
571		* This routine is called after the server connection attempt has
572		* completed. If unsucessful, an error is sent to ops and the client
#	Line 896 | Line 575 | ssl_connect_init(struct Client *client_p
575		* marked for reading.
576		*/
577		static void
578	<	serv_connect_callback(fde_t *fd, int status, void *data)
578	>	server_connect_callback(fde_t *F, int status, void *data)
579		{
580	<	struct Client *client_p = data;
902	<	struct MaskItem *conf = NULL;
580	>	struct Client *const client_p = data;
581
582		/* First, make sure it's a real client! */
583		assert(client_p);
584	<	assert(&client_p->connection->fd == fd);
585	<
586	<	/* Next, for backward purposes, record the ip of the server */
909	<	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
910	<	sizeof(struct irc_ssaddr));
584	>	assert(client_p->connection);
585	>	assert(client_p->connection->fd);
586	>	assert(client_p->connection->fd == F);
587
588		/* Check the status */
589		if (status != COMM_OK)
590		{
591	<	/* We have an error, so report it and quit
592	<	* Admins get to see any IP, mere opers don't *sigh*
591	>	/* We have an error, so report it and quit */
592	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
593	>	"Error connecting to %s: %s",
594	>	client_get_name(client_p, SHOW_IP), comm_errstr(status));
595	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
596	>	"Error connecting to %s: %s",
597	>	client_get_name(client_p, MASK_IP), comm_errstr(status));
598	>
599	>	/*
600	>	* If a fd goes bad, call dead_link() the socket is no
601	>	* longer valid for reading or writing.
602		*/
603	<	if (ConfigServerHide.hide_server_ips)
604	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
920	<	"Error connecting to %s: %s",
921	<	client_p->name, comm_errstr(status));
922	<	else
923	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
924	<	"Error connecting to %s[%s]: %s", client_p->name,
925	<	client_p->host, comm_errstr(status));
926	<
927	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
928	<	"Error connecting to %s: %s",
929	<	client_p->name, comm_errstr(status));
930	<
931	<	/* If a fd goes bad, call dead_link() the socket is no
932	<	* longer valid for reading or writing.
933	<	*/
934	<	dead_link_on_write(client_p, 0);
935	<	return;
603	>	dead_link_on_write(client_p, 0);
604	>	return;
605		}
606
607		/* COMM_OK, so continue the connection procedure */
608	<	/* Get the C/N lines */
609	<	conf = find_conf_name(&client_p->connection->confs,
610	<	client_p->name, CONF_SERVER);
611	<	if (conf == NULL)
612	<	{
613	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
614	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
615	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
616	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
608	>	/* Get the connect {} block */
609	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
610	>	client_p->name, CONF_SERVER);
611	>	if (!conf)
612	>	{
613	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
614	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
615	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
616	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
617
618		exit_client(client_p, "Lost connect{} block");
619		return;
620		}
621
953	–	/* Next, send the initial handshake */
954	–	SetHandshake(client_p);
955	–
956	–	#ifdef HAVE_LIBCRYPTO
622		if (IsConfSSL(conf))
623		{
624	<	ssl_connect_init(client_p, conf, fd);
624	>	server_tls_connect_init(client_p, conf, F);
625		return;
626		}
962	–	#endif
627
628	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
628	>	/* Next, send the initial handshake */
629	>	SetHandshake(client_p);
630	>
631	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
632
633	<	send_capabilities(client_p);
633	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
634
635		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
636		ConfigServerHide.hidden ? "(H) " : "", me.info);
637
971	–	/* If we've been marked dead because a send failed, just exit
972	–	* here now and save everyone the trouble of us ever existing.
973	–	*/
974	–	if (IsDead(client_p))
975	–	{
976	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
977	–	"%s[%s] went dead during handshake",
978	–	client_p->name,
979	–	client_p->host);
980	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
981	–	"%s went dead during handshake", client_p->name);
982	–	return;
983	–	}
984	–
985	–	/* don't move to serv_list yet -- we haven't sent a burst! */
638		/* If we get here, we're ok, so lets start reading some data */
639	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
639	>	read_packet(client_p->connection->fd, client_p);
640		}
641
642		struct Client *
643		find_servconn_in_progress(const char *name)
644		{
645		dlink_node *ptr;
994	–	struct Client *cptr;
646
647		DLINK_FOREACH(ptr, unknown_list.head)
648		{
649	<	cptr = ptr->data;
649	>	struct Client *cptr = ptr->data;
650
651	<	if (cptr && cptr->name[0])
652	<	if (!match(name, cptr->name))
651	>	if (cptr->name[0])
652	>	if (!irccmp(name, cptr->name))
653		return cptr;
654		}
655
656		return NULL;
657		}
1007	–
1008	–	void
1009	–	generate_sid(void)
1010	–	{
1011	–	unsigned int sid = 0;
1012	–	const char *p;
1013	–
1014	–	for (p = me.name; *p; ++p)
1015	–	sid = 5 * sid + *p;
1016	–	for (p = me.info; *p; ++p)
1017	–	sid = 5 * sid + *p;
1018	–
1019	–	snprintf(me.id, IRC_MAXSID + 1, "%03d", sid % 1000);
1020	–	}

Comparing ircd-hybrid/trunk/src/server.c (property svn:keywords):
Revision 6159 by michael, Thu Jun 18 09:36:14 2015 UTC vs.
Revision 9096 by michael, Wed Dec 25 15:53:01 2019 UTC

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

Diff Legend

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