ViewVC Help

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

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

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

Diff Legend

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