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 3110 by michael, Thu Mar 6 20:33:17 2014 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 6350 by michael, Tue Aug 11 17:53:44 2015 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-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 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
51	<	#define MIN_CONN_FREQ 300
51	>	enum { MIN_CONN_FREQ = 300 };
52
53		dlink_list flatten_links;
54	<	static dlink_list cap_list = { NULL, NULL, 0 };
55	<	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;
54	>	static dlink_list server_capabilities_list;
55	>	static void serv_connect_callback(fde_t *, int, void *);
56
66	–	static void burst_members(struct Client *, struct Channel *);
57
58		/*
59		* write_links_file
#	Line 74 | Line 64 | static void burst_members(struct Client
64		*                but in no particular order.
65		*/
66		void
67	<	write_links_file(void *notused)
67	>	write_links_file(void *unused)
68		{
69		FILE *file = NULL;
70	<	dlink_node *ptr = NULL, *ptr_next = NULL;
71	<	char buff[IRCD_BUFSIZE] = { '\0' };
70	>	dlink_node *node = NULL, *node_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73		if ((file = fopen(LIPATH, "w")) == NULL)
74		return;
75
76	<	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
76	>	DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
77		{
78	<	dlinkDelete(ptr, &flatten_links);
79	<	MyFree(ptr->data);
80	<	free_dlink_node(ptr);
78	>	dlinkDelete(node, &flatten_links);
79	>	MyFree(node->data);
80	>	free_dlink_node(node);
81		}
82
83	<	DLINK_FOREACH(ptr, global_serv_list.head)
83	>	DLINK_FOREACH(node, global_server_list.head)
84		{
85	<	const struct Client *target_p = ptr->data;
85	>	const struct Client *target_p = node->data;
86
87		/*
88		* Skip hidden servers, aswell as ourselves, since we already send
#	Line 127 | Line 117 | read_links_file(void)
117		{
118		FILE *file = NULL;
119		char *p = NULL;
120	<	char buff[IRCD_BUFSIZE] = { '\0' };
120	>	char buff[IRCD_BUFSIZE] = "";
121
122		if ((file = fopen(LIPATH, "r")) == NULL)
123		return;
124
125		while (fgets(buff, sizeof(buff), file))
126		{
127	<	if ((p = strchr(buff, '\n')) != NULL)
127	>	if ((p = strchr(buff, '\n')))
128		*p = '\0';
129
130		dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
#	Line 163 | Line 153 | read_links_file(void)
153		*      returns: (see #defines)
154		*/
155		int
156	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
156	>	hunt_server(struct Client *source_p, const char *command,
157		const int server, const int parc, char *parv[])
158		{
159		struct Client *target_p = NULL;
160	<	struct Client *target_tmp = NULL;
171	<	dlink_node *ptr;
172	<	int wilds;
160	>	dlink_node *node = NULL;
161
162		/* Assume it's me, if no server */
163		if (parc <= server || EmptyString(parv[server]))
164		return HUNTED_ISME;
165
166	<	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
167	<	return HUNTED_ISME;
166	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
167	>	target_p = hash_find_server(parv[server]);
168
169	<	/* These are to pickup matches that would cause the following
169	>	/*
170	>	* These are to pickup matches that would cause the following
171		* message to go in the wrong direction while doing quick fast
172		* non-matching lookups.
173		*/
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	–
174		if (target_p)
175		if (target_p->from == source_p->from && !MyConnect(target_p))
176		target_p = NULL;
177
178	<	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)
178	>	if (!target_p && has_wildcards(parv[server]))
179		{
180	<	if (!wilds)
180	>	DLINK_FOREACH(node, global_server_list.head)
181		{
182	<	if (!(target_p = hash_find_server(parv[server])))
182	>	struct Client *tmp = node->data;
183	>
184	>	assert(IsMe(tmp) || IsServer(tmp));
185	>	if (!match(parv[server], tmp->name))
186		{
187	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
188	<	return HUNTED_NOSUCH;
187	>	if (tmp->from == source_p->from && !MyConnect(tmp))
188	>	continue;
189	>
190	>	target_p = node->data;
191	>	break;
192		}
193		}
194	<	else
194	>
195	>	if (!target_p)
196		{
197	<	DLINK_FOREACH(ptr, global_client_list.head)
197	>	DLINK_FOREACH(node, global_client_list.head)
198		{
199	<	target_tmp = ptr->data;
199	>	struct Client *tmp = node->data;
200
201	<	if (!match(parv[server], target_tmp->name))
201	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
202	>	if (!match(parv[server], tmp->name))
203		{
204	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
204	>	if (tmp->from == source_p->from && !MyConnect(tmp))
205		continue;
223	–	target_p = ptr->data;
206
207	<	if (IsRegistered(target_p) && (target_p != client_p))
208	<	break;
207	>	target_p = node->data;
208	>	break;
209		}
210		}
211		}
212		}
213
214	<	if (target_p != NULL)
214	>	if (target_p)
215		{
216	<	if(!IsRegistered(target_p))
235	<	{
236	<	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237	<	return HUNTED_NOSUCH;
238	<	}
239	<
216	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
217		if (IsMe(target_p) || MyClient(target_p))
218		return HUNTED_ISME;
219
220	<	if (match(target_p->name, parv[server]))
221	<	parv[server] = target_p->name;
245	<
246	<	sendto_one(target_p, command, ID_or_name(source_p, target_p),
220	>	parv[server] = target_p->id;
221	>	sendto_one(target_p, command, source_p->id,
222		parv[1], parv[2], parv[3], parv[4],
223		parv[5], parv[6], parv[7], parv[8]);
224		return HUNTED_PASS;
#	Line 266 | Line 241 | hunt_server(struct Client *client_p, str
241		void
242		try_connections(void *unused)
243		{
244	<	dlink_node *ptr = NULL;
245	<	struct MaskItem *conf;
271	<	int confrq;
244	>	dlink_node *node = NULL;
245	>	int confrq = 0;
246
247		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
248		if (GlobalSetOptions.autoconn == 0)
249		return;
250
251	<	DLINK_FOREACH(ptr, server_items.head)
251	>	DLINK_FOREACH(node, server_items.head)
252		{
253	<	conf = ptr->data;
253	>	struct MaskItem *conf = node->data;
254
255		assert(conf->type == CONF_SERVER);
256
257		/* Also when already connecting! (update holdtimes) --SRB
258		*/
259	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
259	>	if (!conf->port || !IsConfAllowAutoConn(conf))
260		continue;
261
262
#	Line 295 | Line 269 | try_connections(void *unused)
269		if (conf->until > CurrentTime)
270		continue;
271
272	<	if (conf->class == NULL)
273	<	confrq = DEFAULT_CONNECTFREQUENCY;
274	<	else
275	<	{
276	<	confrq = conf->class->con_freq;
303	<	if (confrq < MIN_CONN_FREQ)
304	<	confrq = MIN_CONN_FREQ;
305	<	}
272	>	assert(conf->class);
273	>
274	>	confrq = conf->class->con_freq;
275	>	if (confrq < MIN_CONN_FREQ)
276	>	confrq = MIN_CONN_FREQ;
277
278		conf->until = CurrentTime + confrq;
279
280	<	/* Found a CONNECT config with port specified, scan clients
280	>	/*
281	>	* Found a CONNECT config with port specified, scan clients
282		* and see if this server is already connected?
283		*/
284	<	if (hash_find_server(conf->name) != NULL)
284	>	if (hash_find_server(conf->name))
285		continue;
286
287		if (conf->class->ref_count < conf->class->max_total)
288		{
289		/* Go to the end of the list, if not already last */
290	<	if (ptr->next != NULL)
290	>	if (node->next)
291		{
292	<	dlinkDelete(ptr, &server_items);
292	>	dlinkDelete(node, &server_items);
293		dlinkAddTail(conf, &conf->node, &server_items);
294		}
295
296		if (find_servconn_in_progress(conf->name))
297		return;
298
299	<	/* We used to only print this if serv_connect() actually
299	>	/*
300	>	* We used to only print this if serv_connect() actually
301		* succeeded, but since comm_tcp_connect() can call the callback
302		* immediately if there is an error, we were getting error messages
303		* in the wrong order. SO, we just print out the activated line,
#	Line 333 | Line 306 | try_connections(void *unused)
306		*   -- adrian
307		*/
308		if (ConfigServerHide.hide_server_ips)
309	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
309	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
310		"Connection to %s activated.",
311		conf->name);
312		else
313	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
313	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
314		"Connection to %s[%s] activated.",
315		conf->name, conf->host);
316
#	Line 351 | Line 324 | try_connections(void *unused)
324		int
325		valid_servname(const char *name)
326		{
327	<	unsigned int length = 0;
355	<	unsigned int dots   = 0;
327	>	unsigned int dots = 0;
328		const char *p = name;
329
330		for (; *p; ++p)
#	Line 360 | Line 332 | valid_servname(const char *name)
332		if (!IsServChar(*p))
333		return 0;
334
363	–	++length;
364	–
335		if (*p == '.')
336		++dots;
337		}
338
339	<	return dots != 0 && length <= HOSTLEN;
339	>	return dots && (p - name) <= HOSTLEN;
340		}
341
342		int
343		check_server(const char *name, struct Client *client_p)
344		{
345	<	dlink_node *ptr;
345	>	dlink_node *node = NULL;
346		struct MaskItem *conf        = NULL;
347		struct MaskItem *server_conf = NULL;
348		int error = -1;
349
350	<	assert(client_p != NULL);
350	>	assert(client_p);
351
352		/* loop through looking for all possible connect items that might work */
353	<	DLINK_FOREACH(ptr, server_items.head)
353	>	DLINK_FOREACH(node, server_items.head)
354		{
355	<	conf = ptr->data;
355	>	conf = node->data;
356
357		if (match(name, conf->name))
358		continue;
#	Line 396 | Line 366 | check_server(const char *name, struct Cl
366		{
367		error = -2;
368
369	<	if (!match_conf_password(client_p->localClient->passwd, conf))
369	>	if (!match_conf_password(client_p->connection->password, conf))
370		return -2;
371
372		if (!EmptyString(conf->certfp))
#	Line 413 | Line 383 | check_server(const char *name, struct Cl
383		attach_conf(client_p, server_conf);
384
385
386	<	if (server_conf != NULL)
386	>	if (server_conf)
387		{
388		struct sockaddr_in *v4;
419	–	#ifdef IPV6
389		struct sockaddr_in6 *v6;
390	<	#endif
390	>
391		switch (server_conf->aftype)
392		{
424	–	#ifdef IPV6
393		case AF_INET6:
394		v6 = (struct sockaddr_in6 *)&server_conf->addr;
395
396		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
397	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
397	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
398		break;
431	–	#endif
399		case AF_INET:
400		v4 = (struct sockaddr_in *)&server_conf->addr;
401
402		if (v4->sin_addr.s_addr == INADDR_NONE)
403	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
403	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
404		break;
405		}
406		}
#	Line 451 | Line 418 | check_server(const char *name, struct Cl
418		*                modules to dynamically add or subtract their capability.
419		*/
420		void
421	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
421	>	add_capability(const char *name, unsigned int flag)
422		{
423	<	struct Capability *cap = MyMalloc(sizeof(*cap));
423	>	struct Capability *cap = MyCalloc(sizeof(*cap));
424
425	<	cap->name = xstrdup(capab_name);
426	<	cap->cap = cap_flag;
427	<	dlinkAdd(cap, &cap->node, &cap_list);
461	<
462	<	if (add_to_default)
463	<	default_server_capabs |= cap_flag;
425	>	cap->name = xstrdup(name);
426	>	cap->cap = flag;
427	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
428		}
429
430		/* delete_capability()
#	Line 469 | Line 433 | add_capability(const char *capab_name, i
433		* output       - NONE
434		* side effects - delete given capability from ones known.
435		*/
436	<	int
437	<	delete_capability(const char *capab_name)
436	>	void
437	>	delete_capability(const char *name)
438		{
439	<	dlink_node *ptr;
476	<	dlink_node *next_ptr;
477	<	struct Capability *cap;
439	>	dlink_node *node = NULL, *node_next = NULL;
440
441	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
441	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
442		{
443	<	cap = ptr->data;
443	>	struct Capability *cap = node->data;
444
445	<	if (cap->cap != 0)
445	>	if (!irccmp(cap->name, name))
446		{
447	<	if (irccmp(cap->name, capab_name) == 0)
448	<	{
449	<	default_server_capabs &= ~(cap->cap);
488	<	dlinkDelete(ptr, &cap_list);
489	<	MyFree(cap->name);
490	<	MyFree(cap);
491	<	}
447	>	dlinkDelete(node, &server_capabilities_list);
448	>	MyFree(cap->name);
449	>	MyFree(cap);
450		}
451		}
494	–
495	–	return 0;
452		}
453
454		/*
#	Line 503 | Line 459 | delete_capability(const char *capab_name
459		* side effects - none
460		*/
461		unsigned int
462	<	find_capability(const char *capab)
462	>	find_capability(const char *name)
463		{
464	<	const dlink_node *ptr = NULL;
464	>	const dlink_node *node = NULL;
465
466	<	DLINK_FOREACH(ptr, cap_list.head)
466	>	DLINK_FOREACH(node, server_capabilities_list.head)
467		{
468	<	const struct Capability *cap = ptr->data;
468	>	const struct Capability *cap = node->data;
469
470	<	if (cap->cap && !irccmp(cap->name, capab))
470	>	if (!irccmp(cap->name, name))
471		return cap->cap;
472		}
473
#	Line 527 | Line 483 | find_capability(const char *capab)
483		*
484		*/
485		void
486	<	send_capabilities(struct Client *client_p, int cap_can_send)
486	>	send_capabilities(struct Client *client_p)
487		{
488	<	struct Capability *cap=NULL;
489	<	char msgbuf[IRCD_BUFSIZE];
534	<	char *t;
535	<	int tl;
536	<	dlink_node *ptr;
537	<
538	<	t = msgbuf;
488	>	char buf[IRCD_BUFSIZE] = "";
489	>	const dlink_node *node = NULL;
490
491	<	DLINK_FOREACH(ptr, cap_list.head)
491	>	DLINK_FOREACH(node, server_capabilities_list.head)
492		{
493	<	cap = ptr->data;
543	<
544	<	if (cap->cap & (cap_can_send|default_server_capabs))
545	<	{
546	<	tl = sprintf(t, "%s ", cap->name);
547	<	t += tl;
548	<	}
549	<	}
550	<
551	<	*(t - 1) = '\0';
552	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
553	<	}
554	<
555	<	/* sendnick_TS()
556	<	*
557	<	* inputs       - client (server) to send nick towards
558	<	*          - client to send nick for
559	<	* output       - NONE
560	<	* side effects - NICK message is sent towards given client_p
561	<	*/
562	<	void
563	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
564	<	{
565	<	char ubuf[IRCD_BUFSIZE];
566	<
567	<	if (!IsClient(target_p))
568	<	return;
493	>	const struct Capability *cap = node->data;
494
495	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
495	>	strlcat(buf, cap->name, sizeof(buf));
496
497	<	if (ubuf[0] == '\0')
498	<	{
574	<	ubuf[0] = '+';
575	<	ubuf[1] = '\0';
497	>	if (node->next)
498	>	strlcat(buf, " ", sizeof(buf));
499		}
500
501	<	if (IsCapable(client_p, CAP_SVS))
579	<	{
580	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
581	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
582	<	target_p->servptr->id,
583	<	target_p->name, target_p->hopcount + 1,
584	<	(unsigned long) target_p->tsinfo,
585	<	ubuf, target_p->username, target_p->host,
586	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
587	<	"0" : target_p->sockhost, target_p->id,
588	<	target_p->svid, target_p->info);
589	<	else
590	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
591	<	target_p->name, target_p->hopcount + 1,
592	<	(unsigned long) target_p->tsinfo,
593	<	ubuf, target_p->username, target_p->host,
594	<	target_p->servptr->name, target_p->svid,
595	<	target_p->info);
596	<	}
597	<	else
598	<	{
599	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
600	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
601	<	target_p->servptr->id,
602	<	target_p->name, target_p->hopcount + 1,
603	<	(unsigned long) target_p->tsinfo,
604	<	ubuf, target_p->username, target_p->host,
605	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
606	<	"0" : target_p->sockhost, target_p->id, target_p->info);
607	<	else
608	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
609	<	target_p->name, target_p->hopcount + 1,
610	<	(unsigned long) target_p->tsinfo,
611	<	ubuf, target_p->username, target_p->host,
612	<	target_p->servptr->name, target_p->info);
613	<	}
614	<
615	<	if (!EmptyString(target_p->certfp))
616	<	sendto_one(client_p, ":%s CERTFP %s",
617	<	ID_or_name(target_p, client_p), target_p->certfp);
618	<
619	<	if (target_p->away[0])
620	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
621	<	target_p->away);
622	<
501	>	sendto_one(client_p, "CAPAB :%s", buf);
502		}
503
504		/*
#	Line 633 | Line 512 | const char *
512		show_capabilities(const struct Client *target_p)
513		{
514		static char msgbuf[IRCD_BUFSIZE] = "";
515	<	const dlink_node *ptr = NULL;
515	>	const dlink_node *node = NULL;
516
517		strlcpy(msgbuf, "TS", sizeof(msgbuf));
518
519	<	DLINK_FOREACH(ptr, cap_list.head)
519	>	DLINK_FOREACH(node, server_capabilities_list.head)
520		{
521	<	const struct Capability *cap = ptr->data;
521	>	const struct Capability *cap = node->data;
522
523		if (!IsCapable(target_p, cap->cap))
524		continue;
#	Line 662 | Line 541 | struct Server *
541		make_server(struct Client *client_p)
542		{
543		if (client_p->serv == NULL)
544	<	client_p->serv = MyMalloc(sizeof(struct Server));
544	>	client_p->serv = MyCalloc(sizeof(struct Server));
545
546		return client_p->serv;
547		}
548
670	–	/* server_estab()
671	–	*
672	–	* inputs       - pointer to a struct Client
673	–	* output       -
674	–	* side effects -
675	–	*/
676	–	void
677	–	server_estab(struct Client *client_p)
678	–	{
679	–	struct Client *target_p;
680	–	struct MaskItem *conf = NULL;
681	–	char *host;
682	–	const char *inpath;
683	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
684	–	dlink_node *ptr;
685	–	#ifdef HAVE_LIBCRYPTO
686	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
687	–	#endif
688	–
689	–	assert(client_p != NULL);
690	–
691	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
692	–
693	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
694	–	host   = client_p->name;
695	–
696	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
697	–	== NULL)
698	–	{
699	–	/* This shouldn't happen, better tell the ops... -A1kmm */
700	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
701	–	"Warning: Lost connect{} block "
702	–	"for server %s(this shouldn't happen)!", host);
703	–	exit_client(client_p, &me, "Lost connect{} block!");
704	–	return;
705	–	}
706	–
707	–	MyFree(client_p->localClient->passwd);
708	–	client_p->localClient->passwd = NULL;
709	–
710	–	/* Its got identd, since its a server */
711	–	SetGotId(client_p);
712	–
713	–	/* If there is something in the serv_list, it might be this
714	–	* connecting server..
715	–	*/
716	–	if (!ServerInfo.hub && serv_list.head)
717	–	{
718	–	if (client_p != serv_list.head->data || serv_list.head->next)
719	–	{
720	–	++ServerStats.is_ref;
721	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
722	–	exit_client(client_p, &me, "I'm a leaf");
723	–	return;
724	–	}
725	–	}
726	–
727	–	if (IsUnknown(client_p))
728	–	{
729	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
730	–
731	–	send_capabilities(client_p, 0);
732	–
733	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
734	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
735	–	}
736	–
737	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
738	–	(unsigned long)CurrentTime);
739	–
740	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
741	–	if (IsCapable(client_p, CAP_TS6))
742	–	hash_add_id(client_p);
743	–
744	–	/* XXX Does this ever happen? I don't think so -db */
745	–	detach_conf(client_p, CONF_OPER);
746	–
747	–	/* *WARNING*
748	–	**    In the following code in place of plain server's
749	–	**    name we send what is returned by get_client_name
750	–	**    which may add the "sockhost" after the name. It's
751	–	**    *very* *important* that there is a SPACE between
752	–	**    the name and sockhost (if present). The receiving
753	–	**    server will start the information field from this
754	–	**    first blank and thus puts the sockhost into info.
755	–	**    ...a bit tricky, but you have been warned, besides
756	–	**    code is more neat this way...  --msa
757	–	*/
758	–	client_p->servptr = &me;
759	–
760	–	if (IsClosing(client_p))
761	–	return;
762	–
763	–	SetServer(client_p);
764	–
765	–	/* Update the capability combination usage counts. -A1kmm */
766	–	set_chcap_usage_counts(client_p);
767	–
768	–	/* Some day, all these lists will be consolidated *sigh* */
769	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
770	–
771	–	assert(dlinkFind(&unknown_list, client_p));
772	–
773	–	dlink_move_node(&client_p->localClient->lclient_node,
774	–	&unknown_list, &serv_list);
775	–
776	–	Count.myserver++;
777	–
778	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
779	–	hash_add_client(client_p);
780	–
781	–	/* doesnt duplicate client_p->serv if allocated this struct already */
782	–	make_server(client_p);
783	–
784	–	/* fixing eob timings.. -gnp */
785	–	client_p->localClient->firsttime = CurrentTime;
786	–
787	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
788	–	AddFlag(client_p, FLAGS_SERVICE);
789	–
790	–	/* Show the real host/IP to admins */
791	–	#ifdef HAVE_LIBCRYPTO
792	–	if (client_p->localClient->fd.ssl)
793	–	{
794	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
795	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
796	–
797	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
798	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
799	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
800	–	compression ? SSL_COMP_get_name(compression) : "NONE",
801	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
802	–	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: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
806	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
807	–	compression ? SSL_COMP_get_name(compression) : "NONE",
808	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
809	–	show_capabilities(client_p));
810	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
811	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
812	–	compression ? SSL_COMP_get_name(compression) : "NONE",
813	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
814	–	show_capabilities(client_p));
815	–	}
816	–	else
817	–	#endif
818	–	{
819	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
820	–	"Link with %s established: (Capabilities: %s)",
821	–	inpath_ip, show_capabilities(client_p));
822	–	/* Now show the masked hostname/IP to opers */
823	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
824	–	"Link with %s established: (Capabilities: %s)",
825	–	inpath, show_capabilities(client_p));
826	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
827	–	inpath_ip, show_capabilities(client_p));
828	–	}
829	–
830	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
831	–
832	–	/* Old sendto_serv_but_one() call removed because we now
833	–	** need to send different names to different servers
834	–	** (domain name matching) Send new server to other servers.
835	–	*/
836	–	DLINK_FOREACH(ptr, serv_list.head)
837	–	{
838	–	target_p = ptr->data;
839	–
840	–	if (target_p == client_p)
841	–	continue;
842	–
843	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
844	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
845	–	me.id, client_p->name, client_p->id,
846	–	IsHidden(client_p) ? "(H) " : "",
847	–	client_p->info);
848	–	else
849	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
850	–	me.name, client_p->name,
851	–	IsHidden(client_p) ? "(H) " : "",
852	–	client_p->info);
853	–	}
854	–
855	–	/*
856	–	* Pass on my client information to the new server
857	–	*
858	–	* First, pass only servers (idea is that if the link gets
859	–	* cancelled beacause the server was already there,
860	–	* there are no NICK's to be cancelled...). Of course,
861	–	* if cancellation occurs, all this info is sent anyway,
862	–	* and I guess the link dies when a read is attempted...? --msa
863	–	*
864	–	* Note: Link cancellation to occur at this point means
865	–	* that at least two servers from my fragment are building
866	–	* up connection this other fragment at the same time, it's
867	–	* a race condition, not the normal way of operation...
868	–	*
869	–	* ALSO NOTE: using the get_client_name for server names--
870	–	*    see previous *WARNING*!!! (Also, original inpath
871	–	*    is destroyed...)
872	–	*/
873	–
874	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
875	–	{
876	–	target_p = ptr->data;
877	–
878	–	/* target_p->from == target_p for target_p == client_p */
879	–	if (IsMe(target_p) || target_p->from == client_p)
880	–	continue;
881	–
882	–	if (IsCapable(client_p, CAP_TS6))
883	–	{
884	–	if (HasID(target_p))
885	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
886	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
887	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
888	–	target_p->info);
889	–	else  /* introducing non-ts6 server */
890	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
891	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
892	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
893	–	}
894	–	else
895	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
896	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
897	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
898	–
899	–	if (HasFlag(target_p, FLAGS_EOB))
900	–	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
901	–	}
902	–
903	–	server_burst(client_p);
904	–	}
905	–
906	–	/* server_burst()
907	–	*
908	–	* inputs       - struct Client pointer server
909	–	*              -
910	–	* output       - none
911	–	* side effects - send a server burst
912	–	* bugs         - still too long
913	–	*/
914	–	static void
915	–	server_burst(struct Client *client_p)
916	–	{
917	–	/* Send it in the shortened format with the TS, if
918	–	** it's a TS server; walk the list of channels, sending
919	–	** all the nicks that haven't been sent yet for each
920	–	** channel, then send the channel itself -- it's less
921	–	** obvious than sending all nicks first, but on the
922	–	** receiving side memory will be allocated more nicely
923	–	** saving a few seconds in the handling of a split
924	–	** -orabidoo
925	–	*/
926	–
927	–	burst_all(client_p);
928	–
929	–	/* EOB stuff is now in burst_all */
930	–	/* Always send a PING after connect burst is done */
931	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
932	–	}
933	–
934	–	/* burst_all()
935	–	*
936	–	* inputs       - pointer to server to send burst to
937	–	* output       - NONE
938	–	* side effects - complete burst of channels/nicks is sent to client_p
939	–	*/
940	–	static void
941	–	burst_all(struct Client *client_p)
942	–	{
943	–	dlink_node *ptr = NULL;
944	–
945	–	DLINK_FOREACH(ptr, global_channel_list.head)
946	–	{
947	–	struct Channel *chptr = ptr->data;
948	–
949	–	if (dlink_list_length(&chptr->members) != 0)
950	–	{
951	–	burst_members(client_p, chptr);
952	–	send_channel_modes(client_p, chptr);
953	–
954	–	if (IsCapable(client_p, CAP_TBURST))
955	–	send_tb(client_p, chptr);
956	–	}
957	–	}
958	–
959	–	/* also send out those that are not on any channel
960	–	*/
961	–	DLINK_FOREACH(ptr, global_client_list.head)
962	–	{
963	–	struct Client *target_p = ptr->data;
964	–
965	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
966	–	sendnick_TS(client_p, target_p);
967	–
968	–	DelFlag(target_p, FLAGS_BURSTED);
969	–	}
970	–
971	–	if (IsCapable(client_p, CAP_EOB))
972	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
973	–	}
974	–
975	–	/*
976	–	* send_tb
977	–	*
978	–	* inputs       - pointer to Client
979	–	*              - pointer to channel
980	–	* output       - NONE
981	–	* side effects - Called on a server burst when
982	–	*                server is CAP_TBURST capable
983	–	*/
984	–	static void
985	–	send_tb(struct Client *client_p, struct Channel *chptr)
986	–	{
987	–	/*
988	–	* We may also send an empty topic here, but only if topic_time isn't 0,
989	–	* i.e. if we had a topic that got unset.  This is required for syncing
990	–	* topics properly.
991	–	*
992	–	* Imagine the following scenario: Our downlink introduces a channel
993	–	* to us with a TS that is equal to ours, but the channel topic on
994	–	* their side got unset while the servers were in splitmode, which means
995	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
996	–	* deal with it in a more sophisticated fashion instead of just resetting
997	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
998	–	* for further information   -Michael
999	–	*/
1000	–	if (chptr->topic_time != 0)
1001	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1002	–	ID_or_name(&me, client_p),
1003	–	(unsigned long)chptr->channelts, chptr->chname,
1004	–	(unsigned long)chptr->topic_time,
1005	–	chptr->topic_info,
1006	–	chptr->topic);
1007	–	}
1008	–
1009	–	/* burst_members()
1010	–	*
1011	–	* inputs       - pointer to server to send members to
1012	–	*              - dlink_list pointer to membership list to send
1013	–	* output       - NONE
1014	–	* side effects -
1015	–	*/
1016	–	static void
1017	–	burst_members(struct Client *client_p, struct Channel *chptr)
1018	–	{
1019	–	struct Client *target_p;
1020	–	struct Membership *ms;
1021	–	dlink_node *ptr;
1022	–
1023	–	DLINK_FOREACH(ptr, chptr->members.head)
1024	–	{
1025	–	ms       = ptr->data;
1026	–	target_p = ms->client_p;
1027	–
1028	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1029	–	{
1030	–	AddFlag(target_p, FLAGS_BURSTED);
1031	–
1032	–	if (target_p->from != client_p)
1033	–	sendnick_TS(client_p, target_p);
1034	–	}
1035	–	}
1036	–	}
1037	–
549		/* New server connection code
550		* Based upon the stuff floating about in s_bsd.c
551		*   -- adrian
#	Line 1059 | Line 570 | burst_members(struct Client *client_p, s
570		int
571		serv_connect(struct MaskItem *conf, struct Client *by)
572		{
573	<	struct Client *client_p;
574	<	char buf[HOSTIPLEN + 1];
573	>	struct Client *client_p = NULL;
574	>	char buf[HOSTIPLEN + 1] = "";
575
576		/* conversion structs */
577		struct sockaddr_in *v4;
1067	–	/* Make sure conf is useful */
1068	–	assert(conf != NULL);
578
579	+	/* Make sure conf is useful */
580	+	assert(conf);
581
582	<	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
582	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
583		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
584		ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
585		buf);
#	Line 1076 | Line 587 | serv_connect(struct MaskItem *conf, stru
587		/* Still processing a DNS lookup? -> exit */
588		if (conf->dns_pending)
589		{
590	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
590	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
591		"Error connecting to %s: DNS lookup for connect{} in progress.",
592		conf->name);
593	<	return (0);
593	>	return 0;
594		}
595
596		if (conf->dns_failed)
597		{
598	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
598	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
599		"Error connecting to %s: DNS lookup for connect{} failed.",
600		conf->name);
601	<	return (0);
601	>	return 0;
602		}
603
604		/* Make sure this server isn't already connected
605		* Note: conf should ALWAYS be a valid C: line
606		*/
607	<	if ((client_p = hash_find_server(conf->name)) != NULL)
607	>	if ((client_p = hash_find_server(conf->name)))
608		{
609	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
609	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
610		"Server %s already present from %s",
611		conf->name, get_client_name(client_p, SHOW_IP));
612	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
612	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
613		"Server %s already present from %s",
614		conf->name, get_client_name(client_p, MASK_IP));
615		if (by && IsClient(by) && !MyClient(by))
#	Line 1118 | Line 629 | serv_connect(struct MaskItem *conf, stru
629		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
630
631		/* create a socket for the server connection */
632	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1122	<	SOCK_STREAM, 0, NULL) < 0)
632	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
633		{
634		/* Eek, failure to create the socket */
635	<	report_error(L_ALL, "opening stream socket to %s: %s",
636	<	conf->name, errno);
635	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
636	>
637		SetDead(client_p);
638	<	exit_client(client_p, &me, "Connection failed");
638	>	exit_client(client_p, "Connection failed");
639		return 0;
640		}
641
642		/* servernames are always guaranteed under HOSTLEN chars */
643	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
643	>	fd_note(&client_p->connection->fd, "Server: %s", conf->name);
644
645		/* Attach config entries to client here rather than in
646		* serv_connect_callback(). This to avoid null pointer references.
647		*/
648		if (!attach_connect_block(client_p, conf->name, conf->host))
649		{
650	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
651	<	"Host %s is not enabled for connecting: no connect{} block",
650	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
651	>	"Host %s is not enabled for connecting: no connect {} block",
652		conf->name);
653		if (by && IsClient(by) && !MyClient(by))
654	<	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
654	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
655
656		SetDead(client_p);
657	<	exit_client(client_p, client_p, "Connection failed");
657	>	exit_client(client_p, "Connection failed");
658		return 0;
659		}
660
#	Line 1162 | Line 672 | serv_connect(struct MaskItem *conf, stru
672		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
673
674		SetConnecting(client_p);
675	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1166	<	/* from def_fam */
1167	<	client_p->localClient->aftype = conf->aftype;
675	>	client_p->connection->aftype = conf->aftype;
676
677		/* Now, initiate the connection */
678		/* XXX assume that a non 0 type means a specific bind address
#	Line 1174 | Line 682 | serv_connect(struct MaskItem *conf, stru
682		{
683		case AF_INET:
684		v4 = (struct sockaddr_in*)&conf->bind;
685	<	if (v4->sin_addr.s_addr != 0)
685	>	if (v4->sin_addr.s_addr)
686		{
687		struct irc_ssaddr ipn;
688		memset(&ipn, 0, sizeof(struct irc_ssaddr));
689		ipn.ss.ss_family = AF_INET;
690		ipn.ss_port = 0;
691		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
692	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
692	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
693		(struct sockaddr *)&ipn, ipn.ss_len,
694		serv_connect_callback, client_p, conf->aftype,
695		CONNECTTIMEOUT);
696		}
697	<	else if (ServerInfo.specific_ipv4_vhost)
697	>	else if (ConfigServerInfo.specific_ipv4_vhost)
698		{
699		struct irc_ssaddr ipn;
700		memset(&ipn, 0, sizeof(struct irc_ssaddr));
701		ipn.ss.ss_family = AF_INET;
702		ipn.ss_port = 0;
703	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
704	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
703	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
704	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
705		(struct sockaddr *)&ipn, ipn.ss_len,
706		serv_connect_callback, client_p, conf->aftype,
707		CONNECTTIMEOUT);
708		}
709		else
710	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
710	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
711		NULL, 0, serv_connect_callback, client_p, conf->aftype,
712		CONNECTTIMEOUT);
713		break;
1206	–	#ifdef IPV6
714		case AF_INET6:
715		{
716		struct irc_ssaddr ipn;
#	Line 1214 | Line 721 | serv_connect(struct MaskItem *conf, stru
721		v6conf = (struct sockaddr_in6 *)&conf->bind;
722		v6 = (struct sockaddr_in6 *)&ipn;
723
724	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
724	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
725		{
726		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
727		ipn.ss.ss_family = AF_INET6;
728		ipn.ss_port = 0;
729	<	comm_connect_tcp(&client_p->localClient->fd,
729	>	comm_connect_tcp(&client_p->connection->fd,
730		conf->host, conf->port,
731		(struct sockaddr *)&ipn, ipn.ss_len,
732		serv_connect_callback, client_p,
733		conf->aftype, CONNECTTIMEOUT);
734		}
735	<	else if (ServerInfo.specific_ipv6_vhost)
735	>	else if (ConfigServerInfo.specific_ipv6_vhost)
736		{
737	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
737	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
738		ipn.ss.ss_family = AF_INET6;
739		ipn.ss_port = 0;
740	<	comm_connect_tcp(&client_p->localClient->fd,
740	>	comm_connect_tcp(&client_p->connection->fd,
741		conf->host, conf->port,
742		(struct sockaddr *)&ipn, ipn.ss_len,
743		serv_connect_callback, client_p,
744		conf->aftype, CONNECTTIMEOUT);
745		}
746		else
747	<	comm_connect_tcp(&client_p->localClient->fd,
747	>	comm_connect_tcp(&client_p->connection->fd,
748		conf->host, conf->port,
749		NULL, 0, serv_connect_callback, client_p,
750		conf->aftype, CONNECTTIMEOUT);
751		}
1245	–	#endif
752		}
753	+
754		return 1;
755		}
756
#	Line 1253 | Line 760 | finish_ssl_server_handshake(struct Clien
760		{
761		struct MaskItem *conf = NULL;
762
763	<	conf = find_conf_name(&client_p->localClient->confs,
763	>	conf = find_conf_name(&client_p->connection->confs,
764		client_p->name, CONF_SERVER);
765		if (conf == NULL)
766		{
767	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
767	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
768		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
769	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
769	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
770		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
771
772	<	exit_client(client_p, &me, "Lost connect{} block");
772	>	exit_client(client_p, "Lost connect{} block");
773		return;
774		}
775
776		sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
777
778	<	send_capabilities(client_p, 0);
778	>	send_capabilities(client_p);
779
780		sendto_one(client_p, "SERVER %s 1 :%s%s",
781		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1279 | Line 786 | finish_ssl_server_handshake(struct Clien
786		*/
787		if (IsDead(client_p))
788		{
789	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
789	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
790		"%s[%s] went dead during handshake",
791		client_p->name,
792		client_p->host);
793	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
793	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
794		"%s went dead during handshake", client_p->name);
795		return;
796		}
797
798		/* don't move to serv_list yet -- we haven't sent a burst! */
799		/* If we get here, we're ok, so lets start reading some data */
800	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
800	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
801		}
802
803		static void
804	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
804	>	ssl_server_handshake(fde_t *fd, void *data)
805		{
806	+	struct Client *client_p = data;
807		X509 *cert = NULL;
808		int ret = 0;
809
810	<	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
810	>	if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
811		{
812	<	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
812	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
813	>	{
814	>	exit_client(client_p, "Timeout during SSL handshake");
815	>	return;
816	>	}
817	>
818	>	switch (SSL_get_error(client_p->connection->fd.ssl, ret))
819		{
820		case SSL_ERROR_WANT_WRITE:
821	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
822	<	(PF *)ssl_server_handshake, client_p, 0);
821	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
822	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
823		return;
824		case SSL_ERROR_WANT_READ:
825	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
826	<	(PF *)ssl_server_handshake, client_p, 0);
825	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
826	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
827		return;
828		default:
829		{
830		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
831	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
831	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
832		"Error connecting to %s: %s", client_p->name,
833		sslerr ? sslerr : "unknown SSL error");
834	<	exit_client(client_p, client_p, "Error during SSL handshake");
834	>	exit_client(client_p, "Error during SSL handshake");
835		return;
836		}
837		}
838		}
839
840	<	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
840	>	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
841	>
842	>	if ((cert = SSL_get_peer_certificate(client_p->connection->fd.ssl)))
843		{
844	<	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
845	<	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
846	<	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
844	>	int res = SSL_get_verify_result(client_p->connection->fd.ssl);
845	>	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
846	>	unsigned char md[EVP_MAX_MD_SIZE] = "";
847
848		if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
849		res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
850		res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
851		{
852	<	unsigned int i = 0, n = 0;
852	>	unsigned int n = 0;
853
854	<	if (X509_digest(cert, EVP_sha256(), md, &n))
854	>	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
855		{
856	<	for (; i < n; ++i)
1341	<	snprintf(buf + 2 * i, 3, "%02X", md[i]);
856	>	binary_to_hex(md, buf, n);
857		client_p->certfp = xstrdup(buf);
858		}
859		}
#	Line 1354 | Line 869 | ssl_server_handshake(fde_t *fd, struct C
869		static void
870		ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
871		{
872	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
872	>	if ((client_p->connection->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
873		{
874		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
875		ERR_error_string(ERR_get_error(), NULL));
876		SetDead(client_p);
877	<	exit_client(client_p, client_p, "SSL_new failed");
877	>	exit_client(client_p, "SSL_new failed");
878		return;
879		}
880
881		SSL_set_fd(fd->ssl, fd->fd);
882
883		if (!EmptyString(conf->cipher_list))
884	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
884	>	SSL_set_cipher_list(client_p->connection->fd.ssl, conf->cipher_list);
885
886		ssl_server_handshake(NULL, client_p);
887		}
#	Line 1386 | Line 901 | serv_connect_callback(fde_t *fd, int sta
901		struct Client *client_p = data;
902		struct MaskItem *conf = NULL;
903
904	<	/* First, make sure its a real client! */
905	<	assert(client_p != NULL);
906	<	assert(&client_p->localClient->fd == fd);
904	>	/* First, make sure it's a real client! */
905	>	assert(client_p);
906	>	assert(&client_p->connection->fd == fd);
907
908		/* Next, for backward purposes, record the ip of the server */
909	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
909	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
910		sizeof(struct irc_ssaddr));
911	+
912		/* Check the status */
913		if (status != COMM_OK)
914		{
#	Line 1400 | Line 916 | serv_connect_callback(fde_t *fd, int sta
916		* Admins get to see any IP, mere opers don't *sigh*
917		*/
918		if (ConfigServerHide.hide_server_ips)
919	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
919	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
920		"Error connecting to %s: %s",
921		client_p->name, comm_errstr(status));
922		else
923	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
923	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
924		"Error connecting to %s[%s]: %s", client_p->name,
925		client_p->host, comm_errstr(status));
926
927	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
927	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
928		"Error connecting to %s: %s",
929		client_p->name, comm_errstr(status));
930
#	Line 1421 | Line 937 | serv_connect_callback(fde_t *fd, int sta
937
938		/* COMM_OK, so continue the connection procedure */
939		/* Get the C/N lines */
940	<	conf = find_conf_name(&client_p->localClient->confs,
940	>	conf = find_conf_name(&client_p->connection->confs,
941		client_p->name, CONF_SERVER);
942		if (conf == NULL)
943		{
944	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
944	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
945		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
946	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
946	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
947		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
948
949	<	exit_client(client_p, &me, "Lost connect{} block");
949	>	exit_client(client_p, "Lost connect{} block");
950		return;
951		}
952
#	Line 1447 | Line 963 | serv_connect_callback(fde_t *fd, int sta
963
964		sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
965
966	<	send_capabilities(client_p, 0);
966	>	send_capabilities(client_p);
967
968		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
969		ConfigServerHide.hidden ? "(H) " : "", me.info);
#	Line 1457 | Line 973 | serv_connect_callback(fde_t *fd, int sta
973		*/
974		if (IsDead(client_p))
975		{
976	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
976	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
977		"%s[%s] went dead during handshake",
978		client_p->name,
979		client_p->host);
980	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
980	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
981		"%s went dead during handshake", client_p->name);
982		return;
983		}

Diff Legend

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