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 1618 by michael, Tue Oct 30 21:04:38 2012 UTC vs.
Revision 3246 by michael, Sun Mar 30 17:37:13 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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
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 31 | Line 33
33		#include "channel.h"
34		#include "channel_mode.h"
35		#include "client.h"
34	–	#include "dbuf.h"
36		#include "event.h"
37		#include "fdlist.h"
38		#include "hash.h"
39		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
40		#include "ircd.h"
41		#include "ircd_defs.h"
42		#include "s_bsd.h"
#	Line 50 | Line 50
50		#include "s_user.h"
51		#include "send.h"
52		#include "memory.h"
53	<	#include "channel.h" /* chcap_usage_counts stuff...*/
53	>	#include "channel.h"
54		#include "parse.h"
55
56		#define MIN_CONN_FREQ 300
57
58	+	dlink_list flatten_links;
59		static dlink_list cap_list = { NULL, NULL, 0 };
60		static void server_burst(struct Client *);
61		static void burst_all(struct Client *);
#	Line 73 | Line 74 | static void burst_members(struct Client
74		*                but in no particular order.
75		*/
76		void
77	<	write_links_file(void* notused)
77	>	write_links_file(void *notused)
78		{
79	<	MessageFileLine *next_mptr = NULL;
80	<	MessageFileLine *mptr = NULL;
81	<	MessageFileLine *currentMessageLine = NULL;
81	<	MessageFileLine *newMessageLine = NULL;
82	<	MessageFile *MessageFileptr = &ConfigFileEntry.linksfile;
83	<	FILE *file;
84	<	char buff[512];
85	<	dlink_node *ptr;
79	>	FILE *file = NULL;
80	>	dlink_node *ptr = NULL, *ptr_next = NULL;
81	>	char buff[IRCD_BUFSIZE] = "";
82
83	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
83	>	if ((file = fopen(LIPATH, "w")) == NULL)
84		return;
85
86	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
86	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
87		{
88	<	next_mptr = mptr->next;
89	<	MyFree(mptr);
88	>	dlinkDelete(ptr, &flatten_links);
89	>	MyFree(ptr->data);
90	>	free_dlink_node(ptr);
91		}
92
96	–	MessageFileptr->contentsOfFile = NULL;
97	–
93		DLINK_FOREACH(ptr, global_serv_list.head)
94		{
95		const struct Client *target_p = ptr->data;
96
97	<	/* skip ourselves, we send ourselves in /links */
98	<	if (IsMe(target_p))
97	>	/*
98	>	* Skip hidden servers, aswell as ourselves, since we already send
99	>	* ourselves in /links
100	>	*/
101	>	if (IsHidden(target_p) || IsMe(target_p))
102		continue;
103
104	<	/* skip hidden servers */
107	<	if (IsHidden(target_p))
104	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
105		continue;
106
110	–	newMessageLine = MyMalloc(sizeof(MessageFileLine));
111	–
107		/*
108		* Attempt to format the file in such a way it follows the usual links output
109		* ie  "servername uplink :hops info"
110		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
111		* - madmax
112		*/
113	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
114	<	target_p->name, me.name, target_p->info);
115	<
116	<	if (MessageFileptr->contentsOfFile)
117	<	{
123	<	if (currentMessageLine)
124	<	currentMessageLine->next = newMessageLine;
125	<	currentMessageLine = newMessageLine;
126	<	}
127	<	else
128	<	{
129	<	MessageFileptr->contentsOfFile = newMessageLine;
130	<	currentMessageLine = newMessageLine;
131	<	}
113	>	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
114	>	me.name, target_p->info);
115	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
116	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
117	>	me.name, target_p->info);
118
133	–	snprintf(buff, sizeof(buff), "%s %s :1 %s\n",
134	–	target_p->name, me.name, target_p->info);
119		fputs(buff, file);
120		}
121
122		fclose(file);
123		}
124
125	+	void
126	+	read_links_file(void)
127	+	{
128	+	FILE *file = NULL;
129	+	char *p = NULL;
130	+	char buff[IRCD_BUFSIZE] = "";
131	+
132	+	if ((file = fopen(LIPATH, "r")) == NULL)
133	+	return;
134	+
135	+	while (fgets(buff, sizeof(buff), file))
136	+	{
137	+	if ((p = strchr(buff, '\n')))
138	+	*p = '\0';
139	+
140	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
141	+	}
142	+
143	+	fclose(file);
144	+	}
145	+
146		/* hunt_server()
147		*      Do the basic thing in delivering the message (command)
148		*      across the relays to the specific server (server) for
#	Line 158 | Line 163 | write_links_file(void* notused)
163		*      returns: (see #defines)
164		*/
165		int
166	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
167	<	int server, int parc, char *parv[])
166	>	hunt_server(struct Client *source_p, const char *command,
167	>	const int server, const int parc, char *parv[])
168		{
169		struct Client *target_p = NULL;
170		struct Client *target_tmp = NULL;
#	Line 170 | Line 175 | hunt_server(struct Client *client_p, str
175		if (parc <= server || EmptyString(parv[server]))
176		return HUNTED_ISME;
177
178	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
178	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
179		return HUNTED_ISME;
180
181		/* These are to pickup matches that would cause the following
#	Line 180 | Line 185 | hunt_server(struct Client *client_p, str
185		if (MyClient(source_p))
186		target_p = hash_find_client(parv[server]);
187		else
188	<	target_p = find_person(client_p, parv[server]);
188	>	target_p = find_person(source_p, parv[server]);
189
190		if (target_p)
191		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 190 | Line 195 | hunt_server(struct Client *client_p, str
195		if (target_p->from == source_p->from && !MyConnect(target_p))
196		target_p = NULL;
197
193	–	collapse(parv[server]);
198		wilds = has_wildcards(parv[server]);
199
200		/* Again, if there are no wild cards involved in the server
#	Line 202 | Line 206 | hunt_server(struct Client *client_p, str
206		{
207		if (!(target_p = hash_find_server(parv[server])))
208		{
209	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
210	<	me.name, source_p->name, parv[server]);
207	<	return(HUNTED_NOSUCH);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 213 | Line 216 | hunt_server(struct Client *client_p, str
216		{
217		target_tmp = ptr->data;
218
219	<	if (match(parv[server], target_tmp->name))
219	>	if (!match(parv[server], target_tmp->name))
220		{
221		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
222		continue;
223		target_p = ptr->data;
224
225	<	if (IsRegistered(target_p) && (target_p != client_p))
225	>	if (IsRegistered(target_p) && (target_p != source_p->from))
226		break;
227		}
228		}
229		}
230		}
231
232	<	if (target_p != NULL)
232	>	if (target_p)
233		{
234	<	if(!IsRegistered(target_p))
234	>	if (!IsRegistered(target_p))
235		{
236	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
234	<	me.name, source_p->name, parv[server]);
236	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237		return HUNTED_NOSUCH;
238		}
239
240		if (IsMe(target_p) || MyClient(target_p))
241		return HUNTED_ISME;
242
243	<	if (!match(target_p->name, parv[server]))
243	>	if (match(target_p->name, parv[server]))
244		parv[server] = target_p->name;
245
246		/* This is a little kludgy but should work... */
247	<	if (IsClient(source_p) &&
246	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
247	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
248	<	parv[0] = ID(source_p);
249	<
250	<	sendto_one(target_p, command, parv[0],
247	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
248		parv[1], parv[2], parv[3], parv[4],
249		parv[5], parv[6], parv[7], parv[8]);
250	<	return(HUNTED_PASS);
251	<	}
250	>	return HUNTED_PASS;
251	>	}
252
253	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
254	<	me.name, source_p->name, parv[server]);
258	<	return(HUNTED_NOSUCH);
253	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
254	>	return HUNTED_NOSUCH;
255		}
256
257		/* try_connections()
#	Line 271 | Line 267 | hunt_server(struct Client *client_p, str
267		void
268		try_connections(void *unused)
269		{
270	<	dlink_node *ptr;
271	<	struct ConfItem *conf;
276	<	struct AccessItem *aconf;
277	<	struct ClassItem *cltmp;
270	>	dlink_node *ptr = NULL;
271	>	struct MaskItem *conf;
272		int confrq;
273
274		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 284 | Line 278 | try_connections(void *unused)
278		DLINK_FOREACH(ptr, server_items.head)
279		{
280		conf = ptr->data;
287	–	aconf = map_to_conf(conf);
281
282	<	/* Also when already connecting! (update holdtimes) --SRB
282	>	assert(conf->type == CONF_SERVER);
283	>
284	>	/* Also when already connecting! (update holdtimes) --SRB
285		*/
286	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
292	<	!(IsConfAllowAutoConn(aconf)))
286	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
287		continue;
288
295	–	cltmp = map_to_conf(aconf->class_ptr);
289
290		/* Skip this entry if the use of it is still on hold until
291		* future. Otherwise handle this entry (and set it on hold
#	Line 300 | Line 293 | try_connections(void *unused)
293		* made one successfull connection... [this algorithm is
294		* a bit fuzzy... -- msa >;) ]
295		*/
296	<	if (aconf->hold > CurrentTime)
296	>	if (conf->until > CurrentTime)
297		continue;
298
299	<	if (cltmp == NULL)
299	>	if (conf->class == NULL)
300		confrq = DEFAULT_CONNECTFREQUENCY;
301		else
302		{
303	<	confrq = cltmp->con_freq;
303	>	confrq = conf->class->con_freq;
304		if (confrq < MIN_CONN_FREQ)
305	<	confrq = MIN_CONN_FREQ;
305	>	confrq = MIN_CONN_FREQ;
306		}
307
308	<	aconf->hold = CurrentTime + confrq;
308	>	conf->until = CurrentTime + confrq;
309
310	<	/* Found a CONNECT config with port specified, scan clients
310	>	/*
311	>	* Found a CONNECT config with port specified, scan clients
312		* and see if this server is already connected?
313		*/
314	<	if (hash_find_server(conf->name) != NULL)
314	>	if (hash_find_server(conf->name))
315		continue;
316
317	<	if (cltmp->curr_user_count < cltmp->max_total)
317	>	if (conf->class->ref_count < conf->class->max_total)
318		{
319		/* Go to the end of the list, if not already last */
320	<	if (ptr->next != NULL)
320	>	if (ptr->next)
321		{
322		dlinkDelete(ptr, &server_items);
323		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 332 | Line 326 | try_connections(void *unused)
326		if (find_servconn_in_progress(conf->name))
327		return;
328
329	<	/* We used to only print this if serv_connect() actually
329	>	/*
330	>	* We used to only print this if serv_connect() actually
331		* succeeded, but since comm_tcp_connect() can call the callback
332		* immediately if there is an error, we were getting error messages
333		* in the wrong order. SO, we just print out the activated line,
#	Line 347 | Line 342 | try_connections(void *unused)
342		else
343		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
344		"Connection to %s[%s] activated.",
345	<	conf->name, aconf->host);
345	>	conf->name, conf->host);
346
347	<	serv_connect(aconf, NULL);
347	>	serv_connect(conf, NULL);
348		/* We connect only one at time... */
349		return;
350		}
#	Line 374 | Line 369 | valid_servname(const char *name)
369		++dots;
370		}
371
372	<	return dots != 0 && length <= HOSTLEN;
372	>	return dots && length <= HOSTLEN;
373		}
374
375		int
376		check_server(const char *name, struct Client *client_p)
377		{
378		dlink_node *ptr;
379	<	struct ConfItem *conf           = NULL;
380	<	struct ConfItem *server_conf    = NULL;
386	<	struct AccessItem *server_aconf = NULL;
387	<	struct AccessItem *aconf        = NULL;
379	>	struct MaskItem *conf        = NULL;
380	>	struct MaskItem *server_conf = NULL;
381		int error = -1;
382
383	<	assert(client_p != NULL);
383	>	assert(client_p);
384
385		/* loop through looking for all possible connect items that might work */
386		DLINK_FOREACH(ptr, server_items.head)
387		{
388		conf = ptr->data;
396	–	aconf = map_to_conf(conf);
389
390	<	if (!match(name, conf->name))
390	>	if (match(name, conf->name))
391		continue;
392
393		error = -3;
394
395		/* XXX: Fix me for IPv6                    */
396		/* XXX sockhost is the IPv4 ip as a string */
397	<	if (match(aconf->host, client_p->host) ||
398	<	match(aconf->host, client_p->sockhost))
397	>	if (!match(conf->host, client_p->host) ||
398	>	!match(conf->host, client_p->sockhost))
399		{
400		error = -2;
401
402	<	if (!match_conf_password(client_p->localClient->passwd, aconf))
402	>	if (!match_conf_password(client_p->localClient->passwd, conf))
403		return -2;
404
405	+	if (!EmptyString(conf->certfp))
406	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
407	+	return -4;
408	+
409		server_conf = conf;
410		}
411		}
412
413		if (server_conf == NULL)
414	<	return(error);
414	>	return error;
415
416		attach_conf(client_p, server_conf);
417
422	–	server_aconf = map_to_conf(server_conf);
418
419	<	if (aconf != NULL)
419	>	if (server_conf)
420		{
421		struct sockaddr_in *v4;
422		#ifdef IPV6
423		struct sockaddr_in6 *v6;
424		#endif
425	<	switch (aconf->aftype)
425	>	switch (server_conf->aftype)
426		{
427		#ifdef IPV6
428	<	case AF_INET6:
429	<	v6 = (struct sockaddr_in6 *)&aconf->addr;
428	>	case AF_INET6:
429	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
430
431		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
432	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
432	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
433		break;
434		#endif
435		case AF_INET:
436	<	v4 = (struct sockaddr_in *)&aconf->addr;
436	>	v4 = (struct sockaddr_in *)&server_conf->addr;
437
438		if (v4->sin_addr.s_addr == INADDR_NONE)
439	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
439	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
440		break;
441		}
442		}
443
444	<	return(0);
444	>	return 0;
445		}
446
447		/* add_capability()
#	Line 463 | Line 458 | add_capability(const char *capab_name, i
458		{
459		struct Capability *cap = MyMalloc(sizeof(*cap));
460
461	<	DupString(cap->name, capab_name);
461	>	cap->name = xstrdup(capab_name);
462		cap->cap = cap_flag;
463		dlinkAdd(cap, &cap->node, &cap_list);
464
#	Line 492 | Line 487 | delete_capability(const char *capab_name
487		{
488		if (irccmp(cap->name, capab_name) == 0)
489		{
490	<	default_server_capabs &= ~(cap->cap);
491	<	dlinkDelete(ptr, &cap_list);
492	<	MyFree(cap->name);
493	<	cap->name = NULL;
499	<	MyFree(cap);
490	>	default_server_capabs &= ~(cap->cap);
491	>	dlinkDelete(ptr, &cap_list);
492	>	MyFree(cap->name);
493	>	MyFree(cap);
494		}
495		}
496		}
#	Line 511 | Line 505 | delete_capability(const char *capab_name
505		* output       - 0 if not found CAPAB otherwise
506		* side effects - none
507		*/
508	<	int
508	>	unsigned int
509		find_capability(const char *capab)
510		{
511		const dlink_node *ptr = NULL;
#	Line 530 | Line 524 | find_capability(const char *capab)
524		/* send_capabilities()
525		*
526		* inputs       - Client pointer to send to
533	–	*              - Pointer to AccessItem (for crypt)
527		*              - int flag of capabilities that this server can send
528		* output       - NONE
529		* side effects - send the CAPAB line to a server  -orabidoo
530		*
531		*/
532		void
533	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
541	<	int cap_can_send)
533	>	send_capabilities(struct Client *client_p, int cap_can_send)
534		{
535	<	struct Capability *cap=NULL;
536	<	char msgbuf[IRCD_BUFSIZE];
545	<	char *t;
535	>	char msgbuf[IRCD_BUFSIZE] = "";
536	>	char *t = msgbuf;
537		int tl;
538	<	dlink_node *ptr;
548	<
549	<	t = msgbuf;
538	>	dlink_node *ptr = NULL;
539
540		DLINK_FOREACH(ptr, cap_list.head)
541		{
542	<	cap = ptr->data;
542	>	struct Capability *cap = ptr->data;
543
544		if (cap->cap & (cap_can_send|default_server_capabs))
545		{
546	<	tl = ircsprintf(t, "%s ", cap->name);
546	>	tl = sprintf(t, "%s ", cap->name);
547		t += tl;
548		}
549		}
#	Line 564 | Line 553 | send_capabilities(struct Client *client_
553		}
554
555		/* sendnick_TS()
556	<	*
556	>	*
557		* inputs       - client (server) to send nick towards
558		*          - client to send nick for
559		* output       - NONE
#	Line 573 | Line 562 | send_capabilities(struct Client *client_
562		void
563		sendnick_TS(struct Client *client_p, struct Client *target_p)
564		{
565	<	static char ubuf[12];
565	>	char ubuf[IRCD_BUFSIZE] = "";
566
567		if (!IsClient(target_p))
568		return;
#	Line 587 | Line 576 | sendnick_TS(struct Client *client_p, str
576		}
577
578		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)) ?
598	<	"0" : target_p->sockhost, target_p->id,
599	<	target_p->svid, target_p->info);
600	<	else
601	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
602	<	target_p->name, target_p->hopcount + 1,
603	<	(unsigned long) target_p->tsinfo,
604	<	ubuf, target_p->username, target_p->host,
605	<	target_p->servptr->name, target_p->svid,
606	<	target_p->info);
607	<	}
579	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
580	>	target_p->servptr->id,
581	>	target_p->name, target_p->hopcount + 1,
582	>	(unsigned long) target_p->tsinfo,
583	>	ubuf, target_p->username, target_p->host,
584	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
585	>	"0" : target_p->sockhost, target_p->id,
586	>	target_p->svid, target_p->info);
587		else
588	<	{
589	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
590	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
591	<	target_p->servptr->id,
592	<	target_p->name, target_p->hopcount + 1,
593	<	(unsigned long) target_p->tsinfo,
594	<	ubuf, target_p->username, target_p->host,
595	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
596	<	"0" : target_p->sockhost, target_p->id, target_p->info);
597	<	else
619	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
620	<	target_p->name, target_p->hopcount + 1,
621	<	(unsigned long) target_p->tsinfo,
622	<	ubuf, target_p->username, target_p->host,
623	<	target_p->servptr->name, target_p->info);
624	<	}
588	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
589	>	target_p->servptr->id,
590	>	target_p->name, target_p->hopcount + 1,
591	>	(unsigned long) target_p->tsinfo,
592	>	ubuf, target_p->username, target_p->host,
593	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
594	>	"0" : target_p->sockhost, target_p->id, target_p->info);
595	>
596	>	if (!EmptyString(target_p->certfp))
597	>	sendto_one(client_p, ":%s CERTFP %s", target_p->id, target_p->certfp);
598
599		if (target_p->away[0])
600	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
628	<	target_p->away);
600	>	sendto_one(client_p, ":%s AWAY :%s", target_p->id, target_p->away);
601
602		}
603
#	Line 637 | Line 609 | sendnick_TS(struct Client *client_p, str
609		* side effects - build up string representing capabilities of server listed
610		*/
611		const char *
612	<	show_capabilities(struct Client *target_p)
612	>	show_capabilities(const struct Client *target_p)
613		{
614	<	static char msgbuf[IRCD_BUFSIZE];
615	<	char *t = msgbuf;
644	<	dlink_node *ptr;
614	>	static char msgbuf[IRCD_BUFSIZE] = "";
615	>	const dlink_node *ptr = NULL;
616
617	<	t += ircsprintf(msgbuf, "TS ");
617	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
618
619		DLINK_FOREACH(ptr, cap_list.head)
620		{
621		const struct Capability *cap = ptr->data;
622
623	<	if (IsCapable(target_p, cap->cap))
624	<	t += ircsprintf(t, "%s ", cap->name);
623	>	if (!IsCapable(target_p, cap->cap))
624	>	continue;
625	>
626	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
627	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
628		}
629
656	–	*(t - 1) = '\0';
630		return msgbuf;
631		}
632
#	Line 682 | Line 655 | make_server(struct Client *client_p)
655		void
656		server_estab(struct Client *client_p)
657		{
658	<	struct Client *target_p;
686	<	struct ConfItem *conf;
687	<	struct AccessItem *aconf=NULL;
658	>	struct MaskItem *conf = NULL;
659		char *host;
660		const char *inpath;
661		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
#	Line 693 | Line 664 | server_estab(struct Client *client_p)
664		const COMP_METHOD *compression = NULL, *expansion = NULL;
665		#endif
666
667	<	assert(client_p != NULL);
667	>	assert(client_p);
668
669		strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
670
671		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
672		host   = client_p->name;
673
674	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
674	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
675		== NULL)
676		{
677		/* This shouldn't happen, better tell the ops... -A1kmm */
678		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
679		"Warning: Lost connect{} block "
680		"for server %s(this shouldn't happen)!", host);
681	<	exit_client(client_p, &me, "Lost connect{} block!");
681	>	exit_client(client_p, "Lost connect{} block!");
682		return;
683		}
684
#	Line 720 | Line 691 | server_estab(struct Client *client_p)
691		/* If there is something in the serv_list, it might be this
692		* connecting server..
693		*/
694	<	if (!ServerInfo.hub && serv_list.head)
694	>	if (!ServerInfo.hub && serv_list.head)
695		{
696		if (client_p != serv_list.head->data || serv_list.head->next)
697		{
698		++ServerStats.is_ref;
699		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
700	<	exit_client(client_p, &me, "I'm a leaf");
700	>	exit_client(client_p, "I'm a leaf");
701		return;
702		}
703		}
704
734	–	aconf = map_to_conf(conf);
735	–
705		if (IsUnknown(client_p))
706		{
707	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
739	<	*        2.  Check aconf->spasswd, not aconf->passwd.
740	<	*/
741	<	if (!EmptyString(aconf->spasswd))
742	<	sendto_one(client_p, "PASS %s TS %d %s",
743	<	aconf->spasswd, TS_CURRENT, me.id);
744	<
745	<	/* Pass my info to the new server
746	<	*
747	<	* Pass on ZIP if supported
748	<	* Pass on TB if supported.
749	<	* - Dianora
750	<	*/
707	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
708
709	<	send_capabilities(client_p, aconf, 0);
709	>	send_capabilities(client_p, 0);
710
711		sendto_one(client_p, "SERVER %s 1 :%s%s",
712		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
#	Line 758 | Line 715 | server_estab(struct Client *client_p)
715		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
716		(unsigned long)CurrentTime);
717
761	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
762	–	if (IsCapable(client_p, CAP_TS6))
763	–	hash_add_id(client_p);
764	–
718		/* XXX Does this ever happen? I don't think so -db */
719	<	detach_conf(client_p, OPER_TYPE);
719	>	detach_conf(client_p, CONF_OPER);
720
721		/* *WARNING*
722		**    In the following code in place of plain server's
#	Line 783 | Line 736 | server_estab(struct Client *client_p)
736
737		SetServer(client_p);
738
786	–	/* Update the capability combination usage counts. -A1kmm */
787	–	set_chcap_usage_counts(client_p);
788	–
739		/* Some day, all these lists will be consolidated *sigh* */
740		dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
741
#	Line 798 | Line 748 | server_estab(struct Client *client_p)
748
749		dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
750		hash_add_client(client_p);
751	+	hash_add_id(client_p);
752
753		/* doesnt duplicate client_p->serv if allocated this struct already */
754		make_server(client_p);
#	Line 805 | Line 756 | server_estab(struct Client *client_p)
756		/* fixing eob timings.. -gnp */
757		client_p->localClient->firsttime = CurrentTime;
758
759	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
759	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
760		AddFlag(client_p, FLAGS_SERVICE);
761
762		/* Show the real host/IP to admins */
#	Line 850 | Line 801 | server_estab(struct Client *client_p)
801
802		fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
803
804	<	/* Old sendto_serv_but_one() call removed because we now
805	<	** need to send different names to different servers
806	<	** (domain name matching) Send new server to other servers.
856	<	*/
857	<	DLINK_FOREACH(ptr, serv_list.head)
858	<	{
859	<	target_p = ptr->data;
860	<
861	<	if (target_p == client_p)
862	<	continue;
804	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
805	>	me.id, client_p->name, client_p->id,
806	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
807
808	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
809	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
810	<	me.id, client_p->name, client_p->id,
811	<	IsHidden(client_p) ? "(H) " : "",
812	<	client_p->info);
813	<	else
814	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
815	<	me.name, client_p->name,
816	<	IsHidden(client_p) ? "(H) " : "",
817	<	client_p->info);
818	<	}
819	<
820	<	/* Pass on my client information to the new server
821	<	**
822	<	** First, pass only servers (idea is that if the link gets
823	<	** cancelled beacause the server was already there,
824	<	** there are no NICK's to be cancelled...). Of course,
825	<	** if cancellation occurs, all this info is sent anyway,
882	<	** and I guess the link dies when a read is attempted...? --msa
883	<	**
884	<	** Note: Link cancellation to occur at this point means
885	<	** that at least two servers from my fragment are building
886	<	** up connection this other fragment at the same time, it's
887	<	** a race condition, not the normal way of operation...
888	<	**
889	<	** ALSO NOTE: using the get_client_name for server names--
890	<	**    see previous *WARNING*!!! (Also, original inpath
891	<	**    is destroyed...)
892	<	*/
808	>	/*
809	>	* Pass on my client information to the new server
810	>	*
811	>	* First, pass only servers (idea is that if the link gets
812	>	* cancelled beacause the server was already there,
813	>	* there are no NICK's to be cancelled...). Of course,
814	>	* if cancellation occurs, all this info is sent anyway,
815	>	* and I guess the link dies when a read is attempted...? --msa
816	>	*
817	>	* Note: Link cancellation to occur at this point means
818	>	* that at least two servers from my fragment are building
819	>	* up connection this other fragment at the same time, it's
820	>	* a race condition, not the normal way of operation...
821	>	*
822	>	* ALSO NOTE: using the get_client_name for server names--
823	>	*    see previous *WARNING*!!! (Also, original inpath
824	>	*    is destroyed...)
825	>	*/
826
827		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
828		{
829	<	target_p = ptr->data;
829	>	struct Client *target_p = ptr->data;
830
831		/* target_p->from == target_p for target_p == client_p */
832		if (IsMe(target_p) || target_p->from == client_p)
833		continue;
834
835	<	if (IsCapable(client_p, CAP_TS6))
836	<	{
837	<	if (HasID(target_p))
838	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
839	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
840	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
841	<	target_p->info);
909	<	else  /* introducing non-ts6 server */
910	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
911	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
912	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
913	<	}
914	<	else
915	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
916	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
917	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
835	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
836	>	target_p->servptr->id, target_p->name, target_p->hopcount+1,
837	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
838	>	target_p->info);
839	>
840	>	if (HasFlag(target_p, FLAGS_EOB))
841	>	sendto_one(client_p, ":%s EOB", target_p->id, client_p);
842		}
843
844		server_burst(client_p);
#	Line 945 | Line 869 | server_burst(struct Client *client_p)
869
870		/* EOB stuff is now in burst_all */
871		/* Always send a PING after connect burst is done */
872	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
872	>	sendto_one(client_p, "PING :%s", me.id);
873		}
874
875		/* burst_all()
876		*
877	<	* inputs       - pointer to server to send burst to
877	>	* inputs       - pointer to server to send burst to
878		* output       - NONE
879		* side effects - complete burst of channels/nicks is sent to client_p
880		*/
#	Line 963 | Line 887 | burst_all(struct Client *client_p)
887		{
888		struct Channel *chptr = ptr->data;
889
890	<	if (dlink_list_length(&chptr->members) != 0)
890	>	if (dlink_list_length(&chptr->members))
891		{
892		burst_members(client_p, chptr);
893		send_channel_modes(client_p, chptr);
894
895		if (IsCapable(client_p, CAP_TBURST))
896	<	send_tb(client_p, chptr);
896	>	send_tb(client_p, chptr);
897		}
898		}
899
#	Line 981 | Line 905 | burst_all(struct Client *client_p)
905
906		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
907		sendnick_TS(client_p, target_p);
908	<
908	>
909		DelFlag(target_p, FLAGS_BURSTED);
910		}
911
988	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
989	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
990	–	*/
991	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
912		if (IsCapable(client_p, CAP_EOB))
913	<	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
913	>	sendto_one(client_p, ":%s EOB", me.id);
914		}
915
916		/*
#	Line 1018 | Line 938 | send_tb(struct Client *client_p, struct
938		* it to their old topic they had before.  Read m_tburst.c:ms_tburst
939		* for further information   -Michael
940		*/
941	<	if (chptr->topic_time != 0)
942	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1023	<	ID_or_name(&me, client_p),
941	>	if (chptr->topic_time)
942	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s", me.id,
943		(unsigned long)chptr->channelts, chptr->chname,
944		(unsigned long)chptr->topic_time,
945		chptr->topic_info,
#	Line 1063 | Line 982 | burst_members(struct Client *client_p, s
982
983		/* serv_connect() - initiate a server connection
984		*
985	<	* inputs       - pointer to conf
985	>	* inputs       - pointer to conf
986		*              - pointer to client doing the connect
987		* output       -
988		* side effects -
#	Line 1078 | Line 997 | burst_members(struct Client *client_p, s
997		* it suceeded or not, and 0 if it fails in here somewhere.
998		*/
999		int
1000	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1000	>	serv_connect(struct MaskItem *conf, struct Client *by)
1001		{
1002	<	struct ConfItem *conf;
1003	<	struct Client *client_p;
1085	<	char buf[HOSTIPLEN + 1];
1002	>	struct Client *client_p = NULL;
1003	>	char buf[HOSTIPLEN + 1] = "";
1004
1005		/* conversion structs */
1006		struct sockaddr_in *v4;
1089	–	/* Make sure aconf is useful */
1090	–	assert(aconf != NULL);
1007
1008	<	/* XXX should be passing struct ConfItem in the first place */
1009	<	conf = unmap_conf_item(aconf);
1008	>	/* Make sure conf is useful */
1009	>	assert(conf);
1010
1011	<	/* log */
1096	<	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1011	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1012		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1013	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
1013	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1014		buf);
1015
1016		/* Still processing a DNS lookup? -> exit */
1017	<	if (aconf->dns_pending)
1017	>	if (conf->dns_pending)
1018		{
1019		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1020		"Error connecting to %s: DNS lookup for connect{} in progress.",
1021		conf->name);
1022	<	return (0);
1022	>	return 0;
1023		}
1024
1025	<	if (aconf->dns_failed)
1025	>	if (conf->dns_failed)
1026		{
1027		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1028		"Error connecting to %s: DNS lookup for connect{} failed.",
1029		conf->name);
1030	<	return (0);
1030	>	return 0;
1031		}
1032
1033		/* Make sure this server isn't already connected
1034	<	* Note: aconf should ALWAYS be a valid C: line
1034	>	* Note: conf should ALWAYS be a valid C: line
1035		*/
1036	<	if ((client_p = hash_find_server(conf->name)) != NULL)
1037	<	{
1036	>	if ((client_p = hash_find_server(conf->name)))
1037	>	{
1038		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1039	<	"Server %s already present from %s",
1040	<	conf->name, get_client_name(client_p, SHOW_IP));
1039	>	"Server %s already present from %s",
1040	>	conf->name, get_client_name(client_p, SHOW_IP));
1041		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1042	<	"Server %s already present from %s",
1043	<	conf->name, get_client_name(client_p, MASK_IP));
1042	>	"Server %s already present from %s",
1043	>	conf->name, get_client_name(client_p, MASK_IP));
1044		if (by && IsClient(by) && !MyClient(by))
1045	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1046	<	me.name, by->name, conf->name,
1047	<	get_client_name(client_p, MASK_IP));
1133	<	return (0);
1045	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1046	>	conf->name, get_client_name(client_p, MASK_IP));
1047	>	return 0;
1048		}
1049	<
1049	>
1050		/* Create a local client */
1051		client_p = make_client(NULL);
1052
1053		/* Copy in the server, hostname, fd */
1054		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1055	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1055	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1056
1057		/* We already converted the ip once, so lets use it - stu */
1058		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1059
1060	<	/* create a socket for the server connection */
1061	<	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1060	>	/* create a socket for the server connection */
1061	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1062		SOCK_STREAM, 0, NULL) < 0)
1063		{
1064		/* Eek, failure to create the socket */
1065	<	report_error(L_ALL,
1066	<	"opening stream socket to %s: %s", conf->name, errno);
1065	>	report_error(L_ALL, "opening stream socket to %s: %s",
1066	>	conf->name, errno);
1067		SetDead(client_p);
1068	<	exit_client(client_p, &me, "Connection failed");
1069	<	return (0);
1068	>	exit_client(client_p, "Connection failed");
1069	>	return 0;
1070		}
1071
1072		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1161 | Line 1075 | serv_connect(struct AccessItem *aconf, s
1075		/* Attach config entries to client here rather than in
1076		* serv_connect_callback(). This to avoid null pointer references.
1077		*/
1078	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1078	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1079		{
1080		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1081	<	"Host %s is not enabled for connecting: no connect{} block",
1082	<	conf->name);
1083	<	if (by && IsClient(by) && !MyClient(by))
1084	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1085	<	me.name, by->name, client_p->name);
1081	>	"Host %s is not enabled for connecting: no connect{} block",
1082	>	conf->name);
1083	>	if (by && IsClient(by) && !MyClient(by))
1084	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1085	>
1086		SetDead(client_p);
1087	<	exit_client(client_p, client_p, "Connection failed");
1088	<	return (0);
1087	>	exit_client(client_p, "Connection failed");
1088	>	return 0;
1089		}
1090
1091		/* at this point we have a connection in progress and C/N lines
#	Line 1190 | Line 1104 | serv_connect(struct AccessItem *aconf, s
1104		SetConnecting(client_p);
1105		dlinkAdd(client_p, &client_p->node, &global_client_list);
1106		/* from def_fam */
1107	<	client_p->localClient->aftype = aconf->aftype;
1107	>	client_p->localClient->aftype = conf->aftype;
1108
1109		/* Now, initiate the connection */
1110	<	/* XXX assume that a non 0 type means a specific bind address
1110	>	/* XXX assume that a non 0 type means a specific bind address
1111		* for this connect.
1112		*/
1113	<	switch (aconf->aftype)
1113	>	switch (conf->aftype)
1114		{
1115		case AF_INET:
1116	<	v4 = (struct sockaddr_in*)&aconf->bind;
1117	<	if (v4->sin_addr.s_addr != 0)
1116	>	v4 = (struct sockaddr_in*)&conf->bind;
1117	>	if (v4->sin_addr.s_addr)
1118		{
1119		struct irc_ssaddr ipn;
1120		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1121		ipn.ss.ss_family = AF_INET;
1122		ipn.ss_port = 0;
1123	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1124	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1125	<	(struct sockaddr *)&ipn, ipn.ss_len,
1126	<	serv_connect_callback, client_p, aconf->aftype,
1127	<	CONNECTTIMEOUT);
1123	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1124	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1125	>	(struct sockaddr *)&ipn, ipn.ss_len,
1126	>	serv_connect_callback, client_p, conf->aftype,
1127	>	CONNECTTIMEOUT);
1128		}
1129		else if (ServerInfo.specific_ipv4_vhost)
1130		{
#	Line 1219 | Line 1133 | serv_connect(struct AccessItem *aconf, s
1133		ipn.ss.ss_family = AF_INET;
1134		ipn.ss_port = 0;
1135		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1136	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1136	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1137		(struct sockaddr *)&ipn, ipn.ss_len,
1138	<	serv_connect_callback, client_p, aconf->aftype,
1139	<	CONNECTTIMEOUT);
1138	>	serv_connect_callback, client_p, conf->aftype,
1139	>	CONNECTTIMEOUT);
1140		}
1141		else
1142	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1143	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1142	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1143	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1144		CONNECTTIMEOUT);
1145		break;
1146		#ifdef IPV6
1147		case AF_INET6:
1148		{
1149	<	struct irc_ssaddr ipn;
1150	<	struct sockaddr_in6 *v6;
1151	<	struct sockaddr_in6 *v6conf;
1152	<
1153	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1154	<	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1155	<	v6 = (struct sockaddr_in6 *)&ipn;
1156	<
1157	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1158	<	sizeof(struct in6_addr)) != 0)
1159	<	{
1160	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1161	<	ipn.ss.ss_family = AF_INET6;
1162	<	ipn.ss_port = 0;
1163	<	comm_connect_tcp(&client_p->localClient->fd,
1164	<	aconf->host, aconf->port,
1165	<	(struct sockaddr *)&ipn, ipn.ss_len,
1166	<	serv_connect_callback, client_p,
1167	<	aconf->aftype, CONNECTTIMEOUT);
1168	<	}
1255	<	else if (ServerInfo.specific_ipv6_vhost)
1149	>	struct irc_ssaddr ipn;
1150	>	struct sockaddr_in6 *v6;
1151	>	struct sockaddr_in6 *v6conf;
1152	>
1153	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1154	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1155	>	v6 = (struct sockaddr_in6 *)&ipn;
1156	>
1157	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
1158	>	{
1159	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1160	>	ipn.ss.ss_family = AF_INET6;
1161	>	ipn.ss_port = 0;
1162	>	comm_connect_tcp(&client_p->localClient->fd,
1163	>	conf->host, conf->port,
1164	>	(struct sockaddr *)&ipn, ipn.ss_len,
1165	>	serv_connect_callback, client_p,
1166	>	conf->aftype, CONNECTTIMEOUT);
1167	>	}
1168	>	else if (ServerInfo.specific_ipv6_vhost)
1169		{
1170	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1171	<	ipn.ss.ss_family = AF_INET6;
1172	<	ipn.ss_port = 0;
1173	<	comm_connect_tcp(&client_p->localClient->fd,
1174	<	aconf->host, aconf->port,
1175	<	(struct sockaddr *)&ipn, ipn.ss_len,
1176	<	serv_connect_callback, client_p,
1177	<	aconf->aftype, CONNECTTIMEOUT);
1178	<	}
1179	<	else
1180	<	comm_connect_tcp(&client_p->localClient->fd,
1181	<	aconf->host, aconf->port,
1182	<	NULL, 0, serv_connect_callback, client_p,
1183	<	aconf->aftype, CONNECTTIMEOUT);
1170	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1171	>	ipn.ss.ss_family = AF_INET6;
1172	>	ipn.ss_port = 0;
1173	>	comm_connect_tcp(&client_p->localClient->fd,
1174	>	conf->host, conf->port,
1175	>	(struct sockaddr *)&ipn, ipn.ss_len,
1176	>	serv_connect_callback, client_p,
1177	>	conf->aftype, CONNECTTIMEOUT);
1178	>	}
1179	>	else
1180	>	comm_connect_tcp(&client_p->localClient->fd,
1181	>	conf->host, conf->port,
1182	>	NULL, 0, serv_connect_callback, client_p,
1183	>	conf->aftype, CONNECTTIMEOUT);
1184		}
1185		#endif
1186		}
1187	<	return (1);
1187	>	return 1;
1188		}
1189
1190		#ifdef HAVE_LIBCRYPTO
1191		static void
1192		finish_ssl_server_handshake(struct Client *client_p)
1193		{
1194	<	struct ConfItem *conf=NULL;
1282	<	struct AccessItem *aconf=NULL;
1194	>	struct MaskItem *conf = NULL;
1195
1196		conf = find_conf_name(&client_p->localClient->confs,
1197	<	client_p->name, SERVER_TYPE);
1197	>	client_p->name, CONF_SERVER);
1198		if (conf == NULL)
1199		{
1200		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
#	Line 1290 | Line 1202 | finish_ssl_server_handshake(struct Clien
1202		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1203		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1204
1205	<	exit_client(client_p, &me, "Lost connect{} block");
1205	>	exit_client(client_p, "Lost connect{} block");
1206		return;
1207		}
1208
1209	<	aconf = map_to_conf(conf);
1209	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1210
1211	<	/* jdc -- Check and send spasswd, not passwd. */
1300	<	if (!EmptyString(aconf->spasswd))
1301	<	sendto_one(client_p, "PASS %s TS %d %s",
1302	<	aconf->spasswd, TS_CURRENT, me.id);
1303	<
1304	<	send_capabilities(client_p, aconf, 0);
1211	>	send_capabilities(client_p, 0);
1212
1213		sendto_one(client_p, "SERVER %s 1 :%s%s",
1214		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1329 | Line 1236 | finish_ssl_server_handshake(struct Clien
1236		static void
1237		ssl_server_handshake(fde_t *fd, struct Client *client_p)
1238		{
1239	<	int ret;
1240	<	int err;
1334	<
1335	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1239	>	X509 *cert = NULL;
1240	>	int ret = 0;
1241
1242	<	if (ret <= 0)
1242	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1243		{
1244	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1244	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1245		{
1246		case SSL_ERROR_WANT_WRITE:
1247		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1352 | Line 1257 | ssl_server_handshake(fde_t *fd, struct C
1257		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1258		"Error connecting to %s: %s", client_p->name,
1259		sslerr ? sslerr : "unknown SSL error");
1260	<	exit_client(client_p, client_p, "Error during SSL handshake");
1260	>	exit_client(client_p, "Error during SSL handshake");
1261		return;
1262		}
1263		}
1264		}
1265
1266	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1267	+	{
1268	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1269	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1270	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1271	+
1272	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1273	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1274	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1275	+	{
1276	+	unsigned int i = 0, n = 0;
1277	+
1278	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1279	+	{
1280	+	for (; i < n; ++i)
1281	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1282	+	client_p->certfp = xstrdup(buf);
1283	+	}
1284	+	}
1285	+	else
1286	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1287	+	client_p->name, client_p->username, client_p->host, res);
1288	+	X509_free(cert);
1289	+	}
1290	+
1291		finish_ssl_server_handshake(client_p);
1292		}
1293
1294		static void
1295	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1295	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1296		{
1297		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1298		{
1299		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1300		ERR_error_string(ERR_get_error(), NULL));
1301		SetDead(client_p);
1302	<	exit_client(client_p, client_p, "SSL_new failed");
1302	>	exit_client(client_p, "SSL_new failed");
1303		return;
1304		}
1305
1306		SSL_set_fd(fd->ssl, fd->fd);
1307
1308	<	if (!EmptyString(aconf->cipher_list))
1309	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1308	>	if (!EmptyString(conf->cipher_list))
1309	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1310
1311		ssl_server_handshake(NULL, client_p);
1312		}
1313		#endif
1314
1315		/* serv_connect_callback() - complete a server connection.
1316	<	*
1316	>	*
1317		* This routine is called after the server connection attempt has
1318		* completed. If unsucessful, an error is sent to ops and the client
1319		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1394 | Line 1324 | static void
1324		serv_connect_callback(fde_t *fd, int status, void *data)
1325		{
1326		struct Client *client_p = data;
1327	<	struct ConfItem *conf=NULL;
1398	<	struct AccessItem *aconf=NULL;
1327	>	struct MaskItem *conf = NULL;
1328
1329		/* First, make sure its a real client! */
1330	<	assert(client_p != NULL);
1330	>	assert(client_p);
1331		assert(&client_p->localClient->fd == fd);
1332
1333		/* Next, for backward purposes, record the ip of the server */
1334		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
1335		sizeof(struct irc_ssaddr));
1336	+
1337		/* Check the status */
1338		if (status != COMM_OK)
1339		{
#	Line 1416 | Line 1346 | serv_connect_callback(fde_t *fd, int sta
1346		client_p->name, comm_errstr(status));
1347		else
1348		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1349	<	"Error connecting to %s[%s]: %s", client_p->name,
1350	<	client_p->host, comm_errstr(status));
1349	>	"Error connecting to %s[%s]: %s", client_p->name,
1350	>	client_p->host, comm_errstr(status));
1351
1352		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1353	<	"Error connecting to %s: %s",
1354	<	client_p->name, comm_errstr(status));
1353	>	"Error connecting to %s: %s",
1354	>	client_p->name, comm_errstr(status));
1355
1356		/* If a fd goes bad, call dead_link() the socket is no
1357		* longer valid for reading or writing.
#	Line 1433 | Line 1363 | serv_connect_callback(fde_t *fd, int sta
1363		/* COMM_OK, so continue the connection procedure */
1364		/* Get the C/N lines */
1365		conf = find_conf_name(&client_p->localClient->confs,
1366	<	client_p->name, SERVER_TYPE);
1366	>	client_p->name, CONF_SERVER);
1367		if (conf == NULL)
1368		{
1369		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1370	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1370	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1371		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1372	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1372	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1373
1374	<	exit_client(client_p, &me, "Lost connect{} block");
1374	>	exit_client(client_p, "Lost connect{} block");
1375		return;
1376		}
1377
1448	–	aconf = map_to_conf(conf);
1378		/* Next, send the initial handshake */
1379		SetHandshake(client_p);
1380
1381		#ifdef HAVE_LIBCRYPTO
1382	<	if (IsConfSSL(aconf))
1382	>	if (IsConfSSL(conf))
1383		{
1384	<	ssl_connect_init(client_p, aconf, fd);
1384	>	ssl_connect_init(client_p, conf, fd);
1385		return;
1386		}
1387		#endif
1388
1389	<	/* jdc -- Check and send spasswd, not passwd. */
1461	<	if (!EmptyString(aconf->spasswd))
1462	<	sendto_one(client_p, "PASS %s TS %d %s",
1463	<	aconf->spasswd, TS_CURRENT, me.id);
1389	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1390
1391	<	send_capabilities(client_p, aconf, 0);
1391	>	send_capabilities(client_p, 0);
1392
1393	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1394	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1469	<	me.info);
1393	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1394	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1395
1396		/* If we've been marked dead because a send failed, just exit
1397		* here now and save everyone the trouble of us ever existing.
1398		*/
1399	<	if (IsDead(client_p))
1399	>	if (IsDead(client_p))
1400		{
1401		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1402	<	"%s[%s] went dead during handshake",
1402	>	"%s[%s] went dead during handshake",
1403		client_p->name,
1404	<	client_p->host);
1404	>	client_p->host);
1405		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1406	<	"%s went dead during handshake", client_p->name);
1406	>	"%s went dead during handshake", client_p->name);
1407		return;
1408		}
1409
#	Line 1498 | Line 1423 | find_servconn_in_progress(const char *na
1423		cptr = ptr->data;
1424
1425		if (cptr && cptr->name[0])
1426	<	if (match(name, cptr->name))
1426	>	if (!match(name, cptr->name))
1427		return cptr;
1428		}
1429	<
1429	>
1430		return NULL;
1431		}

Diff Legend

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