ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1472 by michael, Sun Jul 22 12:03:18 2012 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3187 by michael, Thu Mar 20 18:29:05 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 = 0;
80	<	MessageFileLine *mptr = 0;
81	<	MessageFileLine *currentMessageLine = 0;
81	<	MessageFileLine *newMessageLine = 0;
82	<	MessageFile *MessageFileptr;
83	<	const char *p;
84	<	FILE *file;
85	<	char buff[512];
86	<	dlink_node *ptr;
87	<
88	<	MessageFileptr = &ConfigFileEntry.linksfile;
79	>	FILE *file = NULL;
80	>	dlink_node *ptr = NULL, *ptr_next = NULL;
81	>	char buff[IRCD_BUFSIZE] = { '\0' };
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
99	–	MessageFileptr->contentsOfFile = NULL;
100	–	currentMessageLine             = NULL;
101	–
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 */
111	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
104	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
105		continue;
106
107	<	if (target_p->info[0])
108	<	p = target_p->info;
116	<	else
117	<	p = "(Unknown Location)";
118	<
119	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
120	<
121	<	/* Attempt to format the file in such a way it follows the usual links output
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(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
119	<	/*
120	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
129	<	* default config but it is configurable..
130	<	* This should be changed to an snprintf at some point, but I'm wanting to
131	<	* know if this is a cause of a bug - cryogen
132	<	*/
133	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
134	<	MESSAGELINELEN);
135	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
136	<	target_p->name, me.name, p);
137	<	newMessageLine->next = NULL;
119	>	fputs(buff, file);
120	>	}
121
122	<	if (MessageFileptr->contentsOfFile)
123	<	{
141	<	if (currentMessageLine)
142	<	currentMessageLine->next = newMessageLine;
143	<	currentMessageLine = newMessageLine;
144	<	}
145	<	else
146	<	{
147	<	MessageFileptr->contentsOfFile = newMessageLine;
148	<	currentMessageLine = newMessageLine;
149	<	}
122	>	fclose(file);
123	>	}
124
125	<	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
126	<	fputs(buff, file);
125	>	void
126	>	read_links_file(void)
127	>	{
128	>	FILE *file = NULL;
129	>	char *p = NULL;
130	>	char buff[IRCD_BUFSIZE] = { '\0' };
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')) != NULL)
138	>	*p = '\0';
139	>
140	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
141		}
142
143		fclose(file);
#	Line 175 | 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 187 | 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 197 | 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 207 | 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
210	–	collapse(parv[server]);
198		wilds = has_wildcards(parv[server]);
199
200		/* Again, if there are no wild cards involved in the server
#	Line 219 | 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]);
224	<	return(HUNTED_NOSUCH);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 230 | 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		}
#	Line 247 | Line 233 | hunt_server(struct Client *client_p, str
233		{
234		if(!IsRegistered(target_p))
235		{
236	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
251	<	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) &&
263	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
264	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
265	<	parv[0] = ID(source_p);
266	<
267	<	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]);
275	<	return(HUNTED_NOSUCH);
253	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
254	>	return HUNTED_NOSUCH;
255		}
256
257		/* try_connections()
#	Line 288 | 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;
293	<	struct AccessItem *aconf;
294	<	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 301 | Line 278 | try_connections(void *unused)
278		DLINK_FOREACH(ptr, server_items.head)
279		{
280		conf = ptr->data;
304	–	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 ||
309	<	!(IsConfAllowAutoConn(aconf)))
286	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
287		continue;
288
312	–	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 317 | 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
311		* and see if this server is already connected?
#	Line 337 | Line 313 | try_connections(void *unused)
313		if (hash_find_server(conf->name) != NULL)
314		continue;
315
316	<	if (cltmp->curr_user_count < cltmp->max_total)
316	>	if (conf->class->ref_count < conf->class->max_total)
317		{
318		/* Go to the end of the list, if not already last */
319		if (ptr->next != NULL)
#	Line 358 | Line 334 | try_connections(void *unused)
334		*   -- adrian
335		*/
336		if (ConfigServerHide.hide_server_ips)
337	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
337	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
338	>	"Connection to %s activated.",
339		conf->name);
340		else
341	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
342	<	conf->name, aconf->host);
341	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
342	>	"Connection to %s[%s] activated.",
343	>	conf->name, conf->host);
344
345	<	serv_connect(aconf, NULL);
345	>	serv_connect(conf, NULL);
346		/* We connect only one at time... */
347		return;
348		}
#	Line 396 | Line 374 | int
374		check_server(const char *name, struct Client *client_p)
375		{
376		dlink_node *ptr;
377	<	struct ConfItem *conf           = NULL;
378	<	struct ConfItem *server_conf    = NULL;
401	<	struct AccessItem *server_aconf = NULL;
402	<	struct AccessItem *aconf        = NULL;
377	>	struct MaskItem *conf        = NULL;
378	>	struct MaskItem *server_conf = NULL;
379		int error = -1;
380
381		assert(client_p != NULL);
#	Line 408 | Line 384 | check_server(const char *name, struct Cl
384		DLINK_FOREACH(ptr, server_items.head)
385		{
386		conf = ptr->data;
411	–	aconf = map_to_conf(conf);
387
388	<	if (!match(name, conf->name))
388	>	if (match(name, conf->name))
389		continue;
390
391		error = -3;
392
393		/* XXX: Fix me for IPv6                    */
394		/* XXX sockhost is the IPv4 ip as a string */
395	<	if (match(aconf->host, client_p->host) ||
396	<	match(aconf->host, client_p->sockhost))
395	>	if (!match(conf->host, client_p->host) ||
396	>	!match(conf->host, client_p->sockhost))
397		{
398		error = -2;
399
400	<	if (!match_conf_password(client_p->localClient->passwd, aconf))
400	>	if (!match_conf_password(client_p->localClient->passwd, conf))
401		return -2;
402
403	+	if (!EmptyString(conf->certfp))
404	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
405	+	return -4;
406	+
407		server_conf = conf;
408		}
409		}
410
411		if (server_conf == NULL)
412	<	return(error);
412	>	return error;
413
414		attach_conf(client_p, server_conf);
415
437	–	server_aconf = map_to_conf(server_conf);
438	–
439	–	if (!IsConfTopicBurst(server_aconf))
440	–	ClearCap(client_p, CAP_TBURST);
416
417	<	if (aconf != NULL)
417	>	if (server_conf != NULL)
418		{
419		struct sockaddr_in *v4;
420		#ifdef IPV6
421		struct sockaddr_in6 *v6;
422		#endif
423	<	switch (aconf->aftype)
423	>	switch (server_conf->aftype)
424		{
425		#ifdef IPV6
426	<	case AF_INET6:
427	<	v6 = (struct sockaddr_in6 *)&aconf->addr;
426	>	case AF_INET6:
427	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
428
429		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
430	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
430	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
431		break;
432		#endif
433		case AF_INET:
434	<	v4 = (struct sockaddr_in *)&aconf->addr;
434	>	v4 = (struct sockaddr_in *)&server_conf->addr;
435
436		if (v4->sin_addr.s_addr == INADDR_NONE)
437	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
437	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
438		break;
439		}
440		}
441
442	<	return(0);
442	>	return 0;
443		}
444
445		/* add_capability()
#	Line 481 | Line 456 | add_capability(const char *capab_name, i
456		{
457		struct Capability *cap = MyMalloc(sizeof(*cap));
458
459	<	DupString(cap->name, capab_name);
459	>	cap->name = xstrdup(capab_name);
460		cap->cap = cap_flag;
461		dlinkAdd(cap, &cap->node, &cap_list);
462
#	Line 510 | Line 485 | delete_capability(const char *capab_name
485		{
486		if (irccmp(cap->name, capab_name) == 0)
487		{
488	<	default_server_capabs &= ~(cap->cap);
489	<	dlinkDelete(ptr, &cap_list);
490	<	MyFree(cap->name);
491	<	cap->name = NULL;
517	<	MyFree(cap);
488	>	default_server_capabs &= ~(cap->cap);
489	>	dlinkDelete(ptr, &cap_list);
490	>	MyFree(cap->name);
491	>	MyFree(cap);
492		}
493		}
494		}
#	Line 529 | Line 503 | delete_capability(const char *capab_name
503		* output       - 0 if not found CAPAB otherwise
504		* side effects - none
505		*/
506	<	int
506	>	unsigned int
507		find_capability(const char *capab)
508		{
509		const dlink_node *ptr = NULL;
#	Line 548 | Line 522 | find_capability(const char *capab)
522		/* send_capabilities()
523		*
524		* inputs       - Client pointer to send to
551	–	*              - Pointer to AccessItem (for crypt)
525		*              - int flag of capabilities that this server can send
526		* output       - NONE
527		* side effects - send the CAPAB line to a server  -orabidoo
528		*
529		*/
530		void
531	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
559	<	int cap_can_send)
531	>	send_capabilities(struct Client *client_p, int cap_can_send)
532		{
533		struct Capability *cap=NULL;
534		char msgbuf[IRCD_BUFSIZE];
#	Line 572 | Line 544 | send_capabilities(struct Client *client_
544
545		if (cap->cap & (cap_can_send|default_server_capabs))
546		{
547	<	tl = ircsprintf(t, "%s ", cap->name);
547	>	tl = sprintf(t, "%s ", cap->name);
548		t += tl;
549		}
550		}
#	Line 582 | Line 554 | send_capabilities(struct Client *client_
554		}
555
556		/* sendnick_TS()
557	<	*
557	>	*
558		* inputs       - client (server) to send nick towards
559		*          - client to send nick for
560		* output       - NONE
#	Line 591 | Line 563 | send_capabilities(struct Client *client_
563		void
564		sendnick_TS(struct Client *client_p, struct Client *target_p)
565		{
566	<	static char ubuf[12];
566	>	char ubuf[IRCD_BUFSIZE];
567
568		if (!IsClient(target_p))
569		return;
#	Line 604 | Line 576 | sendnick_TS(struct Client *client_p, str
576		ubuf[1] = '\0';
577		}
578
607	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
579		if (IsCapable(client_p, CAP_SVS))
580	<	{
581	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
582	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
583	<	target_p->servptr->id,
584	<	target_p->name, target_p->hopcount + 1,
585	<	(unsigned long) target_p->tsinfo,
586	<	ubuf, target_p->username, target_p->host,
587	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
617	<	"0" : target_p->sockhost, target_p->id,
618	<	(unsigned long)target_p->servicestamp, target_p->info);
619	<	else
620	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
621	<	target_p->name, target_p->hopcount + 1,
622	<	(unsigned long) target_p->tsinfo,
623	<	ubuf, target_p->username, target_p->host,
624	<	target_p->servptr->name, (unsigned long)target_p->servicestamp,
625	<	target_p->info);
626	<	}
580	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
581	>	target_p->servptr->id,
582	>	target_p->name, target_p->hopcount + 1,
583	>	(unsigned long) target_p->tsinfo,
584	>	ubuf, target_p->username, target_p->host,
585	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
586	>	"0" : target_p->sockhost, target_p->id,
587	>	target_p->svid, target_p->info);
588		else
589	<	{
590	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
591	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
592	<	target_p->servptr->id,
593	<	target_p->name, target_p->hopcount + 1,
594	<	(unsigned long) target_p->tsinfo,
595	<	ubuf, target_p->username, target_p->host,
635	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
636	<	"0" : target_p->sockhost, target_p->id, target_p->info);
637	<	else
638	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
639	<	target_p->name, target_p->hopcount + 1,
640	<	(unsigned long) target_p->tsinfo,
641	<	ubuf, target_p->username, target_p->host,
642	<	target_p->servptr->name, target_p->info);
643	<	}
589	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	>	target_p->servptr->id,
591	>	target_p->name, target_p->hopcount + 1,
592	>	(unsigned long) target_p->tsinfo,
593	>	ubuf, target_p->username, target_p->host,
594	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
595	>	"0" : target_p->sockhost, target_p->id, target_p->info);
596
597	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->localClient->confs.head->data)))
598	<	if (!EmptyString(target_p->away))
599	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
600	<	target_p->away);
597	>	if (!EmptyString(target_p->certfp))
598	>	sendto_one(client_p, ":%s CERTFP %s", target_p->id, target_p->certfp);
599	>
600	>	if (target_p->away[0])
601	>	sendto_one(client_p, ":%s AWAY :%s", target_p->id, target_p->away);
602
603		}
604
#	Line 657 | Line 610 | sendnick_TS(struct Client *client_p, str
610		* side effects - build up string representing capabilities of server listed
611		*/
612		const char *
613	<	show_capabilities(struct Client *target_p)
613	>	show_capabilities(const struct Client *target_p)
614		{
615	<	static char msgbuf[IRCD_BUFSIZE];
616	<	char *t = msgbuf;
664	<	dlink_node *ptr;
615	>	static char msgbuf[IRCD_BUFSIZE] = "";
616	>	const dlink_node *ptr = NULL;
617
618	<	t += ircsprintf(msgbuf, "TS ");
618	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
619
620		DLINK_FOREACH(ptr, cap_list.head)
621		{
622		const struct Capability *cap = ptr->data;
623
624	<	if (IsCapable(target_p, cap->cap))
625	<	t += ircsprintf(t, "%s ", cap->name);
624	>	if (!IsCapable(target_p, cap->cap))
625	>	continue;
626	>
627	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
628	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
629		}
630
676	–	*(t - 1) = '\0';
631		return msgbuf;
632		}
633
#	Line 702 | Line 656 | make_server(struct Client *client_p)
656		void
657		server_estab(struct Client *client_p)
658		{
659	<	struct Client *target_p;
706	<	struct ConfItem *conf;
707	<	struct AccessItem *aconf=NULL;
659	>	struct MaskItem *conf = NULL;
660		char *host;
661		const char *inpath;
662		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
#	Line 720 | Line 672 | server_estab(struct Client *client_p)
672		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
673		host   = client_p->name;
674
675	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
675	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
676		== NULL)
677		{
678		/* This shouldn't happen, better tell the ops... -A1kmm */
679	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
679	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
680	>	"Warning: Lost connect{} block "
681		"for server %s(this shouldn't happen)!", host);
682	<	exit_client(client_p, &me, "Lost connect{} block!");
682	>	exit_client(client_p, "Lost connect{} block!");
683		return;
684		}
685
#	Line 739 | Line 692 | server_estab(struct Client *client_p)
692		/* If there is something in the serv_list, it might be this
693		* connecting server..
694		*/
695	<	if (!ServerInfo.hub && serv_list.head)
695	>	if (!ServerInfo.hub && serv_list.head)
696		{
697		if (client_p != serv_list.head->data || serv_list.head->next)
698		{
699		++ServerStats.is_ref;
700		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
701	<	exit_client(client_p, &me, "I'm a leaf");
701	>	exit_client(client_p, "I'm a leaf");
702		return;
703		}
704		}
705
753	–	aconf = map_to_conf(conf);
754	–
706		if (IsUnknown(client_p))
707		{
708	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
758	<	*        2.  Check aconf->spasswd, not aconf->passwd.
759	<	*/
760	<	if (!EmptyString(aconf->spasswd))
761	<	sendto_one(client_p, "PASS %s TS %d %s",
762	<	aconf->spasswd, TS_CURRENT, me.id);
763	<
764	<	/* Pass my info to the new server
765	<	*
766	<	* Pass on ZIP if supported
767	<	* Pass on TB if supported.
768	<	* - Dianora
769	<	*/
708	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
709
710	<	send_capabilities(client_p, aconf,
772	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
710	>	send_capabilities(client_p, 0);
711
712		sendto_one(client_p, "SERVER %s 1 :%s%s",
713		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
#	Line 778 | Line 716 | server_estab(struct Client *client_p)
716		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
717		(unsigned long)CurrentTime);
718
781	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
782	–	if (IsCapable(client_p, CAP_TS6))
783	–	hash_add_id(client_p);
784	–
719		/* XXX Does this ever happen? I don't think so -db */
720	<	detach_conf(client_p, OPER_TYPE);
720	>	detach_conf(client_p, CONF_OPER);
721
722		/* *WARNING*
723		**    In the following code in place of plain server's
#	Line 803 | Line 737 | server_estab(struct Client *client_p)
737
738		SetServer(client_p);
739
806	–	/* Update the capability combination usage counts. -A1kmm */
807	–	set_chcap_usage_counts(client_p);
808	–
740		/* Some day, all these lists will be consolidated *sigh* */
741		dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
742
#	Line 818 | Line 749 | server_estab(struct Client *client_p)
749
750		dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
751		hash_add_client(client_p);
752	+	hash_add_id(client_p);
753
754		/* doesnt duplicate client_p->serv if allocated this struct already */
755		make_server(client_p);
#	Line 825 | Line 757 | server_estab(struct Client *client_p)
757		/* fixing eob timings.. -gnp */
758		client_p->localClient->firsttime = CurrentTime;
759
760	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
760	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
761		AddFlag(client_p, FLAGS_SERVICE);
762
763		/* Show the real host/IP to admins */
#	Line 835 | Line 767 | server_estab(struct Client *client_p)
767		compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
768		expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
769
770	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
770	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
771		"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
772		inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
773		compression ? SSL_COMP_get_name(compression) : "NONE",
774		expansion ? SSL_COMP_get_name(expansion) : "NONE",
775		show_capabilities(client_p));
776		/* Now show the masked hostname/IP to opers */
777	<	sendto_realops_flags(UMODE_ALL, L_OPER,
777	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
778		"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
779		inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
780		compression ? SSL_COMP_get_name(compression) : "NONE",
#	Line 857 | Line 789 | server_estab(struct Client *client_p)
789		else
790		#endif
791		{
792	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
792	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
793		"Link with %s established: (Capabilities: %s)",
794	<	inpath_ip,show_capabilities(client_p));
794	>	inpath_ip, show_capabilities(client_p));
795		/* Now show the masked hostname/IP to opers */
796	<	sendto_realops_flags(UMODE_ALL, L_OPER,
796	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
797		"Link with %s established: (Capabilities: %s)",
798	<	inpath,show_capabilities(client_p));
798	>	inpath, show_capabilities(client_p));
799		ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
800		inpath_ip, show_capabilities(client_p));
801		}
802
803		fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
804
805	<	/* Old sendto_serv_but_one() call removed because we now
806	<	** need to send different names to different servers
807	<	** (domain name matching) Send new server to other servers.
876	<	*/
877	<	DLINK_FOREACH(ptr, serv_list.head)
878	<	{
879	<	target_p = ptr->data;
880	<
881	<	if (target_p == client_p)
882	<	continue;
805	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
806	>	me.id, client_p->name, client_p->id,
807	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
808
809	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
810	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
811	<	me.id, client_p->name, client_p->id,
812	<	IsHidden(client_p) ? "(H) " : "",
813	<	client_p->info);
814	<	else
815	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
816	<	me.name, client_p->name,
817	<	IsHidden(client_p) ? "(H) " : "",
818	<	client_p->info);
819	<	}
820	<
821	<	/* Pass on my client information to the new server
822	<	**
823	<	** First, pass only servers (idea is that if the link gets
824	<	** cancelled beacause the server was already there,
825	<	** there are no NICK's to be cancelled...). Of course,
826	<	** if cancellation occurs, all this info is sent anyway,
902	<	** and I guess the link dies when a read is attempted...? --msa
903	<	**
904	<	** Note: Link cancellation to occur at this point means
905	<	** that at least two servers from my fragment are building
906	<	** up connection this other fragment at the same time, it's
907	<	** a race condition, not the normal way of operation...
908	<	**
909	<	** ALSO NOTE: using the get_client_name for server names--
910	<	**    see previous *WARNING*!!! (Also, original inpath
911	<	**    is destroyed...)
912	<	*/
809	>	/*
810	>	* Pass on my client information to the new server
811	>	*
812	>	* First, pass only servers (idea is that if the link gets
813	>	* cancelled beacause the server was already there,
814	>	* there are no NICK's to be cancelled...). Of course,
815	>	* if cancellation occurs, all this info is sent anyway,
816	>	* and I guess the link dies when a read is attempted...? --msa
817	>	*
818	>	* Note: Link cancellation to occur at this point means
819	>	* that at least two servers from my fragment are building
820	>	* up connection this other fragment at the same time, it's
821	>	* a race condition, not the normal way of operation...
822	>	*
823	>	* ALSO NOTE: using the get_client_name for server names--
824	>	*    see previous *WARNING*!!! (Also, original inpath
825	>	*    is destroyed...)
826	>	*/
827
828		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
829		{
830	<	target_p = ptr->data;
830	>	struct Client *target_p = ptr->data;
831
832		/* target_p->from == target_p for target_p == client_p */
833		if (IsMe(target_p) || target_p->from == client_p)
834		continue;
835
836	<	if (IsCapable(client_p, CAP_TS6))
837	<	{
838	<	if (HasID(target_p))
839	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
840	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
841	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
842	<	target_p->info);
929	<	else  /* introducing non-ts6 server */
930	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
931	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
932	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
933	<	}
934	<	else
935	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
936	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
937	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
836	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
837	>	target_p->servptr->id, target_p->name, target_p->hopcount+1,
838	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
839	>	target_p->info);
840	>
841	>	if (HasFlag(target_p, FLAGS_EOB))
842	>	sendto_one(client_p, ":%s EOB", target_p->id, client_p);
843		}
844
845		server_burst(client_p);
#	Line 965 | Line 870 | server_burst(struct Client *client_p)
870
871		/* EOB stuff is now in burst_all */
872		/* Always send a PING after connect burst is done */
873	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
873	>	sendto_one(client_p, "PING :%s", me.id);
874		}
875
876		/* burst_all()
877		*
878	<	* inputs       - pointer to server to send burst to
878	>	* inputs       - pointer to server to send burst to
879		* output       - NONE
880		* side effects - complete burst of channels/nicks is sent to client_p
881		*/
#	Line 989 | Line 894 | burst_all(struct Client *client_p)
894		send_channel_modes(client_p, chptr);
895
896		if (IsCapable(client_p, CAP_TBURST))
897	<	send_tb(client_p, chptr);
897	>	send_tb(client_p, chptr);
898		}
899		}
900
#	Line 1001 | Line 906 | burst_all(struct Client *client_p)
906
907		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
908		sendnick_TS(client_p, target_p);
909	<
909	>
910		DelFlag(target_p, FLAGS_BURSTED);
911		}
912
1008	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1009	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1010	–	*/
1011	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
913		if (IsCapable(client_p, CAP_EOB))
914	<	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
914	>	sendto_one(client_p, ":%s EOB", me.id);
915		}
916
917		/*
#	Line 1039 | Line 940 | send_tb(struct Client *client_p, struct
940		* for further information   -Michael
941		*/
942		if (chptr->topic_time != 0)
943	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1043	<	ID_or_name(&me, client_p),
943	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s", me.id,
944		(unsigned long)chptr->channelts, chptr->chname,
945		(unsigned long)chptr->topic_time,
946		chptr->topic_info,
#	Line 1083 | Line 983 | burst_members(struct Client *client_p, s
983
984		/* serv_connect() - initiate a server connection
985		*
986	<	* inputs       - pointer to conf
986	>	* inputs       - pointer to conf
987		*              - pointer to client doing the connect
988		* output       -
989		* side effects -
#	Line 1098 | Line 998 | burst_members(struct Client *client_p, s
998		* it suceeded or not, and 0 if it fails in here somewhere.
999		*/
1000		int
1001	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1001	>	serv_connect(struct MaskItem *conf, struct Client *by)
1002		{
1103	–	struct ConfItem *conf;
1003		struct Client *client_p;
1004		char buf[HOSTIPLEN + 1];
1005
1006		/* conversion structs */
1007		struct sockaddr_in *v4;
1008	<	/* Make sure aconf is useful */
1009	<	assert(aconf != NULL);
1008	>	/* Make sure conf is useful */
1009	>	assert(conf != NULL);
1010
1112	–	/* XXX should be passing struct ConfItem in the first place */
1113	–	conf = unmap_conf_item(aconf);
1011
1012	<	/* log */
1116	<	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1012	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1013		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1014	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
1014	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1015		buf);
1016
1017		/* Still processing a DNS lookup? -> exit */
1018	<	if (aconf->dns_pending)
1018	>	if (conf->dns_pending)
1019		{
1020	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1020	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1021		"Error connecting to %s: DNS lookup for connect{} in progress.",
1022		conf->name);
1023		return (0);
1024		}
1025
1026	<	if (aconf->dns_failed)
1026	>	if (conf->dns_failed)
1027		{
1028	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1028	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1029		"Error connecting to %s: DNS lookup for connect{} failed.",
1030		conf->name);
1031		return (0);
1032		}
1033
1034		/* Make sure this server isn't already connected
1035	<	* Note: aconf should ALWAYS be a valid C: line
1035	>	* Note: conf should ALWAYS be a valid C: line
1036		*/
1037		if ((client_p = hash_find_server(conf->name)) != NULL)
1038	<	{
1039	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1040	<	"Server %s already present from %s",
1041	<	conf->name, get_client_name(client_p, SHOW_IP));
1042	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1043	<	"Server %s already present from %s",
1044	<	conf->name, get_client_name(client_p, MASK_IP));
1038	>	{
1039	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1040	>	"Server %s already present from %s",
1041	>	conf->name, get_client_name(client_p, SHOW_IP));
1042	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1043	>	"Server %s already present from %s",
1044	>	conf->name, get_client_name(client_p, MASK_IP));
1045		if (by && IsClient(by) && !MyClient(by))
1046	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1047	<	me.name, by->name, conf->name,
1048	<	get_client_name(client_p, MASK_IP));
1153	<	return (0);
1046	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1047	>	conf->name, get_client_name(client_p, MASK_IP));
1048	>	return 0;
1049		}
1050	<
1050	>
1051		/* Create a local client */
1052		client_p = make_client(NULL);
1053
1054		/* Copy in the server, hostname, fd */
1055		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1056	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1056	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1057
1058		/* We already converted the ip once, so lets use it - stu */
1059		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1060
1061	<	/* create a socket for the server connection */
1062	<	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1061	>	/* create a socket for the server connection */
1062	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1063		SOCK_STREAM, 0, NULL) < 0)
1064		{
1065		/* Eek, failure to create the socket */
1066	<	report_error(L_ALL,
1067	<	"opening stream socket to %s: %s", conf->name, errno);
1066	>	report_error(L_ALL, "opening stream socket to %s: %s",
1067	>	conf->name, errno);
1068		SetDead(client_p);
1069	<	exit_client(client_p, &me, "Connection failed");
1070	<	return (0);
1069	>	exit_client(client_p, "Connection failed");
1070	>	return 0;
1071		}
1072
1073		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1181 | Line 1076 | serv_connect(struct AccessItem *aconf, s
1076		/* Attach config entries to client here rather than in
1077		* serv_connect_callback(). This to avoid null pointer references.
1078		*/
1079	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1079	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1080		{
1081	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1082	<	"Host %s is not enabled for connecting:no C/N-line",
1083	<	conf->name);
1084	<	if (by && IsClient(by) && !MyClient(by))
1085	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1086	<	me.name, by->name, client_p->name);
1081	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1082	>	"Host %s is not enabled for connecting: no connect{} block",
1083	>	conf->name);
1084	>	if (by && IsClient(by) && !MyClient(by))
1085	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1086	>
1087		SetDead(client_p);
1088	<	exit_client(client_p, client_p, "Connection failed");
1089	<	return (0);
1088	>	exit_client(client_p, "Connection failed");
1089	>	return 0;
1090		}
1091
1092		/* at this point we have a connection in progress and C/N lines
#	Line 1210 | Line 1105 | serv_connect(struct AccessItem *aconf, s
1105		SetConnecting(client_p);
1106		dlinkAdd(client_p, &client_p->node, &global_client_list);
1107		/* from def_fam */
1108	<	client_p->localClient->aftype = aconf->aftype;
1108	>	client_p->localClient->aftype = conf->aftype;
1109
1110		/* Now, initiate the connection */
1111	<	/* XXX assume that a non 0 type means a specific bind address
1111	>	/* XXX assume that a non 0 type means a specific bind address
1112		* for this connect.
1113		*/
1114	<	switch (aconf->aftype)
1114	>	switch (conf->aftype)
1115		{
1116		case AF_INET:
1117	<	v4 = (struct sockaddr_in*)&aconf->bind;
1117	>	v4 = (struct sockaddr_in*)&conf->bind;
1118		if (v4->sin_addr.s_addr != 0)
1119		{
1120		struct irc_ssaddr ipn;
1121		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1122		ipn.ss.ss_family = AF_INET;
1123		ipn.ss_port = 0;
1124	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1125	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1126	<	(struct sockaddr *)&ipn, ipn.ss_len,
1127	<	serv_connect_callback, client_p, aconf->aftype,
1128	<	CONNECTTIMEOUT);
1124	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1125	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1126	>	(struct sockaddr *)&ipn, ipn.ss_len,
1127	>	serv_connect_callback, client_p, conf->aftype,
1128	>	CONNECTTIMEOUT);
1129		}
1130		else if (ServerInfo.specific_ipv4_vhost)
1131		{
#	Line 1239 | Line 1134 | serv_connect(struct AccessItem *aconf, s
1134		ipn.ss.ss_family = AF_INET;
1135		ipn.ss_port = 0;
1136		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1137	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1137	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1138		(struct sockaddr *)&ipn, ipn.ss_len,
1139	<	serv_connect_callback, client_p, aconf->aftype,
1140	<	CONNECTTIMEOUT);
1139	>	serv_connect_callback, client_p, conf->aftype,
1140	>	CONNECTTIMEOUT);
1141		}
1142		else
1143	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1144	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1143	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1144	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1145		CONNECTTIMEOUT);
1146		break;
1147		#ifdef IPV6
1148		case AF_INET6:
1149		{
1150	<	struct irc_ssaddr ipn;
1151	<	struct sockaddr_in6 *v6;
1152	<	struct sockaddr_in6 *v6conf;
1153	<
1154	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1155	<	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1156	<	v6 = (struct sockaddr_in6 *)&ipn;
1157	<
1158	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1159	<	sizeof(struct in6_addr)) != 0)
1160	<	{
1161	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1162	<	ipn.ss.ss_family = AF_INET6;
1163	<	ipn.ss_port = 0;
1164	<	comm_connect_tcp(&client_p->localClient->fd,
1165	<	aconf->host, aconf->port,
1166	<	(struct sockaddr *)&ipn, ipn.ss_len,
1167	<	serv_connect_callback, client_p,
1168	<	aconf->aftype, CONNECTTIMEOUT);
1169	<	}
1275	<	else if (ServerInfo.specific_ipv6_vhost)
1150	>	struct irc_ssaddr ipn;
1151	>	struct sockaddr_in6 *v6;
1152	>	struct sockaddr_in6 *v6conf;
1153	>
1154	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1155	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1156	>	v6 = (struct sockaddr_in6 *)&ipn;
1157	>
1158	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1159	>	{
1160	>	memcpy(&ipn, &conf->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	>	conf->host, conf->port,
1165	>	(struct sockaddr *)&ipn, ipn.ss_len,
1166	>	serv_connect_callback, client_p,
1167	>	conf->aftype, CONNECTTIMEOUT);
1168	>	}
1169	>	else if (ServerInfo.specific_ipv6_vhost)
1170		{
1171	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1172	<	ipn.ss.ss_family = AF_INET6;
1173	<	ipn.ss_port = 0;
1174	<	comm_connect_tcp(&client_p->localClient->fd,
1175	<	aconf->host, aconf->port,
1176	<	(struct sockaddr *)&ipn, ipn.ss_len,
1177	<	serv_connect_callback, client_p,
1178	<	aconf->aftype, CONNECTTIMEOUT);
1179	<	}
1180	<	else
1181	<	comm_connect_tcp(&client_p->localClient->fd,
1182	<	aconf->host, aconf->port,
1183	<	NULL, 0, serv_connect_callback, client_p,
1184	<	aconf->aftype, CONNECTTIMEOUT);
1171	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1172	>	ipn.ss.ss_family = AF_INET6;
1173	>	ipn.ss_port = 0;
1174	>	comm_connect_tcp(&client_p->localClient->fd,
1175	>	conf->host, conf->port,
1176	>	(struct sockaddr *)&ipn, ipn.ss_len,
1177	>	serv_connect_callback, client_p,
1178	>	conf->aftype, CONNECTTIMEOUT);
1179	>	}
1180	>	else
1181	>	comm_connect_tcp(&client_p->localClient->fd,
1182	>	conf->host, conf->port,
1183	>	NULL, 0, serv_connect_callback, client_p,
1184	>	conf->aftype, CONNECTTIMEOUT);
1185		}
1186		#endif
1187		}
1188	<	return (1);
1188	>	return 1;
1189		}
1190
1191		#ifdef HAVE_LIBCRYPTO
1192		static void
1193		finish_ssl_server_handshake(struct Client *client_p)
1194		{
1195	<	struct ConfItem *conf=NULL;
1302	<	struct AccessItem *aconf=NULL;
1195	>	struct MaskItem *conf = NULL;
1196
1197		conf = find_conf_name(&client_p->localClient->confs,
1198	<	client_p->name, SERVER_TYPE);
1198	>	client_p->name, CONF_SERVER);
1199		if (conf == NULL)
1200		{
1201	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1201	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1202		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1203	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1203	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1204		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1205
1206	<	exit_client(client_p, &me, "Lost connect{} block");
1206	>	exit_client(client_p, "Lost connect{} block");
1207		return;
1208		}
1209
1210	<	aconf = map_to_conf(conf);
1318	<
1319	<	/* jdc -- Check and send spasswd, not passwd. */
1320	<	if (!EmptyString(aconf->spasswd))
1321	<	sendto_one(client_p, "PASS %s TS %d %s",
1322	<	aconf->spasswd, TS_CURRENT, me.id);
1210	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1211
1212	<	send_capabilities(client_p, aconf,
1325	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1212	>	send_capabilities(client_p, 0);
1213
1214		sendto_one(client_p, "SERVER %s 1 :%s%s",
1215		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1333 | Line 1220 | finish_ssl_server_handshake(struct Clien
1220		*/
1221		if (IsDead(client_p))
1222		{
1223	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1223	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1224		"%s[%s] went dead during handshake",
1225		client_p->name,
1226		client_p->host);
1227	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1227	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1228		"%s went dead during handshake", client_p->name);
1229		return;
1230		}
#	Line 1350 | Line 1237 | finish_ssl_server_handshake(struct Clien
1237		static void
1238		ssl_server_handshake(fde_t *fd, struct Client *client_p)
1239		{
1240	<	int ret;
1241	<	int err;
1240	>	X509 *cert = NULL;
1241	>	int ret = 0;
1242
1243	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1357	<
1358	<	if (ret <= 0)
1243	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1244		{
1245	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1245	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1246		{
1247		case SSL_ERROR_WANT_WRITE:
1248		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1370 | Line 1255 | ssl_server_handshake(fde_t *fd, struct C
1255		default:
1256		{
1257		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1258	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1258	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1259		"Error connecting to %s: %s", client_p->name,
1260		sslerr ? sslerr : "unknown SSL error");
1261	<	exit_client(client_p, client_p, "Error during SSL handshake");
1261	>	exit_client(client_p, "Error during SSL handshake");
1262		return;
1263		}
1264		}
1265		}
1266
1267	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1268	+	{
1269	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1270	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1271	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1272	+
1273	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1274	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1275	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1276	+	{
1277	+	unsigned int i = 0, n = 0;
1278	+
1279	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1280	+	{
1281	+	for (; i < n; ++i)
1282	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1283	+	client_p->certfp = xstrdup(buf);
1284	+	}
1285	+	}
1286	+	else
1287	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1288	+	client_p->name, client_p->username, client_p->host, res);
1289	+	X509_free(cert);
1290	+	}
1291	+
1292		finish_ssl_server_handshake(client_p);
1293		}
1294
1295		static void
1296	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1296	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1297		{
1298		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1299		{
1300		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1301		ERR_error_string(ERR_get_error(), NULL));
1302		SetDead(client_p);
1303	<	exit_client(client_p, client_p, "SSL_new failed");
1303	>	exit_client(client_p, "SSL_new failed");
1304		return;
1305		}
1306
1307		SSL_set_fd(fd->ssl, fd->fd);
1308
1309	<	if (!EmptyString(aconf->cipher_list))
1310	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1309	>	if (!EmptyString(conf->cipher_list))
1310	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1311
1312		ssl_server_handshake(NULL, client_p);
1313		}
1314		#endif
1315
1316		/* serv_connect_callback() - complete a server connection.
1317	<	*
1317	>	*
1318		* This routine is called after the server connection attempt has
1319		* completed. If unsucessful, an error is sent to ops and the client
1320		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1415 | Line 1325 | static void
1325		serv_connect_callback(fde_t *fd, int status, void *data)
1326		{
1327		struct Client *client_p = data;
1328	<	struct ConfItem *conf=NULL;
1419	<	struct AccessItem *aconf=NULL;
1328	>	struct MaskItem *conf = NULL;
1329
1330		/* First, make sure its a real client! */
1331		assert(client_p != NULL);
#	Line 1432 | Line 1341 | serv_connect_callback(fde_t *fd, int sta
1341		* Admins get to see any IP, mere opers don't *sigh*
1342		*/
1343		if (ConfigServerHide.hide_server_ips)
1344	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1344	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1345		"Error connecting to %s: %s",
1346		client_p->name, comm_errstr(status));
1347		else
1348	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
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,
1353	<	"Error connecting to %s: %s",
1354	<	client_p->name, comm_errstr(status));
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));
1351	>
1352	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
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 1454 | 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,
1370	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1371	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1372	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1369	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
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));
1373
1374	<	exit_client(client_p, &me, "Lost connect{} block");
1374	>	exit_client(client_p, "Lost connect{} block");
1375		return;
1376		}
1377
1469	–	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. */
1482	<	if (!EmptyString(aconf->spasswd))
1483	<	sendto_one(client_p, "PASS %s TS %d %s",
1484	<	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,
1487	<	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1391	>	send_capabilities(client_p, 0);
1392
1393	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1394	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1491	<	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,
1402	<	"%s[%s] went dead during handshake",
1401	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1402	>	"%s[%s] went dead during handshake",
1403		client_p->name,
1404	<	client_p->host);
1405	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1406	<	"%s went dead during handshake", client_p->name);
1404	>	client_p->host);
1405	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1406	>	"%s went dead during handshake", client_p->name);
1407		return;
1408		}
1409
#	Line 1520 | 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)