ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/server.c

Comparing:
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3136 by michael, Tue Mar 11 18:24:03 2014 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 7006 by michael, Fri Jan 1 00:07:54 2016 UTC

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