ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/server.c

Comparing ircd-hybrid/branches/8.2.x/src/server.c (file contents):
Revision 4676 by michael, Fri Oct 3 11:03:06 2014 UTC vs.
Revision 8878 by michael, Sun Feb 24 09:12:52 2019 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-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 cap_list = { NULL, NULL, 0 };
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 *ptr = NULL, *ptr_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	<	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_server_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		{
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 *ptr = 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(ptr, global_client_list.head)
191	>	DLINK_FOREACH(node, global_server_list.head)
192		{
193	<	struct Client *tmp = ptr->data;
193	>	struct Client *tmp = node->data;
194
195	<	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
196	<	if (!match(parv[server], tmp->name))
195	>	assert(IsMe(tmp) || IsServer(tmp));
196	>	if (match(parv[server], tmp->name) == 0)
197		{
198		if (tmp->from == source_p->from && !MyConnect(tmp))
199		continue;
200
201	<	target_p = ptr->data;
201	>	h->target_p = tmp;
202		break;
203		}
204		}
205	+
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(IsClient(tmp));
213	+	if (match(parv[server], tmp->name) == 0)
214	+	{
215	+	if (tmp->from == source_p->from && !MyConnect(tmp))
216	+	continue;
217	+
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 223 | Line 257 | hunt_server(struct Client *source_p, con
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *ptr = NULL;
227	<	int confrq = 0;
260	>	dlink_node *node;
261
262	<	/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
230	<	if (GlobalSetOptions.autoconn == 0)
262	>	if (GlobalSetOptions.autoconn == false)
263		return;
264
265	<	DLINK_FOREACH(ptr, server_items.head)
265	>	DLINK_FOREACH(node, connect_items.head)
266		{
267	<	struct MaskItem *conf = ptr->data;
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	<	*/
241	<	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
#	Line 251 | Line 283 | try_connections(void *unused)
283		if (conf->until > CurrentTime)
284		continue;
285
286	<	assert(conf->class);
255	<
256	<	confrq = conf->class->con_freq;
257	<	if (confrq < MIN_CONN_FREQ)
258	<	confrq = MIN_CONN_FREQ;
259	<
260	<	conf->until = CurrentTime + confrq;
286	>	conf->until = CurrentTime + conf->class->con_freq;
287
288		/*
289		* Found a CONNECT config with port specified, scan clients
#	Line 268 | 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 */
298	<	if (ptr->next)
297	>	/* Move this entry to the end of the list, if not already last */
298	>	if (node->next)
299		{
300	<	dlinkDelete(ptr, &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 312 | 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 321 | Line 347 | valid_servname(const char *name)
347		return dots && (p - name) <= HOSTLEN;
348		}
349
350	<	int
325	<	check_server(const char *name, struct Client *client_p)
326	<	{
327	<	dlink_node *ptr;
328	<	struct MaskItem *conf        = NULL;
329	<	struct MaskItem *server_conf = NULL;
330	<	int error = -1;
331	<
332	<	assert(client_p);
333	<
334	<	/* loop through looking for all possible connect items that might work */
335	<	DLINK_FOREACH(ptr, server_items.head)
336	<	{
337	<	conf = ptr->data;
338	<
339	<	if (match(name, conf->name))
340	<	continue;
341	<
342	<	error = -3;
343	<
344	<	/* XXX: Fix me for IPv6                    */
345	<	/* XXX sockhost is the IPv4 ip as a string */
346	<	if (!match(conf->host, client_p->host) ||
347	<	!match(conf->host, client_p->sockhost))
348	<	{
349	<	error = -2;
350	<
351	<	if (!match_conf_password(client_p->connection->password, conf))
352	<	return -2;
353	<
354	<	if (!EmptyString(conf->certfp))
355	<	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
356	<	return -4;
357	<
358	<	server_conf = conf;
359	<	}
360	<	}
361	<
362	<	if (server_conf == NULL)
363	<	return error;
364	<
365	<	attach_conf(client_p, server_conf);
366	<
367	<
368	<	if (server_conf)
369	<	{
370	<	struct sockaddr_in *v4;
371	<	struct sockaddr_in6 *v6;
372	<
373	<	switch (server_conf->aftype)
374	<	{
375	<	case AF_INET6:
376	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
377	<
378	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
379	<	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
380	<	break;
381	<	case AF_INET:
382	<	v4 = (struct sockaddr_in *)&server_conf->addr;
383	<
384	<	if (v4->sin_addr.s_addr == INADDR_NONE)
385	<	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
386	<	break;
387	<	}
388	<	}
389	<
390	<	return 0;
391	<	}
392	<
393	<	/* add_capability()
394	<	*
395	<	* inputs       - string name of CAPAB
396	<	*              - int flag of capability
397	<	* output       - NONE
398	<	* side effects - Adds given capability name and bit mask to
399	<	*                current supported capabilities. This allows
400	<	*                modules to dynamically add or subtract their capability.
401	<	*/
402	<	void
403	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
404	<	{
405	<	struct Capability *cap = MyCalloc(sizeof(*cap));
406	<
407	<	cap->name = xstrdup(capab_name);
408	<	cap->cap = cap_flag;
409	<	dlinkAdd(cap, &cap->node, &cap_list);
410	<
411	<	if (add_to_default)
412	<	default_server_capabs |= cap_flag;
413	<	}
414	<
415	<	/* delete_capability()
416	<	*
417	<	* inputs       - string name of CAPAB
418	<	* output       - NONE
419	<	* side effects - delete given capability from ones known.
420	<	*/
421	<	int
422	<	delete_capability(const char *capab_name)
423	<	{
424	<	dlink_node *ptr = NULL, *ptr_next = NULL;
425	<
426	<	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
427	<	{
428	<	struct Capability *cap = ptr->data;
429	<
430	<	if (cap->cap)
431	<	{
432	<	if (!irccmp(cap->name, capab_name))
433	<	{
434	<	default_server_capabs &= ~(cap->cap);
435	<	dlinkDelete(ptr, &cap_list);
436	<	MyFree(cap->name);
437	<	MyFree(cap);
438	<	}
439	<	}
440	<	}
441	<
442	<	return 0;
443	<	}
444	<
445	<	/*
446	<	* find_capability()
447	<	*
448	<	* inputs       - string name of capab to find
449	<	* output       - 0 if not found CAPAB otherwise
450	<	* side effects - none
451	<	*/
452	<	unsigned int
453	<	find_capability(const char *capab)
454	<	{
455	<	const dlink_node *ptr = NULL;
456	<
457	<	DLINK_FOREACH(ptr, cap_list.head)
458	<	{
459	<	const struct Capability *cap = ptr->data;
460	<
461	<	if (cap->cap && !irccmp(cap->name, capab))
462	<	return cap->cap;
463	<	}
464	<
465	<	return 0;
466	<	}
467	<
468	<	/* send_capabilities()
469	<	*
470	<	* inputs       - Client pointer to send to
471	<	*              - int flag of capabilities that this server can send
472	<	* output       - NONE
473	<	* side effects - send the CAPAB line to a server  -orabidoo
474	<	*
475	<	*/
476	<	void
477	<	send_capabilities(struct Client *client_p, int cap_can_send)
478	<	{
479	<	char buf[IRCD_BUFSIZE] = "";
480	<	const dlink_node *ptr = NULL;
481	<
482	<	DLINK_FOREACH(ptr, cap_list.head)
483	<	{
484	<	const struct Capability *cap = ptr->data;
485	<
486	<	if (cap->cap & (cap_can_send|default_server_capabs))
487	<	{
488	<	strlcat(buf, cap->name, sizeof(buf));
489	<	if (ptr->next)
490	<	strlcat(buf, " ", sizeof(buf));
491	<	}
492	<	}
493	<
494	<	sendto_one(client_p, "CAPAB :%s", buf);
495	<	}
496	<
497	<	/*
498	<	* show_capabilities - show current server capabilities
499	<	*
500	<	* inputs       - pointer to a struct Client
501	<	* output       - pointer to static string
502	<	* side effects - build up string representing capabilities of server listed
503	<	*/
504	<	const char *
505	<	show_capabilities(const struct Client *target_p)
506	<	{
507	<	static char msgbuf[IRCD_BUFSIZE] = "";
508	<	const dlink_node *ptr = NULL;
509	<
510	<	strlcpy(msgbuf, "TS", sizeof(msgbuf));
511	<
512	<	DLINK_FOREACH(ptr, cap_list.head)
513	<	{
514	<	const struct Capability *cap = ptr->data;
515	<
516	<	if (!IsCapable(target_p, cap->cap))
517	<	continue;
518	<
519	<	strlcat(msgbuf,       " ", sizeof(msgbuf));
520	<	strlcat(msgbuf, cap->name, sizeof(msgbuf));
521	<	}
522	<
523	<	return msgbuf;
524	<	}
525	<
526	<	/* make_server()
350	>	/* server_make()
351		*
352		* inputs       - pointer to client struct
353		* output       - pointer to struct Server
#	Line 531 | 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
543	<	* Based upon the stuff floating about in s_bsd.c
544	<	*   -- adrian
545	<	*/
546	<
547	<	/* 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 560 | 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		{
566	–	struct Client *client_p = NULL;
385		char buf[HOSTIPLEN + 1] = "";
386
569	–	/* conversion structs */
570	–	struct sockaddr_in *v4;
571	–
387		/* Make sure conf is useful */
388		assert(conf);
389	<
390	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
576	<	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
577	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
578	<	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));
605	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
606	<	"Server %s already present from %s",
607	<	conf->name, get_client_name(client_p, MASK_IP));
608	<	if (by && IsClient(by) && !MyClient(by))
609	<	sendto_one_notice(by, &me, ":Server %s already present from %s",
610	<	conf->name, get_client_name(client_p, MASK_IP));
611	<	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 621 | 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 */
625	<	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
626	<	{
627	<	/* Eek, failure to create the socket */
628	<	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
432	>	memcpy(&client_p->ip, conf->addr, sizeof(client_p->ip));
433
434	<	SetDead(client_p);
631	<	exit_client(client_p, "Connection failed");
632	<	return 0;
633	<	}
434	>	client_p->connection->fd = fd_open(fd, true, NULL);
435
436	<	/* servernames are always guaranteed under HOSTLEN chars */
437	<	fd_note(&client_p->connection->fd, "Server: %s", conf->name);
436	>	/* Server names are always guaranteed under HOSTLEN chars */
437	>	fd_note(client_p->connection->fd, "Server: %s", client_p->name);
438
439	<	/* Attach config entries to client here rather than in
440	<	* serv_connect_callback(). This to avoid null pointer references.
439	>	/*
440	>	* Attach config entries to client here rather than in server_connect_callback().
441	>	* This to avoid null pointer references.
442		*/
443	<	if (!attach_connect_block(client_p, conf->name, conf->host))
642	<	{
643	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
644	<	"Host %s is not enabled for connecting: no connect {} block",
645	<	conf->name);
646	<	if (by && IsClient(by) && !MyClient(by))
647	<	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
648	<
649	<	SetDead(client_p);
650	<	exit_client(client_p, "Connection failed");
651	<	return 0;
652	<	}
443	>	conf_attach(client_p, conf);
444
445	<	/* at this point we have a connection in progress and C/N lines
655	<	* attached to the client, the socket info should be saved in the
656	<	* client and it should either be resolved or have a valid address.
657	<	*
658	<	* The socket has been connected or connect is in progress.
659	<	*/
660	<	make_server(client_p);
445	>	server_make(client_p);
446
447		if (by && IsClient(by))
448		strlcpy(client_p->serv->by, by->name, sizeof(client_p->serv->by));
#	Line 665 | Line 450 | serv_connect(struct MaskItem *conf, stru
450		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
451
452		SetConnecting(client_p);
668	–	client_p->connection->aftype = conf->aftype;
453
454		/* Now, initiate the connection */
455	<	/* XXX assume that a non 0 type means a specific bind address
456	<	* for this connect.
673	<	*/
674	<	switch (conf->aftype)
675	<	{
676	<	case AF_INET:
677	<	v4 = (struct sockaddr_in*)&conf->bind;
678	<	if (v4->sin_addr.s_addr)
679	<	{
680	<	struct irc_ssaddr ipn;
681	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
682	<	ipn.ss.ss_family = AF_INET;
683	<	ipn.ss_port = 0;
684	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
685	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
686	<	(struct sockaddr *)&ipn, ipn.ss_len,
687	<	serv_connect_callback, client_p, conf->aftype,
688	<	CONNECTTIMEOUT);
689	<	}
690	<	else if (ConfigServerInfo.specific_ipv4_vhost)
691	<	{
692	<	struct irc_ssaddr ipn;
693	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
694	<	ipn.ss.ss_family = AF_INET;
695	<	ipn.ss_port = 0;
696	<	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
697	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
698	<	(struct sockaddr *)&ipn, ipn.ss_len,
699	<	serv_connect_callback, client_p, conf->aftype,
700	<	CONNECTTIMEOUT);
701	<	}
702	<	else
703	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
704	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
705	<	CONNECTTIMEOUT);
706	<	break;
707	<	case AF_INET6:
708	<	{
709	<	struct irc_ssaddr ipn;
710	<	struct sockaddr_in6 *v6;
711	<	struct sockaddr_in6 *v6conf;
712	<
713	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
714	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
715	<	v6 = (struct sockaddr_in6 *)&ipn;
455	>	comm_connect_tcp(client_p->connection->fd, conf->addr, conf->port, conf->bind,
456	>	server_connect_callback, client_p, CONNECTTIMEOUT);
457
458	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
459	<	{
460	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
461	<	ipn.ss.ss_family = AF_INET6;
462	<	ipn.ss_port = 0;
463	<	comm_connect_tcp(&client_p->connection->fd,
464	<	conf->host, conf->port,
465	<	(struct sockaddr *)&ipn, ipn.ss_len,
725	<	serv_connect_callback, client_p,
726	<	conf->aftype, CONNECTTIMEOUT);
727	<	}
728	<	else if (ConfigServerInfo.specific_ipv6_vhost)
729	<	{
730	<	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
731	<	ipn.ss.ss_family = AF_INET6;
732	<	ipn.ss_port = 0;
733	<	comm_connect_tcp(&client_p->connection->fd,
734	<	conf->host, conf->port,
735	<	(struct sockaddr *)&ipn, ipn.ss_len,
736	<	serv_connect_callback, client_p,
737	<	conf->aftype, CONNECTTIMEOUT);
738	<	}
739	<	else
740	<	comm_connect_tcp(&client_p->connection->fd,
741	<	conf->host, conf->port,
742	<	NULL, 0, serv_connect_callback, client_p,
743	<	conf->aftype, CONNECTTIMEOUT);
744	<	}
745	<	}
746	<
747	<	return 1;
458	>	/*
459	>	* At this point we have a connection in progress and a connect {} block
460	>	* attached to the client, the socket info should be saved in the client
461	>	* and it should either be resolved or have a valid address.
462	>	*
463	>	* The socket has been connected or connect is in progress.
464	>	*/
465	>	return true;
466		}
467
750	–	#ifdef HAVE_LIBCRYPTO
468		static void
469	<	finish_ssl_server_handshake(struct Client *client_p)
469	>	server_finish_tls_handshake(struct Client *client_p)
470		{
471	<	struct MaskItem *conf = NULL;
472	<
473	<	conf = find_conf_name(&client_p->connection->confs,
474	<	client_p->name, CONF_SERVER);
475	<	if (conf == NULL)
476	<	{
477	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
478	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
762	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
763	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
471	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
472	>	client_p->name, CONF_SERVER);
473	>	if (!conf)
474	>	{
475	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
476	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
477	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
478	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
479
480		exit_client(client_p, "Lost connect{} block");
481		return;
482		}
483
484	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
484	>	/* Next, send the initial handshake */
485	>	SetHandshake(client_p);
486	>
487	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
488
489	<	send_capabilities(client_p, 0);
489	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
490
491		sendto_one(client_p, "SERVER %s 1 :%s%s",
492		me.name, ConfigServerHide.hidden ? "(H) " : "",
493		me.info);
494
777	–	/* If we've been marked dead because a send failed, just exit
778	–	* here now and save everyone the trouble of us ever existing.
779	–	*/
780	–	if (IsDead(client_p))
781	–	{
782	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
783	–	"%s[%s] went dead during handshake",
784	–	client_p->name,
785	–	client_p->host);
786	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
787	–	"%s went dead during handshake", client_p->name);
788	–	return;
789	–	}
790	–
791	–	/* don't move to serv_list yet -- we haven't sent a burst! */
495		/* If we get here, we're ok, so lets start reading some data */
496	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
496	>	read_packet(client_p->connection->fd, client_p);
497		}
498
499		static void
500	<	ssl_server_handshake(fde_t *fd, void *data)
500	>	server_tls_handshake(fde_t *F, void *data)
501		{
502		struct Client *client_p = data;
503	<	X509 *cert = NULL;
801	<	int ret = 0;
503	>	const char *sslerr = NULL;
504
505	<	if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
505	>	assert(client_p);
506	>	assert(client_p->connection);
507	>	assert(client_p->connection->fd);
508	>	assert(client_p->connection->fd == F);
509	>
510	>	tls_handshake_status_t ret = tls_handshake(&F->ssl, TLS_ROLE_CLIENT, &sslerr);
511	>	if (ret != TLS_HANDSHAKE_DONE)
512		{
513	<	switch (SSL_get_error(client_p->connection->fd.ssl, ret))
513	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
514	>	{
515	>	exit_client(client_p, "Timeout during TLS handshake");
516	>	return;
517	>	}
518	>
519	>	switch (ret)
520		{
521	<	case SSL_ERROR_WANT_WRITE:
522	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
523	<	ssl_server_handshake, client_p, 0);
521	>	case TLS_HANDSHAKE_WANT_WRITE:
522	>	comm_setselect(F, COMM_SELECT_WRITE,
523	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
524		return;
525	<	case SSL_ERROR_WANT_READ:
526	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
527	<	ssl_server_handshake, client_p, 0);
525	>	case TLS_HANDSHAKE_WANT_READ:
526	>	comm_setselect(F, COMM_SELECT_READ,
527	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
528		return;
529		default:
530		{
531	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
818	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
531	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
532		"Error connecting to %s: %s", client_p->name,
533	<	sslerr ? sslerr : "unknown SSL error");
534	<	exit_client(client_p, "Error during SSL handshake");
533	>	sslerr ? sslerr : "unknown TLS error");
534	>	exit_client(client_p, "Error during TLS handshake");
535		return;
536		}
537		}
538		}
539
540	<	if ((cert = SSL_get_peer_certificate(client_p->connection->fd.ssl)))
828	<	{
829	<	int res = SSL_get_verify_result(client_p->connection->fd.ssl);
830	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
831	<	unsigned char md[EVP_MAX_MD_SIZE] = "";
832	<
833	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
834	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
835	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
836	<	{
837	<	unsigned int n = 0;
540	>	comm_settimeout(F, 0, NULL, NULL);
541
542	<	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
543	<	{
544	<	binary_to_hex(md, buf, n);
842	<	client_p->certfp = xstrdup(buf);
843	<	}
844	<	}
845	<	else
846	<	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
847	<	client_p->name, client_p->username, client_p->host, res);
848	<	X509_free(cert);
849	<	}
542	>	if (tls_verify_cert(&F->ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp) == false)
543	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
544	>	client_p->name, client_p->username, client_p->host);
545
546	<	finish_ssl_server_handshake(client_p);
546	>	server_finish_tls_handshake(client_p);
547		}
548
549		static void
550	<	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
550	>	server_tls_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *F)
551		{
552	<	if ((client_p->connection->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
552	>	assert(client_p);
553	>	assert(client_p->connection);
554	>	assert(client_p->connection->fd);
555	>	assert(client_p->connection->fd == F);
556	>
557	>	if (tls_new(&F->ssl, F->fd, TLS_ROLE_CLIENT) == false)
558		{
859	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
860	–	ERR_error_string(ERR_get_error(), NULL));
559		SetDead(client_p);
560	<	exit_client(client_p, "SSL_new failed");
560	>	exit_client(client_p, "TLS context initialization failed");
561		return;
562		}
563
866	–	SSL_set_fd(fd->ssl, fd->fd);
867	–
564		if (!EmptyString(conf->cipher_list))
565	<	SSL_set_cipher_list(client_p->connection->fd.ssl, conf->cipher_list);
565	>	tls_set_ciphers(&F->ssl, conf->cipher_list);
566
567	<	ssl_server_handshake(NULL, client_p);
567	>	server_tls_handshake(F, client_p);
568		}
873	–	#endif
569
570	<	/* serv_connect_callback() - complete a server connection.
570	>	/* server_connect_callback() - complete a server connection.
571		*
572		* This routine is called after the server connection attempt has
573		* completed. If unsucessful, an error is sent to ops and the client
#	Line 881 | Line 576 | ssl_connect_init(struct Client *client_p
576		* marked for reading.
577		*/
578		static void
579	<	serv_connect_callback(fde_t *fd, int status, void *data)
579	>	server_connect_callback(fde_t *F, int status, void *data)
580		{
581	<	struct Client *client_p = data;
887	<	struct MaskItem *conf = NULL;
581	>	struct Client *const client_p = data;
582
583		/* First, make sure it's a real client! */
584		assert(client_p);
585	<	assert(&client_p->connection->fd == fd);
586	<
587	<	/* Next, for backward purposes, record the ip of the server */
894	<	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
895	<	sizeof(struct irc_ssaddr));
585	>	assert(client_p->connection);
586	>	assert(client_p->connection->fd);
587	>	assert(client_p->connection->fd == F);
588
589		/* Check the status */
590		if (status != COMM_OK)
591		{
592	<	/* We have an error, so report it and quit
593	<	* Admins get to see any IP, mere opers don't *sigh*
592	>	/* We have an error, so report it and quit */
593	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
594	>	"Error connecting to %s: %s",
595	>	client_get_name(client_p, SHOW_IP), comm_errstr(status));
596	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
597	>	"Error connecting to %s: %s",
598	>	client_get_name(client_p, MASK_IP), comm_errstr(status));
599	>
600	>	/*
601	>	* If a fd goes bad, call dead_link() the socket is no
602	>	* longer valid for reading or writing.
603		*/
604	<	if (ConfigServerHide.hide_server_ips)
605	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
905	<	"Error connecting to %s: %s",
906	<	client_p->name, comm_errstr(status));
907	<	else
908	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
909	<	"Error connecting to %s[%s]: %s", client_p->name,
910	<	client_p->host, comm_errstr(status));
911	<
912	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
913	<	"Error connecting to %s: %s",
914	<	client_p->name, comm_errstr(status));
915	<
916	<	/* If a fd goes bad, call dead_link() the socket is no
917	<	* longer valid for reading or writing.
918	<	*/
919	<	dead_link_on_write(client_p, 0);
920	<	return;
604	>	dead_link_on_write(client_p, 0);
605	>	return;
606		}
607
608		/* COMM_OK, so continue the connection procedure */
609	<	/* Get the C/N lines */
610	<	conf = find_conf_name(&client_p->connection->confs,
611	<	client_p->name, CONF_SERVER);
612	<	if (conf == NULL)
613	<	{
614	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
615	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
616	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
617	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
609	>	/* Get the connect {} block */
610	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
611	>	client_p->name, CONF_SERVER);
612	>	if (!conf)
613	>	{
614	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
615	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
616	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
617	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
618
619		exit_client(client_p, "Lost connect{} block");
620		return;
621		}
622
938	–	/* Next, send the initial handshake */
939	–	SetHandshake(client_p);
940	–
941	–	#ifdef HAVE_LIBCRYPTO
623		if (IsConfSSL(conf))
624		{
625	<	ssl_connect_init(client_p, conf, fd);
625	>	server_tls_connect_init(client_p, conf, F);
626		return;
627		}
947	–	#endif
628
629	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
629	>	/* Next, send the initial handshake */
630	>	SetHandshake(client_p);
631	>
632	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
633
634	<	send_capabilities(client_p, 0);
634	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
635
636		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
637		ConfigServerHide.hidden ? "(H) " : "", me.info);
638
956	–	/* If we've been marked dead because a send failed, just exit
957	–	* here now and save everyone the trouble of us ever existing.
958	–	*/
959	–	if (IsDead(client_p))
960	–	{
961	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
962	–	"%s[%s] went dead during handshake",
963	–	client_p->name,
964	–	client_p->host);
965	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
966	–	"%s went dead during handshake", client_p->name);
967	–	return;
968	–	}
969	–
970	–	/* don't move to serv_list yet -- we haven't sent a burst! */
639		/* If we get here, we're ok, so lets start reading some data */
640	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
640	>	read_packet(client_p->connection->fd, client_p);
641		}
642
643		struct Client *
644		find_servconn_in_progress(const char *name)
645		{
646		dlink_node *ptr;
979	–	struct Client *cptr;
647
648		DLINK_FOREACH(ptr, unknown_list.head)
649		{
650	<	cptr = ptr->data;
650	>	struct Client *cptr = ptr->data;
651
652	<	if (cptr && cptr->name[0])
653	<	if (!match(name, cptr->name))
652	>	if (cptr->name[0])
653	>	if (!irccmp(name, cptr->name))
654		return cptr;
655		}
656

Comparing ircd-hybrid/branches/8.2.x/src/server.c (property svn:keywords):
Revision 4676 by michael, Fri Oct 3 11:03:06 2014 UTC vs.
Revision 8878 by michael, Sun Feb 24 09:12:52 2019 UTC

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

Diff Legend

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