ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2134 by michael, Wed May 29 18:59:39 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/server.c (file contents), Revision 8874 by michael, Sat Feb 16 21:53:04 2019 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-2019 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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 server.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 "server_capab.h"
40		#include "log.h"
48	–	#include "s_misc.h"
49	–	#include "s_user.h"
41		#include "send.h"
42		#include "memory.h"
52	–	#include "channel.h" /* chcap_usage_counts stuff...*/
43		#include "parse.h"
44
55	–	#define MIN_CONN_FREQ 300
45
46	<	static dlink_list cap_list = { NULL, NULL, 0 };
47	<	static void server_burst(struct Client *);
59	<	static void burst_all(struct Client *);
60	<	static void send_tb(struct Client *client_p, struct Channel *chptr);
46	>	dlink_list flatten_links;
47	>	static void server_connect_callback(fde_t *, int, void *);
48
62	–	static CNCB serv_connect_callback;
63	–
64	–	static void burst_members(struct Client *, struct Channel *);
49
50		/*
51		* write_links_file
#	Line 72 | 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	<	MessageFileLine *next_mptr = NULL;
62	<	MessageFileLine *mptr = NULL;
63	<	MessageFileLine *currentMessageLine = NULL;
80	<	MessageFileLine *newMessageLine = NULL;
81	<	MessageFile *MessageFileptr = &ConfigFileEntry.linksfile;
82	<	FILE *file;
83	<	char buff[512];
84	<	dlink_node *ptr;
61	>	FILE *file = NULL;
62	>	dlink_node *node, *node_next;
63	>	char buff[IRCD_BUFSIZE] = "";
64
65	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
65	>	if (EmptyString(ConfigServerHide.flatten_links_file))
66		return;
67
68	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
68	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "w")) == NULL)
69		{
70	<	next_mptr = mptr->next;
71	<	MyFree(mptr);
70	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
71	>	strerror(errno));
72	>	return;
73		}
74
75	<	MessageFileptr->contentsOfFile = NULL;
96	<
97	<	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	<	/* skip ourselves, we send ourselves in /links */
83	<	if (IsMe(target_p))
84	<	continue;
82	>	DLINK_FOREACH(node, global_server_list.head)
83	>	{
84	>	const struct Client *target_p = node->data;
85
86	<	/* skip hidden servers */
87	<	if (IsHidden(target_p))
86	>	/*
87	>	* Skip hidden servers, aswell as ourselves, since we already send
88	>	* ourselves in /links
89	>	*/
90	>	if (IsHidden(target_p) || IsMe(target_p))
91		continue;
92
93		if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
94		continue;
95
112	–	newMessageLine = MyMalloc(sizeof(MessageFileLine));
113	–
96		/*
97		* Attempt to format the file in such a way it follows the usual links output
98		* ie  "servername uplink :hops info"
99		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
100		* - madmax
101		*/
102	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
103	<	target_p->name, me.name, target_p->info);
104	<
105	<	if (MessageFileptr->contentsOfFile)
106	<	{
125	<	if (currentMessageLine)
126	<	currentMessageLine->next = newMessageLine;
127	<	currentMessageLine = newMessageLine;
128	<	}
129	<	else
130	<	{
131	<	MessageFileptr->contentsOfFile = newMessageLine;
132	<	currentMessageLine = newMessageLine;
133	<	}
102	>	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
103	>	me.name, target_p->info);
104	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
105	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
106	>	me.name, target_p->info);
107
135	–	snprintf(buff, sizeof(buff), "%s %s :1 %s\n",
136	–	target_p->name, me.name, target_p->info);
108		fputs(buff, file);
109		}
110
111		fclose(file);
112		}
113
114	<	/* hunt_server()
114	>	void
115	>	read_links_file(void)
116	>	{
117	>	FILE *file = NULL;
118	>	char *p = NULL;
119	>	char buff[IRCD_BUFSIZE] = "";
120	>
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')))
134	>	*p = '\0';
135	>
136	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
137	>	}
138	>
139	>	fclose(file);
140	>	}
141	>
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 159 | Line 158 | write_links_file(void* notused)
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;
169	<	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
185	<	target_p = find_person(client_p, parv[server]);
186	<
187	<	if (target_p)
188	<	if (target_p->from == source_p->from && !MyConnect(target_p))
189	<	target_p = NULL;
190	<
191	<	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
192	<	if (target_p->from == source_p->from && !MyConnect(target_p))
193	<	target_p = NULL;
194	<
195	<	wilds = has_wildcards(parv[server]);
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	<	/* Again, if there are no wild cards involved in the server
198	<	* name, use the hash lookup
199	<	*/
200	<	if (target_p == NULL)
189	>	if (h->target_p == NULL && 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) == 0)
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 = tmp;
202	>	break;
203		}
204		}
205	<	else
205	>
206	>	if (h->target_p == NULL)
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) == 0)
214		{
215	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
215	>	if (tmp->from == source_p->from && !MyConnect(tmp))
216		continue;
221	–	target_p = ptr->data;
217
218	<	if (IsRegistered(target_p) && (target_p != client_p))
219	<	break;
218	>	h->target_p = tmp;
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]);
236	<	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;
241	<
242	<	if (match(target_p->name, parv[server]))
243	<	parv[server] = target_p->name;
244	<
245	<	/* This is a little kludgy but should work... */
246	<	if (IsClient(source_p) &&
247	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
248	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
249	<	parv[0] = ID(source_p);
250	<
251	<	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;
239	<	}
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 272 | Line 257 | hunt_server(struct Client *client_p, str
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *ptr = NULL;
276	<	struct MaskItem *conf;
277	<	int confrq;
260	>	dlink_node *node;
261
262	<	/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
280	<	if (GlobalSetOptions.autoconn == 0)
262	>	if (GlobalSetOptions.autoconn == false)
263		return;
264
265	<	DLINK_FOREACH(ptr, server_items.head)
265	>	DLINK_FOREACH(node, connect_items.head)
266		{
267	<	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	<	*/
291	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
272	>	/* Also when already connecting! (update holdtimes) --SRB */
273	>	if (conf->port == 0 || !IsConfAllowAutoConn(conf))
274		continue;
275
276	<
277	<	/* Skip this entry if the use of it is still on hold until
276	>	/*
277	>	* Skip this entry if the use of it is still on hold until
278		* future. Otherwise handle this entry (and set it on hold
279		* until next time). Will reset only hold times, if already
280		* made one successfull connection... [this algorithm is
#	Line 301 | Line 283 | try_connections(void *unused)
283		if (conf->until > CurrentTime)
284		continue;
285
286	<	if (conf->class == NULL)
305	<	confrq = DEFAULT_CONNECTFREQUENCY;
306	<	else
307	<	{
308	<	confrq = conf->class->con_freq;
309	<	if (confrq < MIN_CONN_FREQ)
310	<	confrq = MIN_CONN_FREQ;
311	<	}
312	<
313	<	conf->until = CurrentTime + confrq;
286	>	conf->until = CurrentTime + conf->class->con_freq;
287
288	<	/* Found a CONNECT config with port specified, scan clients
288	>	/*
289	>	* Found a CONNECT config with port specified, scan clients
290		* and see if this server is already connected?
291		*/
292	<	if (hash_find_server(conf->name) != NULL)
292	>	if (hash_find_server(conf->name))
293		continue;
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 != NULL)
297	>	/* Move this entry to the end of the list, if not already last */
298	>	if (node->next)
299		{
300	<	dlinkDelete(ptr, &server_items);
301	<	dlinkAddTail(conf, &conf->node, &server_items);
300	>	dlinkDelete(node, &connect_items);
301	>	dlinkAddTail(conf, &conf->node, &connect_items);
302		}
303
304		if (find_servconn_in_progress(conf->name))
305		return;
306
307	<	/* We used to only print this if serv_connect() actually
307	>	/*
308	>	* We used to only print this if server_connect() actually
309		* succeeded, but since comm_tcp_connect() can call the callback
310		* immediately if there is an error, we were getting error messages
311		* in the wrong order. SO, we just print out the activated line,
312	<	* and let serv_connect() / serv_connect_callback() print an
312	>	* and let server_connect() / server_connect_callback() print an
313		* error afterwards if it fails.
314		*   -- adrian
315		*/
316		if (ConfigServerHide.hide_server_ips)
317	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
317	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
318		"Connection to %s activated.",
319		conf->name);
320		else
321	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
321	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
322		"Connection to %s[%s] activated.",
323		conf->name, conf->host);
324
325	<	serv_connect(conf, NULL);
325	>	server_connect(conf, NULL);
326		/* We connect only one at time... */
327		return;
328		}
329		}
330		}
331
332	<	int
333	<	valid_servname(const char *name)
332	>	bool
333	>	server_valid_name(const char *name)
334		{
335	<	unsigned int length = 0;
361	<	unsigned int dots   = 0;
335	>	unsigned int dots = 0;
336		const char *p = name;
337
338		for (; *p; ++p)
339		{
340		if (!IsServChar(*p))
341	<	return 0;
368	<
369	<	++length;
341	>	return false;
342
343		if (*p == '.')
344		++dots;
345		}
346
347	<	return dots != 0 && length <= HOSTLEN;
376	<	}
377	<
378	<	int
379	<	check_server(const char *name, struct Client *client_p)
380	<	{
381	<	dlink_node *ptr;
382	<	struct MaskItem *conf        = NULL;
383	<	struct MaskItem *server_conf = NULL;
384	<	int error = -1;
385	<
386	<	assert(client_p != NULL);
387	<
388	<	/* loop through looking for all possible connect items that might work */
389	<	DLINK_FOREACH(ptr, server_items.head)
390	<	{
391	<	conf = ptr->data;
392	<
393	<	if (match(name, conf->name))
394	<	continue;
395	<
396	<	error = -3;
397	<
398	<	/* XXX: Fix me for IPv6                    */
399	<	/* XXX sockhost is the IPv4 ip as a string */
400	<	if (!match(conf->host, client_p->host) ||
401	<	!match(conf->host, client_p->sockhost))
402	<	{
403	<	error = -2;
404	<
405	<	if (!match_conf_password(client_p->localClient->passwd, conf))
406	<	return -2;
407	<
408	<	server_conf = conf;
409	<	}
410	<	}
411	<
412	<	if (server_conf == NULL)
413	<	return(error);
414	<
415	<	attach_conf(client_p, server_conf);
416	<
417	<
418	<	if (server_conf != NULL)
419	<	{
420	<	struct sockaddr_in *v4;
421	<	#ifdef IPV6
422	<	struct sockaddr_in6 *v6;
423	<	#endif
424	<	switch (server_conf->aftype)
425	<	{
426	<	#ifdef IPV6
427	<	case AF_INET6:
428	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
429	<
430	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
431	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
432	<	break;
433	<	#endif
434	<	case AF_INET:
435	<	v4 = (struct sockaddr_in *)&server_conf->addr;
436	<
437	<	if (v4->sin_addr.s_addr == INADDR_NONE)
438	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
439	<	break;
440	<	}
441	<	}
442	<
443	<	return(0);
347	>	return dots && (p - name) <= HOSTLEN;
348		}
349
350	<	/* add_capability()
447	<	*
448	<	* inputs       - string name of CAPAB
449	<	*              - int flag of capability
450	<	* output       - NONE
451	<	* side effects - Adds given capability name and bit mask to
452	<	*                current supported capabilities. This allows
453	<	*                modules to dynamically add or subtract their capability.
454	<	*/
455	<	void
456	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
457	<	{
458	<	struct Capability *cap = MyMalloc(sizeof(*cap));
459	<
460	<	cap->name = xstrdup(capab_name);
461	<	cap->cap = cap_flag;
462	<	dlinkAdd(cap, &cap->node, &cap_list);
463	<
464	<	if (add_to_default)
465	<	default_server_capabs |= cap_flag;
466	<	}
467	<
468	<	/* delete_capability()
469	<	*
470	<	* inputs       - string name of CAPAB
471	<	* output       - NONE
472	<	* side effects - delete given capability from ones known.
473	<	*/
474	<	int
475	<	delete_capability(const char *capab_name)
476	<	{
477	<	dlink_node *ptr;
478	<	dlink_node *next_ptr;
479	<	struct Capability *cap;
480	<
481	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
482	<	{
483	<	cap = ptr->data;
484	<
485	<	if (cap->cap != 0)
486	<	{
487	<	if (irccmp(cap->name, capab_name) == 0)
488	<	{
489	<	default_server_capabs &= ~(cap->cap);
490	<	dlinkDelete(ptr, &cap_list);
491	<	MyFree(cap->name);
492	<	MyFree(cap);
493	<	}
494	<	}
495	<	}
496	<
497	<	return 0;
498	<	}
499	<
500	<	/*
501	<	* find_capability()
502	<	*
503	<	* inputs       - string name of capab to find
504	<	* output       - 0 if not found CAPAB otherwise
505	<	* side effects - none
506	<	*/
507	<	unsigned int
508	<	find_capability(const char *capab)
509	<	{
510	<	const dlink_node *ptr = NULL;
511	<
512	<	DLINK_FOREACH(ptr, cap_list.head)
513	<	{
514	<	const struct Capability *cap = ptr->data;
515	<
516	<	if (cap->cap && !irccmp(cap->name, capab))
517	<	return cap->cap;
518	<	}
519	<
520	<	return 0;
521	<	}
522	<
523	<	/* send_capabilities()
524	<	*
525	<	* inputs       - Client pointer to send to
526	<	*              - int flag of capabilities that this server can send
527	<	* output       - NONE
528	<	* side effects - send the CAPAB line to a server  -orabidoo
529	<	*
530	<	*/
531	<	void
532	<	send_capabilities(struct Client *client_p, int cap_can_send)
533	<	{
534	<	struct Capability *cap=NULL;
535	<	char msgbuf[IRCD_BUFSIZE];
536	<	char *t;
537	<	int tl;
538	<	dlink_node *ptr;
539	<
540	<	t = msgbuf;
541	<
542	<	DLINK_FOREACH(ptr, cap_list.head)
543	<	{
544	<	cap = ptr->data;
545	<
546	<	if (cap->cap & (cap_can_send|default_server_capabs))
547	<	{
548	<	tl = sprintf(t, "%s ", cap->name);
549	<	t += tl;
550	<	}
551	<	}
552	<
553	<	*(t - 1) = '\0';
554	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
555	<	}
556	<
557	<	/* sendnick_TS()
558	<	*
559	<	* inputs       - client (server) to send nick towards
560	<	*          - client to send nick for
561	<	* output       - NONE
562	<	* side effects - NICK message is sent towards given client_p
563	<	*/
564	<	void
565	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
566	<	{
567	<	static char ubuf[12];
568	<
569	<	if (!IsClient(target_p))
570	<	return;
571	<
572	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
573	<
574	<	if (ubuf[0] == '\0')
575	<	{
576	<	ubuf[0] = '+';
577	<	ubuf[1] = '\0';
578	<	}
579	<
580	<	if (IsCapable(client_p, CAP_SVS))
581	<	{
582	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
583	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
584	<	target_p->servptr->id,
585	<	target_p->name, target_p->hopcount + 1,
586	<	(unsigned long) target_p->tsinfo,
587	<	ubuf, target_p->username, target_p->host,
588	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
589	<	"0" : target_p->sockhost, target_p->id,
590	<	target_p->svid, target_p->info);
591	<	else
592	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
593	<	target_p->name, target_p->hopcount + 1,
594	<	(unsigned long) target_p->tsinfo,
595	<	ubuf, target_p->username, target_p->host,
596	<	target_p->servptr->name, target_p->svid,
597	<	target_p->info);
598	<	}
599	<	else
600	<	{
601	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
602	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
603	<	target_p->servptr->id,
604	<	target_p->name, target_p->hopcount + 1,
605	<	(unsigned long) target_p->tsinfo,
606	<	ubuf, target_p->username, target_p->host,
607	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
608	<	"0" : target_p->sockhost, target_p->id, target_p->info);
609	<	else
610	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
611	<	target_p->name, target_p->hopcount + 1,
612	<	(unsigned long) target_p->tsinfo,
613	<	ubuf, target_p->username, target_p->host,
614	<	target_p->servptr->name, target_p->info);
615	<	}
616	<
617	<	if (target_p->away[0])
618	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
619	<	target_p->away);
620	<
621	<	}
622	<
623	<	/*
624	<	* show_capabilities - show current server capabilities
625	<	*
626	<	* inputs       - pointer to a struct Client
627	<	* output       - pointer to static string
628	<	* side effects - build up string representing capabilities of server listed
629	<	*/
630	<	const char *
631	<	show_capabilities(struct Client *target_p)
632	<	{
633	<	static char msgbuf[IRCD_BUFSIZE];
634	<	char *t = msgbuf;
635	<	dlink_node *ptr;
636	<
637	<	t += sprintf(msgbuf, "TS ");
638	<
639	<	DLINK_FOREACH(ptr, cap_list.head)
640	<	{
641	<	const struct Capability *cap = ptr->data;
642	<
643	<	if (IsCapable(target_p, cap->cap))
644	<	t += sprintf(t, "%s ", cap->name);
645	<	}
646	<
647	<	*(t - 1) = '\0';
648	<	return msgbuf;
649	<	}
650	<
651	<	/* make_server()
350	>	/* server_make()
351		*
352		* inputs       - pointer to client struct
353		* output       - pointer to struct Server
#	Line 656 | Line 355 | show_capabilities(struct Client *target_
355		*                if it was not previously allocated.
356		*/
357		struct Server *
358	<	make_server(struct Client *client_p)
358	>	server_make(struct Client *client_p)
359		{
360		if (client_p->serv == NULL)
361	<	client_p->serv = MyMalloc(sizeof(struct Server));
361	>	client_p->serv = xcalloc(sizeof(*client_p->serv));
362
363		return client_p->serv;
364		}
365
366	<	/* server_estab()
366	>	/* server_connect() - initiate a server connection
367		*
368	<	* inputs       - pointer to a struct Client
670	<	* output       -
671	<	* side effects -
672	<	*/
673	<	void
674	<	server_estab(struct Client *client_p)
675	<	{
676	<	struct Client *target_p;
677	<	struct MaskItem *conf = NULL;
678	<	char *host;
679	<	const char *inpath;
680	<	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
681	<	dlink_node *ptr;
682	<	#ifdef HAVE_LIBCRYPTO
683	<	const COMP_METHOD *compression = NULL, *expansion = NULL;
684	<	#endif
685	<
686	<	assert(client_p != NULL);
687	<
688	<	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
689	<
690	<	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
691	<	host   = client_p->name;
692	<
693	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
694	<	== NULL)
695	<	{
696	<	/* This shouldn't happen, better tell the ops... -A1kmm */
697	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
698	<	"Warning: Lost connect{} block "
699	<	"for server %s(this shouldn't happen)!", host);
700	<	exit_client(client_p, &me, "Lost connect{} block!");
701	<	return;
702	<	}
703	<
704	<	MyFree(client_p->localClient->passwd);
705	<	client_p->localClient->passwd = NULL;
706	<
707	<	/* Its got identd, since its a server */
708	<	SetGotId(client_p);
709	<
710	<	/* If there is something in the serv_list, it might be this
711	<	* connecting server..
712	<	*/
713	<	if (!ServerInfo.hub && serv_list.head)
714	<	{
715	<	if (client_p != serv_list.head->data || serv_list.head->next)
716	<	{
717	<	++ServerStats.is_ref;
718	<	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
719	<	exit_client(client_p, &me, "I'm a leaf");
720	<	return;
721	<	}
722	<	}
723	<
724	<	if (IsUnknown(client_p))
725	<	{
726	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
727	<
728	<	send_capabilities(client_p, 0);
729	<
730	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
731	<	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
732	<	}
733	<
734	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
735	<	(unsigned long)CurrentTime);
736	<
737	<	/* assumption here is if they passed the correct TS version, they also passed an SID */
738	<	if (IsCapable(client_p, CAP_TS6))
739	<	hash_add_id(client_p);
740	<
741	<	/* XXX Does this ever happen? I don't think so -db */
742	<	detach_conf(client_p, CONF_OPER);
743	<
744	<	/* *WARNING*
745	<	**    In the following code in place of plain server's
746	<	**    name we send what is returned by get_client_name
747	<	**    which may add the "sockhost" after the name. It's
748	<	**    *very* *important* that there is a SPACE between
749	<	**    the name and sockhost (if present). The receiving
750	<	**    server will start the information field from this
751	<	**    first blank and thus puts the sockhost into info.
752	<	**    ...a bit tricky, but you have been warned, besides
753	<	**    code is more neat this way...  --msa
754	<	*/
755	<	client_p->servptr = &me;
756	<
757	<	if (IsClosing(client_p))
758	<	return;
759	<
760	<	SetServer(client_p);
761	<
762	<	/* Update the capability combination usage counts. -A1kmm */
763	<	set_chcap_usage_counts(client_p);
764	<
765	<	/* Some day, all these lists will be consolidated *sigh* */
766	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
767	<
768	<	assert(dlinkFind(&unknown_list, client_p));
769	<
770	<	dlink_move_node(&client_p->localClient->lclient_node,
771	<	&unknown_list, &serv_list);
772	<
773	<	Count.myserver++;
774	<
775	<	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
776	<	hash_add_client(client_p);
777	<
778	<	/* doesnt duplicate client_p->serv if allocated this struct already */
779	<	make_server(client_p);
780	<
781	<	/* fixing eob timings.. -gnp */
782	<	client_p->localClient->firsttime = CurrentTime;
783	<
784	<	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
785	<	AddFlag(client_p, FLAGS_SERVICE);
786	<
787	<	/* Show the real host/IP to admins */
788	<	#ifdef HAVE_LIBCRYPTO
789	<	if (client_p->localClient->fd.ssl)
790	<	{
791	<	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
792	<	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
793	<
794	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
795	<	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
796	<	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
797	<	compression ? SSL_COMP_get_name(compression) : "NONE",
798	<	expansion ? SSL_COMP_get_name(expansion) : "NONE",
799	<	show_capabilities(client_p));
800	<	/* Now show the masked hostname/IP to opers */
801	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
802	<	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
803	<	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
804	<	compression ? SSL_COMP_get_name(compression) : "NONE",
805	<	expansion ? SSL_COMP_get_name(expansion) : "NONE",
806	<	show_capabilities(client_p));
807	<	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
808	<	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
809	<	compression ? SSL_COMP_get_name(compression) : "NONE",
810	<	expansion ? SSL_COMP_get_name(expansion) : "NONE",
811	<	show_capabilities(client_p));
812	<	}
813	<	else
814	<	#endif
815	<	{
816	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
817	<	"Link with %s established: (Capabilities: %s)",
818	<	inpath_ip, show_capabilities(client_p));
819	<	/* Now show the masked hostname/IP to opers */
820	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
821	<	"Link with %s established: (Capabilities: %s)",
822	<	inpath, show_capabilities(client_p));
823	<	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
824	<	inpath_ip, show_capabilities(client_p));
825	<	}
826	<
827	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
828	<
829	<	/* Old sendto_serv_but_one() call removed because we now
830	<	** need to send different names to different servers
831	<	** (domain name matching) Send new server to other servers.
832	<	*/
833	<	DLINK_FOREACH(ptr, serv_list.head)
834	<	{
835	<	target_p = ptr->data;
836	<
837	<	if (target_p == client_p)
838	<	continue;
839	<
840	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
841	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
842	<	me.id, client_p->name, client_p->id,
843	<	IsHidden(client_p) ? "(H) " : "",
844	<	client_p->info);
845	<	else
846	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
847	<	me.name, client_p->name,
848	<	IsHidden(client_p) ? "(H) " : "",
849	<	client_p->info);
850	<	}
851	<
852	<	/* Pass on my client information to the new server
853	<	**
854	<	** First, pass only servers (idea is that if the link gets
855	<	** cancelled beacause the server was already there,
856	<	** there are no NICK's to be cancelled...). Of course,
857	<	** if cancellation occurs, all this info is sent anyway,
858	<	** and I guess the link dies when a read is attempted...? --msa
859	<	**
860	<	** Note: Link cancellation to occur at this point means
861	<	** that at least two servers from my fragment are building
862	<	** up connection this other fragment at the same time, it's
863	<	** a race condition, not the normal way of operation...
864	<	**
865	<	** ALSO NOTE: using the get_client_name for server names--
866	<	**    see previous *WARNING*!!! (Also, original inpath
867	<	**    is destroyed...)
868	<	*/
869	<
870	<	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
871	<	{
872	<	target_p = ptr->data;
873	<
874	<	/* target_p->from == target_p for target_p == client_p */
875	<	if (IsMe(target_p) || target_p->from == client_p)
876	<	continue;
877	<
878	<	if (IsCapable(client_p, CAP_TS6))
879	<	{
880	<	if (HasID(target_p))
881	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
882	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
883	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
884	<	target_p->info);
885	<	else  /* introducing non-ts6 server */
886	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
887	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
888	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
889	<	}
890	<	else
891	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
892	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
893	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
894	<
895	<	if (HasFlag(target_p, FLAGS_EOB))
896	<	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
897	<	}
898	<
899	<	server_burst(client_p);
900	<	}
901	<
902	<	/* server_burst()
903	<	*
904	<	* inputs       - struct Client pointer server
905	<	*              -
906	<	* output       - none
907	<	* side effects - send a server burst
908	<	* bugs         - still too long
909	<	*/
910	<	static void
911	<	server_burst(struct Client *client_p)
912	<	{
913	<	/* Send it in the shortened format with the TS, if
914	<	** it's a TS server; walk the list of channels, sending
915	<	** all the nicks that haven't been sent yet for each
916	<	** channel, then send the channel itself -- it's less
917	<	** obvious than sending all nicks first, but on the
918	<	** receiving side memory will be allocated more nicely
919	<	** saving a few seconds in the handling of a split
920	<	** -orabidoo
921	<	*/
922	<
923	<	burst_all(client_p);
924	<
925	<	/* EOB stuff is now in burst_all */
926	<	/* Always send a PING after connect burst is done */
927	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
928	<	}
929	<
930	<	/* burst_all()
931	<	*
932	<	* inputs       - pointer to server to send burst to
933	<	* output       - NONE
934	<	* side effects - complete burst of channels/nicks is sent to client_p
935	<	*/
936	<	static void
937	<	burst_all(struct Client *client_p)
938	<	{
939	<	dlink_node *ptr = NULL;
940	<
941	<	DLINK_FOREACH(ptr, global_channel_list.head)
942	<	{
943	<	struct Channel *chptr = ptr->data;
944	<
945	<	if (dlink_list_length(&chptr->members) != 0)
946	<	{
947	<	burst_members(client_p, chptr);
948	<	send_channel_modes(client_p, chptr);
949	<
950	<	if (IsCapable(client_p, CAP_TBURST))
951	<	send_tb(client_p, chptr);
952	<	}
953	<	}
954	<
955	<	/* also send out those that are not on any channel
956	<	*/
957	<	DLINK_FOREACH(ptr, global_client_list.head)
958	<	{
959	<	struct Client *target_p = ptr->data;
960	<
961	<	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
962	<	sendnick_TS(client_p, target_p);
963	<
964	<	DelFlag(target_p, FLAGS_BURSTED);
965	<	}
966	<
967	<	if (IsCapable(client_p, CAP_EOB))
968	<	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
969	<	}
970	<
971	<	/*
972	<	* send_tb
973	<	*
974	<	* inputs       - pointer to Client
975	<	*              - pointer to channel
976	<	* output       - NONE
977	<	* side effects - Called on a server burst when
978	<	*                server is CAP_TBURST capable
979	<	*/
980	<	static void
981	<	send_tb(struct Client *client_p, struct Channel *chptr)
982	<	{
983	<	/*
984	<	* We may also send an empty topic here, but only if topic_time isn't 0,
985	<	* i.e. if we had a topic that got unset.  This is required for syncing
986	<	* topics properly.
987	<	*
988	<	* Imagine the following scenario: Our downlink introduces a channel
989	<	* to us with a TS that is equal to ours, but the channel topic on
990	<	* their side got unset while the servers were in splitmode, which means
991	<	* their 'topic' is newer.  They simply wanted to unset it, so we have to
992	<	* deal with it in a more sophisticated fashion instead of just resetting
993	<	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
994	<	* for further information   -Michael
995	<	*/
996	<	if (chptr->topic_time != 0)
997	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
998	<	ID_or_name(&me, client_p),
999	<	(unsigned long)chptr->channelts, chptr->chname,
1000	<	(unsigned long)chptr->topic_time,
1001	<	chptr->topic_info,
1002	<	chptr->topic);
1003	<	}
1004	<
1005	<	/* burst_members()
1006	<	*
1007	<	* inputs       - pointer to server to send members to
1008	<	*              - dlink_list pointer to membership list to send
1009	<	* output       - NONE
1010	<	* side effects -
1011	<	*/
1012	<	static void
1013	<	burst_members(struct Client *client_p, struct Channel *chptr)
1014	<	{
1015	<	struct Client *target_p;
1016	<	struct Membership *ms;
1017	<	dlink_node *ptr;
1018	<
1019	<	DLINK_FOREACH(ptr, chptr->members.head)
1020	<	{
1021	<	ms       = ptr->data;
1022	<	target_p = ms->client_p;
1023	<
1024	<	if (!HasFlag(target_p, FLAGS_BURSTED))
1025	<	{
1026	<	AddFlag(target_p, FLAGS_BURSTED);
1027	<
1028	<	if (target_p->from != client_p)
1029	<	sendnick_TS(client_p, target_p);
1030	<	}
1031	<	}
1032	<	}
1033	<
1034	<	/* New server connection code
1035	<	* Based upon the stuff floating about in s_bsd.c
1036	<	*   -- adrian
1037	<	*/
1038	<
1039	<	/* serv_connect() - initiate a server connection
1040	<	*
1041	<	* inputs       - pointer to conf
368	>	* inputs       - pointer to conf
369		*              - pointer to client doing the connect
370		* output       -
371		* side effects -
#	Line 1052 | Line 379 | burst_members(struct Client *client_p, s
379		* We return 1 if the connection is attempted, since we don't know whether
380		* it suceeded or not, and 0 if it fails in here somewhere.
381		*/
382	<	int
383	<	serv_connect(struct MaskItem *conf, struct Client *by)
382	>	bool
383	>	server_connect(struct MaskItem *conf, struct Client *by)
384		{
385	<	struct Client *client_p;
1059	<	char buf[HOSTIPLEN + 1];
385	>	char buf[HOSTIPLEN + 1] = "";
386
1061	–	/* conversion structs */
1062	–	struct sockaddr_in *v4;
387		/* Make sure conf is useful */
388	<	assert(conf != NULL);
389	<
390	<
1067	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1068	<	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1069	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1070	<	buf);
388	>	assert(conf);
389	>	assert(conf->type == CONF_SERVER);
390	>	assert(hash_find_server(conf->name) == NULL);  /* This should have been checked by the caller */
391
392		/* Still processing a DNS lookup? -> exit */
393	<	if (conf->dns_pending)
393	>	if (conf->dns_pending == true)
394		{
395	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
395	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
396		"Error connecting to %s: DNS lookup for connect{} in progress.",
397		conf->name);
398	<	return (0);
398	>	return false;
399		}
400
401	<	if (conf->dns_failed)
401	>	if (conf->dns_failed == true)
402		{
403	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
403	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
404		"Error connecting to %s: DNS lookup for connect{} failed.",
405		conf->name);
406	<	return (0);
406	>	return false;
407		}
408
409	<	/* Make sure this server isn't already connected
410	<	* Note: conf should ALWAYS be a valid C: line
411	<	*/
412	<	if ((client_p = hash_find_server(conf->name)) != NULL)
413	<	{
414	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
415	<	"Server %s already present from %s",
416	<	conf->name, get_client_name(client_p, SHOW_IP));
417	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
418	<	"Server %s already present from %s",
419	<	conf->name, get_client_name(client_p, MASK_IP));
1100	<	if (by && IsClient(by) && !MyClient(by))
1101	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1102	<	me.name, by->name, conf->name,
1103	<	get_client_name(client_p, MASK_IP));
1104	<	return 0;
409	>	getnameinfo((const struct sockaddr *)conf->addr, conf->addr->ss_len,
410	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
411	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host, buf);
412	>
413	>	/* Create a socket for the server connection */
414	>	int fd = comm_socket(conf->addr->ss.ss_family, SOCK_STREAM, 0);
415	>	if (fd == -1)
416	>	{
417	>	/* Eek, failure to create the socket */
418	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
419	>	return false;
420		}
421	<
421	>
422		/* Create a local client */
423	<	client_p = make_client(NULL);
423	>	struct Client *client_p = client_make(NULL);
424
425		/* Copy in the server, hostname, fd */
426		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
#	Line 1114 | Line 429 | serv_connect(struct MaskItem *conf, stru
429		/* We already converted the ip once, so lets use it - stu */
430		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
431
432	<	/* create a socket for the server connection */
1118	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1119	<	SOCK_STREAM, 0, NULL) < 0)
1120	<	{
1121	<	/* Eek, failure to create the socket */
1122	<	report_error(L_ALL, "opening stream socket to %s: %s",
1123	<	conf->name, errno);
1124	<	SetDead(client_p);
1125	<	exit_client(client_p, &me, "Connection failed");
1126	<	return 0;
1127	<	}
432	>	memcpy(&client_p->ip, conf->addr, sizeof(client_p->ip));
433
434	<	/* servernames are always guaranteed under HOSTLEN chars */
1130	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
434	>	client_p->connection->fd = fd_open(fd, true, NULL);
435
436	<	/* Attach config entries to client here rather than in
437	<	* serv_connect_callback(). This to avoid null pointer references.
1134	<	*/
1135	<	if (!attach_connect_block(client_p, conf->name, conf->host))
1136	<	{
1137	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1138	<	"Host %s is not enabled for connecting: no connect{} block",
1139	<	conf->name);
1140	<	if (by && IsClient(by) && !MyClient(by))
1141	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1142	<	me.name, by->name, client_p->name);
1143	<	SetDead(client_p);
1144	<	exit_client(client_p, client_p, "Connection failed");
1145	<	return 0;
1146	<	}
436	>	/* Server names are always guaranteed under HOSTLEN chars */
437	>	fd_note(client_p->connection->fd, "Server: %s", client_p->name);
438
439	<	/* at this point we have a connection in progress and C/N lines
440	<	* attached to the client, the socket info should be saved in the
441	<	* client and it should either be resolved or have a valid address.
1151	<	*
1152	<	* The socket has been connected or connect is in progress.
439	>	/*
440	>	* Attach config entries to client here rather than in server_connect_callback().
441	>	* This to avoid null pointer references.
442		*/
443	<	make_server(client_p);
443	>	conf_attach(client_p, conf);
444	>
445	>	server_make(client_p);
446
447		if (by && IsClient(by))
448		strlcpy(client_p->serv->by, by->name, sizeof(client_p->serv->by));
#	Line 1159 | Line 450 | serv_connect(struct MaskItem *conf, stru
450		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
451
452		SetConnecting(client_p);
1162	–	dlinkAdd(client_p, &client_p->node, &global_client_list);
1163	–	/* from def_fam */
1164	–	client_p->localClient->aftype = conf->aftype;
453
454		/* Now, initiate the connection */
455	<	/* XXX assume that a non 0 type means a specific bind address
456	<	* for this connect.
455	>	comm_connect_tcp(client_p->connection->fd, conf->addr, conf->port, conf->bind,
456	>	server_connect_callback, client_p, CONNECTTIMEOUT);
457	>
458	>	/*
459	>	* At this point we have a connection in progress and a connect {} block
460	>	* attached to the client, the socket info should be saved in the client
461	>	* and it should either be resolved or have a valid address.
462	>	*
463	>	* The socket has been connected or connect is in progress.
464		*/
465	<	switch (conf->aftype)
1171	<	{
1172	<	case AF_INET:
1173	<	v4 = (struct sockaddr_in*)&conf->bind;
1174	<	if (v4->sin_addr.s_addr != 0)
1175	<	{
1176	<	struct irc_ssaddr ipn;
1177	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1178	<	ipn.ss.ss_family = AF_INET;
1179	<	ipn.ss_port = 0;
1180	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1181	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1182	<	(struct sockaddr *)&ipn, ipn.ss_len,
1183	<	serv_connect_callback, client_p, conf->aftype,
1184	<	CONNECTTIMEOUT);
1185	<	}
1186	<	else if (ServerInfo.specific_ipv4_vhost)
1187	<	{
1188	<	struct irc_ssaddr ipn;
1189	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1190	<	ipn.ss.ss_family = AF_INET;
1191	<	ipn.ss_port = 0;
1192	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1193	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1194	<	(struct sockaddr *)&ipn, ipn.ss_len,
1195	<	serv_connect_callback, client_p, conf->aftype,
1196	<	CONNECTTIMEOUT);
1197	<	}
1198	<	else
1199	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1200	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1201	<	CONNECTTIMEOUT);
1202	<	break;
1203	<	#ifdef IPV6
1204	<	case AF_INET6:
1205	<	{
1206	<	struct irc_ssaddr ipn;
1207	<	struct sockaddr_in6 *v6;
1208	<	struct sockaddr_in6 *v6conf;
1209	<
1210	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1211	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
1212	<	v6 = (struct sockaddr_in6 *)&ipn;
1213	<
1214	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1215	<	sizeof(struct in6_addr)) != 0)
1216	<	{
1217	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1218	<	ipn.ss.ss_family = AF_INET6;
1219	<	ipn.ss_port = 0;
1220	<	comm_connect_tcp(&client_p->localClient->fd,
1221	<	conf->host, conf->port,
1222	<	(struct sockaddr *)&ipn, ipn.ss_len,
1223	<	serv_connect_callback, client_p,
1224	<	conf->aftype, CONNECTTIMEOUT);
1225	<	}
1226	<	else if (ServerInfo.specific_ipv6_vhost)
1227	<	{
1228	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1229	<	ipn.ss.ss_family = AF_INET6;
1230	<	ipn.ss_port = 0;
1231	<	comm_connect_tcp(&client_p->localClient->fd,
1232	<	conf->host, conf->port,
1233	<	(struct sockaddr *)&ipn, ipn.ss_len,
1234	<	serv_connect_callback, client_p,
1235	<	conf->aftype, CONNECTTIMEOUT);
1236	<	}
1237	<	else
1238	<	comm_connect_tcp(&client_p->localClient->fd,
1239	<	conf->host, conf->port,
1240	<	NULL, 0, serv_connect_callback, client_p,
1241	<	conf->aftype, CONNECTTIMEOUT);
1242	<	}
1243	<	#endif
1244	<	}
1245	<	return (1);
465	>	return true;
466		}
467
1248	–	#ifdef HAVE_LIBCRYPTO
468		static void
469	<	finish_ssl_server_handshake(struct Client *client_p)
469	>	server_finish_tls_handshake(struct Client *client_p)
470		{
471	<	struct MaskItem *conf = NULL;
472	<
473	<	conf = find_conf_name(&client_p->localClient->confs,
474	<	client_p->name, CONF_SERVER);
475	<	if (conf == NULL)
476	<	{
477	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
478	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1260	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1261	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
471	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
472	>	client_p->name, CONF_SERVER);
473	>	if (!conf)
474	>	{
475	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
476	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
477	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
478	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
479
480	<	exit_client(client_p, &me, "Lost connect{} block");
480	>	exit_client(client_p, "Lost connect{} block");
481		return;
482		}
483
484	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
484	>	/* Next, send the initial handshake */
485	>	SetHandshake(client_p);
486
487	<	send_capabilities(client_p, 0);
487	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
488	>
489	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
490
491		sendto_one(client_p, "SERVER %s 1 :%s%s",
492		me.name, ConfigServerHide.hidden ? "(H) " : "",
493		me.info);
494
1275	–	/* If we've been marked dead because a send failed, just exit
1276	–	* here now and save everyone the trouble of us ever existing.
1277	–	*/
1278	–	if (IsDead(client_p))
1279	–	{
1280	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1281	–	"%s[%s] went dead during handshake",
1282	–	client_p->name,
1283	–	client_p->host);
1284	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1285	–	"%s went dead during handshake", client_p->name);
1286	–	return;
1287	–	}
1288	–
1289	–	/* don't move to serv_list yet -- we haven't sent a burst! */
495		/* If we get here, we're ok, so lets start reading some data */
496	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
496	>	read_packet(client_p->connection->fd, client_p);
497		}
498
499		static void
500	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
500	>	server_tls_handshake(fde_t *F, void *data)
501		{
502	<	int ret;
503	<	int err;
502	>	struct Client *client_p = data;
503	>	const char *sslerr = NULL;
504
505	<	ret = SSL_connect(client_p->localClient->fd.ssl);
505	>	assert(client_p);
506	>	assert(client_p->connection);
507	>	assert(client_p->connection->fd);
508	>	assert(client_p->connection->fd == F);
509
510	<	if (ret <= 0)
510	>	tls_handshake_status_t ret = tls_handshake(&F->ssl, TLS_ROLE_CLIENT, &sslerr);
511	>	if (ret != TLS_HANDSHAKE_DONE)
512		{
513	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
513	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
514	>	{
515	>	exit_client(client_p, "Timeout during TLS handshake");
516	>	return;
517	>	}
518	>
519	>	switch (ret)
520		{
521	<	case SSL_ERROR_WANT_WRITE:
522	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
523	<	(PF *)ssl_server_handshake, client_p, 0);
521	>	case TLS_HANDSHAKE_WANT_WRITE:
522	>	comm_setselect(F, COMM_SELECT_WRITE,
523	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
524		return;
525	<	case SSL_ERROR_WANT_READ:
526	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
527	<	(PF *)ssl_server_handshake, client_p, 0);
525	>	case TLS_HANDSHAKE_WANT_READ:
526	>	comm_setselect(F, COMM_SELECT_READ,
527	>	server_tls_handshake, client_p, CONNECTTIMEOUT);
528		return;
529		default:
530		{
531	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1317	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
531	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
532		"Error connecting to %s: %s", client_p->name,
533	<	sslerr ? sslerr : "unknown SSL error");
534	<	exit_client(client_p, client_p, "Error during SSL handshake");
533	>	sslerr ? sslerr : "unknown TLS error");
534	>	exit_client(client_p, "Error during TLS handshake");
535		return;
536		}
537		}
538		}
539
540	<	finish_ssl_server_handshake(client_p);
540	>	comm_settimeout(F, 0, NULL, NULL);
541	>
542	>	if (tls_verify_cert(&F->ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp) == false)
543	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
544	>	client_p->name, client_p->username, client_p->host);
545	>
546	>	server_finish_tls_handshake(client_p);
547		}
548
549		static void
550	<	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
550	>	server_tls_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *F)
551		{
552	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
552	>	assert(client_p);
553	>	assert(client_p->connection);
554	>	assert(client_p->connection->fd);
555	>	assert(client_p->connection->fd == F);
556	>
557	>	if (tls_new(&F->ssl, F->fd, TLS_ROLE_CLIENT) == false)
558		{
1334	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1335	–	ERR_error_string(ERR_get_error(), NULL));
559		SetDead(client_p);
560	<	exit_client(client_p, client_p, "SSL_new failed");
560	>	exit_client(client_p, "TLS context initialization failed");
561		return;
562		}
563
1341	–	SSL_set_fd(fd->ssl, fd->fd);
1342	–
564		if (!EmptyString(conf->cipher_list))
565	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
565	>	tls_set_ciphers(&F->ssl, conf->cipher_list);
566
567	<	ssl_server_handshake(NULL, client_p);
567	>	server_tls_handshake(F, client_p);
568		}
1348	–	#endif
569
570	<	/* serv_connect_callback() - complete a server connection.
571	<	*
570	>	/* server_connect_callback() - complete a server connection.
571	>	*
572		* This routine is called after the server connection attempt has
573		* completed. If unsucessful, an error is sent to ops and the client
574		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1356 | Line 576 | ssl_connect_init(struct Client *client_p
576		* marked for reading.
577		*/
578		static void
579	<	serv_connect_callback(fde_t *fd, int status, void *data)
579	>	server_connect_callback(fde_t *F, int status, void *data)
580		{
581	<	struct Client *client_p = data;
1362	<	struct MaskItem *conf = NULL;
581	>	struct Client *const client_p = data;
582
583	<	/* First, make sure its a real client! */
584	<	assert(client_p != NULL);
585	<	assert(&client_p->localClient->fd == fd);
583	>	/* First, make sure it's a real client! */
584	>	assert(client_p);
585	>	assert(client_p->connection);
586	>	assert(client_p->connection->fd);
587	>	assert(client_p->connection->fd == F);
588
589		/* Next, for backward purposes, record the ip of the server */
590	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
591	<	sizeof(struct irc_ssaddr));
590	>	memcpy(&client_p->ip, &F->connect.hostaddr, sizeof(client_p->ip));
591	>
592		/* Check the status */
593		if (status != COMM_OK)
594		{
595	<	/* We have an error, so report it and quit
596	<	* Admins get to see any IP, mere opers don't *sigh*
595	>	/* We have an error, so report it and quit */
596	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
597	>	"Error connecting to %s: %s",
598	>	client_get_name(client_p, SHOW_IP), comm_errstr(status));
599	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
600	>	"Error connecting to %s: %s",
601	>	client_get_name(client_p, MASK_IP), comm_errstr(status));
602	>
603	>	/*
604	>	* If a fd goes bad, call dead_link() the socket is no
605	>	* longer valid for reading or writing.
606		*/
607	<	if (ConfigServerHide.hide_server_ips)
608	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1379	<	"Error connecting to %s: %s",
1380	<	client_p->name, comm_errstr(status));
1381	<	else
1382	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1383	<	"Error connecting to %s[%s]: %s", client_p->name,
1384	<	client_p->host, comm_errstr(status));
1385	<
1386	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1387	<	"Error connecting to %s: %s",
1388	<	client_p->name, comm_errstr(status));
1389	<
1390	<	/* If a fd goes bad, call dead_link() the socket is no
1391	<	* longer valid for reading or writing.
1392	<	*/
1393	<	dead_link_on_write(client_p, 0);
1394	<	return;
607	>	dead_link_on_write(client_p, 0);
608	>	return;
609		}
610
611		/* COMM_OK, so continue the connection procedure */
612	<	/* Get the C/N lines */
613	<	conf = find_conf_name(&client_p->localClient->confs,
614	<	client_p->name, CONF_SERVER);
615	<	if (conf == NULL)
616	<	{
617	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
618	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
619	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
620	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
612	>	/* Get the connect {} block */
613	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
614	>	client_p->name, CONF_SERVER);
615	>	if (!conf)
616	>	{
617	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
618	>	"Lost connect{} block for %s", client_get_name(client_p, SHOW_IP));
619	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
620	>	"Lost connect{} block for %s", client_get_name(client_p, MASK_IP));
621
622	<	exit_client(client_p, &me, "Lost connect{} block");
622	>	exit_client(client_p, "Lost connect{} block");
623		return;
624		}
625
1412	–	/* Next, send the initial handshake */
1413	–	SetHandshake(client_p);
1414	–
1415	–	#ifdef HAVE_LIBCRYPTO
626		if (IsConfSSL(conf))
627		{
628	<	ssl_connect_init(client_p, conf, fd);
628	>	server_tls_connect_init(client_p, conf, F);
629		return;
630		}
1421	–	#endif
631
632	<	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
632	>	/* Next, send the initial handshake */
633	>	SetHandshake(client_p);
634	>
635	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
636
637	<	send_capabilities(client_p, 0);
637	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
638
639		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
640		ConfigServerHide.hidden ? "(H) " : "", me.info);
641
1430	–	/* If we've been marked dead because a send failed, just exit
1431	–	* here now and save everyone the trouble of us ever existing.
1432	–	*/
1433	–	if (IsDead(client_p))
1434	–	{
1435	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1436	–	"%s[%s] went dead during handshake",
1437	–	client_p->name,
1438	–	client_p->host);
1439	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1440	–	"%s went dead during handshake", client_p->name);
1441	–	return;
1442	–	}
1443	–
1444	–	/* don't move to serv_list yet -- we haven't sent a burst! */
642		/* If we get here, we're ok, so lets start reading some data */
643	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
643	>	read_packet(client_p->connection->fd, client_p);
644		}
645
646		struct Client *
647		find_servconn_in_progress(const char *name)
648		{
649		dlink_node *ptr;
1453	–	struct Client *cptr;
650
651		DLINK_FOREACH(ptr, unknown_list.head)
652		{
653	<	cptr = ptr->data;
653	>	struct Client *cptr = ptr->data;
654
655	<	if (cptr && cptr->name[0])
656	<	if (!match(name, cptr->name))
655	>	if (cptr->name[0])
656	>	if (!irccmp(name, cptr->name))
657		return cptr;
658		}
659	<
659	>
660		return NULL;
661		}

Comparing:
ircd-hybrid/trunk/src/s_serv.c (property svn:keywords), Revision 2134 by michael, Wed May 29 18:59:39 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/server.c (property svn:keywords), Revision 8874 by michael, Sat Feb 16 21:53:04 2019 UTC

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

Diff Legend

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