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 3246 by michael, Sun Mar 30 17:37:13 2014 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 7997 by michael, Tue Mar 14 13:17:52 2017 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-2017 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;
62	>	dlink_node *node, *node_next;
63		char buff[IRCD_BUFSIZE] = "";
64
65	<	if ((file = fopen(LIPATH, "w")) == NULL)
65	>	if (EmptyString(ConfigServerHide.flatten_links_file))
66	>	return;
67	>
68	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "w")) == NULL)
69	>	{
70	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
71	>	strerror(errno));
72		return;
73	+	}
74
75	<	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
75	>	DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
76		{
77	<	dlinkDelete(ptr, &flatten_links);
78	<	MyFree(ptr->data);
79	<	free_dlink_node(ptr);
77	>	dlinkDelete(node, &flatten_links);
78	>	xfree(node->data);
79	>	free_dlink_node(node);
80		}
81
82	<	DLINK_FOREACH(ptr, global_serv_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 129 | 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		{
#	Line 143 | 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 162 | 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	<	struct Client *target_tmp = NULL;
167	<	dlink_node *ptr;
172	<	int wilds;
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 (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
178	<	return HUNTED_ISME;
177	>	if ((h->target_p = find_person(source_p, parv[server])) == NULL)
178	>	h->target_p = hash_find_server(parv[server]);
179
180	<	/* These are to pickup matches that would cause the following
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 (MyClient(source_p))
186	<	target_p = hash_find_client(parv[server]);
187	<	else
188	<	target_p = find_person(source_p, parv[server]);
189	<
190	<	if (target_p)
191	<	if (target_p->from == source_p->from && !MyConnect(target_p))
192	<	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 == 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)
189	>	if (!h->target_p && has_wildcards(parv[server]))
190		{
191	<	if (!wilds)
191	>	DLINK_FOREACH(node, global_server_list.head)
192		{
193	<	if (!(target_p = hash_find_server(parv[server])))
193	>	struct Client *tmp = node->data;
194	>
195	>	assert(IsMe(tmp) || IsServer(tmp));
196	>	if (!match(parv[server], tmp->name))
197		{
198	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
199	<	return HUNTED_NOSUCH;
198	>	if (tmp->from == source_p->from && !MyConnect(tmp))
199	>	continue;
200	>
201	>	h->target_p = tmp;
202	>	break;
203		}
204		}
205	<	else
205	>
206	>	if (!h->target_p)
207		{
208	<	DLINK_FOREACH(ptr, global_client_list.head)
208	>	DLINK_FOREACH(node, global_client_list.head)
209		{
210	<	target_tmp = ptr->data;
210	>	struct Client *tmp = node->data;
211
212	<	if (!match(parv[server], target_tmp->name))
212	>	assert(IsClient(tmp));
213	>	if (!match(parv[server], tmp->name))
214		{
215	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
215	>	if (tmp->from == source_p->from && !MyConnect(tmp))
216		continue;
223	–	target_p = ptr->data;
217
218	<	if (IsRegistered(target_p) && (target_p != source_p->from))
219	<	break;
218	>	h->target_p = tmp;
219	>	break;
220		}
221		}
222		}
223		}
224
225	<	if (target_p)
225	>	if (h->target_p)
226		{
227	<	if (!IsRegistered(target_p))
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	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
231	<	return HUNTED_NOSUCH;
230	>	h->ret = HUNTED_ISME;
231	>	return h;
232		}
233
234	<	if (IsMe(target_p) || MyClient(target_p))
235	<	return HUNTED_ISME;
242	<
243	<	if (match(target_p->name, parv[server]))
244	<	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),
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 267 | Line 257 | hunt_server(struct Client *source_p, con
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *ptr = NULL;
271	<	struct MaskItem *conf;
272	<	int confrq;
260	>	dlink_node *node;
261
274	–	/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
262		if (GlobalSetOptions.autoconn == 0)
263		return;
264
265	<	DLINK_FOREACH(ptr, server_items.head)
265	>	DLINK_FOREACH(node, connect_items.head)
266		{
267	<	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	<	*/
286	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
272	>	/* Also when already connecting! (update holdtimes) --SRB */
273	>	if (!conf->port || !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 296 | Line 283 | try_connections(void *unused)
283		if (conf->until > CurrentTime)
284		continue;
285
286	<	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	<	}
307	<
308	<	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 316 | 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))
#	Line 336 | Line 314 | try_connections(void *unused)
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
#	Line 354 | Line 332 | try_connections(void *unused)
332		int
333		valid_servname(const char *name)
334		{
335	<	unsigned int length = 0;
358	<	unsigned int dots   = 0;
335	>	unsigned int dots = 0;
336		const char *p = name;
337
338		for (; *p; ++p)
#	Line 363 | Line 340 | valid_servname(const char *name)
340		if (!IsServChar(*p))
341		return 0;
342
366	–	++length;
367	–
343		if (*p == '.')
344		++dots;
345		}
346
347	<	return dots && length <= HOSTLEN;
347	>	return dots && (p - name) <= HOSTLEN;
348		}
349
350	<	int
351	<	check_server(const char *name, struct Client *client_p)
350	>	/* server_capab_init()
351	>	*
352	>	* inputs       - none
353	>	* output       - none
354	>	*/
355	>	void
356	>	server_capab_init(void)
357		{
358	<	dlink_node *ptr;
359	<	struct MaskItem *conf        = NULL;
360	<	struct MaskItem *server_conf = NULL;
361	<	int error = -1;
362	<
363	<	assert(client_p);
384	<
385	<	/* loop through looking for all possible connect items that might work */
386	<	DLINK_FOREACH(ptr, server_items.head)
387	<	{
388	<	conf = ptr->data;
389	<
390	<	if (match(name, conf->name))
391	<	continue;
392	<
393	<	error = -3;
394	<
395	<	/* XXX: Fix me for IPv6                    */
396	<	/* XXX sockhost is the IPv4 ip as a string */
397	<	if (!match(conf->host, client_p->host) ||
398	<	!match(conf->host, client_p->sockhost))
399	<	{
400	<	error = -2;
401	<
402	<	if (!match_conf_password(client_p->localClient->passwd, conf))
403	<	return -2;
404	<
405	<	if (!EmptyString(conf->certfp))
406	<	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
407	<	return -4;
408	<
409	<	server_conf = conf;
410	<	}
411	<	}
412	<
413	<	if (server_conf == NULL)
414	<	return error;
415	<
416	<	attach_conf(client_p, server_conf);
417	<
418	<
419	<	if (server_conf)
420	<	{
421	<	struct sockaddr_in *v4;
422	<	#ifdef IPV6
423	<	struct sockaddr_in6 *v6;
424	<	#endif
425	<	switch (server_conf->aftype)
426	<	{
427	<	#ifdef IPV6
428	<	case AF_INET6:
429	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
430	<
431	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
432	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
433	<	break;
434	<	#endif
435	<	case AF_INET:
436	<	v4 = (struct sockaddr_in *)&server_conf->addr;
437	<
438	<	if (v4->sin_addr.s_addr == INADDR_NONE)
439	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
440	<	break;
441	<	}
442	<	}
443	<
444	<	return 0;
358	>	add_capability("QS", CAPAB_QS);
359	>	add_capability("EOB", CAPAB_EOB);
360	>	add_capability("CLUSTER", CAPAB_CLUSTER);
361	>	add_capability("SVS", CAPAB_SVS);
362	>	add_capability("CHW", CAPAB_CHW);
363	>	add_capability("HOPS", CAPAB_HOPS);
364		}
365
366		/* add_capability()
#	Line 454 | Line 373 | check_server(const char *name, struct Cl
373		*                modules to dynamically add or subtract their capability.
374		*/
375		void
376	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
376	>	add_capability(const char *name, unsigned int flag)
377		{
378	<	struct Capability *cap = MyMalloc(sizeof(*cap));
378	>	struct Capability *cap = xcalloc(sizeof(*cap));
379
380	<	cap->name = xstrdup(capab_name);
381	<	cap->cap = cap_flag;
382	<	dlinkAdd(cap, &cap->node, &cap_list);
464	<
465	<	if (add_to_default)
466	<	default_server_capabs |= cap_flag;
380	>	cap->name = xstrdup(name);
381	>	cap->cap = flag;
382	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
383		}
384
385		/* delete_capability()
#	Line 472 | Line 388 | add_capability(const char *capab_name, i
388		* output       - NONE
389		* side effects - delete given capability from ones known.
390		*/
391	<	int
392	<	delete_capability(const char *capab_name)
391	>	void
392	>	delete_capability(const char *name)
393		{
394	<	dlink_node *ptr;
479	<	dlink_node *next_ptr;
480	<	struct Capability *cap;
394	>	dlink_node *node, *node_next;
395
396	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
396	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
397		{
398	<	cap = ptr->data;
398	>	struct Capability *cap = node->data;
399
400	<	if (cap->cap != 0)
400	>	if (!irccmp(cap->name, name))
401		{
402	<	if (irccmp(cap->name, capab_name) == 0)
403	<	{
404	<	default_server_capabs &= ~(cap->cap);
491	<	dlinkDelete(ptr, &cap_list);
492	<	MyFree(cap->name);
493	<	MyFree(cap);
494	<	}
402	>	dlinkDelete(node, &server_capabilities_list);
403	>	xfree(cap->name);
404	>	xfree(cap);
405		}
406		}
497	–
498	–	return 0;
407		}
408
409		/*
#	Line 506 | Line 414 | delete_capability(const char *capab_name
414		* side effects - none
415		*/
416		unsigned int
417	<	find_capability(const char *capab)
417	>	find_capability(const char *name)
418		{
419	<	const dlink_node *ptr = NULL;
419	>	dlink_node *node;
420
421	<	DLINK_FOREACH(ptr, cap_list.head)
421	>	DLINK_FOREACH(node, server_capabilities_list.head)
422		{
423	<	const struct Capability *cap = ptr->data;
423	>	const struct Capability *cap = node->data;
424
425	<	if (cap->cap && !irccmp(cap->name, capab))
425	>	if (!irccmp(cap->name, name))
426		return cap->cap;
427		}
428
429		return 0;
430		}
431
524	–	/* send_capabilities()
525	–	*
526	–	* inputs       - Client pointer to send to
527	–	*              - int flag of capabilities that this server can send
528	–	* output       - NONE
529	–	* side effects - send the CAPAB line to a server  -orabidoo
530	–	*
531	–	*/
532	–	void
533	–	send_capabilities(struct Client *client_p, int cap_can_send)
534	–	{
535	–	char msgbuf[IRCD_BUFSIZE] = "";
536	–	char *t = msgbuf;
537	–	int tl;
538	–	dlink_node *ptr = NULL;
539	–
540	–	DLINK_FOREACH(ptr, cap_list.head)
541	–	{
542	–	struct Capability *cap = ptr->data;
543	–
544	–	if (cap->cap & (cap_can_send|default_server_capabs))
545	–	{
546	–	tl = sprintf(t, "%s ", cap->name);
547	–	t += tl;
548	–	}
549	–	}
550	–
551	–	*(t - 1) = '\0';
552	–	sendto_one(client_p, "CAPAB :%s", msgbuf);
553	–	}
554	–
555	–	/* sendnick_TS()
556	–	*
557	–	* inputs       - client (server) to send nick towards
558	–	*          - client to send nick for
559	–	* output       - NONE
560	–	* side effects - NICK message is sent towards given client_p
561	–	*/
562	–	void
563	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
564	–	{
565	–	char ubuf[IRCD_BUFSIZE] = "";
566	–
567	–	if (!IsClient(target_p))
568	–	return;
569	–
570	–	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
571	–
572	–	if (ubuf[0] == '\0')
573	–	{
574	–	ubuf[0] = '+';
575	–	ubuf[1] = '\0';
576	–	}
577	–
578	–	if (IsCapable(client_p, CAP_SVS))
579	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
580	–	target_p->servptr->id,
581	–	target_p->name, target_p->hopcount + 1,
582	–	(unsigned long) target_p->tsinfo,
583	–	ubuf, target_p->username, target_p->host,
584	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
585	–	"0" : target_p->sockhost, target_p->id,
586	–	target_p->svid, target_p->info);
587	–	else
588	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
589	–	target_p->servptr->id,
590	–	target_p->name, target_p->hopcount + 1,
591	–	(unsigned long) target_p->tsinfo,
592	–	ubuf, target_p->username, target_p->host,
593	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
594	–	"0" : target_p->sockhost, target_p->id, target_p->info);
595	–
596	–	if (!EmptyString(target_p->certfp))
597	–	sendto_one(client_p, ":%s CERTFP %s", target_p->id, target_p->certfp);
598	–
599	–	if (target_p->away[0])
600	–	sendto_one(client_p, ":%s AWAY :%s", target_p->id, target_p->away);
601	–
602	–	}
603	–
432		/*
433		* show_capabilities - show current server capabilities
434		*
#	Line 609 | Line 437 | sendnick_TS(struct Client *client_p, str
437		* side effects - build up string representing capabilities of server listed
438		*/
439		const char *
440	<	show_capabilities(const struct Client *target_p)
440	>	get_capabilities(const struct Client *client_p)
441		{
442	<	static char msgbuf[IRCD_BUFSIZE] = "";
443	<	const dlink_node *ptr = NULL;
442	>	static char buf[IRCD_BUFSIZE] = "";
443	>	dlink_node *node;
444
445	<	strlcpy(msgbuf, "TS", sizeof(msgbuf));
445	>	buf[0] = '\0';
446
447	<	DLINK_FOREACH(ptr, cap_list.head)
447	>	DLINK_FOREACH(node, server_capabilities_list.head)
448		{
449	<	const struct Capability *cap = ptr->data;
449	>	const struct Capability *cap = node->data;
450
451	<	if (!IsCapable(target_p, cap->cap))
451	>	if (client_p && !IsCapable(client_p, cap->cap))
452		continue;
453
454	<	strlcat(msgbuf,       " ", sizeof(msgbuf));
455	<	strlcat(msgbuf, cap->name, sizeof(msgbuf));
454	>	strlcat(buf, cap->name, sizeof(buf));
455	>
456	>	if (node->next)
457	>	strlcat(buf, " ", sizeof(buf));
458		}
459
460	<	return msgbuf;
460	>	return buf;
461		}
462
463		/* make_server()
#	Line 641 | Line 471 | struct Server *
471		make_server(struct Client *client_p)
472		{
473		if (client_p->serv == NULL)
474	<	client_p->serv = MyMalloc(sizeof(struct Server));
474	>	client_p->serv = xcalloc(sizeof(struct Server));
475
476		return client_p->serv;
477		}
478
649	–	/* server_estab()
650	–	*
651	–	* inputs       - pointer to a struct Client
652	–	* output       -
653	–	* side effects -
654	–	*/
655	–	void
656	–	server_estab(struct Client *client_p)
657	–	{
658	–	struct MaskItem *conf = NULL;
659	–	char *host;
660	–	const char *inpath;
661	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
662	–	dlink_node *ptr;
663	–	#ifdef HAVE_LIBCRYPTO
664	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
665	–	#endif
666	–
667	–	assert(client_p);
668	–
669	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
670	–
671	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
672	–	host   = client_p->name;
673	–
674	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
675	–	== NULL)
676	–	{
677	–	/* This shouldn't happen, better tell the ops... -A1kmm */
678	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
679	–	"Warning: Lost connect{} block "
680	–	"for server %s(this shouldn't happen)!", host);
681	–	exit_client(client_p, "Lost connect{} block!");
682	–	return;
683	–	}
684	–
685	–	MyFree(client_p->localClient->passwd);
686	–	client_p->localClient->passwd = NULL;
687	–
688	–	/* Its got identd, since its a server */
689	–	SetGotId(client_p);
690	–
691	–	/* If there is something in the serv_list, it might be this
692	–	* connecting server..
693	–	*/
694	–	if (!ServerInfo.hub && serv_list.head)
695	–	{
696	–	if (client_p != serv_list.head->data || serv_list.head->next)
697	–	{
698	–	++ServerStats.is_ref;
699	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
700	–	exit_client(client_p, "I'm a leaf");
701	–	return;
702	–	}
703	–	}
704	–
705	–	if (IsUnknown(client_p))
706	–	{
707	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
708	–
709	–	send_capabilities(client_p, 0);
710	–
711	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
712	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
713	–	}
714	–
715	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
716	–	(unsigned long)CurrentTime);
717	–
718	–	/* XXX Does this ever happen? I don't think so -db */
719	–	detach_conf(client_p, CONF_OPER);
720	–
721	–	/* *WARNING*
722	–	**    In the following code in place of plain server's
723	–	**    name we send what is returned by get_client_name
724	–	**    which may add the "sockhost" after the name. It's
725	–	**    *very* *important* that there is a SPACE between
726	–	**    the name and sockhost (if present). The receiving
727	–	**    server will start the information field from this
728	–	**    first blank and thus puts the sockhost into info.
729	–	**    ...a bit tricky, but you have been warned, besides
730	–	**    code is more neat this way...  --msa
731	–	*/
732	–	client_p->servptr = &me;
733	–
734	–	if (IsClosing(client_p))
735	–	return;
736	–
737	–	SetServer(client_p);
738	–
739	–	/* Some day, all these lists will be consolidated *sigh* */
740	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
741	–
742	–	assert(dlinkFind(&unknown_list, client_p));
743	–
744	–	dlink_move_node(&client_p->localClient->lclient_node,
745	–	&unknown_list, &serv_list);
746	–
747	–	Count.myserver++;
748	–
749	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
750	–	hash_add_client(client_p);
751	–	hash_add_id(client_p);
752	–
753	–	/* doesnt duplicate client_p->serv if allocated this struct already */
754	–	make_server(client_p);
755	–
756	–	/* fixing eob timings.. -gnp */
757	–	client_p->localClient->firsttime = CurrentTime;
758	–
759	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
760	–	AddFlag(client_p, FLAGS_SERVICE);
761	–
762	–	/* Show the real host/IP to admins */
763	–	#ifdef HAVE_LIBCRYPTO
764	–	if (client_p->localClient->fd.ssl)
765	–	{
766	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
767	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
768	–
769	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
770	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
771	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
772	–	compression ? SSL_COMP_get_name(compression) : "NONE",
773	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
774	–	show_capabilities(client_p));
775	–	/* Now show the masked hostname/IP to opers */
776	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
777	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
778	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
779	–	compression ? SSL_COMP_get_name(compression) : "NONE",
780	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
781	–	show_capabilities(client_p));
782	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
783	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
784	–	compression ? SSL_COMP_get_name(compression) : "NONE",
785	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
786	–	show_capabilities(client_p));
787	–	}
788	–	else
789	–	#endif
790	–	{
791	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
792	–	"Link with %s established: (Capabilities: %s)",
793	–	inpath_ip, show_capabilities(client_p));
794	–	/* Now show the masked hostname/IP to opers */
795	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
796	–	"Link with %s established: (Capabilities: %s)",
797	–	inpath, show_capabilities(client_p));
798	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
799	–	inpath_ip, show_capabilities(client_p));
800	–	}
801	–
802	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
803	–
804	–	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
805	–	me.id, client_p->name, client_p->id,
806	–	IsHidden(client_p) ? "(H) " : "", client_p->info);
807	–
808	–	/*
809	–	* Pass on my client information to the new server
810	–	*
811	–	* First, pass only servers (idea is that if the link gets
812	–	* cancelled beacause the server was already there,
813	–	* there are no NICK's to be cancelled...). Of course,
814	–	* if cancellation occurs, all this info is sent anyway,
815	–	* and I guess the link dies when a read is attempted...? --msa
816	–	*
817	–	* Note: Link cancellation to occur at this point means
818	–	* that at least two servers from my fragment are building
819	–	* up connection this other fragment at the same time, it's
820	–	* a race condition, not the normal way of operation...
821	–	*
822	–	* ALSO NOTE: using the get_client_name for server names--
823	–	*    see previous *WARNING*!!! (Also, original inpath
824	–	*    is destroyed...)
825	–	*/
826	–
827	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
828	–	{
829	–	struct Client *target_p = ptr->data;
830	–
831	–	/* target_p->from == target_p for target_p == client_p */
832	–	if (IsMe(target_p) || target_p->from == client_p)
833	–	continue;
834	–
835	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
836	–	target_p->servptr->id, target_p->name, target_p->hopcount+1,
837	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
838	–	target_p->info);
839	–
840	–	if (HasFlag(target_p, FLAGS_EOB))
841	–	sendto_one(client_p, ":%s EOB", target_p->id, client_p);
842	–	}
843	–
844	–	server_burst(client_p);
845	–	}
846	–
847	–	/* server_burst()
848	–	*
849	–	* inputs       - struct Client pointer server
850	–	*              -
851	–	* output       - none
852	–	* side effects - send a server burst
853	–	* bugs         - still too long
854	–	*/
855	–	static void
856	–	server_burst(struct Client *client_p)
857	–	{
858	–	/* Send it in the shortened format with the TS, if
859	–	** it's a TS server; walk the list of channels, sending
860	–	** all the nicks that haven't been sent yet for each
861	–	** channel, then send the channel itself -- it's less
862	–	** obvious than sending all nicks first, but on the
863	–	** receiving side memory will be allocated more nicely
864	–	** saving a few seconds in the handling of a split
865	–	** -orabidoo
866	–	*/
867	–
868	–	burst_all(client_p);
869	–
870	–	/* EOB stuff is now in burst_all */
871	–	/* Always send a PING after connect burst is done */
872	–	sendto_one(client_p, "PING :%s", me.id);
873	–	}
874	–
875	–	/* burst_all()
876	–	*
877	–	* inputs       - pointer to server to send burst to
878	–	* output       - NONE
879	–	* side effects - complete burst of channels/nicks is sent to client_p
880	–	*/
881	–	static void
882	–	burst_all(struct Client *client_p)
883	–	{
884	–	dlink_node *ptr = NULL;
885	–
886	–	DLINK_FOREACH(ptr, global_channel_list.head)
887	–	{
888	–	struct Channel *chptr = ptr->data;
889	–
890	–	if (dlink_list_length(&chptr->members))
891	–	{
892	–	burst_members(client_p, chptr);
893	–	send_channel_modes(client_p, chptr);
894	–
895	–	if (IsCapable(client_p, CAP_TBURST))
896	–	send_tb(client_p, chptr);
897	–	}
898	–	}
899	–
900	–	/* also send out those that are not on any channel
901	–	*/
902	–	DLINK_FOREACH(ptr, global_client_list.head)
903	–	{
904	–	struct Client *target_p = ptr->data;
905	–
906	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
907	–	sendnick_TS(client_p, target_p);
908	–
909	–	DelFlag(target_p, FLAGS_BURSTED);
910	–	}
911	–
912	–	if (IsCapable(client_p, CAP_EOB))
913	–	sendto_one(client_p, ":%s EOB", me.id);
914	–	}
915	–
916	–	/*
917	–	* send_tb
918	–	*
919	–	* inputs       - pointer to Client
920	–	*              - pointer to channel
921	–	* output       - NONE
922	–	* side effects - Called on a server burst when
923	–	*                server is CAP_TBURST capable
924	–	*/
925	–	static void
926	–	send_tb(struct Client *client_p, struct Channel *chptr)
927	–	{
928	–	/*
929	–	* We may also send an empty topic here, but only if topic_time isn't 0,
930	–	* i.e. if we had a topic that got unset.  This is required for syncing
931	–	* topics properly.
932	–	*
933	–	* Imagine the following scenario: Our downlink introduces a channel
934	–	* to us with a TS that is equal to ours, but the channel topic on
935	–	* their side got unset while the servers were in splitmode, which means
936	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
937	–	* deal with it in a more sophisticated fashion instead of just resetting
938	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
939	–	* for further information   -Michael
940	–	*/
941	–	if (chptr->topic_time)
942	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s", me.id,
943	–	(unsigned long)chptr->channelts, chptr->chname,
944	–	(unsigned long)chptr->topic_time,
945	–	chptr->topic_info,
946	–	chptr->topic);
947	–	}
948	–
949	–	/* burst_members()
950	–	*
951	–	* inputs       - pointer to server to send members to
952	–	*              - dlink_list pointer to membership list to send
953	–	* output       - NONE
954	–	* side effects -
955	–	*/
956	–	static void
957	–	burst_members(struct Client *client_p, struct Channel *chptr)
958	–	{
959	–	struct Client *target_p;
960	–	struct Membership *ms;
961	–	dlink_node *ptr;
962	–
963	–	DLINK_FOREACH(ptr, chptr->members.head)
964	–	{
965	–	ms       = ptr->data;
966	–	target_p = ms->client_p;
967	–
968	–	if (!HasFlag(target_p, FLAGS_BURSTED))
969	–	{
970	–	AddFlag(target_p, FLAGS_BURSTED);
971	–
972	–	if (target_p->from != client_p)
973	–	sendnick_TS(client_p, target_p);
974	–	}
975	–	}
976	–	}
977	–
479		/* New server connection code
480		* Based upon the stuff floating about in s_bsd.c
481		*   -- adrian
#	Line 1008 | Line 509 | serv_connect(struct MaskItem *conf, stru
509		/* Make sure conf is useful */
510		assert(conf);
511
512	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
512	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
513		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
514		ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
515		buf);
#	Line 1016 | Line 517 | serv_connect(struct MaskItem *conf, stru
517		/* Still processing a DNS lookup? -> exit */
518		if (conf->dns_pending)
519		{
520	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
520	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
521		"Error connecting to %s: DNS lookup for connect{} in progress.",
522		conf->name);
523		return 0;
#	Line 1024 | Line 525 | serv_connect(struct MaskItem *conf, stru
525
526		if (conf->dns_failed)
527		{
528	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
528	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
529		"Error connecting to %s: DNS lookup for connect{} failed.",
530		conf->name);
531		return 0;
532		}
533
534	<	/* Make sure this server isn't already connected
535	<	* Note: conf should ALWAYS be a valid C: line
534	>	/*
535	>	* Make sure this server isn't already connected.
536	>	* Note: conf should ALWAYS be a valid connect {} block
537		*/
538		if ((client_p = hash_find_server(conf->name)))
539		{
540	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
540	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
541		"Server %s already present from %s",
542	<	conf->name, get_client_name(client_p, SHOW_IP));
543	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
542	>	conf->name, client_get_name(client_p, SHOW_IP));
543	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
544		"Server %s already present from %s",
545	<	conf->name, get_client_name(client_p, MASK_IP));
545	>	conf->name, client_get_name(client_p, MASK_IP));
546		if (by && IsClient(by) && !MyClient(by))
547		sendto_one_notice(by, &me, ":Server %s already present from %s",
548	<	conf->name, get_client_name(client_p, MASK_IP));
548	>	conf->name, client_get_name(client_p, MASK_IP));
549		return 0;
550		}
551
552		/* Create a local client */
553	<	client_p = make_client(NULL);
553	>	client_p = client_make(NULL);
554
555		/* Copy in the server, hostname, fd */
556		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
#	Line 1057 | Line 559 | serv_connect(struct MaskItem *conf, stru
559		/* We already converted the ip once, so lets use it - stu */
560		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
561
562	<	/* create a socket for the server connection */
563	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1062	<	SOCK_STREAM, 0, NULL) < 0)
562	>	/* Create a socket for the server connection */
563	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
564		{
565		/* Eek, failure to create the socket */
566	<	report_error(L_ALL, "opening stream socket to %s: %s",
567	<	conf->name, errno);
566	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
567	>
568		SetDead(client_p);
569		exit_client(client_p, "Connection failed");
570		return 0;
571		}
572
573	<	/* servernames are always guaranteed under HOSTLEN chars */
574	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
573	>	/* Server names are always guaranteed under HOSTLEN chars */
574	>	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
575
576	<	/* Attach config entries to client here rather than in
577	<	* serv_connect_callback(). This to avoid null pointer references.
576	>	/*
577	>	* Attach config entries to client here rather than in serv_connect_callback().
578	>	* This to avoid null pointer references.
579		*/
580		if (!attach_connect_block(client_p, conf->name, conf->host))
581		{
582	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
583	<	"Host %s is not enabled for connecting: no connect{} block",
582	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
583	>	"Host %s is not enabled for connecting: no connect {} block",
584		conf->name);
585		if (by && IsClient(by) && !MyClient(by))
586	<	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
586	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
587
588		SetDead(client_p);
589		exit_client(client_p, "Connection failed");
590		return 0;
591		}
592
593	<	/* at this point we have a connection in progress and C/N lines
594	<	* attached to the client, the socket info should be saved in the
595	<	* client and it should either be resolved or have a valid address.
593	>	/*
594	>	* At this point we have a connection in progress and a connect {} block
595	>	* attached to the client, the socket info should be saved in the client
596	>	* and it should either be resolved or have a valid address.
597		*
598		* The socket has been connected or connect is in progress.
599		*/
#	Line 1102 | Line 605 | serv_connect(struct MaskItem *conf, stru
605		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
606
607		SetConnecting(client_p);
608	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1106	<	/* from def_fam */
1107	<	client_p->localClient->aftype = conf->aftype;
608	>	client_p->connection->aftype = conf->aftype;
609
610		/* Now, initiate the connection */
611		/* XXX assume that a non 0 type means a specific bind address
#	Line 1121 | Line 622 | serv_connect(struct MaskItem *conf, stru
622		ipn.ss.ss_family = AF_INET;
623		ipn.ss_port = 0;
624		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
625	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
625	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
626		(struct sockaddr *)&ipn, ipn.ss_len,
627		serv_connect_callback, client_p, conf->aftype,
628		CONNECTTIMEOUT);
629		}
630	<	else if (ServerInfo.specific_ipv4_vhost)
630	>	else if (ConfigServerInfo.specific_ipv4_vhost)
631		{
632		struct irc_ssaddr ipn;
633		memset(&ipn, 0, sizeof(struct irc_ssaddr));
634		ipn.ss.ss_family = AF_INET;
635		ipn.ss_port = 0;
636	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
637	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
636	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
637	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
638		(struct sockaddr *)&ipn, ipn.ss_len,
639		serv_connect_callback, client_p, conf->aftype,
640		CONNECTTIMEOUT);
641		}
642		else
643	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
643	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
644		NULL, 0, serv_connect_callback, client_p, conf->aftype,
645		CONNECTTIMEOUT);
646		break;
1146	–	#ifdef IPV6
647		case AF_INET6:
648		{
649		struct irc_ssaddr ipn;
#	Line 1159 | Line 659 | serv_connect(struct MaskItem *conf, stru
659		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
660		ipn.ss.ss_family = AF_INET6;
661		ipn.ss_port = 0;
662	<	comm_connect_tcp(&client_p->localClient->fd,
662	>	comm_connect_tcp(&client_p->connection->fd,
663		conf->host, conf->port,
664		(struct sockaddr *)&ipn, ipn.ss_len,
665		serv_connect_callback, client_p,
666		conf->aftype, CONNECTTIMEOUT);
667		}
668	<	else if (ServerInfo.specific_ipv6_vhost)
668	>	else if (ConfigServerInfo.specific_ipv6_vhost)
669		{
670	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
670	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
671		ipn.ss.ss_family = AF_INET6;
672		ipn.ss_port = 0;
673	<	comm_connect_tcp(&client_p->localClient->fd,
673	>	comm_connect_tcp(&client_p->connection->fd,
674		conf->host, conf->port,
675		(struct sockaddr *)&ipn, ipn.ss_len,
676		serv_connect_callback, client_p,
677		conf->aftype, CONNECTTIMEOUT);
678		}
679		else
680	<	comm_connect_tcp(&client_p->localClient->fd,
680	>	comm_connect_tcp(&client_p->connection->fd,
681		conf->host, conf->port,
682		NULL, 0, serv_connect_callback, client_p,
683		conf->aftype, CONNECTTIMEOUT);
684		}
1185	–	#endif
685		}
686	+
687		return 1;
688		}
689
1190	–	#ifdef HAVE_LIBCRYPTO
690		static void
691		finish_ssl_server_handshake(struct Client *client_p)
692		{
693	<	struct MaskItem *conf = NULL;
694	<
695	<	conf = find_conf_name(&client_p->localClient->confs,
696	<	client_p->name, CONF_SERVER);
697	<	if (conf == NULL)
698	<	{
699	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
700	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1202	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1203	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
693	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
694	>	client_p->name, CONF_SERVER);
695	>	if (!conf)
696	>	{
697	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
698	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
699	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
700	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
701
702		exit_client(client_p, "Lost connect{} block");
703		return;
704		}
705
706	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
706	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
707
708	<	send_capabilities(client_p, 0);
708	>	sendto_one(client_p, "CAPAB :%s", get_capabilities(NULL));
709
710		sendto_one(client_p, "SERVER %s 1 :%s%s",
711		me.name, ConfigServerHide.hidden ? "(H) " : "",
712		me.info);
713
714	<	/* If we've been marked dead because a send failed, just exit
714	>	/*
715	>	* If we've been marked dead because a send failed, just exit
716		* here now and save everyone the trouble of us ever existing.
717		*/
718		if (IsDead(client_p))
719		{
720	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
721	<	"%s[%s] went dead during handshake",
722	<	client_p->name,
723	<	client_p->host);
724	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1227	<	"%s went dead during handshake", client_p->name);
1228	<	return;
720	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
721	>	"%s went dead during handshake", client_get_name(client_p, SHOW_IP));
722	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
723	>	"%s went dead during handshake", client_get_name(client_p, MASK_IP));
724	>	return;
725		}
726
727		/* don't move to serv_list yet -- we haven't sent a burst! */
728		/* If we get here, we're ok, so lets start reading some data */
729	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
729	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
730		}
731
732		static void
733	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
733	>	ssl_server_handshake(fde_t *fd, void *data)
734		{
735	<	X509 *cert = NULL;
736	<	int ret = 0;
735	>	struct Client *client_p = data;
736	>	const char *sslerr = NULL;
737
738	<	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
738	>	tls_handshake_status_t ret = tls_handshake(&client_p->connection->fd.ssl, TLS_ROLE_CLIENT, &sslerr);
739	>	if (ret != TLS_HANDSHAKE_DONE)
740		{
741	<	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
741	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
742		{
743	<	case SSL_ERROR_WANT_WRITE:
744	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
745	<	(PF *)ssl_server_handshake, client_p, 0);
743	>	exit_client(client_p, "Timeout during TLS handshake");
744	>	return;
745	>	}
746	>
747	>	switch (ret)
748	>	{
749	>	case TLS_HANDSHAKE_WANT_WRITE:
750	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
751	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
752		return;
753	<	case SSL_ERROR_WANT_READ:
754	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
755	<	(PF *)ssl_server_handshake, client_p, 0);
753	>	case TLS_HANDSHAKE_WANT_READ:
754	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
755	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
756		return;
757		default:
758		{
759	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1257	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
759	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
760		"Error connecting to %s: %s", client_p->name,
761	<	sslerr ? sslerr : "unknown SSL error");
762	<	exit_client(client_p, "Error during SSL handshake");
761	>	sslerr ? sslerr : "unknown TLS error");
762	>	exit_client(client_p, "Error during TLS handshake");
763		return;
764		}
765		}
766		}
767
768	<	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1267	<	{
1268	<	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1269	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1270	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1271	<
1272	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1273	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1274	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1275	<	{
1276	<	unsigned int i = 0, n = 0;
768	>	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
769
770	<	if (X509_digest(cert, EVP_sha256(), md, &n))
771	<	{
772	<	for (; i < n; ++i)
1281	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1282	<	client_p->certfp = xstrdup(buf);
1283	<	}
1284	<	}
1285	<	else
1286	<	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1287	<	client_p->name, client_p->username, client_p->host, res);
1288	<	X509_free(cert);
1289	<	}
770	>	if (!tls_verify_cert(&client_p->connection->fd.ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp))
771	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
772	>	client_p->name, client_p->username, client_p->host);
773
774		finish_ssl_server_handshake(client_p);
775		}
776
777		static void
778	<	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
778	>	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
779		{
780	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
780	>	if (!tls_new(&client_p->connection->fd.ssl, fd->fd, TLS_ROLE_CLIENT))
781		{
1299	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1300	–	ERR_error_string(ERR_get_error(), NULL));
782		SetDead(client_p);
783	<	exit_client(client_p, "SSL_new failed");
783	>	exit_client(client_p, "TLS context initialization failed");
784		return;
785		}
786
1306	–	SSL_set_fd(fd->ssl, fd->fd);
1307	–
787		if (!EmptyString(conf->cipher_list))
788	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
788	>	tls_set_ciphers(&client_p->connection->fd.ssl, conf->cipher_list);
789
790		ssl_server_handshake(NULL, client_p);
791		}
1313	–	#endif
792
793		/* serv_connect_callback() - complete a server connection.
794		*
#	Line 1323 | Line 801 | ssl_connect_init(struct Client *client_p
801		static void
802		serv_connect_callback(fde_t *fd, int status, void *data)
803		{
804	<	struct Client *client_p = data;
1327	<	struct MaskItem *conf = NULL;
804	>	struct Client *const client_p = data;
805
806	<	/* First, make sure its a real client! */
806	>	/* First, make sure it's a real client! */
807		assert(client_p);
808	<	assert(&client_p->localClient->fd == fd);
808	>	assert(&client_p->connection->fd == fd);
809
810		/* Next, for backward purposes, record the ip of the server */
811	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
1335	<	sizeof(struct irc_ssaddr));
811	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr, sizeof(struct irc_ssaddr));
812
813		/* Check the status */
814		if (status != COMM_OK)
815		{
816	<	/* We have an error, so report it and quit
817	<	* Admins get to see any IP, mere opers don't *sigh*
816	>	/* We have an error, so report it and quit */
817	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
818	>	"Error connecting to %s: %s",
819	>	client_get_name(client_p, SHOW_IP), comm_errstr(status));
820	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
821	>	"Error connecting to %s: %s",
822	>	client_get_name(client_p, MASK_IP), comm_errstr(status));
823	>
824	>	/*
825	>	* If a fd goes bad, call dead_link() the socket is no
826	>	* longer valid for reading or writing.
827		*/
828	<	if (ConfigServerHide.hide_server_ips)
829	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1345	<	"Error connecting to %s: %s",
1346	<	client_p->name, comm_errstr(status));
1347	<	else
1348	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1349	<	"Error connecting to %s[%s]: %s", client_p->name,
1350	<	client_p->host, comm_errstr(status));
1351	<
1352	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1353	<	"Error connecting to %s: %s",
1354	<	client_p->name, comm_errstr(status));
1355	<
1356	<	/* If a fd goes bad, call dead_link() the socket is no
1357	<	* longer valid for reading or writing.
1358	<	*/
1359	<	dead_link_on_write(client_p, 0);
1360	<	return;
828	>	dead_link_on_write(client_p, 0);
829	>	return;
830		}
831
832		/* COMM_OK, so continue the connection procedure */
833	<	/* Get the C/N lines */
834	<	conf = find_conf_name(&client_p->localClient->confs,
835	<	client_p->name, CONF_SERVER);
836	<	if (conf == NULL)
837	<	{
838	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
839	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
840	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
841	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
833	>	/* Get the connect {} block */
834	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
835	>	client_p->name, CONF_SERVER);
836	>	if (!conf)
837	>	{
838	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
839	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
840	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
841	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
842
843		exit_client(client_p, "Lost connect{} block");
844		return;
#	Line 1378 | Line 847 | serv_connect_callback(fde_t *fd, int sta
847		/* Next, send the initial handshake */
848		SetHandshake(client_p);
849
1381	–	#ifdef HAVE_LIBCRYPTO
850		if (IsConfSSL(conf))
851		{
852		ssl_connect_init(client_p, conf, fd);
853		return;
854		}
1387	–	#endif
855
856	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
856	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
857
858	<	send_capabilities(client_p, 0);
858	>	sendto_one(client_p, "CAPAB :%s", get_capabilities(NULL));
859
860		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
861		ConfigServerHide.hidden ? "(H) " : "", me.info);
862
863	<	/* If we've been marked dead because a send failed, just exit
863	>	/*
864	>	* If we've been marked dead because a send failed, just exit
865		* here now and save everyone the trouble of us ever existing.
866		*/
867		if (IsDead(client_p))
868		{
869	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
870	<	"%s[%s] went dead during handshake",
871	<	client_p->name,
872	<	client_p->host);
873	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1406	<	"%s went dead during handshake", client_p->name);
1407	<	return;
869	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
870	>	"%s went dead during handshake", client_get_name(client_p, SHOW_IP));
871	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
872	>	"%s went dead during handshake", client_get_name(client_p, MASK_IP));
873	>	return;
874		}
875
876		/* don't move to serv_list yet -- we haven't sent a burst! */
#	Line 1416 | Line 882 | struct Client *
882		find_servconn_in_progress(const char *name)
883		{
884		dlink_node *ptr;
1419	–	struct Client *cptr;
885
886		DLINK_FOREACH(ptr, unknown_list.head)
887		{
888	<	cptr = ptr->data;
888	>	struct Client *cptr = ptr->data;
889
890	<	if (cptr && cptr->name[0])
891	<	if (!match(name, cptr->name))
890	>	if (cptr->name[0])
891	>	if (!irccmp(name, cptr->name))
892		return cptr;
893		}
894

Comparing:
ircd-hybrid/trunk/src/s_serv.c (property svn:keywords), Revision 3246 by michael, Sun Mar 30 17:37:13 2014 UTC vs.
ircd-hybrid/trunk/src/server.c (property svn:keywords), Revision 7997 by michael, Tue Mar 14 13:17:52 2017 UTC

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

Diff Legend

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