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 2691 by michael, Tue Dec 17 18:55:59 2013 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 7973 by michael, Mon Mar 13 22:05:51 2017 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_serv.c: Server related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
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 16 | 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	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_serv.c
23	>	* \brief Server related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
26	–	#ifdef HAVE_LIBCRYPTO
27	–	#include <openssl/rsa.h>
28	–	#include "rsa.h"
29	–	#endif
28		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
29		#include "client.h"
34	–	#include "dbuf.h"
30		#include "event.h"
36	–	#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"
42	–	#include "numeric.h"
36		#include "packet.h"
44	–	#include "irc_res.h"
37		#include "conf.h"
38	<	#include "s_serv.h"
38	>	#include "server.h"
39		#include "log.h"
48	–	#include "s_misc.h"
49	–	#include "s_user.h"
40		#include "send.h"
41		#include "memory.h"
52	–	#include "channel.h" /* chcap_usage_counts stuff...*/
42		#include "parse.h"
43
55	–	#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 *);
60	<	static void burst_all(struct Client *);
61	<	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
63	–	static CNCB serv_connect_callback;
64	–
65	–	static void burst_members(struct Client *, struct Channel *);
49
50		/*
51		* write_links_file
#	Line 73 | 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 126 | 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 ((file = fopen(LIPATH, "r")) == NULL)
121	>	if (EmptyString(ConfigServerHide.flatten_links_file))
122		return;
123
124	+	if ((file = fopen(ConfigServerHide.flatten_links_file, "r")) == NULL)
125	+	{
126	+	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
127	+	strerror(errno));
128	+	return;
129	+	}
130	+
131		while (fgets(buff, sizeof(buff), file))
132		{
133	<	if ((p = strchr(buff, '\n')) != NULL)
133	>	if ((p = strchr(buff, '\n')))
134		*p = '\0';
135
136		dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
#	Line 142 | 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 161 | Line 158 | read_links_file(void)
158		*
159		*      returns: (see #defines)
160		*/
161	<	int
162	<	hunt_server(struct Client *client_p, 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;
171	<	int wilds;
165	>	static struct server_hunt hunt;
166	>	struct server_hunt *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->ret = HUNTED_ISME;
173	>	h->target_p = &me;
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
187	<	target_p = find_person(client_p, parv[server]);
188	<
189	<	if (target_p)
190	<	if (target_p->from == source_p->from && !MyConnect(target_p))
191	<	target_p = NULL;
192	<
193	<	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
194	<	if (target_p->from == source_p->from && !MyConnect(target_p))
195	<	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	<	wilds = has_wildcards(parv[server]);
198	<
199	<	/* Again, if there are no wild cards involved in the server
200	<	* name, use the hash lookup
201	<	*/
202	<	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(source_p, form_str(ERR_NOSUCHSERVER),
199	<	me.name, source_p->name, parv[server]);
200	<	return HUNTED_NOSUCH;
198	>	if (tmp->from == source_p->from && !MyConnect(tmp))
199	>	continue;
200	>
201	>	h->target_p = node->data;
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 != client_p))
219	<	break;
218	>	h->target_p = node->data;
219	>	break;
220		}
221		}
222		}
223		}
224
225	<	if (target_p != NULL)
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(source_p, form_str(ERR_NOSUCHSERVER),
231	<	me.name, source_p->name, parv[server]);
238	<	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;
243	<
244	<	if (match(target_p->name, parv[server]))
245	<	parv[server] = target_p->name;
246	<
247	<	/* This is a little kludgy but should work... */
248	<	if (IsClient(source_p) &&
249	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
250	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
251	<	parv[0] = ID(source_p);
252	<
253	<	sendto_one(target_p, command, parv[0],
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(source_p, form_str(ERR_NOSUCHSERVER),
243	<	me.name, source_p->name, parv[server]);
244	<	return HUNTED_NOSUCH;
242	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
243	>	h->ret = HUNTED_NOSUCH;
244	>	return h;
245		}
246
247		/* try_connections()
#	Line 274 | Line 257 | hunt_server(struct Client *client_p, str
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *ptr = NULL;
278	<	struct MaskItem *conf;
279	<	int confrq;
260	>	dlink_node *node = NULL;
261
281	–	/* 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
271	<	/* Also when already connecting! (update holdtimes) --SRB
272	<	*/
293	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
271	>	/* Also when already connecting! (update holdtimes) --SRB */
272	>	if (!conf->port || !IsConfAllowAutoConn(conf))
273		continue;
274
275	<
276	<	/* Skip this entry if the use of it is still on hold until
275	>	/*
276	>	* Skip this entry if the use of it is still on hold until
277		* future. Otherwise handle this entry (and set it on hold
278		* until next time). Will reset only hold times, if already
279		* made one successfull connection... [this algorithm is
#	Line 303 | Line 282 | try_connections(void *unused)
282		if (conf->until > CurrentTime)
283		continue;
284
285	<	if (conf->class == NULL)
307	<	confrq = DEFAULT_CONNECTFREQUENCY;
308	<	else
309	<	{
310	<	confrq = conf->class->con_freq;
311	<	if (confrq < MIN_CONN_FREQ)
312	<	confrq = MIN_CONN_FREQ;
313	<	}
285	>	assert(conf->class);
286
287	<	conf->until = CurrentTime + confrq;
287	>	conf->until = CurrentTime + conf->class->con_freq;
288
289	<	/* Found a CONNECT config with port specified, scan clients
289	>	/*
290	>	* Found a CONNECT config with port specified, scan clients
291		* and see if this server is already connected?
292		*/
293	<	if (hash_find_server(conf->name) != NULL)
293	>	if (hash_find_server(conf->name))
294		continue;
295
296		if (conf->class->ref_count < conf->class->max_total)
297		{
298	<	/* Go to the end of the list, if not already last */
299	<	if (ptr->next != NULL)
298	>	/* Move this entry to the end of the list, if not already last */
299	>	if (node->next)
300		{
301	<	dlinkDelete(ptr, &server_items);
302	<	dlinkAddTail(conf, &conf->node, &server_items);
301	>	dlinkDelete(node, &connect_items);
302	>	dlinkAddTail(conf, &conf->node, &connect_items);
303		}
304
305		if (find_servconn_in_progress(conf->name))
306		return;
307
308	<	/* We used to only print this if serv_connect() actually
308	>	/*
309	>	* We used to only print this if serv_connect() actually
310		* succeeded, but since comm_tcp_connect() can call the callback
311		* immediately if there is an error, we were getting error messages
312		* in the wrong order. SO, we just print out the activated line,
#	Line 341 | Line 315 | try_connections(void *unused)
315		*   -- adrian
316		*/
317		if (ConfigServerHide.hide_server_ips)
318	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
318	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
319		"Connection to %s activated.",
320		conf->name);
321		else
322	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
322	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
323		"Connection to %s[%s] activated.",
324		conf->name, conf->host);
325
#	Line 359 | Line 333 | try_connections(void *unused)
333		int
334		valid_servname(const char *name)
335		{
336	<	unsigned int length = 0;
363	<	unsigned int dots   = 0;
336	>	unsigned int dots = 0;
337		const char *p = name;
338
339		for (; *p; ++p)
#	Line 368 | Line 341 | valid_servname(const char *name)
341		if (!IsServChar(*p))
342		return 0;
343
371	–	++length;
372	–
344		if (*p == '.')
345		++dots;
346		}
347
348	<	return dots != 0 && length <= HOSTLEN;
348	>	return dots && (p - name) <= HOSTLEN;
349		}
350
351	<	int
352	<	check_server(const char *name, struct Client *client_p)
351	>	/* server_capab_init()
352	>	*
353	>	* inputs       - none
354	>	* output       - none
355	>	*/
356	>	void
357	>	server_capab_init(void)
358		{
359	<	dlink_node *ptr;
360	<	struct MaskItem *conf        = NULL;
361	<	struct MaskItem *server_conf = NULL;
362	<	int error = -1;
363	<
364	<	assert(client_p != NULL);
389	<
390	<	/* loop through looking for all possible connect items that might work */
391	<	DLINK_FOREACH(ptr, server_items.head)
392	<	{
393	<	conf = ptr->data;
394	<
395	<	if (match(name, conf->name))
396	<	continue;
397	<
398	<	error = -3;
399	<
400	<	/* XXX: Fix me for IPv6                    */
401	<	/* XXX sockhost is the IPv4 ip as a string */
402	<	if (!match(conf->host, client_p->host) ||
403	<	!match(conf->host, client_p->sockhost))
404	<	{
405	<	error = -2;
406	<
407	<	if (!match_conf_password(client_p->localClient->passwd, conf))
408	<	return -2;
409	<
410	<	if (!EmptyString(conf->certfp))
411	<	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
412	<	return -4;
413	<
414	<	server_conf = conf;
415	<	}
416	<	}
417	<
418	<	if (server_conf == NULL)
419	<	return error;
420	<
421	<	attach_conf(client_p, server_conf);
422	<
423	<
424	<	if (server_conf != NULL)
425	<	{
426	<	struct sockaddr_in *v4;
427	<	#ifdef IPV6
428	<	struct sockaddr_in6 *v6;
429	<	#endif
430	<	switch (server_conf->aftype)
431	<	{
432	<	#ifdef IPV6
433	<	case AF_INET6:
434	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
435	<
436	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
437	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
438	<	break;
439	<	#endif
440	<	case AF_INET:
441	<	v4 = (struct sockaddr_in *)&server_conf->addr;
442	<
443	<	if (v4->sin_addr.s_addr == INADDR_NONE)
444	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
445	<	break;
446	<	}
447	<	}
448	<
449	<	return 0;
359	>	add_capability("QS", CAPAB_QS);
360	>	add_capability("EOB", CAPAB_EOB);
361	>	add_capability("CLUSTER", CAPAB_CLUSTER);
362	>	add_capability("SVS", CAPAB_SVS);
363	>	add_capability("CHW", CAPAB_CHW);
364	>	add_capability("HOPS", CAPAB_HOPS);
365		}
366
367		/* add_capability()
#	Line 459 | Line 374 | check_server(const char *name, struct Cl
374		*                modules to dynamically add or subtract their capability.
375		*/
376		void
377	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
377	>	add_capability(const char *name, unsigned int flag)
378		{
379	<	struct Capability *cap = MyMalloc(sizeof(*cap));
465	<
466	<	cap->name = xstrdup(capab_name);
467	<	cap->cap = cap_flag;
468	<	dlinkAdd(cap, &cap->node, &cap_list);
379	>	struct Capability *cap = xcalloc(sizeof(*cap));
380
381	<	if (add_to_default)
382	<	default_server_capabs |= cap_flag;
381	>	cap->name = xstrdup(name);
382	>	cap->cap = flag;
383	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
384		}
385
386		/* delete_capability()
#	Line 477 | Line 389 | add_capability(const char *capab_name, i
389		* output       - NONE
390		* side effects - delete given capability from ones known.
391		*/
392	<	int
393	<	delete_capability(const char *capab_name)
392	>	void
393	>	delete_capability(const char *name)
394		{
395	<	dlink_node *ptr;
484	<	dlink_node *next_ptr;
485	<	struct Capability *cap;
395	>	dlink_node *node = NULL, *node_next = NULL;
396
397	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
397	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
398		{
399	<	cap = ptr->data;
399	>	struct Capability *cap = node->data;
400
401	<	if (cap->cap != 0)
401	>	if (!irccmp(cap->name, name))
402		{
403	<	if (irccmp(cap->name, capab_name) == 0)
404	<	{
405	<	default_server_capabs &= ~(cap->cap);
496	<	dlinkDelete(ptr, &cap_list);
497	<	MyFree(cap->name);
498	<	MyFree(cap);
499	<	}
403	>	dlinkDelete(node, &server_capabilities_list);
404	>	xfree(cap->name);
405	>	xfree(cap);
406		}
407		}
502	–
503	–	return 0;
408		}
409
410		/*
#	Line 511 | Line 415 | delete_capability(const char *capab_name
415		* side effects - none
416		*/
417		unsigned int
418	<	find_capability(const char *capab)
418	>	find_capability(const char *name)
419		{
420	<	const dlink_node *ptr = NULL;
420	>	dlink_node *node;
421
422	<	DLINK_FOREACH(ptr, cap_list.head)
422	>	DLINK_FOREACH(node, server_capabilities_list.head)
423		{
424	<	const struct Capability *cap = ptr->data;
424	>	const struct Capability *cap = node->data;
425
426	<	if (cap->cap && !irccmp(cap->name, capab))
426	>	if (!irccmp(cap->name, name))
427		return cap->cap;
428		}
429
430		return 0;
431		}
432
529	–	/* send_capabilities()
530	–	*
531	–	* inputs       - Client pointer to send to
532	–	*              - int flag of capabilities that this server can send
533	–	* output       - NONE
534	–	* side effects - send the CAPAB line to a server  -orabidoo
535	–	*
536	–	*/
537	–	void
538	–	send_capabilities(struct Client *client_p, int cap_can_send)
539	–	{
540	–	struct Capability *cap=NULL;
541	–	char msgbuf[IRCD_BUFSIZE];
542	–	char *t;
543	–	int tl;
544	–	dlink_node *ptr;
545	–
546	–	t = msgbuf;
547	–
548	–	DLINK_FOREACH(ptr, cap_list.head)
549	–	{
550	–	cap = ptr->data;
551	–
552	–	if (cap->cap & (cap_can_send|default_server_capabs))
553	–	{
554	–	tl = sprintf(t, "%s ", cap->name);
555	–	t += tl;
556	–	}
557	–	}
558	–
559	–	*(t - 1) = '\0';
560	–	sendto_one(client_p, "CAPAB :%s", msgbuf);
561	–	}
562	–
563	–	/* sendnick_TS()
564	–	*
565	–	* inputs       - client (server) to send nick towards
566	–	*          - client to send nick for
567	–	* output       - NONE
568	–	* side effects - NICK message is sent towards given client_p
569	–	*/
570	–	void
571	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
572	–	{
573	–	char ubuf[IRCD_BUFSIZE];
574	–
575	–	if (!IsClient(target_p))
576	–	return;
577	–
578	–	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
579	–
580	–	if (ubuf[0] == '\0')
581	–	{
582	–	ubuf[0] = '+';
583	–	ubuf[1] = '\0';
584	–	}
585	–
586	–	if (IsCapable(client_p, CAP_SVS))
587	–	{
588	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
589	–	sendto_one(client_p, ":%s UID %s %d %lu %s %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,
596	–	target_p->svid, target_p->info);
597	–	else
598	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
599	–	target_p->name, target_p->hopcount + 1,
600	–	(unsigned long) target_p->tsinfo,
601	–	ubuf, target_p->username, target_p->host,
602	–	target_p->servptr->name, target_p->svid,
603	–	target_p->info);
604	–	}
605	–	else
606	–	{
607	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
608	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
609	–	target_p->servptr->id,
610	–	target_p->name, target_p->hopcount + 1,
611	–	(unsigned long) target_p->tsinfo,
612	–	ubuf, target_p->username, target_p->host,
613	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
614	–	"0" : target_p->sockhost, target_p->id, target_p->info);
615	–	else
616	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
617	–	target_p->name, target_p->hopcount + 1,
618	–	(unsigned long) target_p->tsinfo,
619	–	ubuf, target_p->username, target_p->host,
620	–	target_p->servptr->name, target_p->info);
621	–	}
622	–
623	–	if (!EmptyString(target_p->certfp))
624	–	sendto_one(client_p, ":%s CERTFP %s",
625	–	ID_or_name(target_p, client_p), target_p->certfp);
626	–
627	–	if (target_p->away[0])
628	–	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
629	–	target_p->away);
630	–
631	–	}
632	–
433		/*
434		* show_capabilities - show current server capabilities
435		*
#	Line 638 | Line 438 | sendnick_TS(struct Client *client_p, str
438		* side effects - build up string representing capabilities of server listed
439		*/
440		const char *
441	<	show_capabilities(const struct Client *target_p)
441	>	get_capabilities(const struct Client *client_p)
442		{
443	<	static char msgbuf[IRCD_BUFSIZE] = "";
444	<	const dlink_node *ptr = NULL;
443	>	static char buf[IRCD_BUFSIZE] = "";
444	>	dlink_node *node;
445
446	<	strlcpy(msgbuf, "TS", sizeof(msgbuf));
446	>	buf[0] = '\0';
447
448	<	DLINK_FOREACH(ptr, cap_list.head)
448	>	DLINK_FOREACH(node, server_capabilities_list.head)
449		{
450	<	const struct Capability *cap = ptr->data;
450	>	const struct Capability *cap = node->data;
451
452	<	if (!IsCapable(target_p, cap->cap))
452	>	if (client_p && !IsCapable(client_p, cap->cap))
453		continue;
454
455	<	strlcat(msgbuf,       " ", sizeof(msgbuf));
456	<	strlcat(msgbuf, cap->name, sizeof(msgbuf));
455	>	strlcat(buf, cap->name, sizeof(buf));
456	>
457	>	if (node->next)
458	>	strlcat(buf, " ", sizeof(buf));
459		}
460
461	<	return msgbuf;
461	>	return buf;
462		}
463
464		/* make_server()
#	Line 670 | Line 472 | struct Server *
472		make_server(struct Client *client_p)
473		{
474		if (client_p->serv == NULL)
475	<	client_p->serv = MyMalloc(sizeof(struct Server));
475	>	client_p->serv = xcalloc(sizeof(struct Server));
476
477		return client_p->serv;
478		}
479
678	–	/* server_estab()
679	–	*
680	–	* inputs       - pointer to a struct Client
681	–	* output       -
682	–	* side effects -
683	–	*/
684	–	void
685	–	server_estab(struct Client *client_p)
686	–	{
687	–	struct Client *target_p;
688	–	struct MaskItem *conf = NULL;
689	–	char *host;
690	–	const char *inpath;
691	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
692	–	dlink_node *ptr;
693	–	#ifdef HAVE_LIBCRYPTO
694	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
695	–	#endif
696	–
697	–	assert(client_p != NULL);
698	–
699	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
700	–
701	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
702	–	host   = client_p->name;
703	–
704	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
705	–	== NULL)
706	–	{
707	–	/* This shouldn't happen, better tell the ops... -A1kmm */
708	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
709	–	"Warning: Lost connect{} block "
710	–	"for server %s(this shouldn't happen)!", host);
711	–	exit_client(client_p, &me, "Lost connect{} block!");
712	–	return;
713	–	}
714	–
715	–	MyFree(client_p->localClient->passwd);
716	–	client_p->localClient->passwd = NULL;
717	–
718	–	/* Its got identd, since its a server */
719	–	SetGotId(client_p);
720	–
721	–	/* If there is something in the serv_list, it might be this
722	–	* connecting server..
723	–	*/
724	–	if (!ServerInfo.hub && serv_list.head)
725	–	{
726	–	if (client_p != serv_list.head->data || serv_list.head->next)
727	–	{
728	–	++ServerStats.is_ref;
729	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
730	–	exit_client(client_p, &me, "I'm a leaf");
731	–	return;
732	–	}
733	–	}
734	–
735	–	if (IsUnknown(client_p))
736	–	{
737	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
738	–
739	–	send_capabilities(client_p, 0);
740	–
741	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
742	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
743	–	}
744	–
745	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
746	–	(unsigned long)CurrentTime);
747	–
748	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
749	–	if (IsCapable(client_p, CAP_TS6))
750	–	hash_add_id(client_p);
751	–
752	–	/* XXX Does this ever happen? I don't think so -db */
753	–	detach_conf(client_p, CONF_OPER);
754	–
755	–	/* *WARNING*
756	–	**    In the following code in place of plain server's
757	–	**    name we send what is returned by get_client_name
758	–	**    which may add the "sockhost" after the name. It's
759	–	**    *very* *important* that there is a SPACE between
760	–	**    the name and sockhost (if present). The receiving
761	–	**    server will start the information field from this
762	–	**    first blank and thus puts the sockhost into info.
763	–	**    ...a bit tricky, but you have been warned, besides
764	–	**    code is more neat this way...  --msa
765	–	*/
766	–	client_p->servptr = &me;
767	–
768	–	if (IsClosing(client_p))
769	–	return;
770	–
771	–	SetServer(client_p);
772	–
773	–	/* Update the capability combination usage counts. -A1kmm */
774	–	set_chcap_usage_counts(client_p);
775	–
776	–	/* Some day, all these lists will be consolidated *sigh* */
777	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
778	–
779	–	assert(dlinkFind(&unknown_list, client_p));
780	–
781	–	dlink_move_node(&client_p->localClient->lclient_node,
782	–	&unknown_list, &serv_list);
783	–
784	–	Count.myserver++;
785	–
786	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
787	–	hash_add_client(client_p);
788	–
789	–	/* doesnt duplicate client_p->serv if allocated this struct already */
790	–	make_server(client_p);
791	–
792	–	/* fixing eob timings.. -gnp */
793	–	client_p->localClient->firsttime = CurrentTime;
794	–
795	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
796	–	AddFlag(client_p, FLAGS_SERVICE);
797	–
798	–	/* Show the real host/IP to admins */
799	–	#ifdef HAVE_LIBCRYPTO
800	–	if (client_p->localClient->fd.ssl)
801	–	{
802	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
803	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
804	–
805	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
806	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
807	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
808	–	compression ? SSL_COMP_get_name(compression) : "NONE",
809	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
810	–	show_capabilities(client_p));
811	–	/* Now show the masked hostname/IP to opers */
812	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
813	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
814	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
815	–	compression ? SSL_COMP_get_name(compression) : "NONE",
816	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
817	–	show_capabilities(client_p));
818	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
819	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
820	–	compression ? SSL_COMP_get_name(compression) : "NONE",
821	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
822	–	show_capabilities(client_p));
823	–	}
824	–	else
825	–	#endif
826	–	{
827	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
828	–	"Link with %s established: (Capabilities: %s)",
829	–	inpath_ip, show_capabilities(client_p));
830	–	/* Now show the masked hostname/IP to opers */
831	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
832	–	"Link with %s established: (Capabilities: %s)",
833	–	inpath, show_capabilities(client_p));
834	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
835	–	inpath_ip, show_capabilities(client_p));
836	–	}
837	–
838	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
839	–
840	–	/* Old sendto_serv_but_one() call removed because we now
841	–	** need to send different names to different servers
842	–	** (domain name matching) Send new server to other servers.
843	–	*/
844	–	DLINK_FOREACH(ptr, serv_list.head)
845	–	{
846	–	target_p = ptr->data;
847	–
848	–	if (target_p == client_p)
849	–	continue;
850	–
851	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
852	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
853	–	me.id, client_p->name, client_p->id,
854	–	IsHidden(client_p) ? "(H) " : "",
855	–	client_p->info);
856	–	else
857	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
858	–	me.name, client_p->name,
859	–	IsHidden(client_p) ? "(H) " : "",
860	–	client_p->info);
861	–	}
862	–
863	–	/*
864	–	* Pass on my client information to the new server
865	–	*
866	–	* First, pass only servers (idea is that if the link gets
867	–	* cancelled beacause the server was already there,
868	–	* there are no NICK's to be cancelled...). Of course,
869	–	* if cancellation occurs, all this info is sent anyway,
870	–	* and I guess the link dies when a read is attempted...? --msa
871	–	*
872	–	* Note: Link cancellation to occur at this point means
873	–	* that at least two servers from my fragment are building
874	–	* up connection this other fragment at the same time, it's
875	–	* a race condition, not the normal way of operation...
876	–	*
877	–	* ALSO NOTE: using the get_client_name for server names--
878	–	*    see previous *WARNING*!!! (Also, original inpath
879	–	*    is destroyed...)
880	–	*/
881	–
882	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
883	–	{
884	–	target_p = ptr->data;
885	–
886	–	/* target_p->from == target_p for target_p == client_p */
887	–	if (IsMe(target_p) || target_p->from == client_p)
888	–	continue;
889	–
890	–	if (IsCapable(client_p, CAP_TS6))
891	–	{
892	–	if (HasID(target_p))
893	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
894	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
895	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
896	–	target_p->info);
897	–	else  /* introducing non-ts6 server */
898	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
899	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
900	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
901	–	}
902	–	else
903	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
904	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
905	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
906	–
907	–	if (HasFlag(target_p, FLAGS_EOB))
908	–	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
909	–	}
910	–
911	–	server_burst(client_p);
912	–	}
913	–
914	–	/* server_burst()
915	–	*
916	–	* inputs       - struct Client pointer server
917	–	*              -
918	–	* output       - none
919	–	* side effects - send a server burst
920	–	* bugs         - still too long
921	–	*/
922	–	static void
923	–	server_burst(struct Client *client_p)
924	–	{
925	–	/* Send it in the shortened format with the TS, if
926	–	** it's a TS server; walk the list of channels, sending
927	–	** all the nicks that haven't been sent yet for each
928	–	** channel, then send the channel itself -- it's less
929	–	** obvious than sending all nicks first, but on the
930	–	** receiving side memory will be allocated more nicely
931	–	** saving a few seconds in the handling of a split
932	–	** -orabidoo
933	–	*/
934	–
935	–	burst_all(client_p);
936	–
937	–	/* EOB stuff is now in burst_all */
938	–	/* Always send a PING after connect burst is done */
939	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
940	–	}
941	–
942	–	/* burst_all()
943	–	*
944	–	* inputs       - pointer to server to send burst to
945	–	* output       - NONE
946	–	* side effects - complete burst of channels/nicks is sent to client_p
947	–	*/
948	–	static void
949	–	burst_all(struct Client *client_p)
950	–	{
951	–	dlink_node *ptr = NULL;
952	–
953	–	DLINK_FOREACH(ptr, global_channel_list.head)
954	–	{
955	–	struct Channel *chptr = ptr->data;
956	–
957	–	if (dlink_list_length(&chptr->members) != 0)
958	–	{
959	–	burst_members(client_p, chptr);
960	–	send_channel_modes(client_p, chptr);
961	–
962	–	if (IsCapable(client_p, CAP_TBURST))
963	–	send_tb(client_p, chptr);
964	–	}
965	–	}
966	–
967	–	/* also send out those that are not on any channel
968	–	*/
969	–	DLINK_FOREACH(ptr, global_client_list.head)
970	–	{
971	–	struct Client *target_p = ptr->data;
972	–
973	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
974	–	sendnick_TS(client_p, target_p);
975	–
976	–	DelFlag(target_p, FLAGS_BURSTED);
977	–	}
978	–
979	–	if (IsCapable(client_p, CAP_EOB))
980	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
981	–	}
982	–
983	–	/*
984	–	* send_tb
985	–	*
986	–	* inputs       - pointer to Client
987	–	*              - pointer to channel
988	–	* output       - NONE
989	–	* side effects - Called on a server burst when
990	–	*                server is CAP_TBURST capable
991	–	*/
992	–	static void
993	–	send_tb(struct Client *client_p, struct Channel *chptr)
994	–	{
995	–	/*
996	–	* We may also send an empty topic here, but only if topic_time isn't 0,
997	–	* i.e. if we had a topic that got unset.  This is required for syncing
998	–	* topics properly.
999	–	*
1000	–	* Imagine the following scenario: Our downlink introduces a channel
1001	–	* to us with a TS that is equal to ours, but the channel topic on
1002	–	* their side got unset while the servers were in splitmode, which means
1003	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1004	–	* deal with it in a more sophisticated fashion instead of just resetting
1005	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1006	–	* for further information   -Michael
1007	–	*/
1008	–	if (chptr->topic_time != 0)
1009	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1010	–	ID_or_name(&me, client_p),
1011	–	(unsigned long)chptr->channelts, chptr->chname,
1012	–	(unsigned long)chptr->topic_time,
1013	–	chptr->topic_info,
1014	–	chptr->topic);
1015	–	}
1016	–
1017	–	/* burst_members()
1018	–	*
1019	–	* inputs       - pointer to server to send members to
1020	–	*              - dlink_list pointer to membership list to send
1021	–	* output       - NONE
1022	–	* side effects -
1023	–	*/
1024	–	static void
1025	–	burst_members(struct Client *client_p, struct Channel *chptr)
1026	–	{
1027	–	struct Client *target_p;
1028	–	struct Membership *ms;
1029	–	dlink_node *ptr;
1030	–
1031	–	DLINK_FOREACH(ptr, chptr->members.head)
1032	–	{
1033	–	ms       = ptr->data;
1034	–	target_p = ms->client_p;
1035	–
1036	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1037	–	{
1038	–	AddFlag(target_p, FLAGS_BURSTED);
1039	–
1040	–	if (target_p->from != client_p)
1041	–	sendnick_TS(client_p, target_p);
1042	–	}
1043	–	}
1044	–	}
1045	–
480		/* New server connection code
481		* Based upon the stuff floating about in s_bsd.c
482		*   -- adrian
#	Line 1067 | Line 501 | burst_members(struct Client *client_p, s
501		int
502		serv_connect(struct MaskItem *conf, struct Client *by)
503		{
504	<	struct Client *client_p;
505	<	char buf[HOSTIPLEN + 1];
504	>	struct Client *client_p = NULL;
505	>	char buf[HOSTIPLEN + 1] = "";
506
507		/* conversion structs */
508		struct sockaddr_in *v4;
1075	–	/* Make sure conf is useful */
1076	–	assert(conf != NULL);
509
510	+	/* Make sure conf is useful */
511	+	assert(conf);
512
513	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
513	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
514		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
515		ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
516		buf);
#	Line 1084 | Line 518 | serv_connect(struct MaskItem *conf, stru
518		/* Still processing a DNS lookup? -> exit */
519		if (conf->dns_pending)
520		{
521	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
521	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
522		"Error connecting to %s: DNS lookup for connect{} in progress.",
523		conf->name);
524	<	return (0);
524	>	return 0;
525		}
526
527		if (conf->dns_failed)
528		{
529	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
529	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
530		"Error connecting to %s: DNS lookup for connect{} failed.",
531		conf->name);
532	<	return (0);
532	>	return 0;
533		}
534
535	<	/* Make sure this server isn't already connected
536	<	* Note: conf should ALWAYS be a valid C: line
535	>	/*
536	>	* Make sure this server isn't already connected.
537	>	* Note: conf should ALWAYS be a valid connect {} block
538		*/
539	<	if ((client_p = hash_find_server(conf->name)) != NULL)
539	>	if ((client_p = hash_find_server(conf->name)))
540		{
541	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
541	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
542		"Server %s already present from %s",
543		conf->name, get_client_name(client_p, SHOW_IP));
544	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
544	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
545		"Server %s already present from %s",
546		conf->name, get_client_name(client_p, MASK_IP));
547		if (by && IsClient(by) && !MyClient(by))
548	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
549	<	me.name, by->name, conf->name,
1115	<	get_client_name(client_p, MASK_IP));
548	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
549	>	conf->name, get_client_name(client_p, MASK_IP));
550		return 0;
551		}
552
553		/* Create a local client */
554	<	client_p = make_client(NULL);
554	>	client_p = client_make(NULL);
555
556		/* Copy in the server, hostname, fd */
557		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
#	Line 1126 | Line 560 | serv_connect(struct MaskItem *conf, stru
560		/* We already converted the ip once, so lets use it - stu */
561		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
562
563	<	/* create a socket for the server connection */
564	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1131	<	SOCK_STREAM, 0, NULL) < 0)
563	>	/* Create a socket for the server connection */
564	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
565		{
566		/* Eek, failure to create the socket */
567	<	report_error(L_ALL, "opening stream socket to %s: %s",
568	<	conf->name, errno);
567	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
568	>
569		SetDead(client_p);
570	<	exit_client(client_p, &me, "Connection failed");
570	>	exit_client(client_p, "Connection failed");
571		return 0;
572		}
573
574	<	/* servernames are always guaranteed under HOSTLEN chars */
575	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
574	>	/* Server names are always guaranteed under HOSTLEN chars */
575	>	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
576
577	<	/* Attach config entries to client here rather than in
578	<	* serv_connect_callback(). This to avoid null pointer references.
577	>	/*
578	>	* Attach config entries to client here rather than in serv_connect_callback().
579	>	* This to avoid null pointer references.
580		*/
581		if (!attach_connect_block(client_p, conf->name, conf->host))
582		{
583	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
584	<	"Host %s is not enabled for connecting: no connect{} block",
583	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
584	>	"Host %s is not enabled for connecting: no connect {} block",
585		conf->name);
586		if (by && IsClient(by) && !MyClient(by))
587	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
588	<	me.name, by->name, client_p->name);
587	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
588	>
589		SetDead(client_p);
590	<	exit_client(client_p, client_p, "Connection failed");
590	>	exit_client(client_p, "Connection failed");
591		return 0;
592		}
593
594	<	/* at this point we have a connection in progress and C/N lines
595	<	* attached to the client, the socket info should be saved in the
596	<	* client and it should either be resolved or have a valid address.
594	>	/*
595	>	* At this point we have a connection in progress and a connect {} block
596	>	* attached to the client, the socket info should be saved in the client
597	>	* and it should either be resolved or have a valid address.
598		*
599		* The socket has been connected or connect is in progress.
600		*/
#	Line 1171 | Line 606 | serv_connect(struct MaskItem *conf, stru
606		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
607
608		SetConnecting(client_p);
609	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1175	<	/* from def_fam */
1176	<	client_p->localClient->aftype = conf->aftype;
609	>	client_p->connection->aftype = conf->aftype;
610
611		/* Now, initiate the connection */
612		/* XXX assume that a non 0 type means a specific bind address
#	Line 1183 | Line 616 | serv_connect(struct MaskItem *conf, stru
616		{
617		case AF_INET:
618		v4 = (struct sockaddr_in*)&conf->bind;
619	<	if (v4->sin_addr.s_addr != 0)
619	>	if (v4->sin_addr.s_addr)
620		{
621		struct irc_ssaddr ipn;
622		memset(&ipn, 0, sizeof(struct irc_ssaddr));
623		ipn.ss.ss_family = AF_INET;
624		ipn.ss_port = 0;
625		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
626	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
626	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
627		(struct sockaddr *)&ipn, ipn.ss_len,
628		serv_connect_callback, client_p, conf->aftype,
629		CONNECTTIMEOUT);
630		}
631	<	else if (ServerInfo.specific_ipv4_vhost)
631	>	else if (ConfigServerInfo.specific_ipv4_vhost)
632		{
633		struct irc_ssaddr ipn;
634		memset(&ipn, 0, sizeof(struct irc_ssaddr));
635		ipn.ss.ss_family = AF_INET;
636		ipn.ss_port = 0;
637	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
638	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
637	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
638	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
639		(struct sockaddr *)&ipn, ipn.ss_len,
640		serv_connect_callback, client_p, conf->aftype,
641		CONNECTTIMEOUT);
642		}
643		else
644	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
644	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
645		NULL, 0, serv_connect_callback, client_p, conf->aftype,
646		CONNECTTIMEOUT);
647		break;
1215	–	#ifdef IPV6
648		case AF_INET6:
649		{
650		struct irc_ssaddr ipn;
#	Line 1223 | Line 655 | serv_connect(struct MaskItem *conf, stru
655		v6conf = (struct sockaddr_in6 *)&conf->bind;
656		v6 = (struct sockaddr_in6 *)&ipn;
657
658	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
658	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
659		{
660		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
661		ipn.ss.ss_family = AF_INET6;
662		ipn.ss_port = 0;
663	<	comm_connect_tcp(&client_p->localClient->fd,
663	>	comm_connect_tcp(&client_p->connection->fd,
664		conf->host, conf->port,
665		(struct sockaddr *)&ipn, ipn.ss_len,
666		serv_connect_callback, client_p,
667		conf->aftype, CONNECTTIMEOUT);
668		}
669	<	else if (ServerInfo.specific_ipv6_vhost)
669	>	else if (ConfigServerInfo.specific_ipv6_vhost)
670		{
671	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
671	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
672		ipn.ss.ss_family = AF_INET6;
673		ipn.ss_port = 0;
674	<	comm_connect_tcp(&client_p->localClient->fd,
674	>	comm_connect_tcp(&client_p->connection->fd,
675		conf->host, conf->port,
676		(struct sockaddr *)&ipn, ipn.ss_len,
677		serv_connect_callback, client_p,
678		conf->aftype, CONNECTTIMEOUT);
679		}
680		else
681	<	comm_connect_tcp(&client_p->localClient->fd,
681	>	comm_connect_tcp(&client_p->connection->fd,
682		conf->host, conf->port,
683		NULL, 0, serv_connect_callback, client_p,
684		conf->aftype, CONNECTTIMEOUT);
685		}
1254	–	#endif
686		}
687	+
688		return 1;
689		}
690
1259	–	#ifdef HAVE_LIBCRYPTO
691		static void
692		finish_ssl_server_handshake(struct Client *client_p)
693		{
694	<	struct MaskItem *conf = NULL;
695	<
696	<	conf = find_conf_name(&client_p->localClient->confs,
697	<	client_p->name, CONF_SERVER);
698	<	if (conf == NULL)
699	<	{
700	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1270	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1271	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
694	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
695	>	client_p->name, CONF_SERVER);
696	>	if (!conf)
697	>	{
698	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
699	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
700	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
701		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
702
703	<	exit_client(client_p, &me, "Lost connect{} block");
703	>	exit_client(client_p, "Lost connect{} block");
704		return;
705		}
706
707	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
707	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
708
709	<	send_capabilities(client_p, 0);
709	>	sendto_one(client_p, "CAPAB :%s", get_capabilities(NULL));
710
711		sendto_one(client_p, "SERVER %s 1 :%s%s",
712		me.name, ConfigServerHide.hidden ? "(H) " : "",
713		me.info);
714
715	<	/* If we've been marked dead because a send failed, just exit
715	>	/*
716	>	* If we've been marked dead because a send failed, just exit
717		* here now and save everyone the trouble of us ever existing.
718		*/
719		if (IsDead(client_p))
720		{
721	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
722	<	"%s[%s] went dead during handshake",
723	<	client_p->name,
724	<	client_p->host);
725	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1296	<	"%s went dead during handshake", client_p->name);
1297	<	return;
721	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
722	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
723	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
724	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
725	>	return;
726		}
727
728		/* don't move to serv_list yet -- we haven't sent a burst! */
729		/* If we get here, we're ok, so lets start reading some data */
730	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
730	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
731		}
732
733		static void
734	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
734	>	ssl_server_handshake(fde_t *fd, void *data)
735		{
736	<	X509 *cert = NULL;
737	<	int ret = 0;
736	>	struct Client *client_p = data;
737	>	const char *sslerr = NULL;
738
739	<	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
739	>	tls_handshake_status_t ret = tls_handshake(&client_p->connection->fd.ssl, TLS_ROLE_CLIENT, &sslerr);
740	>	if (ret != TLS_HANDSHAKE_DONE)
741		{
742	<	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
742	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
743	>	{
744	>	exit_client(client_p, "Timeout during TLS handshake");
745	>	return;
746	>	}
747	>
748	>	switch (ret)
749		{
750	<	case SSL_ERROR_WANT_WRITE:
751	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
752	<	(PF *)ssl_server_handshake, client_p, 0);
750	>	case TLS_HANDSHAKE_WANT_WRITE:
751	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
752	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
753		return;
754	<	case SSL_ERROR_WANT_READ:
755	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
756	<	(PF *)ssl_server_handshake, client_p, 0);
754	>	case TLS_HANDSHAKE_WANT_READ:
755	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
756	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
757		return;
758		default:
759		{
760	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1326	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
760	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
761		"Error connecting to %s: %s", client_p->name,
762	<	sslerr ? sslerr : "unknown SSL error");
763	<	exit_client(client_p, client_p, "Error during SSL handshake");
762	>	sslerr ? sslerr : "unknown TLS error");
763	>	exit_client(client_p, "Error during TLS handshake");
764		return;
765		}
766		}
767		}
768
769	<	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1336	<	{
1337	<	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1338	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1339	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1340	<
1341	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1342	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1343	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1344	<	{
1345	<	unsigned int i = 0, n = 0;
769	>	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
770
771	<	if (X509_digest(cert, EVP_sha256(), md, &n))
772	<	{
773	<	for (; i < n; ++i)
1350	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1351	<	client_p->certfp = xstrdup(buf);
1352	<	}
1353	<	}
1354	<	else
1355	<	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1356	<	client_p->name, client_p->username, client_p->host, res);
1357	<	X509_free(cert);
1358	<	}
771	>	if (!tls_verify_cert(&client_p->connection->fd.ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp))
772	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
773	>	client_p->name, client_p->username, client_p->host);
774
775		finish_ssl_server_handshake(client_p);
776		}
777
778		static void
779	<	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
779	>	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
780		{
781	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
781	>	if (!tls_new(&client_p->connection->fd.ssl, fd->fd, TLS_ROLE_CLIENT))
782		{
1368	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1369	–	ERR_error_string(ERR_get_error(), NULL));
783		SetDead(client_p);
784	<	exit_client(client_p, client_p, "SSL_new failed");
784	>	exit_client(client_p, "TLS context initialization failed");
785		return;
786		}
787
1375	–	SSL_set_fd(fd->ssl, fd->fd);
1376	–
788		if (!EmptyString(conf->cipher_list))
789	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
789	>	tls_set_ciphers(&client_p->connection->fd.ssl, conf->cipher_list);
790
791		ssl_server_handshake(NULL, client_p);
792		}
1382	–	#endif
793
794		/* serv_connect_callback() - complete a server connection.
795		*
#	Line 1392 | Line 802 | ssl_connect_init(struct Client *client_p
802		static void
803		serv_connect_callback(fde_t *fd, int status, void *data)
804		{
805	<	struct Client *client_p = data;
1396	<	struct MaskItem *conf = NULL;
805	>	struct Client *const client_p = data;
806
807	<	/* First, make sure its a real client! */
808	<	assert(client_p != NULL);
809	<	assert(&client_p->localClient->fd == fd);
807	>	/* First, make sure it's a real client! */
808	>	assert(client_p);
809	>	assert(&client_p->connection->fd == fd);
810
811		/* Next, for backward purposes, record the ip of the server */
812	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
813	<	sizeof(struct irc_ssaddr));
812	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr, sizeof(struct irc_ssaddr));
813	>
814		/* Check the status */
815		if (status != COMM_OK)
816		{
817	<	/* We have an error, so report it and quit
818	<	* Admins get to see any IP, mere opers don't *sigh*
817	>	/* We have an error, so report it and quit */
818	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
819	>	"Error connecting to %s: %s",
820	>	get_client_name(client_p, SHOW_IP), comm_errstr(status));
821	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
822	>	"Error connecting to %s: %s",
823	>	get_client_name(client_p, MASK_IP), comm_errstr(status));
824	>
825	>	/*
826	>	* If a fd goes bad, call dead_link() the socket is no
827	>	* longer valid for reading or writing.
828		*/
829	<	if (ConfigServerHide.hide_server_ips)
830	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1413	<	"Error connecting to %s: %s",
1414	<	client_p->name, comm_errstr(status));
1415	<	else
1416	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1417	<	"Error connecting to %s[%s]: %s", client_p->name,
1418	<	client_p->host, comm_errstr(status));
1419	<
1420	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1421	<	"Error connecting to %s: %s",
1422	<	client_p->name, comm_errstr(status));
1423	<
1424	<	/* If a fd goes bad, call dead_link() the socket is no
1425	<	* longer valid for reading or writing.
1426	<	*/
1427	<	dead_link_on_write(client_p, 0);
1428	<	return;
829	>	dead_link_on_write(client_p, 0);
830	>	return;
831		}
832
833		/* COMM_OK, so continue the connection procedure */
834	<	/* Get the C/N lines */
835	<	conf = find_conf_name(&client_p->localClient->confs,
836	<	client_p->name, CONF_SERVER);
837	<	if (conf == NULL)
838	<	{
839	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
840	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
841	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
834	>	/* Get the connect {} block */
835	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
836	>	client_p->name, CONF_SERVER);
837	>	if (!conf)
838	>	{
839	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
840	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
841	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
842		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
843
844	<	exit_client(client_p, &me, "Lost connect{} block");
844	>	exit_client(client_p, "Lost connect{} block");
845		return;
846		}
847
848		/* Next, send the initial handshake */
849		SetHandshake(client_p);
850
1449	–	#ifdef HAVE_LIBCRYPTO
851		if (IsConfSSL(conf))
852		{
853		ssl_connect_init(client_p, conf, fd);
854		return;
855		}
1455	–	#endif
856
857	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
857	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
858
859	<	send_capabilities(client_p, 0);
859	>	sendto_one(client_p, "CAPAB :%s", get_capabilities(NULL));
860
861		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
862		ConfigServerHide.hidden ? "(H) " : "", me.info);
863
864	<	/* If we've been marked dead because a send failed, just exit
864	>	/*
865	>	* If we've been marked dead because a send failed, just exit
866		* here now and save everyone the trouble of us ever existing.
867		*/
868		if (IsDead(client_p))
869		{
870	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
871	<	"%s[%s] went dead during handshake",
872	<	client_p->name,
873	<	client_p->host);
874	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1474	<	"%s went dead during handshake", client_p->name);
1475	<	return;
870	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
871	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
872	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
873	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
874	>	return;
875		}
876
877		/* don't move to serv_list yet -- we haven't sent a burst! */
#	Line 1484 | Line 883 | struct Client *
883		find_servconn_in_progress(const char *name)
884		{
885		dlink_node *ptr;
1487	–	struct Client *cptr;
886
887		DLINK_FOREACH(ptr, unknown_list.head)
888		{
889	<	cptr = ptr->data;
889	>	struct Client *cptr = ptr->data;
890
891	<	if (cptr && cptr->name[0])
892	<	if (!match(name, cptr->name))
891	>	if (cptr->name[0])
892	>	if (!irccmp(name, cptr->name))
893		return cptr;
894		}
895

Comparing:
ircd-hybrid/trunk/src/s_serv.c (property svn:keywords), Revision 2691 by michael, Tue Dec 17 18:55:59 2013 UTC vs.
ircd-hybrid/trunk/src/server.c (property svn:keywords), Revision 7973 by michael, Mon Mar 13 22:05:51 2017 UTC

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

Diff Legend

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