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 1383 by michael, Tue May 1 11:18:22 2012 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 4196 by michael, Thu Jul 10 19:48:48 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"
43	>	#include "server.h"
44		#include "log.h"
45	<	#include "s_misc.h"
50	<	#include "s_user.h"
45	>	#include "user.h"
46		#include "send.h"
47		#include "memory.h"
48	<	#include "channel.h" /* 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;
69	>	FILE *file = NULL;
70	>	dlink_node *ptr = NULL, *ptr_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73	<	MessageFileptr = &ConfigFileEntry.linksfile;
89	<
90	<	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;
161		dlink_node *ptr;
184	–	int wilds;
162
163		/* Assume it's me, if no server */
164		if (parc <= server || EmptyString(parv[server]))
165		return HUNTED_ISME;
166
167	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
167	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
168		return HUNTED_ISME;
169
170		/* These are to pickup matches that would cause the following
#	Line 197 | Line 174 | hunt_server(struct Client *client_p, str
174		if (MyClient(source_p))
175		target_p = hash_find_client(parv[server]);
176		else
177	<	target_p = find_person(client_p, parv[server]);
177	>	target_p = find_person(source_p, parv[server]);
178
179		if (target_p)
180		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 207 | Line 184 | hunt_server(struct Client *client_p, str
184		if (target_p->from == source_p->from && !MyConnect(target_p))
185		target_p = NULL;
186
210	–	collapse(parv[server]);
211	–	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
212	–
187		/* Again, if there are no wild cards involved in the server
188		* name, use the hash lookup
189		*/
190		if (target_p == NULL)
191		{
192	<	if (!wilds)
192	>	if (!has_wildcards(parv[server]))
193		{
194		if (!(target_p = hash_find_server(parv[server])))
195		{
196	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
197	<	me.name, source_p->name, parv[server]);
224	<	return(HUNTED_NOSUCH);
196	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
197	>	return HUNTED_NOSUCH;
198		}
199		}
200		else
#	Line 230 | Line 203 | hunt_server(struct Client *client_p, str
203		{
204		target_tmp = ptr->data;
205
206	<	if (match(parv[server], target_tmp->name))
206	>	if (!match(parv[server], target_tmp->name))
207		{
208		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
209		continue;
210		target_p = ptr->data;
211
212	<	if (IsRegistered(target_p) && (target_p != client_p))
212	>	if (IsRegistered(target_p) && (target_p != source_p->from))
213		break;
214		}
215		}
216		}
217		}
218
219	<	if (target_p != NULL)
219	>	if (target_p)
220		{
221	<	if(!IsRegistered(target_p))
221	>	if (!IsRegistered(target_p))
222		{
223	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
251	<	me.name, source_p->name, parv[server]);
223	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
224		return HUNTED_NOSUCH;
225		}
226
227		if (IsMe(target_p) || MyClient(target_p))
228		return HUNTED_ISME;
229
230	<	if (!match(target_p->name, parv[server]))
230	>	if (match(target_p->name, parv[server]))
231		parv[server] = target_p->name;
232
233		/* This is a little kludgy but should work... */
234	<	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],
234	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
235		parv[1], parv[2], parv[3], parv[4],
236		parv[5], parv[6], parv[7], parv[8]);
237	<	return(HUNTED_PASS);
238	<	}
237	>	return HUNTED_PASS;
238	>	}
239
240	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
241	<	me.name, source_p->name, parv[server]);
275	<	return(HUNTED_NOSUCH);
240	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
241	>	return HUNTED_NOSUCH;
242		}
243
244		/* try_connections()
#	Line 288 | Line 254 | hunt_server(struct Client *client_p, str
254		void
255		try_connections(void *unused)
256		{
257	<	dlink_node *ptr;
258	<	struct ConfItem *conf;
293	<	struct AccessItem *aconf;
294	<	struct ClassItem *cltmp;
295	<	int confrq;
257	>	dlink_node *ptr = NULL;
258	>	int confrq = 0;
259
260		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
261		if (GlobalSetOptions.autoconn == 0)
#	Line 300 | Line 263 | try_connections(void *unused)
263
264		DLINK_FOREACH(ptr, server_items.head)
265		{
266	<	conf = ptr->data;
267	<	aconf = map_to_conf(conf);
266	>	struct MaskItem *conf = ptr->data;
267	>
268	>	assert(conf->type == CONF_SERVER);
269
270	<	/* Also when already connecting! (update holdtimes) --SRB
270	>	/* Also when already connecting! (update holdtimes) --SRB
271		*/
272	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
309	<	!(IsConfAllowAutoConn(aconf)))
272	>	if (!conf->port || !IsConfAllowAutoConn(conf))
273		continue;
274
312	–	cltmp = map_to_conf(aconf->class_ptr);
275
276		/* Skip this entry if the use of it is still on hold until
277		* future. Otherwise handle this entry (and set it on hold
#	Line 317 | Line 279 | try_connections(void *unused)
279		* made one successfull connection... [this algorithm is
280		* a bit fuzzy... -- msa >;) ]
281		*/
282	<	if (aconf->hold > CurrentTime)
282	>	if (conf->until > CurrentTime)
283		continue;
284
285	<	if (cltmp == NULL)
286	<	confrq = DEFAULT_CONNECTFREQUENCY;
287	<	else
288	<	{
289	<	confrq = cltmp->con_freq;
328	<	if (confrq < MIN_CONN_FREQ)
329	<	confrq = MIN_CONN_FREQ;
330	<	}
285	>	assert(conf->class);
286	>
287	>	confrq = conf->class->con_freq;
288	>	if (confrq < MIN_CONN_FREQ)
289	>	confrq = MIN_CONN_FREQ;
290
291	<	aconf->hold = CurrentTime + confrq;
291	>	conf->until = CurrentTime + confrq;
292
293	<	/* Found a CONNECT config with port specified, scan clients
293	>	/*
294	>	* Found a CONNECT config with port specified, scan clients
295		* and see if this server is already connected?
296		*/
297	<	if (hash_find_server(conf->name) != NULL)
297	>	if (hash_find_server(conf->name))
298		continue;
299
300	<	if (cltmp->curr_user_count < cltmp->max_total)
300	>	if (conf->class->ref_count < conf->class->max_total)
301		{
302		/* Go to the end of the list, if not already last */
303	<	if (ptr->next != NULL)
303	>	if (ptr->next)
304		{
305		dlinkDelete(ptr, &server_items);
306		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 349 | Line 309 | try_connections(void *unused)
309		if (find_servconn_in_progress(conf->name))
310		return;
311
312	<	/* We used to only print this if serv_connect() actually
312	>	/*
313	>	* We used to only print this if serv_connect() actually
314		* succeeded, but since comm_tcp_connect() can call the callback
315		* immediately if there is an error, we were getting error messages
316		* in the wrong order. SO, we just print out the activated line,
#	Line 358 | Line 319 | try_connections(void *unused)
319		*   -- adrian
320		*/
321		if (ConfigServerHide.hide_server_ips)
322	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
322	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
323	>	"Connection to %s activated.",
324		conf->name);
325		else
326	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
327	<	conf->name, aconf->host);
326	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
327	>	"Connection to %s[%s] activated.",
328	>	conf->name, conf->host);
329
330	<	serv_connect(aconf, NULL);
330	>	serv_connect(conf, NULL);
331		/* We connect only one at time... */
332		return;
333		}
#	Line 374 | Line 337 | try_connections(void *unused)
337		int
338		valid_servname(const char *name)
339		{
340	<	unsigned int length = 0;
378	<	unsigned int dots   = 0;
340	>	unsigned int dots = 0;
341		const char *p = name;
342
343		for (; *p; ++p)
#	Line 383 | Line 345 | valid_servname(const char *name)
345		if (!IsServChar(*p))
346		return 0;
347
386	–	++length;
387	–
348		if (*p == '.')
349		++dots;
350		}
351
352	<	return dots != 0 && length <= HOSTLEN;
352	>	return dots && (p - name) <= HOSTLEN;
353		}
354
355		int
356		check_server(const char *name, struct Client *client_p)
357		{
358		dlink_node *ptr;
359	<	struct ConfItem *conf           = NULL;
360	<	struct ConfItem *server_conf    = NULL;
401	<	struct AccessItem *server_aconf = NULL;
402	<	struct AccessItem *aconf        = NULL;
359	>	struct MaskItem *conf        = NULL;
360	>	struct MaskItem *server_conf = NULL;
361		int error = -1;
362
363	<	assert(client_p != NULL);
406	<
407	<	if (client_p == NULL)
408	<	return(error);
409	<
410	<	if (strlen(name) > HOSTLEN)
411	<	return(-4);
363	>	assert(client_p);
364
365		/* loop through looking for all possible connect items that might work */
366		DLINK_FOREACH(ptr, server_items.head)
367		{
368		conf = ptr->data;
417	–	aconf = map_to_conf(conf);
369
370	<	if (!match(name, conf->name))
370	>	if (match(name, conf->name))
371		continue;
372
373		error = -3;
374
375		/* XXX: Fix me for IPv6                    */
376		/* XXX sockhost is the IPv4 ip as a string */
377	<	if (match(aconf->host, client_p->host) ||
378	<	match(aconf->host, client_p->sockhost))
377	>	if (!match(conf->host, client_p->host) ||
378	>	!match(conf->host, client_p->sockhost))
379		{
380		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);
381
382	<	if (IsConfEncrypted(aconf))
383	<	{
384	<	if (strcmp(aconf->passwd,
385	<	(const char *)crypt(client_p->localClient->passwd,
386	<	aconf->passwd)) == 0)
387	<	server_conf = conf;
388	<	}
389	<	else
447	<	{
448	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
449	<	server_conf = conf;
450	<	}
451	<	}
382	>	if (!match_conf_password(client_p->localClient->passwd, conf))
383	>	return -2;
384	>
385	>	if (!EmptyString(conf->certfp))
386	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
387	>	return -4;
388	>
389	>	server_conf = conf;
390		}
391		}
392
393		if (server_conf == NULL)
394	<	return(error);
394	>	return error;
395
396		attach_conf(client_p, server_conf);
397
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	–	}
398
399	<	if (aconf != NULL)
399	>	if (server_conf)
400		{
401		struct sockaddr_in *v4;
402		#ifdef IPV6
403		struct sockaddr_in6 *v6;
404		#endif
405	<	switch (aconf->aftype)
405	>	switch (server_conf->aftype)
406		{
407		#ifdef IPV6
408	<	case AF_INET6:
409	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
408	>	case AF_INET6:
409	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
410
411		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
412	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
412	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
413		break;
414		#endif
415		case AF_INET:
416	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
416	>	v4 = (struct sockaddr_in *)&server_conf->addr;
417
418		if (v4->sin_addr.s_addr == INADDR_NONE)
419	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
419	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
420		break;
421		}
422		}
423
424	<	return(0);
424	>	return 0;
425		}
426
427		/* add_capability()
#	Line 505 | Line 436 | check_server(const char *name, struct Cl
436		void
437		add_capability(const char *capab_name, int cap_flag, int add_to_default)
438		{
439	<	struct Capability *cap = MyMalloc(sizeof(*cap));
439	>	struct Capability *cap = MyCalloc(sizeof(*cap));
440
441	<	DupString(cap->name, capab_name);
441	>	cap->name = xstrdup(capab_name);
442		cap->cap = cap_flag;
443		dlinkAdd(cap, &cap->node, &cap_list);
444
#	Line 524 | Line 455 | add_capability(const char *capab_name, i
455		int
456		delete_capability(const char *capab_name)
457		{
458	<	dlink_node *ptr;
528	<	dlink_node *next_ptr;
529	<	struct Capability *cap;
458	>	dlink_node *ptr = NULL, *ptr_next = NULL;
459
460	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
460	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
461		{
462	<	cap = ptr->data;
462	>	struct Capability *cap = ptr->data;
463
464	<	if (cap->cap != 0)
464	>	if (cap->cap)
465		{
466	<	if (irccmp(cap->name, capab_name) == 0)
466	>	if (!irccmp(cap->name, capab_name))
467		{
468	<	default_server_capabs &= ~(cap->cap);
469	<	dlinkDelete(ptr, &cap_list);
470	<	MyFree(cap->name);
471	<	cap->name = NULL;
543	<	MyFree(cap);
468	>	default_server_capabs &= ~(cap->cap);
469	>	dlinkDelete(ptr, &cap_list);
470	>	MyFree(cap->name);
471	>	MyFree(cap);
472		}
473		}
474		}
#	Line 555 | Line 483 | delete_capability(const char *capab_name
483		* output       - 0 if not found CAPAB otherwise
484		* side effects - none
485		*/
486	<	int
486	>	unsigned int
487		find_capability(const char *capab)
488		{
489		const dlink_node *ptr = NULL;
#	Line 574 | Line 502 | find_capability(const char *capab)
502		/* send_capabilities()
503		*
504		* inputs       - Client pointer to send to
577	–	*              - Pointer to AccessItem (for crypt)
505		*              - int flag of capabilities that this server can send
506		* output       - NONE
507		* side effects - send the CAPAB line to a server  -orabidoo
508		*
509		*/
510		void
511	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
585	<	int cap_can_send)
511	>	send_capabilities(struct Client *client_p, int cap_can_send)
512		{
513	<	struct Capability *cap=NULL;
514	<	char msgbuf[IRCD_BUFSIZE];
589	<	char *t;
590	<	int tl;
591	<	dlink_node *ptr;
592	<
593	<	t = msgbuf;
513	>	char buf[IRCD_BUFSIZE] = "";
514	>	const dlink_node *ptr = NULL;
515
516		DLINK_FOREACH(ptr, cap_list.head)
517		{
518	<	cap = ptr->data;
518	>	const struct Capability *cap = ptr->data;
519
520		if (cap->cap & (cap_can_send|default_server_capabs))
521		{
522	<	tl = ircsprintf(t, "%s ", cap->name);
523	<	t += tl;
522	>	strlcat(buf, cap->name, sizeof(buf));
523	>	if (ptr->next)
524	>	strlcat(buf, " ", sizeof(buf));
525		}
526		}
527
528	<	*(t - 1) = '\0';
607	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
608	<	}
609	<
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->serv->sconf)))
672	<	if (!EmptyString(target_p->away))
673	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
674	<	target_p->away);
675	<
528	>	sendto_one(client_p, "CAPAB :%s", buf);
529		}
530
531		/*
#	Line 683 | Line 536 | sendnick_TS(struct Client *client_p, str
536		* side effects - build up string representing capabilities of server listed
537		*/
538		const char *
539	<	show_capabilities(struct Client *target_p)
539	>	show_capabilities(const struct Client *target_p)
540		{
541	<	static char msgbuf[IRCD_BUFSIZE];
542	<	char *t = msgbuf;
690	<	dlink_node *ptr;
541	>	static char msgbuf[IRCD_BUFSIZE] = "";
542	>	const dlink_node *ptr = NULL;
543
544	<	t += ircsprintf(msgbuf, "TS ");
544	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
545
546		DLINK_FOREACH(ptr, cap_list.head)
547		{
548		const struct Capability *cap = ptr->data;
549
550	<	if (IsCapable(target_p, cap->cap))
551	<	t += ircsprintf(t, "%s ", cap->name);
550	>	if (!IsCapable(target_p, cap->cap))
551	>	continue;
552	>
553	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
554	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
555		}
556
702	–	*(t - 1) = '\0';
557		return msgbuf;
558		}
559
#	Line 714 | Line 568 | struct Server *
568		make_server(struct Client *client_p)
569		{
570		if (client_p->serv == NULL)
571	<	client_p->serv = MyMalloc(sizeof(struct Server));
571	>	client_p->serv = MyCalloc(sizeof(struct Server));
572
573		return client_p->serv;
574		}
575
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	–	client_p->serv->sconf = conf;
898	–
899	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
900	–
901	–	/* Old sendto_serv_but_one() call removed because we now
902	–	** need to send different names to different servers
903	–	** (domain name matching) Send new server to other servers.
904	–	*/
905	–	DLINK_FOREACH(ptr, serv_list.head)
906	–	{
907	–	target_p = ptr->data;
908	–
909	–	if (target_p == client_p)
910	–	continue;
911	–
912	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
913	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
914	–	me.id, client_p->name, client_p->id,
915	–	IsHidden(client_p) ? "(H) " : "",
916	–	client_p->info);
917	–	else
918	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
919	–	me.name, client_p->name,
920	–	IsHidden(client_p) ? "(H) " : "",
921	–	client_p->info);
922	–	}
923	–
924	–	/* Pass on my client information to the new server
925	–	**
926	–	** First, pass only servers (idea is that if the link gets
927	–	** cancelled beacause the server was already there,
928	–	** there are no NICK's to be cancelled...). Of course,
929	–	** if cancellation occurs, all this info is sent anyway,
930	–	** and I guess the link dies when a read is attempted...? --msa
931	–	**
932	–	** Note: Link cancellation to occur at this point means
933	–	** that at least two servers from my fragment are building
934	–	** up connection this other fragment at the same time, it's
935	–	** a race condition, not the normal way of operation...
936	–	**
937	–	** ALSO NOTE: using the get_client_name for server names--
938	–	**    see previous *WARNING*!!! (Also, original inpath
939	–	**    is destroyed...)
940	–	*/
941	–
942	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
943	–	{
944	–	target_p = ptr->data;
945	–
946	–	/* target_p->from == target_p for target_p == client_p */
947	–	if (IsMe(target_p) || target_p->from == client_p)
948	–	continue;
949	–
950	–	if (IsCapable(client_p, CAP_TS6))
951	–	{
952	–	if (HasID(target_p))
953	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
954	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
955	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
956	–	target_p->info);
957	–	else  /* introducing non-ts6 server */
958	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
959	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
960	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
961	–	}
962	–	else
963	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
964	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
965	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
966	–	}
967	–
968	–	server_burst(client_p);
969	–	}
970	–
971	–	/* server_burst()
972	–	*
973	–	* inputs       - struct Client pointer server
974	–	*              -
975	–	* output       - none
976	–	* side effects - send a server burst
977	–	* bugs         - still too long
978	–	*/
979	–	static void
980	–	server_burst(struct Client *client_p)
981	–	{
982	–	/* Send it in the shortened format with the TS, if
983	–	** it's a TS server; walk the list of channels, sending
984	–	** all the nicks that haven't been sent yet for each
985	–	** channel, then send the channel itself -- it's less
986	–	** obvious than sending all nicks first, but on the
987	–	** receiving side memory will be allocated more nicely
988	–	** saving a few seconds in the handling of a split
989	–	** -orabidoo
990	–	*/
991	–
992	–	burst_all(client_p);
993	–
994	–	/* EOB stuff is now in burst_all */
995	–	/* Always send a PING after connect burst is done */
996	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
997	–	}
998	–
999	–	/* burst_all()
1000	–	*
1001	–	* inputs       - pointer to server to send burst to
1002	–	* output       - NONE
1003	–	* side effects - complete burst of channels/nicks is sent to client_p
1004	–	*/
1005	–	static void
1006	–	burst_all(struct Client *client_p)
1007	–	{
1008	–	dlink_node *ptr = NULL;
1009	–
1010	–	DLINK_FOREACH(ptr, global_channel_list.head)
1011	–	{
1012	–	struct Channel *chptr = ptr->data;
1013	–
1014	–	if (dlink_list_length(&chptr->members) != 0)
1015	–	{
1016	–	burst_members(client_p, chptr);
1017	–	send_channel_modes(client_p, chptr);
1018	–
1019	–	if (IsCapable(client_p, CAP_TBURST) ||
1020	–	IsCapable(client_p, CAP_TB))
1021	–	send_tb(client_p, chptr);
1022	–	}
1023	–	}
1024	–
1025	–	/* also send out those that are not on any channel
1026	–	*/
1027	–	DLINK_FOREACH(ptr, global_client_list.head)
1028	–	{
1029	–	struct Client *target_p = ptr->data;
1030	–
1031	–	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
1032	–	sendnick_TS(client_p, target_p);
1033	–
1034	–	DelFlag(target_p, FLAGS_BURSTED);
1035	–	}
1036	–
1037	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1038	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1039	–	*/
1040	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1041	–	if (IsCapable(client_p, CAP_EOB))
1042	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1043	–	}
1044	–
1045	–	/*
1046	–	* send_tb
1047	–	*
1048	–	* inputs       - pointer to Client
1049	–	*              - pointer to channel
1050	–	* output       - NONE
1051	–	* side effects - Called on a server burst when
1052	–	*                server is CAP_TB|CAP_TBURST capable
1053	–	*/
1054	–	static void
1055	–	send_tb(struct Client *client_p, struct Channel *chptr)
1056	–	{
1057	–	/*
1058	–	* We may also send an empty topic here, but only if topic_time isn't 0,
1059	–	* i.e. if we had a topic that got unset.  This is required for syncing
1060	–	* topics properly.
1061	–	*
1062	–	* Imagine the following scenario: Our downlink introduces a channel
1063	–	* to us with a TS that is equal to ours, but the channel topic on
1064	–	* their side got unset while the servers were in splitmode, which means
1065	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1066	–	* deal with it in a more sophisticated fashion instead of just resetting
1067	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1068	–	* for further information   -Michael
1069	–	*/
1070	–	if (chptr->topic_time != 0)
1071	–	{
1072	–	if (IsCapable(client_p, CAP_TBURST))
1073	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1074	–	me.name, (unsigned long)chptr->channelts, chptr->chname,
1075	–	(unsigned long)chptr->topic_time,
1076	–	chptr->topic_info,
1077	–	chptr->topic);
1078	–	else if (IsCapable(client_p, CAP_TB))
1079	–	{
1080	–	if (ConfigChannel.burst_topicwho)
1081	–	{
1082	–	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1083	–	me.name, chptr->chname,
1084	–	(unsigned long)chptr->topic_time,
1085	–	chptr->topic_info, chptr->topic);
1086	–	}
1087	–	else
1088	–	{
1089	–	sendto_one(client_p, ":%s TB %s %lu :%s",
1090	–	me.name, chptr->chname,
1091	–	(unsigned long)chptr->topic_time,
1092	–	chptr->topic);
1093	–	}
1094	–	}
1095	–	}
1096	–	}
1097	–
1098	–	/* burst_members()
1099	–	*
1100	–	* inputs       - pointer to server to send members to
1101	–	*              - dlink_list pointer to membership list to send
1102	–	* output       - NONE
1103	–	* side effects -
1104	–	*/
1105	–	static void
1106	–	burst_members(struct Client *client_p, struct Channel *chptr)
1107	–	{
1108	–	struct Client *target_p;
1109	–	struct Membership *ms;
1110	–	dlink_node *ptr;
1111	–
1112	–	DLINK_FOREACH(ptr, chptr->members.head)
1113	–	{
1114	–	ms       = ptr->data;
1115	–	target_p = ms->client_p;
1116	–
1117	–	if (!HasFlag(target_p, FLAGS_BURSTED))
1118	–	{
1119	–	AddFlag(target_p, FLAGS_BURSTED);
1120	–
1121	–	if (target_p->from != client_p)
1122	–	sendnick_TS(client_p, target_p);
1123	–	}
1124	–	}
1125	–	}
1126	–
576		/* New server connection code
577		* Based upon the stuff floating about in s_bsd.c
578		*   -- adrian
#	Line 1131 | Line 580 | burst_members(struct Client *client_p, s
580
581		/* serv_connect() - initiate a server connection
582		*
583	<	* inputs       - pointer to conf
583	>	* inputs       - pointer to conf
584		*              - pointer to client doing the connect
585		* output       -
586		* side effects -
#	Line 1146 | Line 595 | burst_members(struct Client *client_p, s
595		* it suceeded or not, and 0 if it fails in here somewhere.
596		*/
597		int
598	<	serv_connect(struct AccessItem *aconf, struct Client *by)
598	>	serv_connect(struct MaskItem *conf, struct Client *by)
599		{
600	<	struct ConfItem *conf;
601	<	struct Client *client_p;
1153	<	char buf[HOSTIPLEN];
600	>	struct Client *client_p = NULL;
601	>	char buf[HOSTIPLEN + 1] = "";
602
603		/* conversion structs */
604		struct sockaddr_in *v4;
1157	–	/* Make sure aconf is useful */
1158	–	assert(aconf != NULL);
1159	–
1160	–	if(aconf == NULL)
1161	–	return (0);
605
606	<	/* XXX should be passing struct ConfItem in the first place */
607	<	conf = unmap_conf_item(aconf);
606	>	/* Make sure conf is useful */
607	>	assert(conf);
608
609	<	/* log */
1167	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
609	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
610		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
611	<	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", aconf->user, aconf->host,
611	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
612		buf);
613
614		/* Still processing a DNS lookup? -> exit */
615	<	if (aconf->dns_pending)
615	>	if (conf->dns_pending)
616		{
617	<	sendto_realops_flags(UMODE_ALL, L_ALL,
617	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
618		"Error connecting to %s: DNS lookup for connect{} in progress.",
619		conf->name);
620	<	return (0);
620	>	return 0;
621		}
622
623	<	if (aconf->dns_failed)
623	>	if (conf->dns_failed)
624		{
625	<	sendto_realops_flags(UMODE_ALL, L_ALL,
625	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
626		"Error connecting to %s: DNS lookup for connect{} failed.",
627		conf->name);
628	<	return (0);
628	>	return 0;
629		}
630
631		/* Make sure this server isn't already connected
632	<	* Note: aconf should ALWAYS be a valid C: line
632	>	* Note: conf should ALWAYS be a valid C: line
633		*/
634	<	if ((client_p = hash_find_server(conf->name)) != NULL)
635	<	{
636	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
637	<	"Server %s already present from %s",
638	<	conf->name, get_client_name(client_p, SHOW_IP));
639	<	sendto_realops_flags(UMODE_ALL, L_OPER,
640	<	"Server %s already present from %s",
641	<	conf->name, get_client_name(client_p, MASK_IP));
634	>	if ((client_p = hash_find_server(conf->name)))
635	>	{
636	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
637	>	"Server %s already present from %s",
638	>	conf->name, get_client_name(client_p, SHOW_IP));
639	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
640	>	"Server %s already present from %s",
641	>	conf->name, get_client_name(client_p, MASK_IP));
642		if (by && IsClient(by) && !MyClient(by))
643	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
644	<	me.name, by->name, conf->name,
645	<	get_client_name(client_p, MASK_IP));
1204	<	return (0);
643	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
644	>	conf->name, get_client_name(client_p, MASK_IP));
645	>	return 0;
646		}
647	<
647	>
648		/* Create a local client */
649		client_p = make_client(NULL);
650
651		/* Copy in the server, hostname, fd */
652		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
653	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
653	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
654
655		/* We already converted the ip once, so lets use it - stu */
656		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
657
658	<	/* create a socket for the server connection */
659	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1219	<	SOCK_STREAM, 0, NULL) < 0)
658	>	/* create a socket for the server connection */
659	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
660		{
661		/* Eek, failure to create the socket */
662	<	report_error(L_ALL,
663	<	"opening stream socket to %s: %s", conf->name, errno);
662	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
663	>
664		SetDead(client_p);
665	<	exit_client(client_p, &me, "Connection failed");
666	<	return (0);
665	>	exit_client(client_p, "Connection failed");
666	>	return 0;
667		}
668
669		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1232 | Line 672 | serv_connect(struct AccessItem *aconf, s
672		/* Attach config entries to client here rather than in
673		* serv_connect_callback(). This to avoid null pointer references.
674		*/
675	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
675	>	if (!attach_connect_block(client_p, conf->name, conf->host))
676		{
677	<	sendto_realops_flags(UMODE_ALL, L_ALL,
678	<	"Host %s is not enabled for connecting:no C/N-line",
679	<	conf->name);
680	<	if (by && IsClient(by) && !MyClient(by))
681	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
682	<	me.name, by->name, client_p->name);
677	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
678	>	"Host %s is not enabled for connecting: no connect{} block",
679	>	conf->name);
680	>	if (by && IsClient(by) && !MyClient(by))
681	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
682	>
683		SetDead(client_p);
684	<	exit_client(client_p, client_p, "Connection failed");
685	<	return (0);
684	>	exit_client(client_p, "Connection failed");
685	>	return 0;
686		}
687
688		/* at this point we have a connection in progress and C/N lines
#	Line 1259 | Line 699 | serv_connect(struct AccessItem *aconf, s
699		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
700
701		SetConnecting(client_p);
702	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1263	<	/* from def_fam */
1264	<	client_p->localClient->aftype = aconf->aftype;
702	>	client_p->localClient->aftype = conf->aftype;
703
704		/* Now, initiate the connection */
705	<	/* XXX assume that a non 0 type means a specific bind address
705	>	/* XXX assume that a non 0 type means a specific bind address
706		* for this connect.
707		*/
708	<	switch (aconf->aftype)
708	>	switch (conf->aftype)
709		{
710		case AF_INET:
711	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
712	<	if (v4->sin_addr.s_addr != 0)
711	>	v4 = (struct sockaddr_in*)&conf->bind;
712	>	if (v4->sin_addr.s_addr)
713		{
714		struct irc_ssaddr ipn;
715		memset(&ipn, 0, sizeof(struct irc_ssaddr));
716		ipn.ss.ss_family = AF_INET;
717		ipn.ss_port = 0;
718	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
719	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
720	<	(struct sockaddr *)&ipn, ipn.ss_len,
721	<	serv_connect_callback, client_p, aconf->aftype,
722	<	CONNECTTIMEOUT);
718	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
719	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
720	>	(struct sockaddr *)&ipn, ipn.ss_len,
721	>	serv_connect_callback, client_p, conf->aftype,
722	>	CONNECTTIMEOUT);
723		}
724		else if (ServerInfo.specific_ipv4_vhost)
725		{
#	Line 1290 | Line 728 | serv_connect(struct AccessItem *aconf, s
728		ipn.ss.ss_family = AF_INET;
729		ipn.ss_port = 0;
730		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
731	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
731	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
732		(struct sockaddr *)&ipn, ipn.ss_len,
733	<	serv_connect_callback, client_p, aconf->aftype,
734	<	CONNECTTIMEOUT);
733	>	serv_connect_callback, client_p, conf->aftype,
734	>	CONNECTTIMEOUT);
735		}
736		else
737	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
738	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
737	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
738	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
739		CONNECTTIMEOUT);
740		break;
741		#ifdef IPV6
742		case AF_INET6:
743		{
744	<	struct irc_ssaddr ipn;
745	<	struct sockaddr_in6 *v6;
746	<	struct sockaddr_in6 *v6conf;
747	<
748	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
749	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
750	<	v6 = (struct sockaddr_in6 *)&ipn;
751	<
752	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
753	<	sizeof(struct in6_addr)) != 0)
754	<	{
755	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
756	<	ipn.ss.ss_family = AF_INET6;
757	<	ipn.ss_port = 0;
758	<	comm_connect_tcp(&client_p->localClient->fd,
759	<	aconf->host, aconf->port,
760	<	(struct sockaddr *)&ipn, ipn.ss_len,
761	<	serv_connect_callback, client_p,
762	<	aconf->aftype, CONNECTTIMEOUT);
763	<	}
1326	<	else if (ServerInfo.specific_ipv6_vhost)
744	>	struct irc_ssaddr ipn;
745	>	struct sockaddr_in6 *v6;
746	>	struct sockaddr_in6 *v6conf;
747	>
748	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
749	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
750	>	v6 = (struct sockaddr_in6 *)&ipn;
751	>
752	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
753	>	{
754	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
755	>	ipn.ss.ss_family = AF_INET6;
756	>	ipn.ss_port = 0;
757	>	comm_connect_tcp(&client_p->localClient->fd,
758	>	conf->host, conf->port,
759	>	(struct sockaddr *)&ipn, ipn.ss_len,
760	>	serv_connect_callback, client_p,
761	>	conf->aftype, CONNECTTIMEOUT);
762	>	}
763	>	else if (ServerInfo.specific_ipv6_vhost)
764		{
765	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
766	<	ipn.ss.ss_family = AF_INET6;
767	<	ipn.ss_port = 0;
768	<	comm_connect_tcp(&client_p->localClient->fd,
769	<	aconf->host, aconf->port,
770	<	(struct sockaddr *)&ipn, ipn.ss_len,
771	<	serv_connect_callback, client_p,
772	<	aconf->aftype, CONNECTTIMEOUT);
773	<	}
774	<	else
775	<	comm_connect_tcp(&client_p->localClient->fd,
776	<	aconf->host, aconf->port,
777	<	NULL, 0, serv_connect_callback, client_p,
778	<	aconf->aftype, CONNECTTIMEOUT);
765	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
766	>	ipn.ss.ss_family = AF_INET6;
767	>	ipn.ss_port = 0;
768	>	comm_connect_tcp(&client_p->localClient->fd,
769	>	conf->host, conf->port,
770	>	(struct sockaddr *)&ipn, ipn.ss_len,
771	>	serv_connect_callback, client_p,
772	>	conf->aftype, CONNECTTIMEOUT);
773	>	}
774	>	else
775	>	comm_connect_tcp(&client_p->localClient->fd,
776	>	conf->host, conf->port,
777	>	NULL, 0, serv_connect_callback, client_p,
778	>	conf->aftype, CONNECTTIMEOUT);
779		}
780		#endif
781		}
782	<	return (1);
782	>	return 1;
783		}
784
785		#ifdef HAVE_LIBCRYPTO
786		static void
787		finish_ssl_server_handshake(struct Client *client_p)
788		{
789	<	struct ConfItem *conf=NULL;
1353	<	struct AccessItem *aconf=NULL;
789	>	struct MaskItem *conf = NULL;
790
791		conf = find_conf_name(&client_p->localClient->confs,
792	<	client_p->name, SERVER_TYPE);
792	>	client_p->name, CONF_SERVER);
793		if (conf == NULL)
794		{
795	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
795	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
796		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
797	<	sendto_realops_flags(UMODE_ALL, L_OPER,
797	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
798		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
799
800	<	exit_client(client_p, &me, "Lost connect{} block");
800	>	exit_client(client_p, "Lost connect{} block");
801		return;
802		}
803
804	<	aconf = map_to_conf(conf);
1369	<
1370	<	/* jdc -- Check and send spasswd, not passwd. */
1371	<	if (!EmptyString(aconf->spasswd))
1372	<	sendto_one(client_p, "PASS %s TS %d %s",
1373	<	aconf->spasswd, TS_CURRENT, me.id);
804	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
805
806	<	send_capabilities(client_p, aconf,
1376	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
806	>	send_capabilities(client_p, 0);
807
808		sendto_one(client_p, "SERVER %s 1 :%s%s",
809		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1384 | Line 814 | finish_ssl_server_handshake(struct Clien
814		*/
815		if (IsDead(client_p))
816		{
817	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
817	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
818		"%s[%s] went dead during handshake",
819		client_p->name,
820		client_p->host);
821	<	sendto_realops_flags(UMODE_ALL, L_OPER,
821	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
822		"%s went dead during handshake", client_p->name);
823		return;
824		}
#	Line 1401 | Line 831 | finish_ssl_server_handshake(struct Clien
831		static void
832		ssl_server_handshake(fde_t *fd, struct Client *client_p)
833		{
834	<	int ret;
835	<	int err;
834	>	X509 *cert = NULL;
835	>	int ret = 0;
836
837	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1408	<
1409	<	if (ret <= 0)
837	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
838		{
839	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
839	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
840		{
841		case SSL_ERROR_WANT_WRITE:
842		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1421 | Line 849 | ssl_server_handshake(fde_t *fd, struct C
849		default:
850		{
851		const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
852	<	sendto_realops_flags(UMODE_ALL, L_ALL,
852	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
853		"Error connecting to %s: %s", client_p->name,
854		sslerr ? sslerr : "unknown SSL error");
855	<	exit_client(client_p, client_p, "Error during SSL handshake");
855	>	exit_client(client_p, "Error during SSL handshake");
856		return;
857		}
858		}
859		}
860
861	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
862	+	{
863	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
864	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
865	+	unsigned char md[EVP_MAX_MD_SIZE] = "";
866	+
867	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
868	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
869	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
870	+	{
871	+	unsigned int n = 0;
872	+
873	+	if (X509_digest(cert, ServerInfo.message_digest_algorithm, md, &n))
874	+	{
875	+	binary_to_hex(md, buf, n);
876	+	client_p->certfp = xstrdup(buf);
877	+	}
878	+	}
879	+	else
880	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
881	+	client_p->name, client_p->username, client_p->host, res);
882	+	X509_free(cert);
883	+	}
884	+
885		finish_ssl_server_handshake(client_p);
886		}
887
888		static void
889	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
889	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
890		{
891		if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
892		{
893		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
894		ERR_error_string(ERR_get_error(), NULL));
895		SetDead(client_p);
896	<	exit_client(client_p, client_p, "SSL_new failed");
896	>	exit_client(client_p, "SSL_new failed");
897		return;
898		}
899
900		SSL_set_fd(fd->ssl, fd->fd);
901
902	<	if (!EmptyString(aconf->cipher_list))
903	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
902	>	if (!EmptyString(conf->cipher_list))
903	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
904
905		ssl_server_handshake(NULL, client_p);
906		}
907		#endif
908
909		/* serv_connect_callback() - complete a server connection.
910	<	*
910	>	*
911		* This routine is called after the server connection attempt has
912		* completed. If unsucessful, an error is sent to ops and the client
913		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1466 | Line 918 | static void
918		serv_connect_callback(fde_t *fd, int status, void *data)
919		{
920		struct Client *client_p = data;
921	<	struct ConfItem *conf=NULL;
1470	<	struct AccessItem *aconf=NULL;
921	>	struct MaskItem *conf = NULL;
922
923		/* First, make sure its a real client! */
924	<	assert(client_p != NULL);
924	>	assert(client_p);
925		assert(&client_p->localClient->fd == fd);
926
927		/* Next, for backward purposes, record the ip of the server */
928		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
929		sizeof(struct irc_ssaddr));
930	+
931		/* Check the status */
932		if (status != COMM_OK)
933		{
#	Line 1483 | Line 935 | serv_connect_callback(fde_t *fd, int sta
935		* Admins get to see any IP, mere opers don't *sigh*
936		*/
937		if (ConfigServerHide.hide_server_ips)
938	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
938	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
939		"Error connecting to %s: %s",
940		client_p->name, comm_errstr(status));
941		else
942	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
943	<	"Error connecting to %s[%s]: %s", client_p->name,
944	<	client_p->host, comm_errstr(status));
945	<
946	<	sendto_realops_flags(UMODE_ALL, L_OPER,
947	<	"Error connecting to %s: %s",
948	<	client_p->name, comm_errstr(status));
942	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
943	>	"Error connecting to %s[%s]: %s", client_p->name,
944	>	client_p->host, comm_errstr(status));
945	>
946	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
947	>	"Error connecting to %s: %s",
948	>	client_p->name, comm_errstr(status));
949
950		/* If a fd goes bad, call dead_link() the socket is no
951		* longer valid for reading or writing.
#	Line 1505 | Line 957 | serv_connect_callback(fde_t *fd, int sta
957		/* COMM_OK, so continue the connection procedure */
958		/* Get the C/N lines */
959		conf = find_conf_name(&client_p->localClient->confs,
960	<	client_p->name, SERVER_TYPE);
960	>	client_p->name, CONF_SERVER);
961		if (conf == NULL)
962		{
963	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
964	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
965	<	sendto_realops_flags(UMODE_ALL, L_OPER,
966	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
963	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
964	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
965	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
966	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
967
968	<	exit_client(client_p, &me, "Lost connect{} block");
968	>	exit_client(client_p, "Lost connect{} block");
969		return;
970		}
971
1520	–	aconf = map_to_conf(conf);
972		/* Next, send the initial handshake */
973		SetHandshake(client_p);
974
975		#ifdef HAVE_LIBCRYPTO
976	<	if (IsConfSSL(aconf))
976	>	if (IsConfSSL(conf))
977		{
978	<	ssl_connect_init(client_p, aconf, fd);
978	>	ssl_connect_init(client_p, conf, fd);
979		return;
980		}
981		#endif
982
983	<	/* jdc -- Check and send spasswd, not passwd. */
1533	<	if (!EmptyString(aconf->spasswd))
1534	<	sendto_one(client_p, "PASS %s TS %d %s",
1535	<	aconf->spasswd, TS_CURRENT, me.id);
983	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
984
985	<	send_capabilities(client_p, aconf,
1538	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
985	>	send_capabilities(client_p, 0);
986
987	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
988	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1542	<	me.info);
987	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
988	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
989
990		/* If we've been marked dead because a send failed, just exit
991		* here now and save everyone the trouble of us ever existing.
992		*/
993	<	if (IsDead(client_p))
993	>	if (IsDead(client_p))
994		{
995	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
996	<	"%s[%s] went dead during handshake",
995	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
996	>	"%s[%s] went dead during handshake",
997		client_p->name,
998	<	client_p->host);
999	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1000	<	"%s went dead during handshake", client_p->name);
998	>	client_p->host);
999	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1000	>	"%s went dead during handshake", client_p->name);
1001		return;
1002		}
1003
#	Line 1571 | Line 1017 | find_servconn_in_progress(const char *na
1017		cptr = ptr->data;
1018
1019		if (cptr && cptr->name[0])
1020	<	if (match(name, cptr->name))
1020	>	if (!match(name, cptr->name))
1021		return cptr;
1022		}
1023	<
1023	>
1024		return NULL;
1025		}

Diff Legend

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