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 6527 by michael, Fri Sep 11 16:33:29 2015 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-2015 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"
#	Line 28 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
33		#include "client.h"
34	–	#include "dbuf.h"
34		#include "event.h"
36	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37		#include "ircd.h"
#	Line 41 | Line 39
39		#include "s_bsd.h"
40		#include "numeric.h"
41		#include "packet.h"
44	–	#include "irc_res.h"
42		#include "conf.h"
43	<	#include "s_serv.h"
43	>	#include "server.h"
44		#include "log.h"
45	<	#include "s_misc.h"
49	<	#include "s_user.h"
45	>	#include "user.h"
46		#include "send.h"
47		#include "memory.h"
48	<	#include "channel.h" /* chcap_usage_counts stuff...*/
48	>	#include "channel.h"
49		#include "parse.h"
50
55	–	#define MIN_CONN_FREQ 300
51
52		dlink_list flatten_links;
53	<	static dlink_list cap_list = { NULL, NULL, 0 };
54	<	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);
62	<
63	<	static CNCB serv_connect_callback;
53	>	static dlink_list server_capabilities_list;
54	>	static void serv_connect_callback(fde_t *, int, void *);
55
65	–	static void burst_members(struct Client *, struct Channel *);
56
57		/*
58		* write_links_file
#	Line 73 | Line 63 | static void burst_members(struct Client
63		*                but in no particular order.
64		*/
65		void
66	<	write_links_file(void *notused)
66	>	write_links_file(void *unused)
67		{
68		FILE *file = NULL;
69	<	dlink_node *ptr = NULL, *ptr_next = NULL;
70	<	char buff[IRCD_BUFSIZE] = { '\0' };
69	>	dlink_node *node = NULL, *node_next = NULL;
70	>	char buff[IRCD_BUFSIZE] = "";
71
72		if ((file = fopen(LIPATH, "w")) == NULL)
73		return;
74
75	<	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
75	>	DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
76		{
77	<	dlinkDelete(ptr, &flatten_links);
78	<	MyFree(ptr->data);
79	<	free_dlink_node(ptr);
77	>	dlinkDelete(node, &flatten_links);
78	>	MyFree(node->data);
79	>	free_dlink_node(node);
80		}
81
82	<	DLINK_FOREACH(ptr, global_serv_list.head)
82	>	DLINK_FOREACH(node, global_server_list.head)
83		{
84	<	const struct Client *target_p = ptr->data;
84	>	const struct Client *target_p = node->data;
85
86		/*
87		* Skip hidden servers, aswell as ourselves, since we already send
#	Line 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)
122		return;
123
124		while (fgets(buff, sizeof(buff), file))
125		{
126	<	if ((p = strchr(buff, '\n')) != NULL)
126	>	if ((p = strchr(buff, '\n')))
127		*p = '\0';
128
129		dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
#	Line 162 | Line 152 | read_links_file(void)
152		*      returns: (see #defines)
153		*/
154		int
155	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
155	>	hunt_server(struct Client *source_p, const char *command,
156		const int server, const int parc, char *parv[])
157		{
158		struct Client *target_p = NULL;
159	<	struct Client *target_tmp = NULL;
170	<	dlink_node *ptr;
171	<	int wilds;
159	>	dlink_node *node = NULL;
160
161		/* Assume it's me, if no server */
162		if (parc <= server || EmptyString(parv[server]))
163		return HUNTED_ISME;
164
165	<	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
166	<	return HUNTED_ISME;
165	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
166	>	target_p = hash_find_server(parv[server]);
167
168	<	/* These are to pickup matches that would cause the following
168	>	/*
169	>	* These are to pickup matches that would cause the following
170		* message to go in the wrong direction while doing quick fast
171		* non-matching lookups.
172		*/
184	–	if (MyClient(source_p))
185	–	target_p = hash_find_client(parv[server]);
186	–	else
187	–	target_p = find_person(client_p, parv[server]);
188	–
173		if (target_p)
174		if (target_p->from == source_p->from && !MyConnect(target_p))
175		target_p = NULL;
176
177	<	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;
196	<
197	<	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)
177	>	if (!target_p && has_wildcards(parv[server]))
178		{
179	<	if (!wilds)
179	>	DLINK_FOREACH(node, global_server_list.head)
180		{
181	<	if (!(target_p = hash_find_server(parv[server])))
181	>	struct Client *tmp = node->data;
182	>
183	>	assert(IsMe(tmp) || IsServer(tmp));
184	>	if (!match(parv[server], tmp->name))
185		{
186	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
187	<	me.name, source_p->name, parv[server]);
188	<	return HUNTED_NOSUCH;
186	>	if (tmp->from == source_p->from && !MyConnect(tmp))
187	>	continue;
188	>
189	>	target_p = node->data;
190	>	break;
191		}
192		}
193	<	else
193	>
194	>	if (!target_p)
195		{
196	<	DLINK_FOREACH(ptr, global_client_list.head)
196	>	DLINK_FOREACH(node, global_client_list.head)
197		{
198	<	target_tmp = ptr->data;
198	>	struct Client *tmp = node->data;
199
200	<	if (!match(parv[server], target_tmp->name))
200	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
201	>	if (!match(parv[server], tmp->name))
202		{
203	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
203	>	if (tmp->from == source_p->from && !MyConnect(tmp))
204		continue;
223	–	target_p = ptr->data;
205
206	<	if (IsRegistered(target_p) && (target_p != client_p))
207	<	break;
206	>	target_p = node->data;
207	>	break;
208		}
209		}
210		}
211		}
212
213	<	if (target_p != NULL)
213	>	if (target_p)
214		{
215	<	if(!IsRegistered(target_p))
235	<	{
236	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
237	<	me.name, source_p->name, parv[server]);
238	<	return HUNTED_NOSUCH;
239	<	}
240	<
215	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
216		if (IsMe(target_p) || MyClient(target_p))
217		return HUNTED_ISME;
218
219	<	if (match(target_p->name, parv[server]))
220	<	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],
219	>	parv[server] = target_p->id;
220	>	sendto_one(target_p, command, source_p->id,
221		parv[1], parv[2], parv[3], parv[4],
222		parv[5], parv[6], parv[7], parv[8]);
223		return HUNTED_PASS;
224		}
225
226	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
260	<	me.name, source_p->name, parv[server]);
226	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
227		return HUNTED_NOSUCH;
228		}
229
#	Line 274 | Line 240 | hunt_server(struct Client *client_p, str
240		void
241		try_connections(void *unused)
242		{
243	<	dlink_node *ptr = NULL;
278	<	struct MaskItem *conf;
279	<	int confrq;
243	>	dlink_node *node = NULL;
244
245		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
246		if (GlobalSetOptions.autoconn == 0)
247		return;
248
249	<	DLINK_FOREACH(ptr, server_items.head)
249	>	DLINK_FOREACH(node, server_items.head)
250		{
251	<	conf = ptr->data;
251	>	struct MaskItem *conf = node->data;
252
253		assert(conf->type == CONF_SERVER);
254
255		/* Also when already connecting! (update holdtimes) --SRB
256		*/
257	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
257	>	if (!conf->port || !IsConfAllowAutoConn(conf))
258		continue;
259
260
#	Line 303 | Line 267 | try_connections(void *unused)
267		if (conf->until > CurrentTime)
268		continue;
269
270	<	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	<	}
270	>	assert(conf->class);
271
272	<	conf->until = CurrentTime + confrq;
272	>	conf->until = CurrentTime + conf->class->con_freq;
273
274	<	/* Found a CONNECT config with port specified, scan clients
274	>	/*
275	>	* Found a CONNECT config with port specified, scan clients
276		* and see if this server is already connected?
277		*/
278	<	if (hash_find_server(conf->name) != NULL)
278	>	if (hash_find_server(conf->name))
279		continue;
280
281		if (conf->class->ref_count < conf->class->max_total)
282		{
283	<	/* Go to the end of the list, if not already last */
284	<	if (ptr->next != NULL)
283	>	/* Move this entry to the end of the list, if not already last */
284	>	if (node->next)
285		{
286	<	dlinkDelete(ptr, &server_items);
286	>	dlinkDelete(node, &server_items);
287		dlinkAddTail(conf, &conf->node, &server_items);
288		}
289
290		if (find_servconn_in_progress(conf->name))
291		return;
292
293	<	/* We used to only print this if serv_connect() actually
293	>	/*
294	>	* We used to only print this if serv_connect() actually
295		* succeeded, but since comm_tcp_connect() can call the callback
296		* immediately if there is an error, we were getting error messages
297		* in the wrong order. SO, we just print out the activated line,
#	Line 341 | Line 300 | try_connections(void *unused)
300		*   -- adrian
301		*/
302		if (ConfigServerHide.hide_server_ips)
303	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
303	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
304		"Connection to %s activated.",
305		conf->name);
306		else
307	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
307	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
308		"Connection to %s[%s] activated.",
309		conf->name, conf->host);
310
#	Line 359 | Line 318 | try_connections(void *unused)
318		int
319		valid_servname(const char *name)
320		{
321	<	unsigned int length = 0;
363	<	unsigned int dots   = 0;
321	>	unsigned int dots = 0;
322		const char *p = name;
323
324		for (; *p; ++p)
#	Line 368 | Line 326 | valid_servname(const char *name)
326		if (!IsServChar(*p))
327		return 0;
328
371	–	++length;
372	–
329		if (*p == '.')
330		++dots;
331		}
332
333	<	return dots != 0 && length <= HOSTLEN;
333	>	return dots && (p - name) <= HOSTLEN;
334		}
335
336		int
337		check_server(const char *name, struct Client *client_p)
338		{
339	<	dlink_node *ptr;
339	>	dlink_node *node = NULL;
340		struct MaskItem *conf        = NULL;
341		struct MaskItem *server_conf = NULL;
342		int error = -1;
343
344	<	assert(client_p != NULL);
344	>	assert(client_p);
345
346	<	/* loop through looking for all possible connect items that might work */
347	<	DLINK_FOREACH(ptr, server_items.head)
346	>	/* Loop through looking for all possible connect items that might work */
347	>	DLINK_FOREACH(node, server_items.head)
348		{
349	<	conf = ptr->data;
349	>	conf = node->data;
350
351		if (match(name, conf->name))
352		continue;
#	Line 404 | Line 360 | check_server(const char *name, struct Cl
360		{
361		error = -2;
362
363	<	if (!match_conf_password(client_p->localClient->passwd, conf))
363	>	if (!match_conf_password(client_p->connection->password, conf))
364		return -2;
365
366		if (!EmptyString(conf->certfp))
#	Line 420 | Line 376 | check_server(const char *name, struct Cl
376
377		attach_conf(client_p, server_conf);
378
379	<
424	<	if (server_conf != NULL)
379	>	switch (server_conf->aftype)
380		{
381	<	struct sockaddr_in *v4;
427	<	#ifdef IPV6
428	<	struct sockaddr_in6 *v6;
429	<	#endif
430	<	switch (server_conf->aftype)
381	>	case AF_INET6:
382		{
383	<	#ifdef IPV6
433	<	case AF_INET6:
434	<	v6 = (struct sockaddr_in6 *)&server_conf->addr;
383	>	const struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&server_conf->addr;
384
385	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
386	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
387	<	break;
388	<	#endif
389	<	case AF_INET:
390	<	v4 = (struct sockaddr_in *)&server_conf->addr;
385	>	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
386	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
387	>	break;
388	>	}
389	>	case AF_INET:
390	>	{
391	>	const struct sockaddr_in *v4 = (struct sockaddr_in *)&server_conf->addr;
392
393	<	if (v4->sin_addr.s_addr == INADDR_NONE)
394	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
395	<	break;
393	>	if (v4->sin_addr.s_addr == INADDR_NONE)
394	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
395	>	break;
396		}
397		}
398
#	Line 459 | Line 409 | check_server(const char *name, struct Cl
409		*                modules to dynamically add or subtract their capability.
410		*/
411		void
412	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
412	>	add_capability(const char *name, unsigned int flag)
413		{
414	<	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);
414	>	struct Capability *cap = MyCalloc(sizeof(*cap));
415
416	<	if (add_to_default)
417	<	default_server_capabs |= cap_flag;
416	>	cap->name = xstrdup(name);
417	>	cap->cap = flag;
418	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
419		}
420
421		/* delete_capability()
#	Line 477 | Line 424 | add_capability(const char *capab_name, i
424		* output       - NONE
425		* side effects - delete given capability from ones known.
426		*/
427	<	int
428	<	delete_capability(const char *capab_name)
427	>	void
428	>	delete_capability(const char *name)
429		{
430	<	dlink_node *ptr;
484	<	dlink_node *next_ptr;
485	<	struct Capability *cap;
430	>	dlink_node *node = NULL, *node_next = NULL;
431
432	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
432	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
433		{
434	<	cap = ptr->data;
434	>	struct Capability *cap = node->data;
435
436	<	if (cap->cap != 0)
436	>	if (!irccmp(cap->name, name))
437		{
438	<	if (irccmp(cap->name, capab_name) == 0)
439	<	{
440	<	default_server_capabs &= ~(cap->cap);
496	<	dlinkDelete(ptr, &cap_list);
497	<	MyFree(cap->name);
498	<	MyFree(cap);
499	<	}
438	>	dlinkDelete(node, &server_capabilities_list);
439	>	MyFree(cap->name);
440	>	MyFree(cap);
441		}
442		}
502	–
503	–	return 0;
443		}
444
445		/*
#	Line 511 | Line 450 | delete_capability(const char *capab_name
450		* side effects - none
451		*/
452		unsigned int
453	<	find_capability(const char *capab)
453	>	find_capability(const char *name)
454		{
455	<	const dlink_node *ptr = NULL;
455	>	const dlink_node *node = NULL;
456
457	<	DLINK_FOREACH(ptr, cap_list.head)
457	>	DLINK_FOREACH(node, server_capabilities_list.head)
458		{
459	<	const struct Capability *cap = ptr->data;
459	>	const struct Capability *cap = node->data;
460
461	<	if (cap->cap && !irccmp(cap->name, capab))
461	>	if (!irccmp(cap->name, name))
462		return cap->cap;
463		}
464
#	Line 535 | Line 474 | find_capability(const char *capab)
474		*
475		*/
476		void
477	<	send_capabilities(struct Client *client_p, int cap_can_send)
477	>	send_capabilities(struct Client *client_p)
478		{
479	<	struct Capability *cap=NULL;
480	<	char msgbuf[IRCD_BUFSIZE];
542	<	char *t;
543	<	int tl;
544	<	dlink_node *ptr;
545	<
546	<	t = msgbuf;
479	>	char buf[IRCD_BUFSIZE] = "";
480	>	const dlink_node *node = NULL;
481
482	<	DLINK_FOREACH(ptr, cap_list.head)
482	>	DLINK_FOREACH(node, server_capabilities_list.head)
483		{
484	<	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];
484	>	const struct Capability *cap = node->data;
485
486	<	if (!IsClient(target_p))
576	<	return;
577	<
578	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
486	>	strlcat(buf, cap->name, sizeof(buf));
487
488	<	if (ubuf[0] == '\0')
489	<	{
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);
488	>	if (node->next)
489	>	strlcat(buf, " ", sizeof(buf));
490		}
491
492	<	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	<
492	>	sendto_one(client_p, "CAPAB :%s", buf);
493		}
494
495		/*
#	Line 641 | Line 503 | const char *
503		show_capabilities(const struct Client *target_p)
504		{
505		static char msgbuf[IRCD_BUFSIZE] = "";
506	<	const dlink_node *ptr = NULL;
506	>	const dlink_node *node = NULL;
507
508		strlcpy(msgbuf, "TS", sizeof(msgbuf));
509
510	<	DLINK_FOREACH(ptr, cap_list.head)
510	>	DLINK_FOREACH(node, server_capabilities_list.head)
511		{
512	<	const struct Capability *cap = ptr->data;
512	>	const struct Capability *cap = node->data;
513
514		if (!IsCapable(target_p, cap->cap))
515		continue;
#	Line 670 | Line 532 | struct Server *
532		make_server(struct Client *client_p)
533		{
534		if (client_p->serv == NULL)
535	<	client_p->serv = MyMalloc(sizeof(struct Server));
535	>	client_p->serv = MyCalloc(sizeof(struct Server));
536
537		return client_p->serv;
538		}
539
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	–
540		/* New server connection code
541		* Based upon the stuff floating about in s_bsd.c
542		*   -- adrian
#	Line 1067 | Line 561 | burst_members(struct Client *client_p, s
561		int
562		serv_connect(struct MaskItem *conf, struct Client *by)
563		{
564	<	struct Client *client_p;
565	<	char buf[HOSTIPLEN + 1];
564	>	struct Client *client_p = NULL;
565	>	char buf[HOSTIPLEN + 1] = "";
566
567		/* conversion structs */
568		struct sockaddr_in *v4;
1075	–	/* Make sure conf is useful */
1076	–	assert(conf != NULL);
569
570	+	/* Make sure conf is useful */
571	+	assert(conf);
572
573	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
573	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
574		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
575		ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
576		buf);
#	Line 1084 | Line 578 | serv_connect(struct MaskItem *conf, stru
578		/* Still processing a DNS lookup? -> exit */
579		if (conf->dns_pending)
580		{
581	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
581	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
582		"Error connecting to %s: DNS lookup for connect{} in progress.",
583		conf->name);
584	<	return (0);
584	>	return 0;
585		}
586
587		if (conf->dns_failed)
588		{
589	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
589	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
590		"Error connecting to %s: DNS lookup for connect{} failed.",
591		conf->name);
592	<	return (0);
592	>	return 0;
593		}
594
595		/* Make sure this server isn't already connected
596		* Note: conf should ALWAYS be a valid C: line
597		*/
598	<	if ((client_p = hash_find_server(conf->name)) != NULL)
598	>	if ((client_p = hash_find_server(conf->name)))
599		{
600	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
600	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
601		"Server %s already present from %s",
602		conf->name, get_client_name(client_p, SHOW_IP));
603	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
603	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
604		"Server %s already present from %s",
605		conf->name, get_client_name(client_p, MASK_IP));
606		if (by && IsClient(by) && !MyClient(by))
607	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
608	<	me.name, by->name, conf->name,
1115	<	get_client_name(client_p, MASK_IP));
607	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
608	>	conf->name, get_client_name(client_p, MASK_IP));
609		return 0;
610		}
611
#	Line 1127 | Line 620 | serv_connect(struct MaskItem *conf, stru
620		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
621
622		/* create a socket for the server connection */
623	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1131	<	SOCK_STREAM, 0, NULL) < 0)
623	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
624		{
625		/* Eek, failure to create the socket */
626	<	report_error(L_ALL, "opening stream socket to %s: %s",
627	<	conf->name, errno);
626	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
627	>
628		SetDead(client_p);
629	<	exit_client(client_p, &me, "Connection failed");
629	>	exit_client(client_p, "Connection failed");
630		return 0;
631		}
632
633		/* servernames are always guaranteed under HOSTLEN chars */
634	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
634	>	fd_note(&client_p->connection->fd, "Server: %s", conf->name);
635
636		/* Attach config entries to client here rather than in
637		* serv_connect_callback(). This to avoid null pointer references.
638		*/
639		if (!attach_connect_block(client_p, conf->name, conf->host))
640		{
641	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
642	<	"Host %s is not enabled for connecting: no connect{} block",
641	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
642	>	"Host %s is not enabled for connecting: no connect {} block",
643		conf->name);
644		if (by && IsClient(by) && !MyClient(by))
645	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
646	<	me.name, by->name, client_p->name);
645	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
646	>
647		SetDead(client_p);
648	<	exit_client(client_p, client_p, "Connection failed");
648	>	exit_client(client_p, "Connection failed");
649		return 0;
650		}
651
#	Line 1171 | Line 663 | serv_connect(struct MaskItem *conf, stru
663		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
664
665		SetConnecting(client_p);
666	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1175	<	/* from def_fam */
1176	<	client_p->localClient->aftype = conf->aftype;
666	>	client_p->connection->aftype = conf->aftype;
667
668		/* Now, initiate the connection */
669		/* XXX assume that a non 0 type means a specific bind address
#	Line 1183 | Line 673 | serv_connect(struct MaskItem *conf, stru
673		{
674		case AF_INET:
675		v4 = (struct sockaddr_in*)&conf->bind;
676	<	if (v4->sin_addr.s_addr != 0)
676	>	if (v4->sin_addr.s_addr)
677		{
678		struct irc_ssaddr ipn;
679		memset(&ipn, 0, sizeof(struct irc_ssaddr));
680		ipn.ss.ss_family = AF_INET;
681		ipn.ss_port = 0;
682		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
683	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
683	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
684		(struct sockaddr *)&ipn, ipn.ss_len,
685		serv_connect_callback, client_p, conf->aftype,
686		CONNECTTIMEOUT);
687		}
688	<	else if (ServerInfo.specific_ipv4_vhost)
688	>	else if (ConfigServerInfo.specific_ipv4_vhost)
689		{
690		struct irc_ssaddr ipn;
691		memset(&ipn, 0, sizeof(struct irc_ssaddr));
692		ipn.ss.ss_family = AF_INET;
693		ipn.ss_port = 0;
694	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
695	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
694	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
695	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
696		(struct sockaddr *)&ipn, ipn.ss_len,
697		serv_connect_callback, client_p, conf->aftype,
698		CONNECTTIMEOUT);
699		}
700		else
701	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
701	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
702		NULL, 0, serv_connect_callback, client_p, conf->aftype,
703		CONNECTTIMEOUT);
704		break;
1215	–	#ifdef IPV6
705		case AF_INET6:
706		{
707		struct irc_ssaddr ipn;
#	Line 1223 | Line 712 | serv_connect(struct MaskItem *conf, stru
712		v6conf = (struct sockaddr_in6 *)&conf->bind;
713		v6 = (struct sockaddr_in6 *)&ipn;
714
715	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
715	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
716		{
717		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
718		ipn.ss.ss_family = AF_INET6;
719		ipn.ss_port = 0;
720	<	comm_connect_tcp(&client_p->localClient->fd,
720	>	comm_connect_tcp(&client_p->connection->fd,
721		conf->host, conf->port,
722		(struct sockaddr *)&ipn, ipn.ss_len,
723		serv_connect_callback, client_p,
724		conf->aftype, CONNECTTIMEOUT);
725		}
726	<	else if (ServerInfo.specific_ipv6_vhost)
726	>	else if (ConfigServerInfo.specific_ipv6_vhost)
727		{
728	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
728	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
729		ipn.ss.ss_family = AF_INET6;
730		ipn.ss_port = 0;
731	<	comm_connect_tcp(&client_p->localClient->fd,
731	>	comm_connect_tcp(&client_p->connection->fd,
732		conf->host, conf->port,
733		(struct sockaddr *)&ipn, ipn.ss_len,
734		serv_connect_callback, client_p,
735		conf->aftype, CONNECTTIMEOUT);
736		}
737		else
738	<	comm_connect_tcp(&client_p->localClient->fd,
738	>	comm_connect_tcp(&client_p->connection->fd,
739		conf->host, conf->port,
740		NULL, 0, serv_connect_callback, client_p,
741		conf->aftype, CONNECTTIMEOUT);
742		}
1254	–	#endif
743		}
744	+
745		return 1;
746		}
747
#	Line 1262 | Line 751 | finish_ssl_server_handshake(struct Clien
751		{
752		struct MaskItem *conf = NULL;
753
754	<	conf = find_conf_name(&client_p->localClient->confs,
754	>	conf = find_conf_name(&client_p->connection->confs,
755		client_p->name, CONF_SERVER);
756		if (conf == NULL)
757		{
758	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
759	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
760	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
758	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
759	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
760	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
761		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
762
763	<	exit_client(client_p, &me, "Lost connect{} block");
763	>	exit_client(client_p, "Lost connect{} block");
764		return;
765		}
766
767		sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
768
769	<	send_capabilities(client_p, 0);
769	>	send_capabilities(client_p);
770
771		sendto_one(client_p, "SERVER %s 1 :%s%s",
772		me.name, ConfigServerHide.hidden ? "(H) " : "",
773		me.info);
774
775	<	/* If we've been marked dead because a send failed, just exit
775	>	/*
776	>	* If we've been marked dead because a send failed, just exit
777		* here now and save everyone the trouble of us ever existing.
778		*/
779		if (IsDead(client_p))
780		{
781	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
782	<	"%s[%s] went dead during handshake",
783	<	client_p->name,
784	<	client_p->host);
785	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1296	<	"%s went dead during handshake", client_p->name);
1297	<	return;
781	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
782	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
783	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
784	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
785	>	return;
786		}
787
788		/* don't move to serv_list yet -- we haven't sent a burst! */
789		/* If we get here, we're ok, so lets start reading some data */
790	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
790	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
791		}
792
793		static void
794	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
794	>	ssl_server_handshake(fde_t *fd, void *data)
795		{
796	+	struct Client *client_p = data;
797		X509 *cert = NULL;
798		int ret = 0;
799
800	<	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
800	>	if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
801		{
802	<	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
802	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
803	>	{
804	>	exit_client(client_p, "Timeout during SSL handshake");
805	>	return;
806	>	}
807	>
808	>	switch (SSL_get_error(client_p->connection->fd.ssl, ret))
809		{
810		case SSL_ERROR_WANT_WRITE:
811	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
812	<	(PF *)ssl_server_handshake, client_p, 0);
811	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
812	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
813		return;
814		case SSL_ERROR_WANT_READ:
815	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
816	<	(PF *)ssl_server_handshake, client_p, 0);
815	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
816	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
817		return;
818		default:
819		{
820		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
821	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
821	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
822		"Error connecting to %s: %s", client_p->name,
823		sslerr ? sslerr : "unknown SSL error");
824	<	exit_client(client_p, client_p, "Error during SSL handshake");
824	>	exit_client(client_p, "Error during SSL handshake");
825		return;
826		}
827		}
828		}
829
830	<	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
830	>	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
831	>
832	>	if ((cert = SSL_get_peer_certificate(client_p->connection->fd.ssl)))
833		{
834	<	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
835	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
836	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
834	>	int res = SSL_get_verify_result(client_p->connection->fd.ssl);
835	>	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
836	>	unsigned char md[EVP_MAX_MD_SIZE] = "";
837
838		if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
839		res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
840		res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
841		{
842	<	unsigned int i = 0, n = 0;
842	>	unsigned int n = 0;
843
844	<	if (X509_digest(cert, EVP_sha256(), md, &n))
844	>	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
845		{
846	<	for (; i < n; ++i)
1350	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
846	>	binary_to_hex(md, buf, n);
847		client_p->certfp = xstrdup(buf);
848		}
849		}
#	Line 1361 | Line 857 | ssl_server_handshake(fde_t *fd, struct C
857		}
858
859		static void
860	<	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
860	>	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
861		{
862	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
862	>	if ((client_p->connection->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
863		{
864		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
865		ERR_error_string(ERR_get_error(), NULL));
866		SetDead(client_p);
867	<	exit_client(client_p, client_p, "SSL_new failed");
867	>	exit_client(client_p, "SSL_new failed");
868		return;
869		}
870
871		SSL_set_fd(fd->ssl, fd->fd);
872
873		if (!EmptyString(conf->cipher_list))
874	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
874	>	SSL_set_cipher_list(client_p->connection->fd.ssl, conf->cipher_list);
875
876		ssl_server_handshake(NULL, client_p);
877		}
#	Line 1392 | Line 888 | ssl_connect_init(struct Client *client_p
888		static void
889		serv_connect_callback(fde_t *fd, int status, void *data)
890		{
891	<	struct Client *client_p = data;
892	<	struct MaskItem *conf = NULL;
891	>	struct Client *const client_p = data;
892	>	const struct MaskItem *conf = NULL;
893
894	<	/* First, make sure its a real client! */
895	<	assert(client_p != NULL);
896	<	assert(&client_p->localClient->fd == fd);
894	>	/* First, make sure it's a real client! */
895	>	assert(client_p);
896	>	assert(&client_p->connection->fd == fd);
897
898		/* Next, for backward purposes, record the ip of the server */
899	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
899	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
900		sizeof(struct irc_ssaddr));
901	+
902		/* Check the status */
903		if (status != COMM_OK)
904		{
905	<	/* We have an error, so report it and quit
906	<	* Admins get to see any IP, mere opers don't *sigh*
905	>	/* We have an error, so report it and quit */
906	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
907	>	"Error connecting to %s: %s",
908	>	get_client_name(client_p, SHOW_IP), comm_errstr(status));
909	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
910	>	"Error connecting to %s: %s",
911	>	get_client_name(client_p, MASK_IP), comm_errstr(status));
912	>
913	>	/*
914	>	* If a fd goes bad, call dead_link() the socket is no
915	>	* longer valid for reading or writing.
916		*/
917	<	if (ConfigServerHide.hide_server_ips)
918	<	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;
917	>	dead_link_on_write(client_p, 0);
918	>	return;
919		}
920
921		/* COMM_OK, so continue the connection procedure */
922		/* Get the C/N lines */
923	<	conf = find_conf_name(&client_p->localClient->confs,
923	>	conf = find_conf_name(&client_p->connection->confs,
924		client_p->name, CONF_SERVER);
925		if (conf == NULL)
926		{
927	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
928	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
929	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
927	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
928	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
929	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
930		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
931
932	<	exit_client(client_p, &me, "Lost connect{} block");
932	>	exit_client(client_p, "Lost connect{} block");
933		return;
934		}
935
#	Line 1456 | Line 946 | serv_connect_callback(fde_t *fd, int sta
946
947		sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
948
949	<	send_capabilities(client_p, 0);
949	>	send_capabilities(client_p);
950
951		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
952		ConfigServerHide.hidden ? "(H) " : "", me.info);
953
954	<	/* If we've been marked dead because a send failed, just exit
954	>	/*
955	>	* If we've been marked dead because a send failed, just exit
956		* here now and save everyone the trouble of us ever existing.
957		*/
958		if (IsDead(client_p))
959		{
960	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
961	<	"%s[%s] went dead during handshake",
962	<	client_p->name,
963	<	client_p->host);
964	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1474	<	"%s went dead during handshake", client_p->name);
1475	<	return;
960	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
961	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
962	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
963	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
964	>	return;
965		}
966
967		/* don't move to serv_list yet -- we haven't sent a burst! */

Diff Legend

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