ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2134 by michael, Wed May 29 18:59:39 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/server.c (file contents), Revision 4676 by michael, Fri Oct 3 11:03:06 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_serv.c: Server related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_serv.c
23	>	* \brief Server related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 28 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
33		#include "client.h"
34	–	#include "dbuf.h"
34		#include "event.h"
36	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37		#include "ircd.h"
#	Line 41 | Line 39
39		#include "s_bsd.h"
40		#include "numeric.h"
41		#include "packet.h"
44	–	#include "irc_res.h"
42		#include "conf.h"
43	<	#include "s_serv.h"
43	>	#include "server.h"
44		#include "log.h"
45	<	#include "s_misc.h"
49	<	#include "s_user.h"
45	>	#include "user.h"
46		#include "send.h"
47		#include "memory.h"
48	<	#include "channel.h" /* chcap_usage_counts stuff...*/
48	>	#include "channel.h"
49		#include "parse.h"
50
51		#define 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 *);
59	<	static void burst_all(struct Client *);
60	<	static void send_tb(struct Client *client_p, struct Channel *chptr);
55	>	static void serv_connect_callback(fde_t *, int, void *);
56
62	–	static CNCB serv_connect_callback;
63	–
64	–	static void burst_members(struct Client *, struct Channel *);
57
58		/*
59		* write_links_file
#	Line 72 | 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	<	MessageFileLine *next_mptr = NULL;
70	<	MessageFileLine *mptr = NULL;
71	<	MessageFileLine *currentMessageLine = NULL;
80	<	MessageFileLine *newMessageLine = NULL;
81	<	MessageFile *MessageFileptr = &ConfigFileEntry.linksfile;
82	<	FILE *file;
83	<	char buff[512];
84	<	dlink_node *ptr;
69	>	FILE *file = NULL;
70	>	dlink_node *ptr = NULL, *ptr_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
73	>	if ((file = fopen(LIPATH, "w")) == NULL)
74		return;
75
76	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
76	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
77		{
78	<	next_mptr = mptr->next;
79	<	MyFree(mptr);
78	>	dlinkDelete(ptr, &flatten_links);
79	>	MyFree(ptr->data);
80	>	free_dlink_node(ptr);
81		}
82
83	<	MessageFileptr->contentsOfFile = NULL;
96	<
97	<	DLINK_FOREACH(ptr, global_serv_list.head)
83	>	DLINK_FOREACH(ptr, global_server_list.head)
84		{
85		const struct Client *target_p = ptr->data;
86
87	<	/* skip ourselves, we send ourselves in /links */
88	<	if (IsMe(target_p))
89	<	continue;
90	<
91	<	/* skip hidden servers */
106	<	if (IsHidden(target_p))
87	>	/*
88	>	* Skip hidden servers, aswell as ourselves, since we already send
89	>	* ourselves in /links
90	>	*/
91	>	if (IsHidden(target_p) || IsMe(target_p))
92		continue;
93
94		if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
95		continue;
96
112	–	newMessageLine = MyMalloc(sizeof(MessageFileLine));
113	–
97		/*
98		* Attempt to format the file in such a way it follows the usual links output
99		* ie  "servername uplink :hops info"
100		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
101		* - madmax
102		*/
103	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
104	<	target_p->name, me.name, target_p->info);
105	<
106	<	if (MessageFileptr->contentsOfFile)
107	<	{
125	<	if (currentMessageLine)
126	<	currentMessageLine->next = newMessageLine;
127	<	currentMessageLine = newMessageLine;
128	<	}
129	<	else
130	<	{
131	<	MessageFileptr->contentsOfFile = newMessageLine;
132	<	currentMessageLine = newMessageLine;
133	<	}
103	>	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
104	>	me.name, target_p->info);
105	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
106	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
107	>	me.name, target_p->info);
108
135	–	snprintf(buff, sizeof(buff), "%s %s :1 %s\n",
136	–	target_p->name, me.name, target_p->info);
109		fputs(buff, file);
110		}
111
112		fclose(file);
113		}
114
115	+	void
116	+	read_links_file(void)
117	+	{
118	+	FILE *file = NULL;
119	+	char *p = NULL;
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')))
128	+	*p = '\0';
129	+
130	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
131	+	}
132	+
133	+	fclose(file);
134	+	}
135	+
136		/* hunt_server()
137		*      Do the basic thing in delivering the message (command)
138		*      across the relays to the specific server (server) for
#	Line 160 | Line 153 | write_links_file(void* notused)
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;
168	<	dlink_node *ptr;
169	<	int wilds;
160	>	dlink_node *ptr = 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		*/
182	–	if (MyClient(source_p))
183	–	target_p = hash_find_client(parv[server]);
184	–	else
185	–	target_p = find_person(client_p, parv[server]);
186	–
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])))
192	<	if (target_p->from == source_p->from && !MyConnect(target_p))
193	<	target_p = NULL;
194	<
195	<	wilds = has_wildcards(parv[server]);
196	<
197	<	/* Again, if there are no wild cards involved in the server
198	<	* name, use the hash lookup
199	<	*/
200	<	if (target_p == NULL)
178	>	if (!target_p && has_wildcards(parv[server]))
179		{
180	<	if (!wilds)
180	>	DLINK_FOREACH(ptr, global_client_list.head)
181		{
182	<	if (!(target_p = hash_find_server(parv[server])))
205	<	{
206	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
207	<	me.name, source_p->name, parv[server]);
208	<	return(HUNTED_NOSUCH);
209	<	}
210	<	}
211	<	else
212	<	{
213	<	DLINK_FOREACH(ptr, global_client_list.head)
214	<	{
215	<	target_tmp = ptr->data;
182	>	struct Client *tmp = ptr->data;
183
184	<	if (!match(parv[server], target_tmp->name))
185	<	{
186	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
187	<	continue;
188	<	target_p = ptr->data;
184	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
185	>	if (!match(parv[server], tmp->name))
186	>	{
187	>	if (tmp->from == source_p->from && !MyConnect(tmp))
188	>	continue;
189
190	<	if (IsRegistered(target_p) && (target_p != client_p))
191	<	break;
225	<	}
190	>	target_p = ptr->data;
191	>	break;
192		}
193		}
194		}
195
196	<	if (target_p != NULL)
196	>	if (target_p)
197		{
198	<	if(!IsRegistered(target_p))
233	<	{
234	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
235	<	me.name, source_p->name, parv[server]);
236	<	return HUNTED_NOSUCH;
237	<	}
238	<
198	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
199		if (IsMe(target_p) || MyClient(target_p))
200		return HUNTED_ISME;
201
202	<	if (match(target_p->name, parv[server]))
203	<	parv[server] = target_p->name;
244	<
245	<	/* This is a little kludgy but should work... */
246	<	if (IsClient(source_p) &&
247	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
248	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
249	<	parv[0] = ID(source_p);
250	<
251	<	sendto_one(target_p, command, parv[0],
202	>	parv[server] = target_p->id;
203	>	sendto_one(target_p, command, source_p->id,
204		parv[1], parv[2], parv[3], parv[4],
205		parv[5], parv[6], parv[7], parv[8]);
206		return HUNTED_PASS;
207	<	}
207	>	}
208
209	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
258	<	me.name, source_p->name, parv[server]);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210		return HUNTED_NOSUCH;
211		}
212
#	Line 273 | Line 224 | void
224		try_connections(void *unused)
225		{
226		dlink_node *ptr = NULL;
227	<	struct MaskItem *conf;
277	<	int confrq;
227	>	int confrq = 0;
228
229		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
230		if (GlobalSetOptions.autoconn == 0)
#	Line 282 | Line 232 | try_connections(void *unused)
232
233		DLINK_FOREACH(ptr, server_items.head)
234		{
235	<	conf = ptr->data;
235	>	struct MaskItem *conf = ptr->data;
236
237		assert(conf->type == CONF_SERVER);
238
239	<	/* Also when already connecting! (update holdtimes) --SRB
239	>	/* Also when already connecting! (update holdtimes) --SRB
240		*/
241	<	if (!conf->port ||!IsConfAllowAutoConn(conf))
241	>	if (!conf->port || !IsConfAllowAutoConn(conf))
242		continue;
243
244
#	Line 301 | Line 251 | try_connections(void *unused)
251		if (conf->until > CurrentTime)
252		continue;
253
254	<	if (conf->class == NULL)
255	<	confrq = DEFAULT_CONNECTFREQUENCY;
256	<	else
257	<	{
258	<	confrq = conf->class->con_freq;
309	<	if (confrq < MIN_CONN_FREQ)
310	<	confrq = MIN_CONN_FREQ;
311	<	}
254	>	assert(conf->class);
255	>
256	>	confrq = conf->class->con_freq;
257	>	if (confrq < MIN_CONN_FREQ)
258	>	confrq = MIN_CONN_FREQ;
259
260		conf->until = CurrentTime + confrq;
261
262	<	/* Found a CONNECT config with port specified, scan clients
262	>	/*
263	>	* Found a CONNECT config with port specified, scan clients
264		* and see if this server is already connected?
265		*/
266	<	if (hash_find_server(conf->name) != NULL)
266	>	if (hash_find_server(conf->name))
267		continue;
268
269		if (conf->class->ref_count < conf->class->max_total)
270		{
271		/* Go to the end of the list, if not already last */
272	<	if (ptr->next != NULL)
272	>	if (ptr->next)
273		{
274		dlinkDelete(ptr, &server_items);
275		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 330 | Line 278 | try_connections(void *unused)
278		if (find_servconn_in_progress(conf->name))
279		return;
280
281	<	/* We used to only print this if serv_connect() actually
281	>	/*
282	>	* We used to only print this if serv_connect() actually
283		* succeeded, but since comm_tcp_connect() can call the callback
284		* immediately if there is an error, we were getting error messages
285		* in the wrong order. SO, we just print out the activated line,
#	Line 357 | Line 306 | try_connections(void *unused)
306		int
307		valid_servname(const char *name)
308		{
309	<	unsigned int length = 0;
361	<	unsigned int dots   = 0;
309	>	unsigned int dots = 0;
310		const char *p = name;
311
312		for (; *p; ++p)
#	Line 366 | Line 314 | valid_servname(const char *name)
314		if (!IsServChar(*p))
315		return 0;
316
369	–	++length;
370	–
317		if (*p == '.')
318		++dots;
319		}
320
321	<	return dots != 0 && length <= HOSTLEN;
321	>	return dots && (p - name) <= HOSTLEN;
322		}
323
324		int
#	Line 383 | Line 329 | check_server(const char *name, struct Cl
329		struct MaskItem *server_conf = NULL;
330		int error = -1;
331
332	<	assert(client_p != NULL);
332	>	assert(client_p);
333
334		/* loop through looking for all possible connect items that might work */
335		DLINK_FOREACH(ptr, server_items.head)
#	Line 397 | Line 343 | check_server(const char *name, struct Cl
343
344		/* XXX: Fix me for IPv6                    */
345		/* XXX sockhost is the IPv4 ip as a string */
346	<	if (!match(conf->host, client_p->host) ||
346	>	if (!match(conf->host, client_p->host) ||
347		!match(conf->host, client_p->sockhost))
348		{
349		error = -2;
350
351	<	if (!match_conf_password(client_p->localClient->passwd, conf))
351	>	if (!match_conf_password(client_p->connection->password, conf))
352		return -2;
353
354	+	if (!EmptyString(conf->certfp))
355	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
356	+	return -4;
357	+
358		server_conf = conf;
359		}
360		}
361
362		if (server_conf == NULL)
363	<	return(error);
363	>	return error;
364
365		attach_conf(client_p, server_conf);
366
367
368	<	if (server_conf != NULL)
368	>	if (server_conf)
369		{
370		struct sockaddr_in *v4;
421	–	#ifdef IPV6
371		struct sockaddr_in6 *v6;
372	<	#endif
372	>
373		switch (server_conf->aftype)
374		{
375	<	#ifdef IPV6
427	<	case AF_INET6:
375	>	case AF_INET6:
376		v6 = (struct sockaddr_in6 *)&server_conf->addr;
377
378		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
379	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
379	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
380		break;
433	–	#endif
381		case AF_INET:
382		v4 = (struct sockaddr_in *)&server_conf->addr;
383
384		if (v4->sin_addr.s_addr == INADDR_NONE)
385	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
385	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
386		break;
387		}
388		}
389
390	<	return(0);
390	>	return 0;
391		}
392
393		/* add_capability()
#	Line 455 | Line 402 | check_server(const char *name, struct Cl
402		void
403		add_capability(const char *capab_name, int cap_flag, int add_to_default)
404		{
405	<	struct Capability *cap = MyMalloc(sizeof(*cap));
405	>	struct Capability *cap = MyCalloc(sizeof(*cap));
406
407		cap->name = xstrdup(capab_name);
408		cap->cap = cap_flag;
#	Line 474 | Line 421 | add_capability(const char *capab_name, i
421		int
422		delete_capability(const char *capab_name)
423		{
424	<	dlink_node *ptr;
478	<	dlink_node *next_ptr;
479	<	struct Capability *cap;
424	>	dlink_node *ptr = NULL, *ptr_next = NULL;
425
426	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
426	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
427		{
428	<	cap = ptr->data;
428	>	struct Capability *cap = ptr->data;
429
430	<	if (cap->cap != 0)
430	>	if (cap->cap)
431		{
432	<	if (irccmp(cap->name, capab_name) == 0)
432	>	if (!irccmp(cap->name, capab_name))
433		{
434		default_server_capabs &= ~(cap->cap);
435		dlinkDelete(ptr, &cap_list);
#	Line 531 | Line 476 | find_capability(const char *capab)
476		void
477		send_capabilities(struct Client *client_p, int cap_can_send)
478		{
479	<	struct Capability *cap=NULL;
480	<	char msgbuf[IRCD_BUFSIZE];
536	<	char *t;
537	<	int tl;
538	<	dlink_node *ptr;
539	<
540	<	t = msgbuf;
479	>	char buf[IRCD_BUFSIZE] = "";
480	>	const dlink_node *ptr = NULL;
481
482		DLINK_FOREACH(ptr, cap_list.head)
483		{
484	<	cap = ptr->data;
484	>	const struct Capability *cap = ptr->data;
485
486		if (cap->cap & (cap_can_send|default_server_capabs))
487		{
488	<	tl = sprintf(t, "%s ", cap->name);
489	<	t += tl;
488	>	strlcat(buf, cap->name, sizeof(buf));
489	>	if (ptr->next)
490	>	strlcat(buf, " ", sizeof(buf));
491		}
492		}
493
494	<	*(t - 1) = '\0';
554	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
555	<	}
556	<
557	<	/* sendnick_TS()
558	<	*
559	<	* inputs       - client (server) to send nick towards
560	<	*          - client to send nick for
561	<	* output       - NONE
562	<	* side effects - NICK message is sent towards given client_p
563	<	*/
564	<	void
565	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
566	<	{
567	<	static char ubuf[12];
568	<
569	<	if (!IsClient(target_p))
570	<	return;
571	<
572	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
573	<
574	<	if (ubuf[0] == '\0')
575	<	{
576	<	ubuf[0] = '+';
577	<	ubuf[1] = '\0';
578	<	}
579	<
580	<	if (IsCapable(client_p, CAP_SVS))
581	<	{
582	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
583	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
584	<	target_p->servptr->id,
585	<	target_p->name, target_p->hopcount + 1,
586	<	(unsigned long) target_p->tsinfo,
587	<	ubuf, target_p->username, target_p->host,
588	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
589	<	"0" : target_p->sockhost, target_p->id,
590	<	target_p->svid, target_p->info);
591	<	else
592	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
593	<	target_p->name, target_p->hopcount + 1,
594	<	(unsigned long) target_p->tsinfo,
595	<	ubuf, target_p->username, target_p->host,
596	<	target_p->servptr->name, target_p->svid,
597	<	target_p->info);
598	<	}
599	<	else
600	<	{
601	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
602	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
603	<	target_p->servptr->id,
604	<	target_p->name, target_p->hopcount + 1,
605	<	(unsigned long) target_p->tsinfo,
606	<	ubuf, target_p->username, target_p->host,
607	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
608	<	"0" : target_p->sockhost, target_p->id, target_p->info);
609	<	else
610	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
611	<	target_p->name, target_p->hopcount + 1,
612	<	(unsigned long) target_p->tsinfo,
613	<	ubuf, target_p->username, target_p->host,
614	<	target_p->servptr->name, target_p->info);
615	<	}
616	<
617	<	if (target_p->away[0])
618	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
619	<	target_p->away);
620	<
494	>	sendto_one(client_p, "CAPAB :%s", buf);
495		}
496
497		/*
#	Line 628 | Line 502 | sendnick_TS(struct Client *client_p, str
502		* side effects - build up string representing capabilities of server listed
503		*/
504		const char *
505	<	show_capabilities(struct Client *target_p)
505	>	show_capabilities(const struct Client *target_p)
506		{
507	<	static char msgbuf[IRCD_BUFSIZE];
508	<	char *t = msgbuf;
635	<	dlink_node *ptr;
507	>	static char msgbuf[IRCD_BUFSIZE] = "";
508	>	const dlink_node *ptr = NULL;
509
510	<	t += sprintf(msgbuf, "TS ");
510	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
511
512		DLINK_FOREACH(ptr, cap_list.head)
513		{
514		const struct Capability *cap = ptr->data;
515
516	<	if (IsCapable(target_p, cap->cap))
517	<	t += sprintf(t, "%s ", cap->name);
516	>	if (!IsCapable(target_p, cap->cap))
517	>	continue;
518	>
519	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
520	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
521		}
522
647	–	*(t - 1) = '\0';
523		return msgbuf;
524		}
525
#	Line 659 | Line 534 | struct Server *
534		make_server(struct Client *client_p)
535		{
536		if (client_p->serv == NULL)
537	<	client_p->serv = MyMalloc(sizeof(struct Server));
537	>	client_p->serv = MyCalloc(sizeof(struct Server));
538
539		return client_p->serv;
540		}
541
667	–	/* server_estab()
668	–	*
669	–	* inputs       - pointer to a struct Client
670	–	* output       -
671	–	* side effects -
672	–	*/
673	–	void
674	–	server_estab(struct Client *client_p)
675	–	{
676	–	struct Client *target_p;
677	–	struct MaskItem *conf = NULL;
678	–	char *host;
679	–	const char *inpath;
680	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
681	–	dlink_node *ptr;
682	–	#ifdef HAVE_LIBCRYPTO
683	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
684	–	#endif
685	–
686	–	assert(client_p != NULL);
687	–
688	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
689	–
690	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
691	–	host   = client_p->name;
692	–
693	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
694	–	== NULL)
695	–	{
696	–	/* This shouldn't happen, better tell the ops... -A1kmm */
697	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
698	–	"Warning: Lost connect{} block "
699	–	"for server %s(this shouldn't happen)!", host);
700	–	exit_client(client_p, &me, "Lost connect{} block!");
701	–	return;
702	–	}
703	–
704	–	MyFree(client_p->localClient->passwd);
705	–	client_p->localClient->passwd = NULL;
706	–
707	–	/* Its got identd, since its a server */
708	–	SetGotId(client_p);
709	–
710	–	/* If there is something in the serv_list, it might be this
711	–	* connecting server..
712	–	*/
713	–	if (!ServerInfo.hub && serv_list.head)
714	–	{
715	–	if (client_p != serv_list.head->data || serv_list.head->next)
716	–	{
717	–	++ServerStats.is_ref;
718	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
719	–	exit_client(client_p, &me, "I'm a leaf");
720	–	return;
721	–	}
722	–	}
723	–
724	–	if (IsUnknown(client_p))
725	–	{
726	–	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
727	–
728	–	send_capabilities(client_p, 0);
729	–
730	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
731	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
732	–	}
733	–
734	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
735	–	(unsigned long)CurrentTime);
736	–
737	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
738	–	if (IsCapable(client_p, CAP_TS6))
739	–	hash_add_id(client_p);
740	–
741	–	/* XXX Does this ever happen? I don't think so -db */
742	–	detach_conf(client_p, CONF_OPER);
743	–
744	–	/* *WARNING*
745	–	**    In the following code in place of plain server's
746	–	**    name we send what is returned by get_client_name
747	–	**    which may add the "sockhost" after the name. It's
748	–	**    *very* *important* that there is a SPACE between
749	–	**    the name and sockhost (if present). The receiving
750	–	**    server will start the information field from this
751	–	**    first blank and thus puts the sockhost into info.
752	–	**    ...a bit tricky, but you have been warned, besides
753	–	**    code is more neat this way...  --msa
754	–	*/
755	–	client_p->servptr = &me;
756	–
757	–	if (IsClosing(client_p))
758	–	return;
759	–
760	–	SetServer(client_p);
761	–
762	–	/* Update the capability combination usage counts. -A1kmm */
763	–	set_chcap_usage_counts(client_p);
764	–
765	–	/* Some day, all these lists will be consolidated *sigh* */
766	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
767	–
768	–	assert(dlinkFind(&unknown_list, client_p));
769	–
770	–	dlink_move_node(&client_p->localClient->lclient_node,
771	–	&unknown_list, &serv_list);
772	–
773	–	Count.myserver++;
774	–
775	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
776	–	hash_add_client(client_p);
777	–
778	–	/* doesnt duplicate client_p->serv if allocated this struct already */
779	–	make_server(client_p);
780	–
781	–	/* fixing eob timings.. -gnp */
782	–	client_p->localClient->firsttime = CurrentTime;
783	–
784	–	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
785	–	AddFlag(client_p, FLAGS_SERVICE);
786	–
787	–	/* Show the real host/IP to admins */
788	–	#ifdef HAVE_LIBCRYPTO
789	–	if (client_p->localClient->fd.ssl)
790	–	{
791	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
792	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
793	–
794	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
795	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
796	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
797	–	compression ? SSL_COMP_get_name(compression) : "NONE",
798	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
799	–	show_capabilities(client_p));
800	–	/* Now show the masked hostname/IP to opers */
801	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
802	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
803	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
804	–	compression ? SSL_COMP_get_name(compression) : "NONE",
805	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
806	–	show_capabilities(client_p));
807	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
808	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
809	–	compression ? SSL_COMP_get_name(compression) : "NONE",
810	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
811	–	show_capabilities(client_p));
812	–	}
813	–	else
814	–	#endif
815	–	{
816	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
817	–	"Link with %s established: (Capabilities: %s)",
818	–	inpath_ip, show_capabilities(client_p));
819	–	/* Now show the masked hostname/IP to opers */
820	–	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
821	–	"Link with %s established: (Capabilities: %s)",
822	–	inpath, show_capabilities(client_p));
823	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
824	–	inpath_ip, show_capabilities(client_p));
825	–	}
826	–
827	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
828	–
829	–	/* Old sendto_serv_but_one() call removed because we now
830	–	** need to send different names to different servers
831	–	** (domain name matching) Send new server to other servers.
832	–	*/
833	–	DLINK_FOREACH(ptr, serv_list.head)
834	–	{
835	–	target_p = ptr->data;
836	–
837	–	if (target_p == client_p)
838	–	continue;
839	–
840	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
841	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
842	–	me.id, client_p->name, client_p->id,
843	–	IsHidden(client_p) ? "(H) " : "",
844	–	client_p->info);
845	–	else
846	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
847	–	me.name, client_p->name,
848	–	IsHidden(client_p) ? "(H) " : "",
849	–	client_p->info);
850	–	}
851	–
852	–	/* Pass on my client information to the new server
853	–	**
854	–	** First, pass only servers (idea is that if the link gets
855	–	** cancelled beacause the server was already there,
856	–	** there are no NICK's to be cancelled...). Of course,
857	–	** if cancellation occurs, all this info is sent anyway,
858	–	** and I guess the link dies when a read is attempted...? --msa
859	–	**
860	–	** Note: Link cancellation to occur at this point means
861	–	** that at least two servers from my fragment are building
862	–	** up connection this other fragment at the same time, it's
863	–	** a race condition, not the normal way of operation...
864	–	**
865	–	** ALSO NOTE: using the get_client_name for server names--
866	–	**    see previous *WARNING*!!! (Also, original inpath
867	–	**    is destroyed...)
868	–	*/
869	–
870	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
871	–	{
872	–	target_p = ptr->data;
873	–
874	–	/* target_p->from == target_p for target_p == client_p */
875	–	if (IsMe(target_p) || target_p->from == client_p)
876	–	continue;
877	–
878	–	if (IsCapable(client_p, CAP_TS6))
879	–	{
880	–	if (HasID(target_p))
881	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
882	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
883	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
884	–	target_p->info);
885	–	else  /* introducing non-ts6 server */
886	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
887	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
888	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
889	–	}
890	–	else
891	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
892	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
893	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
894	–
895	–	if (HasFlag(target_p, FLAGS_EOB))
896	–	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
897	–	}
898	–
899	–	server_burst(client_p);
900	–	}
901	–
902	–	/* server_burst()
903	–	*
904	–	* inputs       - struct Client pointer server
905	–	*              -
906	–	* output       - none
907	–	* side effects - send a server burst
908	–	* bugs         - still too long
909	–	*/
910	–	static void
911	–	server_burst(struct Client *client_p)
912	–	{
913	–	/* Send it in the shortened format with the TS, if
914	–	** it's a TS server; walk the list of channels, sending
915	–	** all the nicks that haven't been sent yet for each
916	–	** channel, then send the channel itself -- it's less
917	–	** obvious than sending all nicks first, but on the
918	–	** receiving side memory will be allocated more nicely
919	–	** saving a few seconds in the handling of a split
920	–	** -orabidoo
921	–	*/
922	–
923	–	burst_all(client_p);
924	–
925	–	/* EOB stuff is now in burst_all */
926	–	/* Always send a PING after connect burst is done */
927	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
928	–	}
929	–
930	–	/* burst_all()
931	–	*
932	–	* inputs       - pointer to server to send burst to
933	–	* output       - NONE
934	–	* side effects - complete burst of channels/nicks is sent to client_p
935	–	*/
936	–	static void
937	–	burst_all(struct Client *client_p)
938	–	{
939	–	dlink_node *ptr = NULL;
940	–
941	–	DLINK_FOREACH(ptr, global_channel_list.head)
942	–	{
943	–	struct Channel *chptr = ptr->data;
944	–
945	–	if (dlink_list_length(&chptr->members) != 0)
946	–	{
947	–	burst_members(client_p, chptr);
948	–	send_channel_modes(client_p, chptr);
949	–
950	–	if (IsCapable(client_p, CAP_TBURST))
951	–	send_tb(client_p, chptr);
952	–	}
953	–	}
954	–
955	–	/* also send out those that are not on any channel
956	–	*/
957	–	DLINK_FOREACH(ptr, global_client_list.head)
958	–	{
959	–	struct Client *target_p = ptr->data;
960	–
961	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
962	–	sendnick_TS(client_p, target_p);
963	–
964	–	DelFlag(target_p, FLAGS_BURSTED);
965	–	}
966	–
967	–	if (IsCapable(client_p, CAP_EOB))
968	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
969	–	}
970	–
971	–	/*
972	–	* send_tb
973	–	*
974	–	* inputs       - pointer to Client
975	–	*              - pointer to channel
976	–	* output       - NONE
977	–	* side effects - Called on a server burst when
978	–	*                server is CAP_TBURST capable
979	–	*/
980	–	static void
981	–	send_tb(struct Client *client_p, struct Channel *chptr)
982	–	{
983	–	/*
984	–	* We may also send an empty topic here, but only if topic_time isn't 0,
985	–	* i.e. if we had a topic that got unset.  This is required for syncing
986	–	* topics properly.
987	–	*
988	–	* Imagine the following scenario: Our downlink introduces a channel
989	–	* to us with a TS that is equal to ours, but the channel topic on
990	–	* their side got unset while the servers were in splitmode, which means
991	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
992	–	* deal with it in a more sophisticated fashion instead of just resetting
993	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
994	–	* for further information   -Michael
995	–	*/
996	–	if (chptr->topic_time != 0)
997	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
998	–	ID_or_name(&me, client_p),
999	–	(unsigned long)chptr->channelts, chptr->chname,
1000	–	(unsigned long)chptr->topic_time,
1001	–	chptr->topic_info,
1002	–	chptr->topic);
1003	–	}
1004	–
1005	–	/* burst_members()
1006	–	*
1007	–	* inputs       - pointer to server to send members to
1008	–	*              - dlink_list pointer to membership list to send
1009	–	* output       - NONE
1010	–	* side effects -
1011	–	*/
1012	–	static void
1013	–	burst_members(struct Client *client_p, struct Channel *chptr)
1014	–	{
1015	–	struct Client *target_p;
1016	–	struct Membership *ms;
1017	–	dlink_node *ptr;
1018	–
1019	–	DLINK_FOREACH(ptr, chptr->members.head)
1020	–	{
1021	–	ms       = ptr->data;
1022	–	target_p = ms->client_p;
1023	–
1024	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1025	–	{
1026	–	AddFlag(target_p, FLAGS_BURSTED);
1027	–
1028	–	if (target_p->from != client_p)
1029	–	sendnick_TS(client_p, target_p);
1030	–	}
1031	–	}
1032	–	}
1033	–
542		/* New server connection code
543		* Based upon the stuff floating about in s_bsd.c
544		*   -- adrian
#	Line 1038 | Line 546 | burst_members(struct Client *client_p, s
546
547		/* serv_connect() - initiate a server connection
548		*
549	<	* inputs       - pointer to conf
549	>	* inputs       - pointer to conf
550		*              - pointer to client doing the connect
551		* output       -
552		* side effects -
#	Line 1055 | Line 563 | burst_members(struct Client *client_p, s
563		int
564		serv_connect(struct MaskItem *conf, struct Client *by)
565		{
566	<	struct Client *client_p;
567	<	char buf[HOSTIPLEN + 1];
566	>	struct Client *client_p = NULL;
567	>	char buf[HOSTIPLEN + 1] = "";
568
569		/* conversion structs */
570		struct sockaddr_in *v4;
1063	–	/* Make sure conf is useful */
1064	–	assert(conf != NULL);
571
572	+	/* Make sure conf is useful */
573	+	assert(conf);
574
575		getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
576		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
#	Line 1075 | Line 583 | serv_connect(struct MaskItem *conf, stru
583		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
584		"Error connecting to %s: DNS lookup for connect{} in progress.",
585		conf->name);
586	<	return (0);
586	>	return 0;
587		}
588
589		if (conf->dns_failed)
#	Line 1083 | Line 591 | serv_connect(struct MaskItem *conf, stru
591		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
592		"Error connecting to %s: DNS lookup for connect{} failed.",
593		conf->name);
594	<	return (0);
594	>	return 0;
595		}
596
597		/* Make sure this server isn't already connected
598		* Note: conf should ALWAYS be a valid C: line
599		*/
600	<	if ((client_p = hash_find_server(conf->name)) != NULL)
601	<	{
600	>	if ((client_p = hash_find_server(conf->name)))
601	>	{
602		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
603		"Server %s already present from %s",
604		conf->name, get_client_name(client_p, SHOW_IP));
#	Line 1098 | Line 606 | serv_connect(struct MaskItem *conf, stru
606		"Server %s already present from %s",
607		conf->name, get_client_name(client_p, MASK_IP));
608		if (by && IsClient(by) && !MyClient(by))
609	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
610	<	me.name, by->name, conf->name,
1103	<	get_client_name(client_p, MASK_IP));
609	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
610	>	conf->name, get_client_name(client_p, MASK_IP));
611		return 0;
612		}
613	<
613	>
614		/* Create a local client */
615		client_p = make_client(NULL);
616
#	Line 1114 | Line 621 | serv_connect(struct MaskItem *conf, stru
621		/* We already converted the ip once, so lets use it - stu */
622		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
623
624	<	/* create a socket for the server connection */
625	<	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1119	<	SOCK_STREAM, 0, NULL) < 0)
624	>	/* create a socket for the server connection */
625	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
626		{
627		/* Eek, failure to create the socket */
628	<	report_error(L_ALL, "opening stream socket to %s: %s",
629	<	conf->name, errno);
628	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
629	>
630		SetDead(client_p);
631	<	exit_client(client_p, &me, "Connection failed");
631	>	exit_client(client_p, "Connection failed");
632		return 0;
633		}
634
635		/* servernames are always guaranteed under HOSTLEN chars */
636	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
636	>	fd_note(&client_p->connection->fd, "Server: %s", conf->name);
637
638		/* Attach config entries to client here rather than in
639		* serv_connect_callback(). This to avoid null pointer references.
#	Line 1135 | Line 641 | serv_connect(struct MaskItem *conf, stru
641		if (!attach_connect_block(client_p, conf->name, conf->host))
642		{
643		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
644	<	"Host %s is not enabled for connecting: no connect{} block",
644	>	"Host %s is not enabled for connecting: no connect {} block",
645		conf->name);
646	<	if (by && IsClient(by) && !MyClient(by))
647	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
648	<	me.name, by->name, client_p->name);
646	>	if (by && IsClient(by) && !MyClient(by))
647	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
648	>
649		SetDead(client_p);
650	<	exit_client(client_p, client_p, "Connection failed");
650	>	exit_client(client_p, "Connection failed");
651		return 0;
652		}
653
#	Line 1159 | Line 665 | serv_connect(struct MaskItem *conf, stru
665		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
666
667		SetConnecting(client_p);
668	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1163	<	/* from def_fam */
1164	<	client_p->localClient->aftype = conf->aftype;
668	>	client_p->connection->aftype = conf->aftype;
669
670		/* Now, initiate the connection */
671	<	/* XXX assume that a non 0 type means a specific bind address
671	>	/* XXX assume that a non 0 type means a specific bind address
672		* for this connect.
673		*/
674		switch (conf->aftype)
675		{
676		case AF_INET:
677		v4 = (struct sockaddr_in*)&conf->bind;
678	<	if (v4->sin_addr.s_addr != 0)
678	>	if (v4->sin_addr.s_addr)
679		{
680		struct irc_ssaddr ipn;
681		memset(&ipn, 0, sizeof(struct irc_ssaddr));
682		ipn.ss.ss_family = AF_INET;
683		ipn.ss_port = 0;
684		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
685	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
686	<	(struct sockaddr *)&ipn, ipn.ss_len,
685	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
686	>	(struct sockaddr *)&ipn, ipn.ss_len,
687		serv_connect_callback, client_p, conf->aftype,
688		CONNECTTIMEOUT);
689		}
690	<	else if (ServerInfo.specific_ipv4_vhost)
690	>	else if (ConfigServerInfo.specific_ipv4_vhost)
691		{
692		struct irc_ssaddr ipn;
693		memset(&ipn, 0, sizeof(struct irc_ssaddr));
694		ipn.ss.ss_family = AF_INET;
695		ipn.ss_port = 0;
696	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
697	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
696	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
697	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
698		(struct sockaddr *)&ipn, ipn.ss_len,
699		serv_connect_callback, client_p, conf->aftype,
700		CONNECTTIMEOUT);
701		}
702		else
703	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
704	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
703	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
704	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
705		CONNECTTIMEOUT);
706		break;
1203	–	#ifdef IPV6
707		case AF_INET6:
708		{
709	<	struct irc_ssaddr ipn;
710	<	struct sockaddr_in6 *v6;
711	<	struct sockaddr_in6 *v6conf;
712	<
713	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
714	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
715	<	v6 = (struct sockaddr_in6 *)&ipn;
716	<
717	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
718	<	sizeof(struct in6_addr)) != 0)
719	<	{
720	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
721	<	ipn.ss.ss_family = AF_INET6;
722	<	ipn.ss_port = 0;
723	<	comm_connect_tcp(&client_p->localClient->fd,
724	<	conf->host, conf->port,
725	<	(struct sockaddr *)&ipn, ipn.ss_len,
726	<	serv_connect_callback, client_p,
727	<	conf->aftype, CONNECTTIMEOUT);
728	<	}
1226	<	else if (ServerInfo.specific_ipv6_vhost)
709	>	struct irc_ssaddr ipn;
710	>	struct sockaddr_in6 *v6;
711	>	struct sockaddr_in6 *v6conf;
712	>
713	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
714	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
715	>	v6 = (struct sockaddr_in6 *)&ipn;
716	>
717	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
718	>	{
719	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
720	>	ipn.ss.ss_family = AF_INET6;
721	>	ipn.ss_port = 0;
722	>	comm_connect_tcp(&client_p->connection->fd,
723	>	conf->host, conf->port,
724	>	(struct sockaddr *)&ipn, ipn.ss_len,
725	>	serv_connect_callback, client_p,
726	>	conf->aftype, CONNECTTIMEOUT);
727	>	}
728	>	else if (ConfigServerInfo.specific_ipv6_vhost)
729		{
730	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
731	<	ipn.ss.ss_family = AF_INET6;
732	<	ipn.ss_port = 0;
733	<	comm_connect_tcp(&client_p->localClient->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
740	<	comm_connect_tcp(&client_p->localClient->fd,
741	<	conf->host, conf->port,
742	<	NULL, 0, serv_connect_callback, client_p,
743	<	conf->aftype, CONNECTTIMEOUT);
730	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
731	>	ipn.ss.ss_family = AF_INET6;
732	>	ipn.ss_port = 0;
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
740	>	comm_connect_tcp(&client_p->connection->fd,
741	>	conf->host, conf->port,
742	>	NULL, 0, serv_connect_callback, client_p,
743	>	conf->aftype, CONNECTTIMEOUT);
744		}
1243	–	#endif
745		}
746	<	return (1);
746	>
747	>	return 1;
748		}
749
750		#ifdef HAVE_LIBCRYPTO
#	Line 1251 | Line 753 | finish_ssl_server_handshake(struct Clien
753		{
754		struct MaskItem *conf = NULL;
755
756	<	conf = find_conf_name(&client_p->localClient->confs,
756	>	conf = find_conf_name(&client_p->connection->confs,
757		client_p->name, CONF_SERVER);
758		if (conf == NULL)
759		{
#	Line 1260 | Line 762 | finish_ssl_server_handshake(struct Clien
762		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
763		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
764
765	<	exit_client(client_p, &me, "Lost connect{} block");
765	>	exit_client(client_p, "Lost connect{} block");
766		return;
767		}
768
#	Line 1288 | Line 790 | finish_ssl_server_handshake(struct Clien
790
791		/* don't move to serv_list yet -- we haven't sent a burst! */
792		/* If we get here, we're ok, so lets start reading some data */
793	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
793	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
794		}
795
796		static void
797	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
797	>	ssl_server_handshake(fde_t *fd, void *data)
798		{
799	<	int ret;
800	<	int err;
801	<
1300	<	ret = SSL_connect(client_p->localClient->fd.ssl);
799	>	struct Client *client_p = data;
800	>	X509 *cert = NULL;
801	>	int ret = 0;
802
803	<	if (ret <= 0)
803	>	if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
804		{
805	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
805	>	switch (SSL_get_error(client_p->connection->fd.ssl, ret))
806		{
807		case SSL_ERROR_WANT_WRITE:
808	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
809	<	(PF *)ssl_server_handshake, client_p, 0);
808	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
809	>	ssl_server_handshake, client_p, 0);
810		return;
811		case SSL_ERROR_WANT_READ:
812	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
813	<	(PF *)ssl_server_handshake, client_p, 0);
812	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
813	>	ssl_server_handshake, client_p, 0);
814		return;
815		default:
816		{
#	Line 1317 | Line 818 | ssl_server_handshake(fde_t *fd, struct C
818		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
819		"Error connecting to %s: %s", client_p->name,
820		sslerr ? sslerr : "unknown SSL error");
821	<	exit_client(client_p, client_p, "Error during SSL handshake");
821	>	exit_client(client_p, "Error during SSL handshake");
822		return;
823		}
824		}
825		}
826
827	+	if ((cert = SSL_get_peer_certificate(client_p->connection->fd.ssl)))
828	+	{
829	+	int res = SSL_get_verify_result(client_p->connection->fd.ssl);
830	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
831	+	unsigned char md[EVP_MAX_MD_SIZE] = "";
832	+
833	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
834	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
835	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
836	+	{
837	+	unsigned int n = 0;
838	+
839	+	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
840	+	{
841	+	binary_to_hex(md, buf, n);
842	+	client_p->certfp = xstrdup(buf);
843	+	}
844	+	}
845	+	else
846	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
847	+	client_p->name, client_p->username, client_p->host, res);
848	+	X509_free(cert);
849	+	}
850	+
851		finish_ssl_server_handshake(client_p);
852		}
853
854		static void
855		ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
856		{
857	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
857	>	if ((client_p->connection->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
858		{
859		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
860		ERR_error_string(ERR_get_error(), NULL));
861		SetDead(client_p);
862	<	exit_client(client_p, client_p, "SSL_new failed");
862	>	exit_client(client_p, "SSL_new failed");
863		return;
864		}
865
866		SSL_set_fd(fd->ssl, fd->fd);
867
868		if (!EmptyString(conf->cipher_list))
869	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
869	>	SSL_set_cipher_list(client_p->connection->fd.ssl, conf->cipher_list);
870
871		ssl_server_handshake(NULL, client_p);
872		}
873		#endif
874
875		/* serv_connect_callback() - complete a server connection.
876	<	*
876	>	*
877		* This routine is called after the server connection attempt has
878		* completed. If unsucessful, an error is sent to ops and the client
879		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1361 | Line 886 | serv_connect_callback(fde_t *fd, int sta
886		struct Client *client_p = data;
887		struct MaskItem *conf = NULL;
888
889	<	/* First, make sure its a real client! */
890	<	assert(client_p != NULL);
891	<	assert(&client_p->localClient->fd == fd);
889	>	/* First, make sure it's a real client! */
890	>	assert(client_p);
891	>	assert(&client_p->connection->fd == fd);
892
893		/* Next, for backward purposes, record the ip of the server */
894	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
894	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
895		sizeof(struct irc_ssaddr));
896	+
897		/* Check the status */
898		if (status != COMM_OK)
899		{
#	Line 1396 | Line 922 | serv_connect_callback(fde_t *fd, int sta
922
923		/* COMM_OK, so continue the connection procedure */
924		/* Get the C/N lines */
925	<	conf = find_conf_name(&client_p->localClient->confs,
925	>	conf = find_conf_name(&client_p->connection->confs,
926		client_p->name, CONF_SERVER);
927		if (conf == NULL)
928		{
#	Line 1405 | Line 931 | serv_connect_callback(fde_t *fd, int sta
931		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
932		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
933
934	<	exit_client(client_p, &me, "Lost connect{} block");
934	>	exit_client(client_p, "Lost connect{} block");
935		return;
936		}
937
#	Line 1430 | Line 956 | serv_connect_callback(fde_t *fd, int sta
956		/* If we've been marked dead because a send failed, just exit
957		* here now and save everyone the trouble of us ever existing.
958		*/
959	<	if (IsDead(client_p))
959	>	if (IsDead(client_p))
960		{
961		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
962		"%s[%s] went dead during handshake",
#	Line 1460 | Line 986 | find_servconn_in_progress(const char *na
986		if (!match(name, cptr->name))
987		return cptr;
988		}
989	<
989	>
990		return NULL;
991		}

Diff Legend

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