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 1398 by michael, Sun May 6 10:57:06 2012 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3335 by michael, Thu Apr 17 18:55:31 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 28 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
33		#include "client.h"
34	–	#include "dbuf.h"
34		#include "event.h"
36	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
37		#include "ircd.h"
38		#include "ircd_defs.h"
39		#include "s_bsd.h"
40		#include "numeric.h"
41		#include "packet.h"
45	–	#include "irc_res.h"
42		#include "conf.h"
43		#include "s_serv.h"
44		#include "log.h"
49	–	#include "s_misc.h"
45		#include "s_user.h"
46		#include "send.h"
47		#include "memory.h"
48	<	#include "channel.h" /* chcap_usage_counts stuff...*/
48	>	#include "channel.h"
49		#include "parse.h"
50
51		#define MIN_CONN_FREQ 300
52
53	+	dlink_list flatten_links;
54		static dlink_list cap_list = { NULL, NULL, 0 };
59	–	static void server_burst(struct Client *);
60	–	static void burst_all(struct Client *);
61	–	static void send_tb(struct Client *client_p, struct Channel *chptr);
62	–
55		static CNCB serv_connect_callback;
56
65	–	static void burst_members(struct Client *, struct Channel *);
57
58		/*
59		* write_links_file
#	Line 73 | Line 64 | static void burst_members(struct Client
64		*                but in no particular order.
65		*/
66		void
67	<	write_links_file(void* notused)
67	>	write_links_file(void *notused)
68		{
69	<	MessageFileLine *next_mptr = 0;
70	<	MessageFileLine *mptr = 0;
71	<	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;
69	>	FILE *file = NULL;
70	>	dlink_node *ptr = NULL, *ptr_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
73	>	if ((file = fopen(LIPATH, "w")) == NULL)
74		return;
75
76	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
76	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
77		{
78	<	next_mptr = mptr->next;
79	<	MyFree(mptr);
78	>	dlinkDelete(ptr, &flatten_links);
79	>	MyFree(ptr->data);
80	>	free_dlink_node(ptr);
81		}
82
99	–	MessageFileptr->contentsOfFile = NULL;
100	–	currentMessageLine             = NULL;
101	–
83		DLINK_FOREACH(ptr, global_serv_list.head)
84		{
85		const struct Client *target_p = ptr->data;
86
87	<	/* skip ourselves, we send ourselves in /links */
88	<	if (IsMe(target_p))
87	>	/*
88	>	* Skip hidden servers, aswell as ourselves, since we already send
89	>	* ourselves in /links
90	>	*/
91	>	if (IsHidden(target_p) || IsMe(target_p))
92		continue;
93
94	<	/* skip hidden servers */
111	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
94	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
95		continue;
96
97	<	if (target_p->info[0])
98	<	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
97	>	/*
98	>	* Attempt to format the file in such a way it follows the usual links output
99		* ie  "servername uplink :hops info"
100		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
101		* - madmax
102		*/
103	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
104	+	me.name, target_p->info);
105	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
106	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
107	+	me.name, target_p->info);
108
109	<	/*
110	<	* 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;
109	>	fputs(buff, file);
110	>	}
111
112	<	if (MessageFileptr->contentsOfFile)
113	<	{
141	<	if (currentMessageLine)
142	<	currentMessageLine->next = newMessageLine;
143	<	currentMessageLine = newMessageLine;
144	<	}
145	<	else
146	<	{
147	<	MessageFileptr->contentsOfFile = newMessageLine;
148	<	currentMessageLine = newMessageLine;
149	<	}
112	>	fclose(file);
113	>	}
114
115	<	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
116	<	fputs(buff, file);
115	>	void
116	>	read_links_file(void)
117	>	{
118	>	FILE *file = NULL;
119	>	char *p = NULL;
120	>	char buff[IRCD_BUFSIZE] = "";
121	>
122	>	if ((file = fopen(LIPATH, "r")) == NULL)
123	>	return;
124	>
125	>	while (fgets(buff, sizeof(buff), file))
126	>	{
127	>	if ((p = strchr(buff, '\n')))
128	>	*p = '\0';
129	>
130	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
131		}
132
133		fclose(file);
#	Line 175 | Line 153 | write_links_file(void* notused)
153		*      returns: (see #defines)
154		*/
155		int
156	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
157	<	int server, int parc, char *parv[])
156	>	hunt_server(struct Client *source_p, const char *command,
157	>	const int server, const int parc, char *parv[])
158		{
159		struct Client *target_p = NULL;
160		struct Client *target_tmp = NULL;
#	Line 187 | Line 165 | hunt_server(struct Client *client_p, str
165		if (parc <= server || EmptyString(parv[server]))
166		return HUNTED_ISME;
167
168	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
168	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
169		return HUNTED_ISME;
170
171		/* These are to pickup matches that would cause the following
#	Line 197 | Line 175 | hunt_server(struct Client *client_p, str
175		if (MyClient(source_p))
176		target_p = hash_find_client(parv[server]);
177		else
178	<	target_p = find_person(client_p, parv[server]);
178	>	target_p = find_person(source_p, parv[server]);
179
180		if (target_p)
181		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 207 | Line 185 | hunt_server(struct Client *client_p, str
185		if (target_p->from == source_p->from && !MyConnect(target_p))
186		target_p = NULL;
187
188	<	collapse(parv[server]);
211	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
188	>	wilds = has_wildcards(parv[server]);
189
190		/* Again, if there are no wild cards involved in the server
191		* name, use the hash lookup
#	Line 219 | Line 196 | hunt_server(struct Client *client_p, str
196		{
197		if (!(target_p = hash_find_server(parv[server])))
198		{
199	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
200	<	me.name, source_p->name, parv[server]);
224	<	return(HUNTED_NOSUCH);
199	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
200	>	return HUNTED_NOSUCH;
201		}
202		}
203		else
#	Line 230 | Line 206 | hunt_server(struct Client *client_p, str
206		{
207		target_tmp = ptr->data;
208
209	<	if (match(parv[server], target_tmp->name))
209	>	if (!match(parv[server], target_tmp->name))
210		{
211		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
212		continue;
213		target_p = ptr->data;
214
215	<	if (IsRegistered(target_p) && (target_p != client_p))
215	>	if (IsRegistered(target_p) && (target_p != source_p->from))
216		break;
217		}
218		}
219		}
220		}
221
222	<	if (target_p != NULL)
222	>	if (target_p)
223		{
224	<	if(!IsRegistered(target_p))
224	>	if (!IsRegistered(target_p))
225		{
226	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
251	<	me.name, source_p->name, parv[server]);
226	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
227		return HUNTED_NOSUCH;
228		}
229
230		if (IsMe(target_p) || MyClient(target_p))
231		return HUNTED_ISME;
232
233	<	if (!match(target_p->name, parv[server]))
233	>	if (match(target_p->name, parv[server]))
234		parv[server] = target_p->name;
235
236		/* This is a little kludgy but should work... */
237	<	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],
237	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
238		parv[1], parv[2], parv[3], parv[4],
239		parv[5], parv[6], parv[7], parv[8]);
240	<	return(HUNTED_PASS);
241	<	}
240	>	return HUNTED_PASS;
241	>	}
242
243	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
244	<	me.name, source_p->name, parv[server]);
275	<	return(HUNTED_NOSUCH);
243	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
244	>	return HUNTED_NOSUCH;
245		}
246
247		/* try_connections()
#	Line 288 | Line 257 | hunt_server(struct Client *client_p, str
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *ptr;
261	<	struct ConfItem *conf;
293	<	struct AccessItem *aconf;
294	<	struct ClassItem *cltmp;
295	<	int confrq;
260	>	dlink_node *ptr = NULL;
261	>	int confrq = 0;
262
263		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
264		if (GlobalSetOptions.autoconn == 0)
#	Line 300 | Line 266 | try_connections(void *unused)
266
267		DLINK_FOREACH(ptr, server_items.head)
268		{
269	<	conf = ptr->data;
270	<	aconf = map_to_conf(conf);
269	>	struct MaskItem *conf = ptr->data;
270	>
271	>	assert(conf->type == CONF_SERVER);
272
273	<	/* Also when already connecting! (update holdtimes) --SRB
273	>	/* Also when already connecting! (update holdtimes) --SRB
274		*/
275	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
309	<	!(IsConfAllowAutoConn(aconf)))
275	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
276		continue;
277
312	–	cltmp = map_to_conf(aconf->class_ptr);
278
279		/* Skip this entry if the use of it is still on hold until
280		* future. Otherwise handle this entry (and set it on hold
#	Line 317 | Line 282 | try_connections(void *unused)
282		* made one successfull connection... [this algorithm is
283		* a bit fuzzy... -- msa >;) ]
284		*/
285	<	if (aconf->hold > CurrentTime)
285	>	if (conf->until > CurrentTime)
286		continue;
287
288	<	if (cltmp == NULL)
288	>	if (conf->class == NULL)
289		confrq = DEFAULT_CONNECTFREQUENCY;
290		else
291		{
292	<	confrq = cltmp->con_freq;
292	>	confrq = conf->class->con_freq;
293		if (confrq < MIN_CONN_FREQ)
294	<	confrq = MIN_CONN_FREQ;
294	>	confrq = MIN_CONN_FREQ;
295		}
296
297	<	aconf->hold = CurrentTime + confrq;
297	>	conf->until = CurrentTime + confrq;
298
299	<	/* Found a CONNECT config with port specified, scan clients
299	>	/*
300	>	* Found a CONNECT config with port specified, scan clients
301		* and see if this server is already connected?
302		*/
303	<	if (hash_find_server(conf->name) != NULL)
303	>	if (hash_find_server(conf->name))
304		continue;
305
306	<	if (cltmp->curr_user_count < cltmp->max_total)
306	>	if (conf->class->ref_count < conf->class->max_total)
307		{
308		/* Go to the end of the list, if not already last */
309	<	if (ptr->next != NULL)
309	>	if (ptr->next)
310		{
311		dlinkDelete(ptr, &server_items);
312		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 349 | Line 315 | try_connections(void *unused)
315		if (find_servconn_in_progress(conf->name))
316		return;
317
318	<	/* We used to only print this if serv_connect() actually
318	>	/*
319	>	* We used to only print this if serv_connect() actually
320		* succeeded, but since comm_tcp_connect() can call the callback
321		* immediately if there is an error, we were getting error messages
322		* in the wrong order. SO, we just print out the activated line,
#	Line 358 | Line 325 | try_connections(void *unused)
325		*   -- adrian
326		*/
327		if (ConfigServerHide.hide_server_ips)
328	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
328	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
329	>	"Connection to %s activated.",
330		conf->name);
331		else
332	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
333	<	conf->name, aconf->host);
332	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
333	>	"Connection to %s[%s] activated.",
334	>	conf->name, conf->host);
335
336	<	serv_connect(aconf, NULL);
336	>	serv_connect(conf, NULL);
337		/* We connect only one at time... */
338		return;
339		}
#	Line 389 | Line 358 | valid_servname(const char *name)
358		++dots;
359		}
360
361	<	return dots != 0 && length <= HOSTLEN;
361	>	return dots && length <= HOSTLEN;
362		}
363
364		int
365		check_server(const char *name, struct Client *client_p)
366		{
367		dlink_node *ptr;
368	<	struct ConfItem *conf           = NULL;
369	<	struct ConfItem *server_conf    = NULL;
401	<	struct AccessItem *server_aconf = NULL;
402	<	struct AccessItem *aconf        = NULL;
368	>	struct MaskItem *conf        = NULL;
369	>	struct MaskItem *server_conf = NULL;
370		int error = -1;
371
372	<	assert(client_p != NULL);
406	<
407	<	if (client_p == NULL)
408	<	return(error);
409	<
410	<	if (strlen(name) > HOSTLEN)
411	<	return(-4);
372	>	assert(client_p);
373
374		/* loop through looking for all possible connect items that might work */
375		DLINK_FOREACH(ptr, server_items.head)
376		{
377		conf = ptr->data;
417	–	aconf = map_to_conf(conf);
378
379	<	if (!match(name, conf->name))
379	>	if (match(name, conf->name))
380		continue;
381
382		error = -3;
383
384		/* XXX: Fix me for IPv6                    */
385		/* XXX sockhost is the IPv4 ip as a string */
386	<	if (match(aconf->host, client_p->host) ||
387	<	match(aconf->host, client_p->sockhost))
386	>	if (!match(conf->host, client_p->host) ||
387	>	!match(conf->host, client_p->sockhost))
388		{
389		error = -2;
430	–	{
431	–	/* A NULL password is as good as a bad one */
432	–	if (EmptyString(client_p->localClient->passwd))
433	–	return(-2);
434	–
435	–	/* code in s_conf.c should not have allowed this to be NULL */
436	–	if (aconf->passwd == NULL)
437	–	return(-2);
390
391	<	if (IsConfEncrypted(aconf))
392	<	{
393	<	if (strcmp(aconf->passwd,
394	<	(const char *)crypt(client_p->localClient->passwd,
395	<	aconf->passwd)) == 0)
396	<	server_conf = conf;
397	<	}
398	<	else
447	<	{
448	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
449	<	server_conf = conf;
450	<	}
451	<	}
391	>	if (!match_conf_password(client_p->localClient->passwd, conf))
392	>	return -2;
393	>
394	>	if (!EmptyString(conf->certfp))
395	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
396	>	return -4;
397	>
398	>	server_conf = conf;
399		}
400		}
401
402		if (server_conf == NULL)
403	<	return(error);
403	>	return error;
404
405		attach_conf(client_p, server_conf);
406
460	–	server_aconf = map_to_conf(server_conf);
461	–
462	–	if (!IsConfTopicBurst(server_aconf))
463	–	{
464	–	ClearCap(client_p, CAP_TB);
465	–	ClearCap(client_p, CAP_TBURST);
466	–	}
407
408	<	if (aconf != NULL)
408	>	if (server_conf)
409		{
410		struct sockaddr_in *v4;
411		#ifdef IPV6
412		struct sockaddr_in6 *v6;
413		#endif
414	<	switch (aconf->aftype)
414	>	switch (server_conf->aftype)
415		{
416		#ifdef IPV6
417	<	case AF_INET6:
418	<	v6 = (struct sockaddr_in6 *)&aconf->addr;
417	>	case AF_INET6:
418	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
419
420		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
421	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
421	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
422		break;
423		#endif
424		case AF_INET:
425	<	v4 = (struct sockaddr_in *)&aconf->addr;
425	>	v4 = (struct sockaddr_in *)&server_conf->addr;
426
427		if (v4->sin_addr.s_addr == INADDR_NONE)
428	<	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
428	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
429		break;
430		}
431		}
432
433	<	return(0);
433	>	return 0;
434		}
435
436		/* add_capability()
#	Line 507 | Line 447 | add_capability(const char *capab_name, i
447		{
448		struct Capability *cap = MyMalloc(sizeof(*cap));
449
450	<	DupString(cap->name, capab_name);
450	>	cap->name = xstrdup(capab_name);
451		cap->cap = cap_flag;
452		dlinkAdd(cap, &cap->node, &cap_list);
453
#	Line 524 | Line 464 | add_capability(const char *capab_name, i
464		int
465		delete_capability(const char *capab_name)
466		{
467	<	dlink_node *ptr;
528	<	dlink_node *next_ptr;
529	<	struct Capability *cap;
467	>	dlink_node *ptr = NULL, *ptr_next = NULL;
468
469	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
469	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
470		{
471	<	cap = ptr->data;
471	>	struct Capability *cap = ptr->data;
472
473	<	if (cap->cap != 0)
473	>	if (cap->cap)
474		{
475	<	if (irccmp(cap->name, capab_name) == 0)
475	>	if (!irccmp(cap->name, capab_name))
476		{
477	<	default_server_capabs &= ~(cap->cap);
478	<	dlinkDelete(ptr, &cap_list);
479	<	MyFree(cap->name);
480	<	cap->name = NULL;
543	<	MyFree(cap);
477	>	default_server_capabs &= ~(cap->cap);
478	>	dlinkDelete(ptr, &cap_list);
479	>	MyFree(cap->name);
480	>	MyFree(cap);
481		}
482		}
483		}
#	Line 555 | Line 492 | delete_capability(const char *capab_name
492		* output       - 0 if not found CAPAB otherwise
493		* side effects - none
494		*/
495	<	int
495	>	unsigned int
496		find_capability(const char *capab)
497		{
498		const dlink_node *ptr = NULL;
#	Line 574 | Line 511 | find_capability(const char *capab)
511		/* send_capabilities()
512		*
513		* inputs       - Client pointer to send to
577	–	*              - Pointer to AccessItem (for crypt)
514		*              - int flag of capabilities that this server can send
515		* output       - NONE
516		* side effects - send the CAPAB line to a server  -orabidoo
517		*
518		*/
519		void
520	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
585	<	int cap_can_send)
520	>	send_capabilities(struct Client *client_p, int cap_can_send)
521		{
522	<	struct Capability *cap=NULL;
523	<	char msgbuf[IRCD_BUFSIZE];
589	<	char *t;
522	>	char msgbuf[IRCD_BUFSIZE] = "";
523	>	char *t = msgbuf;
524		int tl;
525	<	dlink_node *ptr;
592	<
593	<	t = msgbuf;
525	>	dlink_node *ptr = NULL;
526
527		DLINK_FOREACH(ptr, cap_list.head)
528		{
529	<	cap = ptr->data;
529	>	struct Capability *cap = ptr->data;
530
531		if (cap->cap & (cap_can_send|default_server_capabs))
532		{
533	<	tl = ircsprintf(t, "%s ", cap->name);
533	>	tl = sprintf(t, "%s ", cap->name);
534		t += tl;
535		}
536		}
#	Line 607 | Line 539 | send_capabilities(struct Client *client_
539		sendto_one(client_p, "CAPAB :%s", msgbuf);
540		}
541
610	–	/* sendnick_TS()
611	–	*
612	–	* inputs       - client (server) to send nick towards
613	–	*          - client to send nick for
614	–	* output       - NONE
615	–	* side effects - NICK message is sent towards given client_p
616	–	*/
617	–	void
618	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
619	–	{
620	–	static char ubuf[12];
621	–
622	–	if (!IsClient(target_p))
623	–	return;
624	–
625	–	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
626	–
627	–	if (ubuf[0] == '\0')
628	–	{
629	–	ubuf[0] = '+';
630	–	ubuf[1] = '\0';
631	–	}
632	–
633	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
634	–	if (IsCapable(client_p, CAP_SVS))
635	–	{
636	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
637	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
638	–	target_p->servptr->id,
639	–	target_p->name, target_p->hopcount + 1,
640	–	(unsigned long) target_p->tsinfo,
641	–	ubuf, target_p->username, target_p->host,
642	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
643	–	"0" : target_p->sockhost, target_p->id,
644	–	(unsigned long)target_p->servicestamp, target_p->info);
645	–	else
646	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
647	–	target_p->name, target_p->hopcount + 1,
648	–	(unsigned long) target_p->tsinfo,
649	–	ubuf, target_p->username, target_p->host,
650	–	target_p->servptr->name, (unsigned long)target_p->servicestamp,
651	–	target_p->info);
652	–	}
653	–	else
654	–	{
655	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
656	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
657	–	target_p->servptr->id,
658	–	target_p->name, target_p->hopcount + 1,
659	–	(unsigned long) target_p->tsinfo,
660	–	ubuf, target_p->username, target_p->host,
661	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
662	–	"0" : target_p->sockhost, target_p->id, target_p->info);
663	–	else
664	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
665	–	target_p->name, target_p->hopcount + 1,
666	–	(unsigned long) target_p->tsinfo,
667	–	ubuf, target_p->username, target_p->host,
668	–	target_p->servptr->name, target_p->info);
669	–	}
670	–
671	–	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->localClient->confs.head->data)))
672	–	if (!EmptyString(target_p->away))
673	–	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
674	–	target_p->away);
675	–
676	–	}
677	–
542		/*
543		* show_capabilities - show current server capabilities
544		*
#	Line 683 | Line 547 | sendnick_TS(struct Client *client_p, str
547		* side effects - build up string representing capabilities of server listed
548		*/
549		const char *
550	<	show_capabilities(struct Client *target_p)
550	>	show_capabilities(const struct Client *target_p)
551		{
552	<	static char msgbuf[IRCD_BUFSIZE];
553	<	char *t = msgbuf;
690	<	dlink_node *ptr;
552	>	static char msgbuf[IRCD_BUFSIZE] = "";
553	>	const dlink_node *ptr = NULL;
554
555	<	t += ircsprintf(msgbuf, "TS ");
555	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
556
557		DLINK_FOREACH(ptr, cap_list.head)
558		{
559		const struct Capability *cap = ptr->data;
560
561	<	if (IsCapable(target_p, cap->cap))
562	<	t += ircsprintf(t, "%s ", cap->name);
561	>	if (!IsCapable(target_p, cap->cap))
562	>	continue;
563	>
564	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
565	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
566		}
567
702	–	*(t - 1) = '\0';
568		return msgbuf;
569		}
570
#	Line 719 | Line 584 | make_server(struct Client *client_p)
584		return client_p->serv;
585		}
586
722	–	/* server_estab()
723	–	*
724	–	* inputs       - pointer to a struct Client
725	–	* output       -
726	–	* side effects -
727	–	*/
728	–	void
729	–	server_estab(struct Client *client_p)
730	–	{
731	–	struct Client *target_p;
732	–	struct ConfItem *conf;
733	–	struct AccessItem *aconf=NULL;
734	–	char *host;
735	–	const char *inpath;
736	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
737	–	dlink_node *ptr;
738	–	#ifdef HAVE_LIBCRYPTO
739	–	const COMP_METHOD *compression = NULL, *expansion = NULL;
740	–	#endif
741	–
742	–	assert(client_p != NULL);
743	–
744	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
745	–
746	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
747	–	host   = client_p->name;
748	–
749	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
750	–	== NULL)
751	–	{
752	–	/* This shouldn't happen, better tell the ops... -A1kmm */
753	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
754	–	"for server %s(this shouldn't happen)!", host);
755	–	exit_client(client_p, &me, "Lost connect{} block!");
756	–	return;
757	–	}
758	–
759	–	MyFree(client_p->localClient->passwd);
760	–	client_p->localClient->passwd = NULL;
761	–
762	–	/* Its got identd, since its a server */
763	–	SetGotId(client_p);
764	–
765	–	/* If there is something in the serv_list, it might be this
766	–	* connecting server..
767	–	*/
768	–	if (!ServerInfo.hub && serv_list.head)
769	–	{
770	–	if (client_p != serv_list.head->data || serv_list.head->next)
771	–	{
772	–	++ServerStats.is_ref;
773	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
774	–	exit_client(client_p, &me, "I'm a leaf");
775	–	return;
776	–	}
777	–	}
778	–
779	–	aconf = map_to_conf(conf);
780	–
781	–	if (IsUnknown(client_p))
782	–	{
783	–	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
784	–	*        2.  Check aconf->spasswd, not aconf->passwd.
785	–	*/
786	–	if (!EmptyString(aconf->spasswd))
787	–	sendto_one(client_p, "PASS %s TS %d %s",
788	–	aconf->spasswd, TS_CURRENT, me.id);
789	–
790	–	/* Pass my info to the new server
791	–	*
792	–	* Pass on ZIP if supported
793	–	* Pass on TB if supported.
794	–	* - Dianora
795	–	*/
796	–
797	–	send_capabilities(client_p, aconf,
798	–	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
799	–
800	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
801	–	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
802	–	}
803	–
804	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
805	–	(unsigned long)CurrentTime);
806	–
807	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
808	–	if (IsCapable(client_p, CAP_TS6))
809	–	hash_add_id(client_p);
810	–
811	–	/* XXX Does this ever happen? I don't think so -db */
812	–	detach_conf(client_p, OPER_TYPE);
813	–
814	–	/* *WARNING*
815	–	**    In the following code in place of plain server's
816	–	**    name we send what is returned by get_client_name
817	–	**    which may add the "sockhost" after the name. It's
818	–	**    *very* *important* that there is a SPACE between
819	–	**    the name and sockhost (if present). The receiving
820	–	**    server will start the information field from this
821	–	**    first blank and thus puts the sockhost into info.
822	–	**    ...a bit tricky, but you have been warned, besides
823	–	**    code is more neat this way...  --msa
824	–	*/
825	–	client_p->servptr = &me;
826	–
827	–	if (IsClosing(client_p))
828	–	return;
829	–
830	–	SetServer(client_p);
831	–
832	–	/* Update the capability combination usage counts. -A1kmm */
833	–	set_chcap_usage_counts(client_p);
834	–
835	–	/* Some day, all these lists will be consolidated *sigh* */
836	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
837	–
838	–	assert(dlinkFind(&unknown_list, client_p));
839	–
840	–	dlink_move_node(&client_p->localClient->lclient_node,
841	–	&unknown_list, &serv_list);
842	–
843	–	Count.myserver++;
844	–
845	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
846	–	hash_add_client(client_p);
847	–
848	–	/* doesnt duplicate client_p->serv if allocated this struct already */
849	–	make_server(client_p);
850	–
851	–	/* fixing eob timings.. -gnp */
852	–	client_p->localClient->firsttime = CurrentTime;
853	–
854	–	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
855	–	AddFlag(client_p, FLAGS_SERVICE);
856	–
857	–	/* Show the real host/IP to admins */
858	–	#ifdef HAVE_LIBCRYPTO
859	–	if (client_p->localClient->fd.ssl)
860	–	{
861	–	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
862	–	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
863	–
864	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
865	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
866	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
867	–	compression ? SSL_COMP_get_name(compression) : "NONE",
868	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
869	–	show_capabilities(client_p));
870	–	/* Now show the masked hostname/IP to opers */
871	–	sendto_realops_flags(UMODE_ALL, L_OPER,
872	–	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
873	–	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
874	–	compression ? SSL_COMP_get_name(compression) : "NONE",
875	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
876	–	show_capabilities(client_p));
877	–	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
878	–	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
879	–	compression ? SSL_COMP_get_name(compression) : "NONE",
880	–	expansion ? SSL_COMP_get_name(expansion) : "NONE",
881	–	show_capabilities(client_p));
882	–	}
883	–	else
884	–	#endif
885	–	{
886	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
887	–	"Link with %s established: (Capabilities: %s)",
888	–	inpath_ip,show_capabilities(client_p));
889	–	/* Now show the masked hostname/IP to opers */
890	–	sendto_realops_flags(UMODE_ALL, L_OPER,
891	–	"Link with %s established: (Capabilities: %s)",
892	–	inpath,show_capabilities(client_p));
893	–	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
894	–	inpath_ip, show_capabilities(client_p));
895	–	}
896	–
897	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
898	–
899	–	/* Old sendto_serv_but_one() call removed because we now
900	–	** need to send different names to different servers
901	–	** (domain name matching) Send new server to other servers.
902	–	*/
903	–	DLINK_FOREACH(ptr, serv_list.head)
904	–	{
905	–	target_p = ptr->data;
906	–
907	–	if (target_p == client_p)
908	–	continue;
909	–
910	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
911	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
912	–	me.id, client_p->name, client_p->id,
913	–	IsHidden(client_p) ? "(H) " : "",
914	–	client_p->info);
915	–	else
916	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
917	–	me.name, client_p->name,
918	–	IsHidden(client_p) ? "(H) " : "",
919	–	client_p->info);
920	–	}
921	–
922	–	/* Pass on my client information to the new server
923	–	**
924	–	** First, pass only servers (idea is that if the link gets
925	–	** cancelled beacause the server was already there,
926	–	** there are no NICK's to be cancelled...). Of course,
927	–	** if cancellation occurs, all this info is sent anyway,
928	–	** and I guess the link dies when a read is attempted...? --msa
929	–	**
930	–	** Note: Link cancellation to occur at this point means
931	–	** that at least two servers from my fragment are building
932	–	** up connection this other fragment at the same time, it's
933	–	** a race condition, not the normal way of operation...
934	–	**
935	–	** ALSO NOTE: using the get_client_name for server names--
936	–	**    see previous *WARNING*!!! (Also, original inpath
937	–	**    is destroyed...)
938	–	*/
939	–
940	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
941	–	{
942	–	target_p = ptr->data;
943	–
944	–	/* target_p->from == target_p for target_p == client_p */
945	–	if (IsMe(target_p) || target_p->from == client_p)
946	–	continue;
947	–
948	–	if (IsCapable(client_p, CAP_TS6))
949	–	{
950	–	if (HasID(target_p))
951	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
952	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
953	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
954	–	target_p->info);
955	–	else  /* introducing non-ts6 server */
956	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
957	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
958	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
959	–	}
960	–	else
961	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
962	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
963	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
964	–	}
965	–
966	–	server_burst(client_p);
967	–	}
968	–
969	–	/* server_burst()
970	–	*
971	–	* inputs       - struct Client pointer server
972	–	*              -
973	–	* output       - none
974	–	* side effects - send a server burst
975	–	* bugs         - still too long
976	–	*/
977	–	static void
978	–	server_burst(struct Client *client_p)
979	–	{
980	–	/* Send it in the shortened format with the TS, if
981	–	** it's a TS server; walk the list of channels, sending
982	–	** all the nicks that haven't been sent yet for each
983	–	** channel, then send the channel itself -- it's less
984	–	** obvious than sending all nicks first, but on the
985	–	** receiving side memory will be allocated more nicely
986	–	** saving a few seconds in the handling of a split
987	–	** -orabidoo
988	–	*/
989	–
990	–	burst_all(client_p);
991	–
992	–	/* EOB stuff is now in burst_all */
993	–	/* Always send a PING after connect burst is done */
994	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
995	–	}
996	–
997	–	/* burst_all()
998	–	*
999	–	* inputs       - pointer to server to send burst to
1000	–	* output       - NONE
1001	–	* side effects - complete burst of channels/nicks is sent to client_p
1002	–	*/
1003	–	static void
1004	–	burst_all(struct Client *client_p)
1005	–	{
1006	–	dlink_node *ptr = NULL;
1007	–
1008	–	DLINK_FOREACH(ptr, global_channel_list.head)
1009	–	{
1010	–	struct Channel *chptr = ptr->data;
1011	–
1012	–	if (dlink_list_length(&chptr->members) != 0)
1013	–	{
1014	–	burst_members(client_p, chptr);
1015	–	send_channel_modes(client_p, chptr);
1016	–
1017	–	if (IsCapable(client_p, CAP_TBURST) ||
1018	–	IsCapable(client_p, CAP_TB))
1019	–	send_tb(client_p, chptr);
1020	–	}
1021	–	}
1022	–
1023	–	/* also send out those that are not on any channel
1024	–	*/
1025	–	DLINK_FOREACH(ptr, global_client_list.head)
1026	–	{
1027	–	struct Client *target_p = ptr->data;
1028	–
1029	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
1030	–	sendnick_TS(client_p, target_p);
1031	–
1032	–	DelFlag(target_p, FLAGS_BURSTED);
1033	–	}
1034	–
1035	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1036	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1037	–	*/
1038	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1039	–	if (IsCapable(client_p, CAP_EOB))
1040	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1041	–	}
1042	–
1043	–	/*
1044	–	* send_tb
1045	–	*
1046	–	* inputs       - pointer to Client
1047	–	*              - pointer to channel
1048	–	* output       - NONE
1049	–	* side effects - Called on a server burst when
1050	–	*                server is CAP_TB|CAP_TBURST capable
1051	–	*/
1052	–	static void
1053	–	send_tb(struct Client *client_p, struct Channel *chptr)
1054	–	{
1055	–	/*
1056	–	* We may also send an empty topic here, but only if topic_time isn't 0,
1057	–	* i.e. if we had a topic that got unset.  This is required for syncing
1058	–	* topics properly.
1059	–	*
1060	–	* Imagine the following scenario: Our downlink introduces a channel
1061	–	* to us with a TS that is equal to ours, but the channel topic on
1062	–	* their side got unset while the servers were in splitmode, which means
1063	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1064	–	* deal with it in a more sophisticated fashion instead of just resetting
1065	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1066	–	* for further information   -Michael
1067	–	*/
1068	–	if (chptr->topic_time != 0)
1069	–	{
1070	–	if (IsCapable(client_p, CAP_TBURST))
1071	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1072	–	me.name, (unsigned long)chptr->channelts, chptr->chname,
1073	–	(unsigned long)chptr->topic_time,
1074	–	chptr->topic_info,
1075	–	chptr->topic);
1076	–	else if (IsCapable(client_p, CAP_TB))
1077	–	{
1078	–	if (ConfigChannel.burst_topicwho)
1079	–	{
1080	–	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1081	–	me.name, chptr->chname,
1082	–	(unsigned long)chptr->topic_time,
1083	–	chptr->topic_info, chptr->topic);
1084	–	}
1085	–	else
1086	–	{
1087	–	sendto_one(client_p, ":%s TB %s %lu :%s",
1088	–	me.name, chptr->chname,
1089	–	(unsigned long)chptr->topic_time,
1090	–	chptr->topic);
1091	–	}
1092	–	}
1093	–	}
1094	–	}
1095	–
1096	–	/* burst_members()
1097	–	*
1098	–	* inputs       - pointer to server to send members to
1099	–	*              - dlink_list pointer to membership list to send
1100	–	* output       - NONE
1101	–	* side effects -
1102	–	*/
1103	–	static void
1104	–	burst_members(struct Client *client_p, struct Channel *chptr)
1105	–	{
1106	–	struct Client *target_p;
1107	–	struct Membership *ms;
1108	–	dlink_node *ptr;
1109	–
1110	–	DLINK_FOREACH(ptr, chptr->members.head)
1111	–	{
1112	–	ms       = ptr->data;
1113	–	target_p = ms->client_p;
1114	–
1115	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1116	–	{
1117	–	AddFlag(target_p, FLAGS_BURSTED);
1118	–
1119	–	if (target_p->from != client_p)
1120	–	sendnick_TS(client_p, target_p);
1121	–	}
1122	–	}
1123	–	}
1124	–
587		/* New server connection code
588		* Based upon the stuff floating about in s_bsd.c
589		*   -- adrian
#	Line 1129 | Line 591 | burst_members(struct Client *client_p, s
591
592		/* serv_connect() - initiate a server connection
593		*
594	<	* inputs       - pointer to conf
594	>	* inputs       - pointer to conf
595		*              - pointer to client doing the connect
596		* output       -
597		* side effects -
#	Line 1144 | Line 606 | burst_members(struct Client *client_p, s
606		* it suceeded or not, and 0 if it fails in here somewhere.
607		*/
608		int
609	<	serv_connect(struct AccessItem *aconf, struct Client *by)
609	>	serv_connect(struct MaskItem *conf, struct Client *by)
610		{
611	<	struct ConfItem *conf;
612	<	struct Client *client_p;
1151	<	char buf[HOSTIPLEN + 1];
611	>	struct Client *client_p = NULL;
612	>	char buf[HOSTIPLEN + 1] = "";
613
614		/* conversion structs */
615		struct sockaddr_in *v4;
1155	–	/* Make sure aconf is useful */
1156	–	assert(aconf != NULL);
616
617	<	if(aconf == NULL)
618	<	return (0);
617	>	/* Make sure conf is useful */
618	>	assert(conf);
619
620	<	/* XXX should be passing struct ConfItem in the first place */
1162	<	conf = unmap_conf_item(aconf);
1163	<
1164	<	/* log */
1165	<	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
620	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
621		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
622	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", aconf->user, aconf->host,
622	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
623		buf);
624
625		/* Still processing a DNS lookup? -> exit */
626	<	if (aconf->dns_pending)
626	>	if (conf->dns_pending)
627		{
628	<	sendto_realops_flags(UMODE_ALL, L_ALL,
628	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
629		"Error connecting to %s: DNS lookup for connect{} in progress.",
630		conf->name);
631	<	return (0);
631	>	return 0;
632		}
633
634	<	if (aconf->dns_failed)
634	>	if (conf->dns_failed)
635		{
636	<	sendto_realops_flags(UMODE_ALL, L_ALL,
636	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
637		"Error connecting to %s: DNS lookup for connect{} failed.",
638		conf->name);
639	<	return (0);
639	>	return 0;
640		}
641
642		/* Make sure this server isn't already connected
643	<	* Note: aconf should ALWAYS be a valid C: line
643	>	* Note: conf should ALWAYS be a valid C: line
644		*/
645	<	if ((client_p = hash_find_server(conf->name)) != NULL)
646	<	{
647	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
648	<	"Server %s already present from %s",
649	<	conf->name, get_client_name(client_p, SHOW_IP));
650	<	sendto_realops_flags(UMODE_ALL, L_OPER,
651	<	"Server %s already present from %s",
652	<	conf->name, get_client_name(client_p, MASK_IP));
645	>	if ((client_p = hash_find_server(conf->name)))
646	>	{
647	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
648	>	"Server %s already present from %s",
649	>	conf->name, get_client_name(client_p, SHOW_IP));
650	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
651	>	"Server %s already present from %s",
652	>	conf->name, get_client_name(client_p, MASK_IP));
653		if (by && IsClient(by) && !MyClient(by))
654	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
655	<	me.name, by->name, conf->name,
656	<	get_client_name(client_p, MASK_IP));
1202	<	return (0);
654	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
655	>	conf->name, get_client_name(client_p, MASK_IP));
656	>	return 0;
657		}
658	<
658	>
659		/* Create a local client */
660		client_p = make_client(NULL);
661
662		/* Copy in the server, hostname, fd */
663		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
664	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
664	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
665
666		/* We already converted the ip once, so lets use it - stu */
667		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
668
669	<	/* create a socket for the server connection */
670	<	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1217	<	SOCK_STREAM, 0, NULL) < 0)
669	>	/* create a socket for the server connection */
670	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
671		{
672		/* Eek, failure to create the socket */
673	<	report_error(L_ALL,
674	<	"opening stream socket to %s: %s", conf->name, errno);
673	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
674	>
675		SetDead(client_p);
676	<	exit_client(client_p, &me, "Connection failed");
677	<	return (0);
676	>	exit_client(client_p, "Connection failed");
677	>	return 0;
678		}
679
680		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1230 | Line 683 | serv_connect(struct AccessItem *aconf, s
683		/* Attach config entries to client here rather than in
684		* serv_connect_callback(). This to avoid null pointer references.
685		*/
686	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
686	>	if (!attach_connect_block(client_p, conf->name, conf->host))
687		{
688	<	sendto_realops_flags(UMODE_ALL, L_ALL,
689	<	"Host %s is not enabled for connecting:no C/N-line",
690	<	conf->name);
691	<	if (by && IsClient(by) && !MyClient(by))
692	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
693	<	me.name, by->name, client_p->name);
688	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
689	>	"Host %s is not enabled for connecting: no connect{} block",
690	>	conf->name);
691	>	if (by && IsClient(by) && !MyClient(by))
692	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
693	>
694		SetDead(client_p);
695	<	exit_client(client_p, client_p, "Connection failed");
696	<	return (0);
695	>	exit_client(client_p, "Connection failed");
696	>	return 0;
697		}
698
699		/* at this point we have a connection in progress and C/N lines
#	Line 1258 | Line 711 | serv_connect(struct AccessItem *aconf, s
711
712		SetConnecting(client_p);
713		dlinkAdd(client_p, &client_p->node, &global_client_list);
714	<	/* from def_fam */
715	<	client_p->localClient->aftype = aconf->aftype;
714	>
715	>	client_p->localClient->aftype = conf->aftype;
716
717		/* Now, initiate the connection */
718	<	/* XXX assume that a non 0 type means a specific bind address
718	>	/* XXX assume that a non 0 type means a specific bind address
719		* for this connect.
720		*/
721	<	switch (aconf->aftype)
721	>	switch (conf->aftype)
722		{
723		case AF_INET:
724	<	v4 = (struct sockaddr_in*)&aconf->bind;
725	<	if (v4->sin_addr.s_addr != 0)
724	>	v4 = (struct sockaddr_in*)&conf->bind;
725	>	if (v4->sin_addr.s_addr)
726		{
727		struct irc_ssaddr ipn;
728		memset(&ipn, 0, sizeof(struct irc_ssaddr));
729		ipn.ss.ss_family = AF_INET;
730		ipn.ss_port = 0;
731	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
732	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
733	<	(struct sockaddr *)&ipn, ipn.ss_len,
734	<	serv_connect_callback, client_p, aconf->aftype,
735	<	CONNECTTIMEOUT);
731	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
732	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
733	>	(struct sockaddr *)&ipn, ipn.ss_len,
734	>	serv_connect_callback, client_p, conf->aftype,
735	>	CONNECTTIMEOUT);
736		}
737		else if (ServerInfo.specific_ipv4_vhost)
738		{
#	Line 1288 | Line 741 | serv_connect(struct AccessItem *aconf, s
741		ipn.ss.ss_family = AF_INET;
742		ipn.ss_port = 0;
743		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
744	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
744	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
745		(struct sockaddr *)&ipn, ipn.ss_len,
746	<	serv_connect_callback, client_p, aconf->aftype,
747	<	CONNECTTIMEOUT);
746	>	serv_connect_callback, client_p, conf->aftype,
747	>	CONNECTTIMEOUT);
748		}
749		else
750	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
751	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
750	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
751	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
752		CONNECTTIMEOUT);
753		break;
754		#ifdef IPV6
755		case AF_INET6:
756		{
757	<	struct irc_ssaddr ipn;
758	<	struct sockaddr_in6 *v6;
759	<	struct sockaddr_in6 *v6conf;
760	<
761	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
762	<	v6conf = (struct sockaddr_in6 *)&aconf->bind;
763	<	v6 = (struct sockaddr_in6 *)&ipn;
764	<
765	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
766	<	sizeof(struct in6_addr)) != 0)
767	<	{
768	<	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
769	<	ipn.ss.ss_family = AF_INET6;
770	<	ipn.ss_port = 0;
771	<	comm_connect_tcp(&client_p->localClient->fd,
772	<	aconf->host, aconf->port,
773	<	(struct sockaddr *)&ipn, ipn.ss_len,
774	<	serv_connect_callback, client_p,
775	<	aconf->aftype, CONNECTTIMEOUT);
776	<	}
1324	<	else if (ServerInfo.specific_ipv6_vhost)
757	>	struct irc_ssaddr ipn;
758	>	struct sockaddr_in6 *v6;
759	>	struct sockaddr_in6 *v6conf;
760	>
761	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
762	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
763	>	v6 = (struct sockaddr_in6 *)&ipn;
764	>
765	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
766	>	{
767	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
768	>	ipn.ss.ss_family = AF_INET6;
769	>	ipn.ss_port = 0;
770	>	comm_connect_tcp(&client_p->localClient->fd,
771	>	conf->host, conf->port,
772	>	(struct sockaddr *)&ipn, ipn.ss_len,
773	>	serv_connect_callback, client_p,
774	>	conf->aftype, CONNECTTIMEOUT);
775	>	}
776	>	else if (ServerInfo.specific_ipv6_vhost)
777		{
778	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
779	<	ipn.ss.ss_family = AF_INET6;
780	<	ipn.ss_port = 0;
781	<	comm_connect_tcp(&client_p->localClient->fd,
782	<	aconf->host, aconf->port,
783	<	(struct sockaddr *)&ipn, ipn.ss_len,
784	<	serv_connect_callback, client_p,
785	<	aconf->aftype, CONNECTTIMEOUT);
786	<	}
787	<	else
788	<	comm_connect_tcp(&client_p->localClient->fd,
789	<	aconf->host, aconf->port,
790	<	NULL, 0, serv_connect_callback, client_p,
791	<	aconf->aftype, CONNECTTIMEOUT);
778	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
779	>	ipn.ss.ss_family = AF_INET6;
780	>	ipn.ss_port = 0;
781	>	comm_connect_tcp(&client_p->localClient->fd,
782	>	conf->host, conf->port,
783	>	(struct sockaddr *)&ipn, ipn.ss_len,
784	>	serv_connect_callback, client_p,
785	>	conf->aftype, CONNECTTIMEOUT);
786	>	}
787	>	else
788	>	comm_connect_tcp(&client_p->localClient->fd,
789	>	conf->host, conf->port,
790	>	NULL, 0, serv_connect_callback, client_p,
791	>	conf->aftype, CONNECTTIMEOUT);
792		}
793		#endif
794		}
795	<	return (1);
795	>	return 1;
796		}
797
798		#ifdef HAVE_LIBCRYPTO
799		static void
800		finish_ssl_server_handshake(struct Client *client_p)
801		{
802	<	struct ConfItem *conf=NULL;
1351	<	struct AccessItem *aconf=NULL;
802	>	struct MaskItem *conf = NULL;
803
804		conf = find_conf_name(&client_p->localClient->confs,
805	<	client_p->name, SERVER_TYPE);
805	>	client_p->name, CONF_SERVER);
806		if (conf == NULL)
807		{
808	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
808	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
809		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
810	<	sendto_realops_flags(UMODE_ALL, L_OPER,
810	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
811		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
812
813	<	exit_client(client_p, &me, "Lost connect{} block");
813	>	exit_client(client_p, "Lost connect{} block");
814		return;
815		}
816
817	<	aconf = map_to_conf(conf);
1367	<
1368	<	/* jdc -- Check and send spasswd, not passwd. */
1369	<	if (!EmptyString(aconf->spasswd))
1370	<	sendto_one(client_p, "PASS %s TS %d %s",
1371	<	aconf->spasswd, TS_CURRENT, me.id);
817	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
818
819	<	send_capabilities(client_p, aconf,
1374	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
819	>	send_capabilities(client_p, 0);
820
821		sendto_one(client_p, "SERVER %s 1 :%s%s",
822		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1382 | Line 827 | finish_ssl_server_handshake(struct Clien
827		*/
828		if (IsDead(client_p))
829		{
830	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
830	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
831		"%s[%s] went dead during handshake",
832		client_p->name,
833		client_p->host);
834	<	sendto_realops_flags(UMODE_ALL, L_OPER,
834	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
835		"%s went dead during handshake", client_p->name);
836		return;
837		}
#	Line 1399 | Line 844 | finish_ssl_server_handshake(struct Clien
844		static void
845		ssl_server_handshake(fde_t *fd, struct Client *client_p)
846		{
847	<	int ret;
848	<	int err;
847	>	X509 *cert = NULL;
848	>	int ret = 0;
849
850	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1406	<
1407	<	if (ret <= 0)
850	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
851		{
852	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
852	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
853		{
854		case SSL_ERROR_WANT_WRITE:
855		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1419 | Line 862 | ssl_server_handshake(fde_t *fd, struct C
862		default:
863		{
864		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
865	<	sendto_realops_flags(UMODE_ALL, L_ALL,
865	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
866		"Error connecting to %s: %s", client_p->name,
867		sslerr ? sslerr : "unknown SSL error");
868	<	exit_client(client_p, client_p, "Error during SSL handshake");
868	>	exit_client(client_p, "Error during SSL handshake");
869		return;
870		}
871		}
872		}
873
874	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
875	+	{
876	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
877	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
878	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
879	+
880	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
881	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
882	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
883	+	{
884	+	unsigned int i = 0, n = 0;
885	+
886	+	if (X509_digest(cert, EVP_sha256(), md, &n))
887	+	{
888	+	for (; i < n; ++i)
889	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
890	+	client_p->certfp = xstrdup(buf);
891	+	}
892	+	}
893	+	else
894	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
895	+	client_p->name, client_p->username, client_p->host, res);
896	+	X509_free(cert);
897	+	}
898	+
899		finish_ssl_server_handshake(client_p);
900		}
901
902		static void
903	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
903	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
904		{
905		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
906		{
907		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
908		ERR_error_string(ERR_get_error(), NULL));
909		SetDead(client_p);
910	<	exit_client(client_p, client_p, "SSL_new failed");
910	>	exit_client(client_p, "SSL_new failed");
911		return;
912		}
913
914		SSL_set_fd(fd->ssl, fd->fd);
915
916	<	if (!EmptyString(aconf->cipher_list))
917	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
916	>	if (!EmptyString(conf->cipher_list))
917	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
918
919		ssl_server_handshake(NULL, client_p);
920		}
921		#endif
922
923		/* serv_connect_callback() - complete a server connection.
924	<	*
924	>	*
925		* This routine is called after the server connection attempt has
926		* completed. If unsucessful, an error is sent to ops and the client
927		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1464 | Line 932 | static void
932		serv_connect_callback(fde_t *fd, int status, void *data)
933		{
934		struct Client *client_p = data;
935	<	struct ConfItem *conf=NULL;
1468	<	struct AccessItem *aconf=NULL;
935	>	struct MaskItem *conf = NULL;
936
937		/* First, make sure its a real client! */
938	<	assert(client_p != NULL);
938	>	assert(client_p);
939		assert(&client_p->localClient->fd == fd);
940
941		/* Next, for backward purposes, record the ip of the server */
942		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
943		sizeof(struct irc_ssaddr));
944	+
945		/* Check the status */
946		if (status != COMM_OK)
947		{
#	Line 1481 | Line 949 | serv_connect_callback(fde_t *fd, int sta
949		* Admins get to see any IP, mere opers don't *sigh*
950		*/
951		if (ConfigServerHide.hide_server_ips)
952	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
952	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
953		"Error connecting to %s: %s",
954		client_p->name, comm_errstr(status));
955		else
956	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
957	<	"Error connecting to %s[%s]: %s", client_p->name,
958	<	client_p->host, comm_errstr(status));
959	<
960	<	sendto_realops_flags(UMODE_ALL, L_OPER,
961	<	"Error connecting to %s: %s",
962	<	client_p->name, comm_errstr(status));
956	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
957	>	"Error connecting to %s[%s]: %s", client_p->name,
958	>	client_p->host, comm_errstr(status));
959	>
960	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
961	>	"Error connecting to %s: %s",
962	>	client_p->name, comm_errstr(status));
963
964		/* If a fd goes bad, call dead_link() the socket is no
965		* longer valid for reading or writing.
#	Line 1503 | Line 971 | serv_connect_callback(fde_t *fd, int sta
971		/* COMM_OK, so continue the connection procedure */
972		/* Get the C/N lines */
973		conf = find_conf_name(&client_p->localClient->confs,
974	<	client_p->name, SERVER_TYPE);
974	>	client_p->name, CONF_SERVER);
975		if (conf == NULL)
976		{
977	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
978	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
979	<	sendto_realops_flags(UMODE_ALL, L_OPER,
980	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
977	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
978	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
979	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
980	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
981
982	<	exit_client(client_p, &me, "Lost connect{} block");
982	>	exit_client(client_p, "Lost connect{} block");
983		return;
984		}
985
1518	–	aconf = map_to_conf(conf);
986		/* Next, send the initial handshake */
987		SetHandshake(client_p);
988
989		#ifdef HAVE_LIBCRYPTO
990	<	if (IsConfSSL(aconf))
990	>	if (IsConfSSL(conf))
991		{
992	<	ssl_connect_init(client_p, aconf, fd);
992	>	ssl_connect_init(client_p, conf, fd);
993		return;
994		}
995		#endif
996
997	<	/* jdc -- Check and send spasswd, not passwd. */
1531	<	if (!EmptyString(aconf->spasswd))
1532	<	sendto_one(client_p, "PASS %s TS %d %s",
1533	<	aconf->spasswd, TS_CURRENT, me.id);
997	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
998
999	<	send_capabilities(client_p, aconf,
1536	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
999	>	send_capabilities(client_p, 0);
1000
1001	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1002	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1540	<	me.info);
1001	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1002	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1003
1004		/* If we've been marked dead because a send failed, just exit
1005		* here now and save everyone the trouble of us ever existing.
1006		*/
1007	<	if (IsDead(client_p))
1007	>	if (IsDead(client_p))
1008		{
1009	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1010	<	"%s[%s] went dead during handshake",
1009	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1010	>	"%s[%s] went dead during handshake",
1011		client_p->name,
1012	<	client_p->host);
1013	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1014	<	"%s went dead during handshake", client_p->name);
1012	>	client_p->host);
1013	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1014	>	"%s went dead during handshake", client_p->name);
1015		return;
1016		}
1017
#	Line 1569 | Line 1031 | find_servconn_in_progress(const char *na
1031		cptr = ptr->data;
1032
1033		if (cptr && cptr->name[0])
1034	<	if (match(name, cptr->name))
1034	>	if (!match(name, cptr->name))
1035		return cptr;
1036		}
1037	<
1037	>
1038		return NULL;
1039		}

Diff Legend

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