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/s_serv.c (file contents), Revision 3136 by michael, Tue Mar 11 18:24:03 2014 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 7401 by michael, Sun Mar 6 16:15:22 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 25 | Line 25
25		*/
26
27		#include "stdinc.h"
28	–	#ifdef HAVE_LIBCRYPTO
29	–	#include <openssl/rsa.h>
30	–	#include "rsa.h"
31	–	#endif
28		#include "list.h"
33	–	#include "channel.h"
34	–	#include "channel_mode.h"
29		#include "client.h"
30		#include "event.h"
37	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
33		#include "ircd.h"
34		#include "ircd_defs.h"
35		#include "s_bsd.h"
43	–	#include "numeric.h"
36		#include "packet.h"
45	–	#include "irc_res.h"
37		#include "conf.h"
38	<	#include "s_serv.h"
38	>	#include "server.h"
39		#include "log.h"
49	–	#include "s_misc.h"
50	–	#include "s_user.h"
40		#include "send.h"
41		#include "memory.h"
53	–	#include "channel.h"
42		#include "parse.h"
43
56	–	#define MIN_CONN_FREQ 300
44
45		dlink_list flatten_links;
46	<	static dlink_list cap_list = { NULL, NULL, 0 };
47	<	static void server_burst(struct Client *);
61	<	static void burst_all(struct Client *);
62	<	static void send_tb(struct Client *client_p, struct Channel *chptr);
46	>	static dlink_list server_capabilities_list;
47	>	static void serv_connect_callback(fde_t *, int, void *);
48
64	–	static CNCB serv_connect_callback;
65	–
66	–	static void burst_members(struct Client *, struct Channel *);
49
50		/*
51		* write_links_file
#	Line 74 | Line 56 | static void burst_members(struct Client
56		*                but in no particular order.
57		*/
58		void
59	<	write_links_file(void *notused)
59	>	write_links_file(void *unused)
60		{
61		FILE *file = NULL;
62	<	dlink_node *ptr = NULL, *ptr_next = NULL;
63	<	char buff[IRCD_BUFSIZE] = { '\0' };
62	>	dlink_node *node = NULL, *node_next = NULL;
63	>	char buff[IRCD_BUFSIZE] = "";
64
65	<	if ((file = fopen(LIPATH, "w")) == NULL)
65	>	if (EmptyString(ConfigServerHide.flatten_links_file))
66		return;
67
68	<	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
68	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "w")) == NULL)
69		{
70	<	dlinkDelete(ptr, &flatten_links);
71	<	MyFree(ptr->data);
72	<	free_dlink_node(ptr);
70	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
71	>	strerror(errno));
72	>	return;
73		}
74
75	<	DLINK_FOREACH(ptr, global_serv_list.head)
75	>	DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
76		{
77	<	const struct Client *target_p = ptr->data;
77	>	dlinkDelete(node, &flatten_links);
78	>	xfree(node->data);
79	>	free_dlink_node(node);
80	>	}
81	>
82	>	DLINK_FOREACH(node, global_server_list.head)
83	>	{
84	>	const struct Client *target_p = node->data;
85
86		/*
87		* Skip hidden servers, aswell as ourselves, since we already send
#	Line 127 | Line 116 | read_links_file(void)
116		{
117		FILE *file = NULL;
118		char *p = NULL;
119	<	char buff[IRCD_BUFSIZE] = { '\0' };
119	>	char buff[IRCD_BUFSIZE] = "";
120	>
121	>	if (EmptyString(ConfigServerHide.flatten_links_file))
122	>	return;
123
124	<	if ((file = fopen(LIPATH, "r")) == NULL)
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')) != NULL)
133	>	if ((p = strchr(buff, '\n')))
134		*p = '\0';
135
136		dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
#	Line 163 | Line 159 | read_links_file(void)
159		*      returns: (see #defines)
160		*/
161		int
162	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
162	>	hunt_server(struct Client *source_p, const char *command,
163		const int server, const int parc, char *parv[])
164		{
165		struct Client *target_p = NULL;
166	<	struct Client *target_tmp = NULL;
171	<	dlink_node *ptr;
172	<	int wilds;
166	>	dlink_node *node = NULL;
167
168		/* Assume it's me, if no server */
169		if (parc <= server || EmptyString(parv[server]))
170		return HUNTED_ISME;
171
172	<	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
173	<	return HUNTED_ISME;
172	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
173	>	target_p = hash_find_server(parv[server]);
174
175	<	/* These are to pickup matches that would cause the following
175	>	/*
176	>	* These are to pickup matches that would cause the following
177		* message to go in the wrong direction while doing quick fast
178		* non-matching lookups.
179		*/
185	–	if (MyClient(source_p))
186	–	target_p = hash_find_client(parv[server]);
187	–	else
188	–	target_p = find_person(client_p, parv[server]);
189	–
180		if (target_p)
181		if (target_p->from == source_p->from && !MyConnect(target_p))
182		target_p = NULL;
183
184	<	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
195	<	if (target_p->from == source_p->from && !MyConnect(target_p))
196	<	target_p = NULL;
197	<
198	<	wilds = has_wildcards(parv[server]);
199	<
200	<	/* Again, if there are no wild cards involved in the server
201	<	* name, use the hash lookup
202	<	*/
203	<	if (target_p == NULL)
184	>	if (!target_p && has_wildcards(parv[server]))
185		{
186	<	if (!wilds)
186	>	DLINK_FOREACH(node, global_server_list.head)
187		{
188	<	if (!(target_p = hash_find_server(parv[server])))
188	>	struct Client *tmp = node->data;
189	>
190	>	assert(IsMe(tmp) || IsServer(tmp));
191	>	if (!match(parv[server], tmp->name))
192		{
193	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
194	<	return HUNTED_NOSUCH;
193	>	if (tmp->from == source_p->from && !MyConnect(tmp))
194	>	continue;
195	>
196	>	target_p = node->data;
197	>	break;
198		}
199		}
200	<	else
200	>
201	>	if (!target_p)
202		{
203	<	DLINK_FOREACH(ptr, global_client_list.head)
203	>	DLINK_FOREACH(node, global_client_list.head)
204		{
205	<	target_tmp = ptr->data;
205	>	struct Client *tmp = node->data;
206
207	<	if (!match(parv[server], target_tmp->name))
207	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
208	>	if (!match(parv[server], tmp->name))
209		{
210	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
210	>	if (tmp->from == source_p->from && !MyConnect(tmp))
211		continue;
223	–	target_p = ptr->data;
212
213	<	if (IsRegistered(target_p) && (target_p != client_p))
214	<	break;
213	>	target_p = node->data;
214	>	break;
215		}
216		}
217		}
218		}
219
220	<	if (target_p != NULL)
220	>	if (target_p)
221		{
222	<	if(!IsRegistered(target_p))
235	<	{
236	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237	<	return HUNTED_NOSUCH;
238	<	}
239	<
222	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
223		if (IsMe(target_p) || MyClient(target_p))
224		return HUNTED_ISME;
225
226	<	if (match(target_p->name, parv[server]))
227	<	parv[server] = target_p->name;
245	<
246	<	/* This is a little kludgy but should work... */
247	<	sendto_one(target_p, command, ID_or_name(source_p, target_p),
226	>	parv[server] = target_p->id;
227	>	sendto_one(target_p, command, source_p->id,
228		parv[1], parv[2], parv[3], parv[4],
229		parv[5], parv[6], parv[7], parv[8]);
230		return HUNTED_PASS;
#	Line 267 | Line 247 | hunt_server(struct Client *client_p, str
247		void
248		try_connections(void *unused)
249		{
250	<	dlink_node *ptr = NULL;
271	<	struct MaskItem *conf;
272	<	int confrq;
250	>	dlink_node *node = NULL;
251
274	–	/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
252		if (GlobalSetOptions.autoconn == 0)
253		return;
254
255	<	DLINK_FOREACH(ptr, server_items.head)
255	>	DLINK_FOREACH(node, connect_items.head)
256		{
257	<	conf = ptr->data;
257	>	struct MaskItem *conf = node->data;
258
259		assert(conf->type == CONF_SERVER);
260
261	<	/* Also when already connecting! (update holdtimes) --SRB
262	<	*/
286	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
261	>	/* Also when already connecting! (update holdtimes) --SRB */
262	>	if (!conf->port || !IsConfAllowAutoConn(conf))
263		continue;
264
265	<
266	<	/* Skip this entry if the use of it is still on hold until
265	>	/*
266	>	* Skip this entry if the use of it is still on hold until
267		* future. Otherwise handle this entry (and set it on hold
268		* until next time). Will reset only hold times, if already
269		* made one successfull connection... [this algorithm is
#	Line 296 | Line 272 | try_connections(void *unused)
272		if (conf->until > CurrentTime)
273		continue;
274
275	<	if (conf->class == NULL)
300	<	confrq = DEFAULT_CONNECTFREQUENCY;
301	<	else
302	<	{
303	<	confrq = conf->class->con_freq;
304	<	if (confrq < MIN_CONN_FREQ)
305	<	confrq = MIN_CONN_FREQ;
306	<	}
275	>	assert(conf->class);
276
277	<	conf->until = CurrentTime + confrq;
277	>	conf->until = CurrentTime + conf->class->con_freq;
278
279	<	/* Found a CONNECT config with port specified, scan clients
279	>	/*
280	>	* Found a CONNECT config with port specified, scan clients
281		* and see if this server is already connected?
282		*/
283	<	if (hash_find_server(conf->name) != NULL)
283	>	if (hash_find_server(conf->name))
284		continue;
285
286		if (conf->class->ref_count < conf->class->max_total)
287		{
288	<	/* Go to the end of the list, if not already last */
289	<	if (ptr->next != NULL)
288	>	/* Move this entry to the end of the list, if not already last */
289	>	if (node->next)
290		{
291	<	dlinkDelete(ptr, &server_items);
292	<	dlinkAddTail(conf, &conf->node, &server_items);
291	>	dlinkDelete(node, &connect_items);
292	>	dlinkAddTail(conf, &conf->node, &connect_items);
293		}
294
295		if (find_servconn_in_progress(conf->name))
296		return;
297
298	<	/* We used to only print this if serv_connect() actually
298	>	/*
299	>	* We used to only print this if serv_connect() actually
300		* succeeded, but since comm_tcp_connect() can call the callback
301		* immediately if there is an error, we were getting error messages
302		* in the wrong order. SO, we just print out the activated line,
#	Line 334 | Line 305 | try_connections(void *unused)
305		*   -- adrian
306		*/
307		if (ConfigServerHide.hide_server_ips)
308	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
308	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
309		"Connection to %s activated.",
310		conf->name);
311		else
312	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
312	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
313		"Connection to %s[%s] activated.",
314		conf->name, conf->host);
315
#	Line 352 | Line 323 | try_connections(void *unused)
323		int
324		valid_servname(const char *name)
325		{
326	<	unsigned int length = 0;
356	<	unsigned int dots   = 0;
326	>	unsigned int dots = 0;
327		const char *p = name;
328
329		for (; *p; ++p)
#	Line 361 | Line 331 | valid_servname(const char *name)
331		if (!IsServChar(*p))
332		return 0;
333
364	–	++length;
365	–
334		if (*p == '.')
335		++dots;
336		}
337
338	<	return dots != 0 && length <= HOSTLEN;
338	>	return dots && (p - name) <= HOSTLEN;
339		}
340
341		int
342		check_server(const char *name, struct Client *client_p)
343		{
344	<	dlink_node *ptr;
344	>	dlink_node *node = NULL;
345		struct MaskItem *conf        = NULL;
346		struct MaskItem *server_conf = NULL;
347		int error = -1;
348
349	<	assert(client_p != NULL);
349	>	assert(client_p);
350
351	<	/* loop through looking for all possible connect items that might work */
352	<	DLINK_FOREACH(ptr, server_items.head)
351	>	/* Loop through looking for all possible connect items that might work */
352	>	DLINK_FOREACH(node, connect_items.head)
353		{
354	<	conf = ptr->data;
354	>	conf = node->data;
355
356		if (match(name, conf->name))
357		continue;
358
359		error = -3;
360
393	–	/* XXX: Fix me for IPv6                    */
394	–	/* XXX sockhost is the IPv4 ip as a string */
361		if (!match(conf->host, client_p->host) ||
362		!match(conf->host, client_p->sockhost))
363		{
364		error = -2;
365
366	<	if (!match_conf_password(client_p->localClient->passwd, conf))
366	>	if (!match_conf_password(client_p->connection->password, conf))
367		return -2;
368
369		if (!EmptyString(conf->certfp))
#	Line 413 | Line 379 | check_server(const char *name, struct Cl
379
380		attach_conf(client_p, server_conf);
381
382	<
417	<	if (server_conf != NULL)
382	>	switch (server_conf->aftype)
383		{
384	<	struct sockaddr_in *v4;
420	<	#ifdef IPV6
421	<	struct sockaddr_in6 *v6;
422	<	#endif
423	<	switch (server_conf->aftype)
384	>	case AF_INET6:
385		{
386	<	#ifdef IPV6
426	<	case AF_INET6:
427	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
386	>	const struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&server_conf->addr;
387
388	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
389	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
390	<	break;
391	<	#endif
392	<	case AF_INET:
393	<	v4 = (struct sockaddr_in *)&server_conf->addr;
388	>	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
389	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
390	>	break;
391	>	}
392	>	case AF_INET:
393	>	{
394	>	const struct sockaddr_in *v4 = (struct sockaddr_in *)&server_conf->addr;
395
396	<	if (v4->sin_addr.s_addr == INADDR_NONE)
397	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
398	<	break;
396	>	if (v4->sin_addr.s_addr == INADDR_NONE)
397	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
398	>	break;
399		}
400		}
401
#	Line 452 | Line 412 | check_server(const char *name, struct Cl
412		*                modules to dynamically add or subtract their capability.
413		*/
414		void
415	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
415	>	add_capability(const char *name, unsigned int flag)
416		{
417	<	struct Capability *cap = MyMalloc(sizeof(*cap));
458	<
459	<	cap->name = xstrdup(capab_name);
460	<	cap->cap = cap_flag;
461	<	dlinkAdd(cap, &cap->node, &cap_list);
417	>	struct Capability *cap = xcalloc(sizeof(*cap));
418
419	<	if (add_to_default)
420	<	default_server_capabs |= cap_flag;
419	>	cap->name = xstrdup(name);
420	>	cap->cap = flag;
421	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
422		}
423
424		/* delete_capability()
#	Line 470 | Line 427 | add_capability(const char *capab_name, i
427		* output       - NONE
428		* side effects - delete given capability from ones known.
429		*/
430	<	int
431	<	delete_capability(const char *capab_name)
430	>	void
431	>	delete_capability(const char *name)
432		{
433	<	dlink_node *ptr;
477	<	dlink_node *next_ptr;
478	<	struct Capability *cap;
433	>	dlink_node *node = NULL, *node_next = NULL;
434
435	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
435	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
436		{
437	<	cap = ptr->data;
437	>	struct Capability *cap = node->data;
438
439	<	if (cap->cap != 0)
439	>	if (!irccmp(cap->name, name))
440		{
441	<	if (irccmp(cap->name, capab_name) == 0)
442	<	{
443	<	default_server_capabs &= ~(cap->cap);
489	<	dlinkDelete(ptr, &cap_list);
490	<	MyFree(cap->name);
491	<	MyFree(cap);
492	<	}
441	>	dlinkDelete(node, &server_capabilities_list);
442	>	xfree(cap->name);
443	>	xfree(cap);
444		}
445		}
495	–
496	–	return 0;
446		}
447
448		/*
#	Line 504 | Line 453 | delete_capability(const char *capab_name
453		* side effects - none
454		*/
455		unsigned int
456	<	find_capability(const char *capab)
456	>	find_capability(const char *name)
457		{
458	<	const dlink_node *ptr = NULL;
458	>	const dlink_node *node = NULL;
459
460	<	DLINK_FOREACH(ptr, cap_list.head)
460	>	DLINK_FOREACH(node, server_capabilities_list.head)
461		{
462	<	const struct Capability *cap = ptr->data;
462	>	const struct Capability *cap = node->data;
463
464	<	if (cap->cap && !irccmp(cap->name, capab))
464	>	if (!irccmp(cap->name, name))
465		return cap->cap;
466		}
467
#	Line 528 | Line 477 | find_capability(const char *capab)
477		*
478		*/
479		void
480	<	send_capabilities(struct Client *client_p, int cap_can_send)
480	>	send_capabilities(struct Client *client_p)
481		{
482	<	struct Capability *cap=NULL;
483	<	char msgbuf[IRCD_BUFSIZE];
535	<	char *t;
536	<	int tl;
537	<	dlink_node *ptr;
482	>	char buf[IRCD_BUFSIZE] = "";
483	>	const dlink_node *node = NULL;
484
485	<	t = msgbuf;
540	<
541	<	DLINK_FOREACH(ptr, cap_list.head)
485	>	DLINK_FOREACH(node, server_capabilities_list.head)
486		{
487	<	cap = ptr->data;
544	<
545	<	if (cap->cap & (cap_can_send|default_server_capabs))
546	<	{
547	<	tl = sprintf(t, "%s ", cap->name);
548	<	t += tl;
549	<	}
550	<	}
551	<
552	<	*(t - 1) = '\0';
553	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
554	<	}
555	<
556	<	/* sendnick_TS()
557	<	*
558	<	* inputs       - client (server) to send nick towards
559	<	*          - client to send nick for
560	<	* output       - NONE
561	<	* side effects - NICK message is sent towards given client_p
562	<	*/
563	<	void
564	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
565	<	{
566	<	char ubuf[IRCD_BUFSIZE];
487	>	const struct Capability *cap = node->data;
488
489	<	if (!IsClient(target_p))
569	<	return;
489	>	strlcat(buf, cap->name, sizeof(buf));
490
491	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
492	<
573	<	if (ubuf[0] == '\0')
574	<	{
575	<	ubuf[0] = '+';
576	<	ubuf[1] = '\0';
491	>	if (node->next)
492	>	strlcat(buf, " ", sizeof(buf));
493		}
494
495	<	if (IsCapable(client_p, CAP_SVS))
580	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
581	<	target_p->servptr->id,
582	<	target_p->name, target_p->hopcount + 1,
583	<	(unsigned long) target_p->tsinfo,
584	<	ubuf, target_p->username, target_p->host,
585	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
586	<	"0" : target_p->sockhost, target_p->id,
587	<	target_p->svid, target_p->info);
588	<	else
589	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	<	target_p->servptr->id,
591	<	target_p->name, target_p->hopcount + 1,
592	<	(unsigned long) target_p->tsinfo,
593	<	ubuf, target_p->username, target_p->host,
594	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
595	<	"0" : target_p->sockhost, target_p->id, target_p->info);
596	<
597	<	if (!EmptyString(target_p->certfp))
598	<	sendto_one(client_p, ":%s CERTFP %s",
599	<	ID_or_name(target_p, client_p), target_p->certfp);
600	<
601	<	if (target_p->away[0])
602	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
603	<	target_p->away);
604	<
495	>	sendto_one(client_p, "CAPAB :%s", buf);
496		}
497
498		/*
#	Line 615 | Line 506 | const char *
506		show_capabilities(const struct Client *target_p)
507		{
508		static char msgbuf[IRCD_BUFSIZE] = "";
509	<	const dlink_node *ptr = NULL;
509	>	const dlink_node *node = NULL;
510
511		strlcpy(msgbuf, "TS", sizeof(msgbuf));
512
513	<	DLINK_FOREACH(ptr, cap_list.head)
513	>	DLINK_FOREACH(node, server_capabilities_list.head)
514		{
515	<	const struct Capability *cap = ptr->data;
515	>	const struct Capability *cap = node->data;
516
517		if (!IsCapable(target_p, cap->cap))
518		continue;
#	Line 644 | Line 535 | struct Server *
535		make_server(struct Client *client_p)
536		{
537		if (client_p->serv == NULL)
538	<	client_p->serv = MyMalloc(sizeof(struct Server));
538	>	client_p->serv = xcalloc(sizeof(struct Server));
539
540		return client_p->serv;
541		}
542
652	–	/* server_estab()
653	–	*
654	–	* inputs       - pointer to a struct Client
655	–	* output       -
656	–	* side effects -
657	–	*/
658	–	void
659	–	server_estab(struct Client *client_p)
660	–	{
661	–	struct Client *target_p;
662	–	struct MaskItem *conf = NULL;
663	–	char *host;
664	–	const char *inpath;
665	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
666	–	dlink_node *ptr;
667	–	#ifdef HAVE_LIBCRYPTO
668	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
669	–	#endif
670	–
671	–	assert(client_p != NULL);
672	–
673	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
674	–
675	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
676	–	host   = client_p->name;
677	–
678	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
679	–	== NULL)
680	–	{
681	–	/* This shouldn't happen, better tell the ops... -A1kmm */
682	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
683	–	"Warning: Lost connect{} block "
684	–	"for server %s(this shouldn't happen)!", host);
685	–	exit_client(client_p, &me, "Lost connect{} block!");
686	–	return;
687	–	}
688	–
689	–	MyFree(client_p->localClient->passwd);
690	–	client_p->localClient->passwd = NULL;
691	–
692	–	/* Its got identd, since its a server */
693	–	SetGotId(client_p);
694	–
695	–	/* If there is something in the serv_list, it might be this
696	–	* connecting server..
697	–	*/
698	–	if (!ServerInfo.hub && serv_list.head)
699	–	{
700	–	if (client_p != serv_list.head->data || serv_list.head->next)
701	–	{
702	–	++ServerStats.is_ref;
703	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
704	–	exit_client(client_p, &me, "I'm a leaf");
705	–	return;
706	–	}
707	–	}
708	–
709	–	if (IsUnknown(client_p))
710	–	{
711	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
712	–
713	–	send_capabilities(client_p, 0);
714	–
715	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
716	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
717	–	}
718	–
719	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
720	–	(unsigned long)CurrentTime);
721	–
722	–	if (HasID(client_p))
723	–	hash_add_id(client_p);
724	–
725	–	/* XXX Does this ever happen? I don't think so -db */
726	–	detach_conf(client_p, CONF_OPER);
727	–
728	–	/* *WARNING*
729	–	**    In the following code in place of plain server's
730	–	**    name we send what is returned by get_client_name
731	–	**    which may add the "sockhost" after the name. It's
732	–	**    *very* *important* that there is a SPACE between
733	–	**    the name and sockhost (if present). The receiving
734	–	**    server will start the information field from this
735	–	**    first blank and thus puts the sockhost into info.
736	–	**    ...a bit tricky, but you have been warned, besides
737	–	**    code is more neat this way...  --msa
738	–	*/
739	–	client_p->servptr = &me;
740	–
741	–	if (IsClosing(client_p))
742	–	return;
743	–
744	–	SetServer(client_p);
745	–
746	–	/* Update the capability combination usage counts. -A1kmm */
747	–	set_chcap_usage_counts(client_p);
748	–
749	–	/* Some day, all these lists will be consolidated *sigh* */
750	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
751	–
752	–	assert(dlinkFind(&unknown_list, client_p));
753	–
754	–	dlink_move_node(&client_p->localClient->lclient_node,
755	–	&unknown_list, &serv_list);
756	–
757	–	Count.myserver++;
758	–
759	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
760	–	hash_add_client(client_p);
761	–
762	–	/* doesnt duplicate client_p->serv if allocated this struct already */
763	–	make_server(client_p);
764	–
765	–	/* fixing eob timings.. -gnp */
766	–	client_p->localClient->firsttime = CurrentTime;
767	–
768	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
769	–	AddFlag(client_p, FLAGS_SERVICE);
770	–
771	–	/* Show the real host/IP to admins */
772	–	#ifdef HAVE_LIBCRYPTO
773	–	if (client_p->localClient->fd.ssl)
774	–	{
775	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
776	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
777	–
778	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
779	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
780	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
781	–	compression ? SSL_COMP_get_name(compression) : "NONE",
782	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
783	–	show_capabilities(client_p));
784	–	/* Now show the masked hostname/IP to opers */
785	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
786	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
787	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
788	–	compression ? SSL_COMP_get_name(compression) : "NONE",
789	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
790	–	show_capabilities(client_p));
791	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
792	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
793	–	compression ? SSL_COMP_get_name(compression) : "NONE",
794	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
795	–	show_capabilities(client_p));
796	–	}
797	–	else
798	–	#endif
799	–	{
800	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
801	–	"Link with %s established: (Capabilities: %s)",
802	–	inpath_ip, show_capabilities(client_p));
803	–	/* Now show the masked hostname/IP to opers */
804	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
805	–	"Link with %s established: (Capabilities: %s)",
806	–	inpath, show_capabilities(client_p));
807	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
808	–	inpath_ip, show_capabilities(client_p));
809	–	}
810	–
811	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
812	–
813	–	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
814	–	me.id, client_p->name, client_p->id,
815	–	IsHidden(client_p) ? "(H) " : "", client_p->info);
816	–
817	–	/*
818	–	* Pass on my client information to the new server
819	–	*
820	–	* First, pass only servers (idea is that if the link gets
821	–	* cancelled beacause the server was already there,
822	–	* there are no NICK's to be cancelled...). Of course,
823	–	* if cancellation occurs, all this info is sent anyway,
824	–	* and I guess the link dies when a read is attempted...? --msa
825	–	*
826	–	* Note: Link cancellation to occur at this point means
827	–	* that at least two servers from my fragment are building
828	–	* up connection this other fragment at the same time, it's
829	–	* a race condition, not the normal way of operation...
830	–	*
831	–	* ALSO NOTE: using the get_client_name for server names--
832	–	*    see previous *WARNING*!!! (Also, original inpath
833	–	*    is destroyed...)
834	–	*/
835	–
836	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
837	–	{
838	–	target_p = ptr->data;
839	–
840	–	/* target_p->from == target_p for target_p == client_p */
841	–	if (IsMe(target_p) || target_p->from == client_p)
842	–	continue;
843	–
844	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
845	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
846	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
847	–	target_p->info);
848	–
849	–	if (HasFlag(target_p, FLAGS_EOB))
850	–	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
851	–	}
852	–
853	–	server_burst(client_p);
854	–	}
855	–
856	–	/* server_burst()
857	–	*
858	–	* inputs       - struct Client pointer server
859	–	*              -
860	–	* output       - none
861	–	* side effects - send a server burst
862	–	* bugs         - still too long
863	–	*/
864	–	static void
865	–	server_burst(struct Client *client_p)
866	–	{
867	–	/* Send it in the shortened format with the TS, if
868	–	** it's a TS server; walk the list of channels, sending
869	–	** all the nicks that haven't been sent yet for each
870	–	** channel, then send the channel itself -- it's less
871	–	** obvious than sending all nicks first, but on the
872	–	** receiving side memory will be allocated more nicely
873	–	** saving a few seconds in the handling of a split
874	–	** -orabidoo
875	–	*/
876	–
877	–	burst_all(client_p);
878	–
879	–	/* EOB stuff is now in burst_all */
880	–	/* Always send a PING after connect burst is done */
881	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
882	–	}
883	–
884	–	/* burst_all()
885	–	*
886	–	* inputs       - pointer to server to send burst to
887	–	* output       - NONE
888	–	* side effects - complete burst of channels/nicks is sent to client_p
889	–	*/
890	–	static void
891	–	burst_all(struct Client *client_p)
892	–	{
893	–	dlink_node *ptr = NULL;
894	–
895	–	DLINK_FOREACH(ptr, global_channel_list.head)
896	–	{
897	–	struct Channel *chptr = ptr->data;
898	–
899	–	if (dlink_list_length(&chptr->members) != 0)
900	–	{
901	–	burst_members(client_p, chptr);
902	–	send_channel_modes(client_p, chptr);
903	–
904	–	if (IsCapable(client_p, CAP_TBURST))
905	–	send_tb(client_p, chptr);
906	–	}
907	–	}
908	–
909	–	/* also send out those that are not on any channel
910	–	*/
911	–	DLINK_FOREACH(ptr, global_client_list.head)
912	–	{
913	–	struct Client *target_p = ptr->data;
914	–
915	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
916	–	sendnick_TS(client_p, target_p);
917	–
918	–	DelFlag(target_p, FLAGS_BURSTED);
919	–	}
920	–
921	–	if (IsCapable(client_p, CAP_EOB))
922	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
923	–	}
924	–
925	–	/*
926	–	* send_tb
927	–	*
928	–	* inputs       - pointer to Client
929	–	*              - pointer to channel
930	–	* output       - NONE
931	–	* side effects - Called on a server burst when
932	–	*                server is CAP_TBURST capable
933	–	*/
934	–	static void
935	–	send_tb(struct Client *client_p, struct Channel *chptr)
936	–	{
937	–	/*
938	–	* We may also send an empty topic here, but only if topic_time isn't 0,
939	–	* i.e. if we had a topic that got unset.  This is required for syncing
940	–	* topics properly.
941	–	*
942	–	* Imagine the following scenario: Our downlink introduces a channel
943	–	* to us with a TS that is equal to ours, but the channel topic on
944	–	* their side got unset while the servers were in splitmode, which means
945	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
946	–	* deal with it in a more sophisticated fashion instead of just resetting
947	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
948	–	* for further information   -Michael
949	–	*/
950	–	if (chptr->topic_time != 0)
951	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
952	–	ID_or_name(&me, client_p),
953	–	(unsigned long)chptr->channelts, chptr->chname,
954	–	(unsigned long)chptr->topic_time,
955	–	chptr->topic_info,
956	–	chptr->topic);
957	–	}
958	–
959	–	/* burst_members()
960	–	*
961	–	* inputs       - pointer to server to send members to
962	–	*              - dlink_list pointer to membership list to send
963	–	* output       - NONE
964	–	* side effects -
965	–	*/
966	–	static void
967	–	burst_members(struct Client *client_p, struct Channel *chptr)
968	–	{
969	–	struct Client *target_p;
970	–	struct Membership *ms;
971	–	dlink_node *ptr;
972	–
973	–	DLINK_FOREACH(ptr, chptr->members.head)
974	–	{
975	–	ms       = ptr->data;
976	–	target_p = ms->client_p;
977	–
978	–	if (!HasFlag(target_p, FLAGS_BURSTED))
979	–	{
980	–	AddFlag(target_p, FLAGS_BURSTED);
981	–
982	–	if (target_p->from != client_p)
983	–	sendnick_TS(client_p, target_p);
984	–	}
985	–	}
986	–	}
987	–
543		/* New server connection code
544		* Based upon the stuff floating about in s_bsd.c
545		*   -- adrian
#	Line 1009 | Line 564 | burst_members(struct Client *client_p, s
564		int
565		serv_connect(struct MaskItem *conf, struct Client *by)
566		{
567	<	struct Client *client_p;
568	<	char buf[HOSTIPLEN + 1];
567	>	struct Client *client_p = NULL;
568	>	char buf[HOSTIPLEN + 1] = "";
569
570		/* conversion structs */
571		struct sockaddr_in *v4;
1017	–	/* Make sure conf is useful */
1018	–	assert(conf != NULL);
572
573	+	/* Make sure conf is useful */
574	+	assert(conf);
575
576	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
576	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
577		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
578		ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
579		buf);
#	Line 1026 | Line 581 | serv_connect(struct MaskItem *conf, stru
581		/* Still processing a DNS lookup? -> exit */
582		if (conf->dns_pending)
583		{
584	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
584	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
585		"Error connecting to %s: DNS lookup for connect{} in progress.",
586		conf->name);
587	<	return (0);
587	>	return 0;
588		}
589
590		if (conf->dns_failed)
591		{
592	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
592	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
593		"Error connecting to %s: DNS lookup for connect{} failed.",
594		conf->name);
595	<	return (0);
595	>	return 0;
596		}
597
598	<	/* Make sure this server isn't already connected
599	<	* Note: conf should ALWAYS be a valid C: line
598	>	/*
599	>	* Make sure this server isn't already connected.
600	>	* Note: conf should ALWAYS be a valid connect {} block
601		*/
602	<	if ((client_p = hash_find_server(conf->name)) != NULL)
602	>	if ((client_p = hash_find_server(conf->name)))
603		{
604	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
604	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
605		"Server %s already present from %s",
606		conf->name, get_client_name(client_p, SHOW_IP));
607	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
607	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
608		"Server %s already present from %s",
609		conf->name, get_client_name(client_p, MASK_IP));
610		if (by && IsClient(by) && !MyClient(by))
#	Line 1067 | Line 623 | serv_connect(struct MaskItem *conf, stru
623		/* We already converted the ip once, so lets use it - stu */
624		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
625
626	<	/* create a socket for the server connection */
627	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1072	<	SOCK_STREAM, 0, NULL) < 0)
626	>	/* Create a socket for the server connection */
627	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
628		{
629		/* Eek, failure to create the socket */
630	<	report_error(L_ALL, "opening stream socket to %s: %s",
631	<	conf->name, errno);
630	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
631	>
632		SetDead(client_p);
633	<	exit_client(client_p, &me, "Connection failed");
633	>	exit_client(client_p, "Connection failed");
634		return 0;
635		}
636
637	<	/* servernames are always guaranteed under HOSTLEN chars */
638	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
637	>	/* Server names are always guaranteed under HOSTLEN chars */
638	>	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
639
640	<	/* Attach config entries to client here rather than in
641	<	* serv_connect_callback(). This to avoid null pointer references.
640	>	/*
641	>	* Attach config entries to client here rather than in serv_connect_callback().
642	>	* This to avoid null pointer references.
643		*/
644		if (!attach_connect_block(client_p, conf->name, conf->host))
645		{
646	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
647	<	"Host %s is not enabled for connecting: no connect{} block",
646	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
647	>	"Host %s is not enabled for connecting: no connect {} block",
648		conf->name);
649		if (by && IsClient(by) && !MyClient(by))
650	<	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
650	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
651
652		SetDead(client_p);
653	<	exit_client(client_p, client_p, "Connection failed");
653	>	exit_client(client_p, "Connection failed");
654		return 0;
655		}
656
657	<	/* at this point we have a connection in progress and C/N lines
658	<	* attached to the client, the socket info should be saved in the
659	<	* client and it should either be resolved or have a valid address.
657	>	/*
658	>	* At this point we have a connection in progress and a connect {} block
659	>	* attached to the client, the socket info should be saved in the client
660	>	* and it should either be resolved or have a valid address.
661		*
662		* The socket has been connected or connect is in progress.
663		*/
#	Line 1112 | Line 669 | serv_connect(struct MaskItem *conf, stru
669		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
670
671		SetConnecting(client_p);
672	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1116	<	/* from def_fam */
1117	<	client_p->localClient->aftype = conf->aftype;
672	>	client_p->connection->aftype = conf->aftype;
673
674		/* Now, initiate the connection */
675		/* XXX assume that a non 0 type means a specific bind address
#	Line 1124 | Line 679 | serv_connect(struct MaskItem *conf, stru
679		{
680		case AF_INET:
681		v4 = (struct sockaddr_in*)&conf->bind;
682	<	if (v4->sin_addr.s_addr != 0)
682	>	if (v4->sin_addr.s_addr)
683		{
684		struct irc_ssaddr ipn;
685		memset(&ipn, 0, sizeof(struct irc_ssaddr));
686		ipn.ss.ss_family = AF_INET;
687		ipn.ss_port = 0;
688		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
689	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
689	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
690		(struct sockaddr *)&ipn, ipn.ss_len,
691		serv_connect_callback, client_p, conf->aftype,
692		CONNECTTIMEOUT);
693		}
694	<	else if (ServerInfo.specific_ipv4_vhost)
694	>	else if (ConfigServerInfo.specific_ipv4_vhost)
695		{
696		struct irc_ssaddr ipn;
697		memset(&ipn, 0, sizeof(struct irc_ssaddr));
698		ipn.ss.ss_family = AF_INET;
699		ipn.ss_port = 0;
700	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
701	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
700	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
701	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
702		(struct sockaddr *)&ipn, ipn.ss_len,
703		serv_connect_callback, client_p, conf->aftype,
704		CONNECTTIMEOUT);
705		}
706		else
707	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
707	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
708		NULL, 0, serv_connect_callback, client_p, conf->aftype,
709		CONNECTTIMEOUT);
710		break;
1156	–	#ifdef IPV6
711		case AF_INET6:
712		{
713		struct irc_ssaddr ipn;
#	Line 1164 | Line 718 | serv_connect(struct MaskItem *conf, stru
718		v6conf = (struct sockaddr_in6 *)&conf->bind;
719		v6 = (struct sockaddr_in6 *)&ipn;
720
721	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
721	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
722		{
723		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
724		ipn.ss.ss_family = AF_INET6;
725		ipn.ss_port = 0;
726	<	comm_connect_tcp(&client_p->localClient->fd,
726	>	comm_connect_tcp(&client_p->connection->fd,
727		conf->host, conf->port,
728		(struct sockaddr *)&ipn, ipn.ss_len,
729		serv_connect_callback, client_p,
730		conf->aftype, CONNECTTIMEOUT);
731		}
732	<	else if (ServerInfo.specific_ipv6_vhost)
732	>	else if (ConfigServerInfo.specific_ipv6_vhost)
733		{
734	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
734	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
735		ipn.ss.ss_family = AF_INET6;
736		ipn.ss_port = 0;
737	<	comm_connect_tcp(&client_p->localClient->fd,
737	>	comm_connect_tcp(&client_p->connection->fd,
738		conf->host, conf->port,
739		(struct sockaddr *)&ipn, ipn.ss_len,
740		serv_connect_callback, client_p,
741		conf->aftype, CONNECTTIMEOUT);
742		}
743		else
744	<	comm_connect_tcp(&client_p->localClient->fd,
744	>	comm_connect_tcp(&client_p->connection->fd,
745		conf->host, conf->port,
746		NULL, 0, serv_connect_callback, client_p,
747		conf->aftype, CONNECTTIMEOUT);
748		}
1195	–	#endif
749		}
750	+
751		return 1;
752		}
753
1200	–	#ifdef HAVE_LIBCRYPTO
754		static void
755		finish_ssl_server_handshake(struct Client *client_p)
756		{
757		struct MaskItem *conf = NULL;
758
759	<	conf = find_conf_name(&client_p->localClient->confs,
759	>	conf = find_conf_name(&client_p->connection->confs,
760		client_p->name, CONF_SERVER);
761		if (conf == NULL)
762		{
763	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
764	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
765	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
763	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
764	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
765	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
766		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
767
768	<	exit_client(client_p, &me, "Lost connect{} block");
768	>	exit_client(client_p, "Lost connect{} block");
769		return;
770		}
771
772	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
772	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
773
774	<	send_capabilities(client_p, 0);
774	>	send_capabilities(client_p);
775
776		sendto_one(client_p, "SERVER %s 1 :%s%s",
777		me.name, ConfigServerHide.hidden ? "(H) " : "",
778		me.info);
779
780	<	/* If we've been marked dead because a send failed, just exit
780	>	/*
781	>	* If we've been marked dead because a send failed, just exit
782		* here now and save everyone the trouble of us ever existing.
783		*/
784		if (IsDead(client_p))
785		{
786	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
787	<	"%s[%s] went dead during handshake",
788	<	client_p->name,
789	<	client_p->host);
790	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1237	<	"%s went dead during handshake", client_p->name);
1238	<	return;
786	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
787	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
788	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
789	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
790	>	return;
791		}
792
793		/* don't move to serv_list yet -- we haven't sent a burst! */
794		/* If we get here, we're ok, so lets start reading some data */
795	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
795	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
796		}
797
798		static void
799	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
799	>	ssl_server_handshake(fde_t *fd, void *data)
800		{
801	<	X509 *cert = NULL;
802	<	int ret = 0;
801	>	struct Client *client_p = data;
802	>	const char *sslerr = NULL;
803
804	<	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
804	>	tls_handshake_status_t ret = tls_handshake(&client_p->connection->fd.ssl, TLS_ROLE_CLIENT, &sslerr);
805	>	if (ret != TLS_HANDSHAKE_DONE)
806		{
807	<	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
807	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
808		{
809	<	case SSL_ERROR_WANT_WRITE:
810	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
811	<	(PF *)ssl_server_handshake, client_p, 0);
809	>	exit_client(client_p, "Timeout during TLS handshake");
810	>	return;
811	>	}
812	>
813	>	switch (ret)
814	>	{
815	>	case TLS_HANDSHAKE_WANT_WRITE:
816	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
817	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
818		return;
819	<	case SSL_ERROR_WANT_READ:
820	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
821	<	(PF *)ssl_server_handshake, client_p, 0);
819	>	case TLS_HANDSHAKE_WANT_READ:
820	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
821	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
822		return;
823		default:
824		{
825	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1267	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
825	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
826		"Error connecting to %s: %s", client_p->name,
827	<	sslerr ? sslerr : "unknown SSL error");
828	<	exit_client(client_p, client_p, "Error during SSL handshake");
827	>	sslerr ? sslerr : "unknown TLS error");
828	>	exit_client(client_p, "Error during TLS handshake");
829		return;
830		}
831		}
832		}
833
834	<	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1277	<	{
1278	<	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1279	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1280	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1281	<
1282	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1283	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1284	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1285	<	{
1286	<	unsigned int i = 0, n = 0;
834	>	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
835
836	<	if (X509_digest(cert, EVP_sha256(), md, &n))
837	<	{
838	<	for (; i < n; ++i)
1291	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1292	<	client_p->certfp = xstrdup(buf);
1293	<	}
1294	<	}
1295	<	else
1296	<	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1297	<	client_p->name, client_p->username, client_p->host, res);
1298	<	X509_free(cert);
1299	<	}
836	>	if (!tls_verify_cert(&client_p->connection->fd.ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp))
837	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
838	>	client_p->name, client_p->username, client_p->host);
839
840		finish_ssl_server_handshake(client_p);
841		}
842
843		static void
844	<	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
844	>	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
845		{
846	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
846	>	if (!tls_new(&client_p->connection->fd.ssl, fd->fd, TLS_ROLE_CLIENT))
847		{
1309	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1310	–	ERR_error_string(ERR_get_error(), NULL));
848		SetDead(client_p);
849	<	exit_client(client_p, client_p, "SSL_new failed");
849	>	exit_client(client_p, "TLS context initialization failed");
850		return;
851		}
852
1316	–	SSL_set_fd(fd->ssl, fd->fd);
1317	–
853		if (!EmptyString(conf->cipher_list))
854	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
854	>	tls_set_ciphers(&client_p->connection->fd.ssl, conf->cipher_list);
855
856		ssl_server_handshake(NULL, client_p);
857		}
1323	–	#endif
858
859		/* serv_connect_callback() - complete a server connection.
860		*
#	Line 1333 | Line 867 | ssl_connect_init(struct Client *client_p
867		static void
868		serv_connect_callback(fde_t *fd, int status, void *data)
869		{
870	<	struct Client *client_p = data;
871	<	struct MaskItem *conf = NULL;
870	>	struct Client *const client_p = data;
871	>	const struct MaskItem *conf = NULL;
872
873	<	/* First, make sure its a real client! */
874	<	assert(client_p != NULL);
875	<	assert(&client_p->localClient->fd == fd);
873	>	/* First, make sure it's a real client! */
874	>	assert(client_p);
875	>	assert(&client_p->connection->fd == fd);
876
877		/* Next, for backward purposes, record the ip of the server */
878	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
878	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
879		sizeof(struct irc_ssaddr));
880	+
881		/* Check the status */
882		if (status != COMM_OK)
883		{
884	<	/* We have an error, so report it and quit
885	<	* Admins get to see any IP, mere opers don't *sigh*
884	>	/* We have an error, so report it and quit */
885	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
886	>	"Error connecting to %s: %s",
887	>	get_client_name(client_p, SHOW_IP), comm_errstr(status));
888	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
889	>	"Error connecting to %s: %s",
890	>	get_client_name(client_p, MASK_IP), comm_errstr(status));
891	>
892	>	/*
893	>	* If a fd goes bad, call dead_link() the socket is no
894	>	* longer valid for reading or writing.
895		*/
896	<	if (ConfigServerHide.hide_server_ips)
897	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1354	<	"Error connecting to %s: %s",
1355	<	client_p->name, comm_errstr(status));
1356	<	else
1357	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1358	<	"Error connecting to %s[%s]: %s", client_p->name,
1359	<	client_p->host, comm_errstr(status));
1360	<
1361	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1362	<	"Error connecting to %s: %s",
1363	<	client_p->name, comm_errstr(status));
1364	<
1365	<	/* If a fd goes bad, call dead_link() the socket is no
1366	<	* longer valid for reading or writing.
1367	<	*/
1368	<	dead_link_on_write(client_p, 0);
1369	<	return;
896	>	dead_link_on_write(client_p, 0);
897	>	return;
898		}
899
900		/* COMM_OK, so continue the connection procedure */
901		/* Get the C/N lines */
902	<	conf = find_conf_name(&client_p->localClient->confs,
902	>	conf = find_conf_name(&client_p->connection->confs,
903		client_p->name, CONF_SERVER);
904		if (conf == NULL)
905		{
906	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
907	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
908	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
906	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
907	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
908	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
909		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
910
911	<	exit_client(client_p, &me, "Lost connect{} block");
911	>	exit_client(client_p, "Lost connect{} block");
912		return;
913		}
914
915		/* Next, send the initial handshake */
916		SetHandshake(client_p);
917
1390	–	#ifdef HAVE_LIBCRYPTO
918		if (IsConfSSL(conf))
919		{
920		ssl_connect_init(client_p, conf, fd);
921		return;
922		}
1396	–	#endif
923
924	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
924	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
925
926	<	send_capabilities(client_p, 0);
926	>	send_capabilities(client_p);
927
928		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
929		ConfigServerHide.hidden ? "(H) " : "", me.info);
930
931	<	/* If we've been marked dead because a send failed, just exit
931	>	/*
932	>	* If we've been marked dead because a send failed, just exit
933		* here now and save everyone the trouble of us ever existing.
934		*/
935		if (IsDead(client_p))
936		{
937	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
938	<	"%s[%s] went dead during handshake",
939	<	client_p->name,
940	<	client_p->host);
941	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1415	<	"%s went dead during handshake", client_p->name);
1416	<	return;
937	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
938	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
939	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
940	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
941	>	return;
942		}
943
944		/* don't move to serv_list yet -- we haven't sent a burst! */

Diff Legend

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