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 7950 by michael, Thu Mar 2 17:54:03 2017 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-2017 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		*/
#	Line 36 | Line 36
36		#include "packet.h"
37		#include "conf.h"
38		#include "server.h"
39	+	#include "server_capab.h"
40		#include "log.h"
41		#include "send.h"
42		#include "memory.h"
#	Line 43 | Line 44
44
45
46		dlink_list flatten_links;
47	<	static dlink_list server_capabilities_list;
47	<	static void serv_connect_callback(fde_t *, int, void *);
47	>	static void server_connect_callback(fde_t *, int, void *);
48
49
50		/*
#	Line 59 | 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 139 | 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 158 | 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 247 | 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)
262	>	if (GlobalSetOptions.autoconn == false)
263		return;
264
265		DLINK_FOREACH(node, connect_items.head)
#	Line 257 | Line 267 | try_connections(void *unused)
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 272 | Line 283 | try_connections(void *unused)
283		if (conf->until > CurrentTime)
284		continue;
285
275	–	assert(conf->class);
276	–
286		conf->until = CurrentTime + conf->class->con_freq;
287
288		/*
#	Line 296 | Line 305 | try_connections(void *unused)
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 313 | 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		}
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 329 | 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 338 | Line 347 | valid_servname(const char *name)
347		return dots && (p - name) <= HOSTLEN;
348		}
349
350	<	/* server_capab_init()
342	<	*
343	<	* inputs       - none
344	<	* output       - none
345	<	*/
346	<	void
347	<	server_capab_init(void)
348	<	{
349	<	add_capability("QS", CAPAB_QS);
350	<	add_capability("EOB", CAPAB_EOB);
351	<	add_capability("CLUSTER", CAPAB_CLUSTER);
352	<	add_capability("SVS", CAPAB_SVS);
353	<	add_capability("CHW", CAPAB_CHW);
354	<	add_capability("HOPS", CAPAB_HOPS);
355	<	}
356	<
357	<	/* add_capability()
358	<	*
359	<	* inputs       - string name of CAPAB
360	<	*              - int flag of capability
361	<	* output       - NONE
362	<	* side effects - Adds given capability name and bit mask to
363	<	*                current supported capabilities. This allows
364	<	*                modules to dynamically add or subtract their capability.
365	<	*/
366	<	void
367	<	add_capability(const char *name, unsigned int flag)
368	<	{
369	<	struct Capability *cap = xcalloc(sizeof(*cap));
370	<
371	<	cap->name = xstrdup(name);
372	<	cap->cap = flag;
373	<	dlinkAdd(cap, &cap->node, &server_capabilities_list);
374	<	}
375	<
376	<	/* delete_capability()
377	<	*
378	<	* inputs       - string name of CAPAB
379	<	* output       - NONE
380	<	* side effects - delete given capability from ones known.
381	<	*/
382	<	void
383	<	delete_capability(const char *name)
384	<	{
385	<	dlink_node *node = NULL, *node_next = NULL;
386	<
387	<	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
388	<	{
389	<	struct Capability *cap = node->data;
390	<
391	<	if (!irccmp(cap->name, name))
392	<	{
393	<	dlinkDelete(node, &server_capabilities_list);
394	<	xfree(cap->name);
395	<	xfree(cap);
396	<	}
397	<	}
398	<	}
399	<
400	<	/*
401	<	* find_capability()
402	<	*
403	<	* inputs       - string name of capab to find
404	<	* output       - 0 if not found CAPAB otherwise
405	<	* side effects - none
406	<	*/
407	<	unsigned int
408	<	find_capability(const char *name)
409	<	{
410	<	dlink_node *node;
411	<
412	<	DLINK_FOREACH(node, server_capabilities_list.head)
413	<	{
414	<	const struct Capability *cap = node->data;
415	<
416	<	if (!irccmp(cap->name, name))
417	<	return cap->cap;
418	<	}
419	<
420	<	return 0;
421	<	}
422	<
423	<	/*
424	<	* show_capabilities - show current server capabilities
425	<	*
426	<	* inputs       - pointer to a struct Client
427	<	* output       - pointer to static string
428	<	* side effects - build up string representing capabilities of server listed
429	<	*/
430	<	const char *
431	<	get_capabilities(const struct Client *client_p)
432	<	{
433	<	static char buf[IRCD_BUFSIZE] = "";
434	<	dlink_node *node;
435	<
436	<	buf[0] = '\0';
437	<
438	<	DLINK_FOREACH(node, server_capabilities_list.head)
439	<	{
440	<	const struct Capability *cap = node->data;
441	<
442	<	if (client_p && !IsCapable(client_p, cap->cap))
443	<	continue;
444	<
445	<	strlcat(buf, cap->name, sizeof(buf));
446	<
447	<	if (node->next)
448	<	strlcat(buf, " ", sizeof(buf));
449	<	}
450	<
451	<	return buf;
452	<	}
453	<
454	<	/* make_server()
350	>	/* server_make()
351		*
352		* inputs       - pointer to client struct
353		* output       - pointer to struct Server
#	Line 459 | Line 355 | get_capabilities(const struct Client *cl
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 = xcalloc(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
471	<	* Based upon the stuff floating about in s_bsd.c
472	<	*   -- adrian
473	<	*/
474	<
475	<	/* 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 488 | 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		{
494	–	struct Client *client_p = NULL;
385		char buf[HOSTIPLEN + 1] = "";
386
497	–	/* conversion structs */
498	–	struct sockaddr_in *v4;
499	–
387		/* Make sure conf is useful */
388		assert(conf);
389	<
390	<	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
504	<	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
505	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
506	<	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_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_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	<	/*
410	<	* Make sure this server isn't already connected.
411	<	* Note: conf should ALWAYS be a valid connect {} block
412	<	*/
413	<	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_SERVNOTICE, L_ADMIN, SEND_NOTICE,
418	<	"Server %s already present from %s",
419	<	conf->name, get_client_name(client_p, SHOW_IP));
534	<	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
535	<	"Server %s already present from %s",
536	<	conf->name, get_client_name(client_p, MASK_IP));
537	<	if (by && IsClient(by) && !MyClient(by))
538	<	sendto_one_notice(by, &me, ":Server %s already present from %s",
539	<	conf->name, get_client_name(client_p, MASK_IP));
540	<	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 550 | 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 */
554	<	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
555	<	{
556	<	/* Eek, failure to create the socket */
557	<	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);
560	<	exit_client(client_p, "Connection failed");
561	<	return 0;
562	<	}
434	>	client_p->connection->fd = fd_open(fd, true, NULL);
435
436		/* Server names are always guaranteed under HOSTLEN chars */
437	<	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
437	>	fd_note(client_p->connection->fd, "Server: %s", client_p->name);
438
439		/*
440	<	* Attach config entries to client here rather than in serv_connect_callback().
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))
572	<	{
573	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
574	<	"Host %s is not enabled for connecting: no connect {} block",
575	<	conf->name);
576	<	if (by && IsClient(by) && !MyClient(by))
577	<	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
443	>	conf_attach(client_p, conf);
444
445	<	SetDead(client_p);
580	<	exit_client(client_p, "Connection failed");
581	<	return 0;
582	<	}
583	<
584	<	/*
585	<	* At this point we have a connection in progress and a connect {} block
586	<	* attached to the client, the socket info should be saved in the client
587	<	* and it should either be resolved or have a valid address.
588	<	*
589	<	* The socket has been connected or connect is in progress.
590	<	*/
591	<	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 596 | 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);
599	–	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.
604	<	*/
605	<	switch (conf->aftype)
606	<	{
607	<	case AF_INET:
608	<	v4 = (struct sockaddr_in*)&conf->bind;
609	<	if (v4->sin_addr.s_addr)
610	<	{
611	<	struct irc_ssaddr ipn;
612	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
613	<	ipn.ss.ss_family = AF_INET;
614	<	ipn.ss_port = 0;
615	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
616	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
617	<	(struct sockaddr *)&ipn, ipn.ss_len,
618	<	serv_connect_callback, client_p, conf->aftype,
619	<	CONNECTTIMEOUT);
620	<	}
621	<	else if (ConfigServerInfo.specific_ipv4_vhost)
622	<	{
623	<	struct irc_ssaddr ipn;
624	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
625	<	ipn.ss.ss_family = AF_INET;
626	<	ipn.ss_port = 0;
627	<	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
628	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
629	<	(struct sockaddr *)&ipn, ipn.ss_len,
630	<	serv_connect_callback, client_p, conf->aftype,
631	<	CONNECTTIMEOUT);
632	<	}
633	<	else
634	<	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
635	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
636	<	CONNECTTIMEOUT);
637	<	break;
638	<	case AF_INET6:
639	<	{
640	<	struct irc_ssaddr ipn;
641	<	struct sockaddr_in6 *v6;
642	<	struct sockaddr_in6 *v6conf;
643	<
644	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
645	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
646	<	v6 = (struct sockaddr_in6 *)&ipn;
647	<
648	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
649	<	{
650	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
651	<	ipn.ss.ss_family = AF_INET6;
652	<	ipn.ss_port = 0;
653	<	comm_connect_tcp(&client_p->connection->fd,
654	<	conf->host, conf->port,
655	<	(struct sockaddr *)&ipn, ipn.ss_len,
656	<	serv_connect_callback, client_p,
657	<	conf->aftype, CONNECTTIMEOUT);
658	<	}
659	<	else if (ConfigServerInfo.specific_ipv6_vhost)
660	<	{
661	<	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
662	<	ipn.ss.ss_family = AF_INET6;
663	<	ipn.ss_port = 0;
664	<	comm_connect_tcp(&client_p->connection->fd,
665	<	conf->host, conf->port,
666	<	(struct sockaddr *)&ipn, ipn.ss_len,
667	<	serv_connect_callback, client_p,
668	<	conf->aftype, CONNECTTIMEOUT);
669	<	}
670	<	else
671	<	comm_connect_tcp(&client_p->connection->fd,
672	<	conf->host, conf->port,
673	<	NULL, 0, serv_connect_callback, client_p,
674	<	conf->aftype, CONNECTTIMEOUT);
675	<	}
676	<	}
455	>	comm_connect_tcp(client_p->connection->fd, conf->addr, conf->port, conf->bind,
456	>	server_connect_callback, client_p, CONNECTTIMEOUT);
457
458	<	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
468		static void
469	<	finish_ssl_server_handshake(struct Client *client_p)
469	>	server_finish_tls_handshake(struct Client *client_p)
470		{
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", get_client_name(client_p, SHOW_IP));
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", get_client_name(client_p, MASK_IP));
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	+	/* 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	<	sendto_one(client_p, "CAPAB :%s", get_capabilities(NULL));
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
705	–	/*
706	–	* If we've been marked dead because a send failed, just exit
707	–	* here now and save everyone the trouble of us ever existing.
708	–	*/
709	–	if (IsDead(client_p))
710	–	{
711	–	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
712	–	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
713	–	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
714	–	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
715	–	return;
716	–	}
717	–
718	–	/* 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		const char *sslerr = NULL;
504
505	<	tls_handshake_status_t ret = tls_handshake(&client_p->connection->fd.ssl, TLS_ROLE_CLIENT, &sslerr);
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		if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
#	Line 738 | Line 519 | ssl_server_handshake(fde_t *fd, void *da
519		switch (ret)
520		{
521		case TLS_HANDSHAKE_WANT_WRITE:
522	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
523	<	ssl_server_handshake, client_p, CONNECTTIMEOUT);
522	>	comm_setselect(F, COMM_SELECT_WRITE,
523	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
524		return;
525		case TLS_HANDSHAKE_WANT_READ:
526	<	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
527	<	ssl_server_handshake, client_p, CONNECTTIMEOUT);
526	>	comm_setselect(F, COMM_SELECT_READ,
527	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
528		return;
529		default:
530		{
#	Line 756 | Line 537 | ssl_server_handshake(fde_t *fd, void *da
537		}
538		}
539
540	<	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
540	>	comm_settimeout(F, 0, NULL, NULL);
541
542	<	if (!tls_verify_cert(&client_p->connection->fd.ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp))
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, const 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 (!tls_new(&client_p->connection->fd.ssl, fd->fd, TLS_ROLE_CLIENT))
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		{
559		SetDead(client_p);
560		exit_client(client_p, "TLS context initialization failed");
#	Line 776 | Line 562 | ssl_connect_init(struct Client *client_p
562		}
563
564		if (!EmptyString(conf->cipher_list))
565	<	tls_set_ciphers(&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		}
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 790 | 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 *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 */
802	<	memcpy(&client_p->connection->ip, &fd->connect.hostaddr, 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)
#	Line 807 | Line 592 | serv_connect_callback(fde_t *fd, int sta
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	<	get_client_name(client_p, SHOW_IP), comm_errstr(status));
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	<	get_client_name(client_p, MASK_IP), comm_errstr(status));
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
#	Line 827 | Line 612 | serv_connect_callback(fde_t *fd, int sta
612		if (!conf)
613		{
614		sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
615	<	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
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", get_client_name(client_p, MASK_IP));
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
838	–	/* Next, send the initial handshake */
839	–	SetHandshake(client_p);
840	–
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		}
628
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	<	sendto_one(client_p, "CAPAB :%s", get_capabilities(NULL));
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
854	–	/*
855	–	* If we've been marked dead because a send failed, just exit
856	–	* here now and save everyone the trouble of us ever existing.
857	–	*/
858	–	if (IsDead(client_p))
859	–	{
860	–	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
861	–	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
862	–	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
863	–	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
864	–	return;
865	–	}
866	–
867	–	/* 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 *

Diff Legend

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