ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/server.c

Comparing:
ircd-hybrid-7.2/src/s_serv.c (file contents), Revision 337 by michael, Mon Dec 26 19:20:47 2005 UTC vs.
ircd-hybrid/branches/8.2.x/src/server.c (file contents), Revision 3452 by michael, Thu May 1 19:20:08 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 27 | Line 29
29		#include <openssl/rsa.h>
30		#include "rsa.h"
31		#endif
32	<	#include "tools.h"
31	<	#include "channel.h"
32	<	#include "channel_mode.h"
32	>	#include "list.h"
33		#include "client.h"
34	–	#include "common.h"
35	–	#include "dbuf.h"
34		#include "event.h"
37	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
40	–	#include "inet_misc.h"
41	–	#include "sprintf_irc.h"
37		#include "ircd.h"
38		#include "ircd_defs.h"
39		#include "s_bsd.h"
45	–	#include "irc_getnameinfo.h"
46	–	#include "list.h"
40		#include "numeric.h"
41		#include "packet.h"
42	<	#include "irc_res.h"
43	<	#include "s_conf.h"
44	<	#include "s_serv.h"
45	<	#include "s_log.h"
53	<	#include "s_stats.h"
54	<	#include "s_user.h"
42	>	#include "conf.h"
43	>	#include "server.h"
44	>	#include "log.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	<	struct Client *uplink  = NULL;
62	<
63	<
53	>	dlink_list flatten_links;
54		static dlink_list cap_list = { NULL, NULL, 0 };
65	–	static unsigned long freeMask;
66	–	static void server_burst(struct Client *);
67	–	static int fork_server(struct Client *);
68	–	static void burst_all(struct Client *);
69	–	static void cjoin_all(struct Client *);
70	–	static void send_tb(struct Client *client_p, struct Channel *chptr);
71	–
55		static CNCB serv_connect_callback;
56
74	–	static void start_io(struct Client *);
75	–	static void burst_members(struct Client *, struct Channel *);
76	–	static void burst_ll_members(struct Client *, struct Channel *);
77	–	static void add_lazylinkchannel(struct Client *, struct Channel *);
78	–
79	–	static SlinkRplHnd slink_error;
80	–	static SlinkRplHnd slink_zipstats;
81	–
82	–
83	–	#ifdef HAVE_LIBCRYPTO
84	–	struct EncCapability CipherTable[] =
85	–	{
86	–	#ifdef HAVE_EVP_BF_CFB
87	–	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
88	–	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
89	–	#endif
90	–	#ifdef HAVE_EVP_CAST5_CFB
91	–	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
92	–	#endif
93	–	#ifdef HAVE_EVP_IDEA_CFB
94	–	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
95	–	#endif
96	–	#ifdef HAVE_EVP_RC5_32_12_16_CFB
97	–	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
98	–	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
99	–	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
100	–	#endif
101	–	#ifdef HAVE_EVP_DES_EDE3_CFB
102	–	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
103	–	#endif
104	–	#ifdef HAVE_EVP_DES_CFB
105	–	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
106	–	#endif
107	–	{ 0,            0,                   0, 0             }
108	–	};
109	–	#endif
110	–
111	–	struct SlinkRplDef slinkrpltab[] = {
112	–	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
113	–	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
114	–	{ 0,                 0,              0 },
115	–	};
116	–
117	–
118	–	void
119	–	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
120	–	struct Client *server_p)
121	–	{
122	–	assert(rpl == SLINKRPL_ERROR);
123	–	assert(len < 256);
124	–
125	–	data[len-1] = '\0';
126	–
127	–	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
128	–	server_p->name, data);
129	–	/* XXX should this be exit_client? */
130	–	exit_client(server_p, &me, "servlink error -- terminating link");
131	–	}
132	–
133	–	void
134	–	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
135	–	struct Client *server_p)
136	–	{
137	–	struct ZipStats zipstats;
138	–	unsigned long in = 0, in_wire = 0, out = 0, out_wire = 0;
139	–	int i = 0;
140	–
141	–	assert(rpl == SLINKRPL_ZIPSTATS);
142	–	assert(len == 16);
143	–	assert(IsCapable(server_p, CAP_ZIP));
144	–
145	–	/* Yes, it needs to be done this way, no we cannot let the compiler
146	–	* work with the pointer to the structure.  This works around a GCC
147	–	* bug on SPARC that affects all versions at the time of this writing.
148	–	* I will feed you to the creatures living in RMS's beard if you do
149	–	* not leave this as is, without being sure that you are not causing
150	–	* regression for most of our installed SPARC base.
151	–	* -jmallett, 04/27/2002
152	–	*/
153	–	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
154	–
155	–	in |= (data[i++] << 24);
156	–	in |= (data[i++] << 16);
157	–	in |= (data[i++] <<  8);
158	–	in |= (data[i++]      );
159	–
160	–	in_wire |= (data[i++] << 24);
161	–	in_wire |= (data[i++] << 16);
162	–	in_wire |= (data[i++] <<  8);
163	–	in_wire |= (data[i++]      );
164	–
165	–	out |= (data[i++] << 24);
166	–	out |= (data[i++] << 16);
167	–	out |= (data[i++] <<  8);
168	–	out |= (data[i++]      );
169	–
170	–	out_wire |= (data[i++] << 24);
171	–	out_wire |= (data[i++] << 16);
172	–	out_wire |= (data[i++] <<  8);
173	–	out_wire |= (data[i++]      );
174	–
175	–	/* This macro adds b to a if a plus b is not an overflow, and sets the
176	–	* value of a to b if it is.
177	–	* Add and Set if No Overflow.
178	–	*/
179	–	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
180	–
181	–	ASNO(zipstats.in, in);
182	–	ASNO(zipstats.out, out);
183	–	ASNO(zipstats.in_wire, in_wire);
184	–	ASNO(zipstats.out_wire, out_wire);
185	–
186	–	if (zipstats.in > 0)
187	–	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
188	–	(double)zipstats.in) * 100.00);
189	–	else
190	–	zipstats.in_ratio = 0;
191	–
192	–	if (zipstats.out > 0)
193	–	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
194	–	(double)zipstats.out) * 100.00);
195	–	else
196	–	zipstats.out_ratio = 0;
197	–
198	–	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof (struct ZipStats));
199	–	}
200	–
201	–	void
202	–	collect_zipstats(void *unused)
203	–	{
204	–	dlink_node *ptr;
205	–	struct Client *target_p;
206	–
207	–	DLINK_FOREACH(ptr, serv_list.head)
208	–	{
209	–	target_p = ptr->data;
210	–
211	–	if (IsCapable(target_p, CAP_ZIP))
212	–	{
213	–	/* only bother if we haven't already got something queued... */
214	–	if (!target_p->localClient->slinkq)
215	–	{
216	–	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
217	–	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
218	–	target_p->localClient->slinkq_ofs = 0;
219	–	target_p->localClient->slinkq_len = 1;
220	–	send_queued_slink_write(target_p);
221	–	}
222	–	}
223	–	}
224	–	}
225	–
226	–	#ifdef HAVE_LIBCRYPTO
227	–	struct EncCapability *
228	–	check_cipher(struct Client *client_p, struct AccessItem *aconf)
229	–	{
230	–	struct EncCapability *epref = NULL;
231	–
232	–	/* Use connect{} specific info if available */
233	–	if (aconf->cipher_preference)
234	–	epref = aconf->cipher_preference;
235	–	else if (ConfigFileEntry.default_cipher_preference)
236	–	epref = ConfigFileEntry.default_cipher_preference;
237	–
238	–	/*
239	–	* If the server supports the capability in hand, return the matching
240	–	* conf struct.  Otherwise, return NULL (an error).
241	–	*/
242	–	if (epref && IsCapableEnc(client_p, epref->cap))
243	–	return epref;
244	–
245	–	return NULL;
246	–	}
247	–	#endif /* HAVE_LIBCRYPTO */
248	–
249	–	/* my_name_for_link()
250	–	* return wildcard name of my server name
251	–	* according to given config entry --Jto
252	–	*/
253	–	const char *
254	–	my_name_for_link(struct ConfItem *conf)
255	–	{
256	–	struct AccessItem *aconf;
257	–
258	–	aconf = (struct AccessItem *)map_to_conf(conf);
259	–	if (aconf->fakename != NULL)
260	–	return(aconf->fakename);
261	–	else
262	–	return(me.name);
263	–	}
57
58		/*
59		* write_links_file
#	Line 271 | Line 64 | my_name_for_link(struct ConfItem *conf)
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;
279	<	MessageFileLine *newMessageLine = 0;
280	<	MessageFile *MessageFileptr;
281	<	const char *p;
282	<	FBFILE *file;
283	<	char buff[512];
284	<	dlink_node *ptr;
285	<
286	<	MessageFileptr = &ConfigFileEntry.linksfile;
69	>	FILE *file = NULL;
70	>	dlink_node *ptr = NULL, *ptr_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73	<	if ((file = fbopen(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
297	–	MessageFileptr->contentsOfFile = NULL;
298	–	currentMessageLine             = NULL;
299	–
83		DLINK_FOREACH(ptr, global_serv_list.head)
84		{
85	<	size_t nbytes = 0;
303	<	struct Client *target_p = ptr->data;
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 */
310	<	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;
315	<	else
316	<	p = "(Unknown Location)";
317	<
318	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
319	<
320	<	/* 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
328	<	* default config but it is configurable..
329	<	* This should be changed to an snprintf at some point, but I'm wanting to
330	<	* know if this is a cause of a bug - cryogen
331	<	*/
332	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
333	<	MESSAGELINELEN);
334	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
335	<	target_p->name, me.name, p);
336	<	newMessageLine->next = NULL;
109	>	fputs(buff, file);
110	>	}
111
112	<	if (MessageFileptr->contentsOfFile)
113	<	{
340	<	if (currentMessageLine)
341	<	currentMessageLine->next = newMessageLine;
342	<	currentMessageLine = newMessageLine;
343	<	}
344	<	else
345	<	{
346	<	MessageFileptr->contentsOfFile = newMessageLine;
347	<	currentMessageLine = newMessageLine;
348	<	}
112	>	fclose(file);
113	>	}
114
115	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
116	<	fbputs(buff, file, nbytes);
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	<	fbclose(file);
133	>	fclose(file);
134		}
135
136		/* hunt_server()
#	Line 374 | 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;
383	–	int wilds;
162
163	<	/* Assume it's me, if no server
164	<	*/
165	<	if (parc <= server || EmptyString(parv[server]) ||
166	<	match(me.name, parv[server]) ||
167	<	match(parv[server], me.name) ||
168	<	!strcmp(parv[server], me.id))
391	<	return(HUNTED_ISME);
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))
168	>	return HUNTED_ISME;
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		*/
174		if (MyClient(source_p))
175	<	target_p = find_client(parv[server]);
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))
181		target_p = NULL;
182
183	<	if (target_p == NULL && (target_p = find_server(parv[server])))
183	>	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
184		if (target_p->from == source_p->from && !MyConnect(target_p))
185		target_p = NULL;
186
410	–	collapse(parv[server]);
411	–	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
412	–
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 = find_server(parv[server])))
194	>	if (!(target_p = hash_find_server(parv[server])))
195		{
196	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
197	<	me.name, parv[0], parv[server]);
424	<	return(HUNTED_NOSUCH);
196	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
197	>	return HUNTED_NOSUCH;
198		}
199		}
200		else
#	Line 430 | 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),
451	<	me.name, parv[0], 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
461	–	/* Deal with lazylinks */
462	–	client_burst_if_needed(target_p, source_p);
463	–
233		/* This is a little kludgy but should work... */
234	<	if (IsClient(source_p) &&
466	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
467	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
468	<	parv[0] = ID(source_p);
469	<
470	<	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, parv[0], parv[server]);
478	<	return(HUNTED_NOSUCH);
240	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
241	>	return HUNTED_NOSUCH;
242		}
243
244		/* try_connections()
#	Line 491 | 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;
496	<	struct AccessItem *aconf;
497	<	struct ClassItem *cltmp;
498	<	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 503 | Line 263 | try_connections(void *unused)
263
264		DLINK_FOREACH(ptr, server_items.head)
265		{
266	<	conf = ptr->data;
507	<	aconf = (struct AccessItem *)map_to_conf(conf);
266	>	struct MaskItem *conf = ptr->data;
267
268	<	/* Also when already connecting! (update holdtimes) --SRB
268	>	assert(conf->type == CONF_SERVER);
269	>
270	>	/* Also when already connecting! (update holdtimes) --SRB
271		*/
272	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
512	<	!(IsConfAllowAutoConn(aconf)))
272	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
273		continue;
274
515	–	cltmp = (struct ClassItem *)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 520 | 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)
285	>	if (conf->class == NULL)
286		confrq = DEFAULT_CONNECTFREQUENCY;
287		else
288		{
289	<	confrq = ConFreq(cltmp);
290	<	if (confrq < MIN_CONN_FREQ )
291	<	confrq = MIN_CONN_FREQ;
289	>	confrq = conf->class->con_freq;
290	>	if (confrq < MIN_CONN_FREQ)
291	>	confrq = MIN_CONN_FREQ;
292		}
293
294	<	aconf->hold = CurrentTime + confrq;
294	>	conf->until = CurrentTime + confrq;
295
296	<	/* Found a CONNECT config with port specified, scan clients
296	>	/*
297	>	* Found a CONNECT config with port specified, scan clients
298		* and see if this server is already connected?
299		*/
300	<	if (find_server(conf->name) != NULL)
300	>	if (hash_find_server(conf->name))
301		continue;
302
303	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
303	>	if (conf->class->ref_count < conf->class->max_total)
304		{
305		/* Go to the end of the list, if not already last */
306	<	if (ptr->next != NULL)
306	>	if (ptr->next)
307		{
308		dlinkDelete(ptr, &server_items);
309		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 552 | Line 312 | try_connections(void *unused)
312		if (find_servconn_in_progress(conf->name))
313		return;
314
315	<	/* We used to only print this if serv_connect() actually
315	>	/*
316	>	* We used to only print this if serv_connect() actually
317		* succeeded, but since comm_tcp_connect() can call the callback
318		* immediately if there is an error, we were getting error messages
319		* in the wrong order. SO, we just print out the activated line,
#	Line 561 | Line 322 | try_connections(void *unused)
322		*   -- adrian
323		*/
324		if (ConfigServerHide.hide_server_ips)
325	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
325	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
326	>	"Connection to %s activated.",
327		conf->name);
328		else
329	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
330	<	conf->name, aconf->host);
329	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
330	>	"Connection to %s[%s] activated.",
331	>	conf->name, conf->host);
332
333	<	serv_connect(aconf, NULL);
333	>	serv_connect(conf, NULL);
334		/* We connect only one at time... */
335		return;
336		}
#	Line 575 | Line 338 | try_connections(void *unused)
338		}
339
340		int
341	<	check_server(const char *name, struct Client *client_p, int cryptlink)
341	>	valid_servname(const char *name)
342		{
343	<	dlink_node *ptr;
344	<	struct ConfItem *conf           = NULL;
582	<	struct ConfItem *server_conf    = NULL;
583	<	struct AccessItem *server_aconf = NULL;
584	<	struct AccessItem *aconf        = NULL;
585	<	int error = -1;
343	>	unsigned int dots = 0;
344	>	const char *p = name;
345
346	<	assert(client_p != NULL);
346	>	for (; *p; ++p)
347	>	{
348	>	if (!IsServChar(*p))
349	>	return 0;
350
351	<	if (client_p == NULL)
352	<	return(error);
351	>	if (*p == '.')
352	>	++dots;
353	>	}
354
355	<	if (strlen(name) > HOSTLEN)
356	<	return(-4);
355	>	return dots && (p - name) <= HOSTLEN;
356	>	}
357	>
358	>	int
359	>	check_server(const char *name, struct Client *client_p)
360	>	{
361	>	dlink_node *ptr;
362	>	struct MaskItem *conf        = NULL;
363	>	struct MaskItem *server_conf = NULL;
364	>	int error = -1;
365	>
366	>	assert(client_p);
367
368		/* loop through looking for all possible connect items that might work */
369		DLINK_FOREACH(ptr, server_items.head)
370		{
371		conf = ptr->data;
599	–	aconf = (struct AccessItem *)map_to_conf(conf);
372
373	<	if (!match(name, conf->name))
373	>	if (match(name, conf->name))
374		continue;
375
376		error = -3;
377
378		/* XXX: Fix me for IPv6                    */
379		/* XXX sockhost is the IPv4 ip as a string */
380	<	if (match(aconf->host, client_p->host) ||
381	<	match(aconf->host, client_p->sockhost))
380	>	if (!match(conf->host, client_p->host) ||
381	>	!match(conf->host, client_p->sockhost))
382		{
383		error = -2;
612	–	#ifdef HAVE_LIBCRYPTO
613	–	if (cryptlink && IsConfCryptLink(aconf))
614	–	{
615	–	if (aconf->rsa_public_key)
616	–	server_conf = conf;
617	–	}
618	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
619	–	#endif /* HAVE_LIBCRYPTO */
620	–	{
621	–	/* A NULL password is as good as a bad one */
622	–	if (EmptyString(client_p->localClient->passwd))
623	–	return(-2);
624	–
625	–	/* code in s_conf.c should not have allowed this to be NULL */
626	–	if (aconf->passwd == NULL)
627	–	return(-2);
384
385	<	if (IsConfEncrypted(aconf))
386	<	{
387	<	if (strcmp(aconf->passwd,
388	<	(const char *)crypt(client_p->localClient->passwd,
389	<	aconf->passwd)) == 0)
390	<	server_conf = conf;
391	<	}
392	<	else
637	<	{
638	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
639	<	server_conf = conf;
640	<	}
641	<	}
385	>	if (!match_conf_password(client_p->localClient->passwd, conf))
386	>	return -2;
387	>
388	>	if (!EmptyString(conf->certfp))
389	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
390	>	return -4;
391	>
392	>	server_conf = conf;
393		}
394		}
395
396		if (server_conf == NULL)
397	<	return(error);
397	>	return error;
398
399		attach_conf(client_p, server_conf);
400
650	–	/* Now find all leaf or hub config items for this server */
651	–	DLINK_FOREACH(ptr, hub_items.head)
652	–	{
653	–	conf = ptr->data;
401
402	<	if (!match(name, conf->name))
656	<	continue;
657	<	attach_conf(client_p, conf);
658	<	}
659	<
660	<	DLINK_FOREACH(ptr, leaf_items.head)
661	<	{
662	<	conf = ptr->data;
663	<
664	<	if (!match(name, conf->name))
665	<	continue;
666	<	attach_conf(client_p, conf);
667	<	}
668	<
669	<	server_aconf = (struct AccessItem *)map_to_conf(server_conf);
670	<
671	<	if (!IsConfLazyLink(server_aconf))
672	<	ClearCap(client_p, CAP_LL);
673	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
674	<	if (!IsConfCompressed(server_aconf))
675	<	#endif
676	<	ClearCap(client_p, CAP_ZIP);
677	<	if (!IsConfCryptLink(server_aconf))
678	<	ClearCap(client_p, CAP_ENC);
679	<	if (!IsConfTopicBurst(server_aconf))
680	<	{
681	<	ClearCap(client_p, CAP_TB);
682	<	ClearCap(client_p, CAP_TBURST);
683	<	}
684	<
685	<	/* Don't unset CAP_HUB here even if the server isn't a hub,
686	<	* it only indicates if the server thinks it's lazylinks are
687	<	* leafs or not.. if you unset it, bad things will happen
688	<	*/
689	<	if (aconf != NULL)
402	>	if (server_conf)
403		{
404		struct sockaddr_in *v4;
405		#ifdef IPV6
406		struct sockaddr_in6 *v6;
407		#endif
408	<	switch (aconf->aftype)
408	>	switch (server_conf->aftype)
409		{
410		#ifdef IPV6
411	<	case AF_INET6:
412	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
411	>	case AF_INET6:
412	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
413
414		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
415	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
415	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
416		break;
417		#endif
418		case AF_INET:
419	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
419	>	v4 = (struct sockaddr_in *)&server_conf->addr;
420
421		if (v4->sin_addr.s_addr == INADDR_NONE)
422	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
422	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
423		break;
424		}
425		}
426
427	<	return(0);
427	>	return 0;
428		}
429
430		/* add_capability()
#	Line 726 | Line 439 | check_server(const char *name, struct Cl
439		void
440		add_capability(const char *capab_name, int cap_flag, int add_to_default)
441		{
442	<	struct Capability *cap;
442	>	struct Capability *cap = MyMalloc(sizeof(*cap));
443
444	<	cap = (struct Capability *)MyMalloc(sizeof(*cap));
732	<	DupString(cap->name, capab_name);
444	>	cap->name = xstrdup(capab_name);
445		cap->cap = cap_flag;
446		dlinkAdd(cap, &cap->node, &cap_list);
447	+
448		if (add_to_default)
449		default_server_capabs |= cap_flag;
450		}
#	Line 745 | Line 458 | add_capability(const char *capab_name, i
458		int
459		delete_capability(const char *capab_name)
460		{
461	<	dlink_node *ptr;
749	<	dlink_node *next_ptr;
750	<	struct Capability *cap;
461	>	dlink_node *ptr = NULL, *ptr_next = NULL;
462
463	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
463	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
464		{
465	<	cap = ptr->data;
465	>	struct Capability *cap = ptr->data;
466
467	<	if (cap->cap != 0)
467	>	if (cap->cap)
468		{
469	<	if (irccmp(cap->name, capab_name) == 0)
469	>	if (!irccmp(cap->name, capab_name))
470		{
471	<	default_server_capabs &= ~(cap->cap);
472	<	dlinkDelete(ptr, &cap_list);
473	<	MyFree(cap->name);
474	<	cap->name = NULL;
764	<	MyFree(cap);
471	>	default_server_capabs &= ~(cap->cap);
472	>	dlinkDelete(ptr, &cap_list);
473	>	MyFree(cap->name);
474	>	MyFree(cap);
475		}
476		}
477		}
478
479	<	return(0);
479	>	return 0;
480		}
481
482		/*
#	Line 776 | Line 486 | delete_capability(const char *capab_name
486		* output       - 0 if not found CAPAB otherwise
487		* side effects - none
488		*/
489	<	int
489	>	unsigned int
490		find_capability(const char *capab)
491		{
492	<	dlink_node *ptr;
783	<	struct Capability *cap;
492	>	const dlink_node *ptr = NULL;
493
494		DLINK_FOREACH(ptr, cap_list.head)
495		{
496	<	cap = ptr->data;
496	>	const struct Capability *cap = ptr->data;
497
498	<	if (cap->cap != 0)
499	<	{
791	<	if (irccmp(cap->name, capab) == 0)
792	<	return(cap->cap);
793	<	}
498	>	if (cap->cap && !irccmp(cap->name, capab))
499	>	return cap->cap;
500		}
501	<	return(0);
501	>
502	>	return 0;
503		}
504
505		/* send_capabilities()
506		*
507		* inputs       - Client pointer to send to
801	–	*              - Pointer to AccessItem (for crypt)
508		*              - int flag of capabilities that this server can send
803	–	*              - int flag of encryption capabilities
509		* output       - NONE
510		* side effects - send the CAPAB line to a server  -orabidoo
511		*
512		*/
513		void
514	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
810	<	int cap_can_send, int enc_can_send)
514	>	send_capabilities(struct Client *client_p, int cap_can_send)
515		{
516	<	struct Capability *cap=NULL;
517	<	char msgbuf[IRCD_BUFSIZE];
814	<	char *t;
516	>	char msgbuf[IRCD_BUFSIZE] = "";
517	>	char *t = msgbuf;
518		int tl;
519	<	dlink_node *ptr;
817	<	#ifdef HAVE_LIBCRYPTO
818	<	const struct EncCapability *epref = NULL;
819	<	char *capend;
820	<	int sent_cipher = 0;
821	<	#endif
822	<
823	<	t = msgbuf;
519	>	dlink_node *ptr = NULL;
520
521		DLINK_FOREACH(ptr, cap_list.head)
522		{
523	<	cap = ptr->data;
523	>	struct Capability *cap = ptr->data;
524
525		if (cap->cap & (cap_can_send|default_server_capabs))
526		{
527	<	tl = ircsprintf(t, "%s ", cap->name);
527	>	tl = sprintf(t, "%s ", cap->name);
528		t += tl;
529		}
530		}
835	–	#ifdef HAVE_LIBCRYPTO
836	–	if (enc_can_send)
837	–	{
838	–	capend = t;
839	–	strcpy(t, "ENC:");
840	–	t += 4;
841	–
842	–	/* use connect{} specific info if available */
843	–	if (aconf->cipher_preference)
844	–	epref = aconf->cipher_preference;
845	–	else if (ConfigFileEntry.default_cipher_preference)
846	–	epref = ConfigFileEntry.default_cipher_preference;
847	–
848	–	if (epref && (epref->cap & enc_can_send))
849	–	{
850	–	/* Leave the space -- it is removed later. */
851	–	tl = ircsprintf(t, "%s ", epref->name);
852	–	t += tl;
853	–	sent_cipher = 1;
854	–	}
531
856	–	if (!sent_cipher)
857	–	t = capend; /* truncate string before ENC:, below */
858	–	}
859	–	#endif
532		*(t - 1) = '\0';
533		sendto_one(client_p, "CAPAB :%s", msgbuf);
534		}
535
864	–	/* sendnick_TS()
865	–	*
866	–	* inputs       - client (server) to send nick towards
867	–	*              - client to send nick for
868	–	* output       - NONE
869	–	* side effects - NICK message is sent towards given client_p
870	–	*/
871	–	void
872	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
873	–	{
874	–	static char ubuf[12];
875	–
876	–	if (!IsClient(target_p))
877	–	return;
878	–
879	–	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
880	–	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
881	–
882	–	if (ubuf[0] == '\0')
883	–	{
884	–	ubuf[0] = '+';
885	–	ubuf[1] = '\0';
886	–	}
887	–
888	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
889	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
890	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
891	–	target_p->servptr->id,
892	–	target_p->name, target_p->hopcount + 1,
893	–	(unsigned long) target_p->tsinfo,
894	–	ubuf, target_p->username, target_p->host,
895	–	((MyClient(target_p)&&!IsIPSpoof(target_p))?target_p->sockhost:"0"),
896	–	target_p->id, target_p->info);
897	–	else
898	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
899	–	target_p->name, target_p->hopcount + 1,
900	–	(unsigned long) target_p->tsinfo,
901	–	ubuf, target_p->username, target_p->host,
902	–	target_p->servptr->name, target_p->info);
903	–	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
904	–	if (!EmptyString(target_p->away))
905	–	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
906	–	target_p->away);
907	–
908	–	}
909	–
910	–	/* client_burst_if_needed()
911	–	*
912	–	* inputs       - pointer to server
913	–	*              - pointer to client to add
914	–	* output       - NONE
915	–	* side effects - If this client is not known by this lazyleaf, send it
916	–	*/
917	–	void
918	–	client_burst_if_needed(struct Client *client_p, struct Client *target_p)
919	–	{
920	–	if (!ServerInfo.hub)
921	–	return;
922	–	if (!MyConnect(client_p))
923	–	return;
924	–	if (!IsCapable(client_p,CAP_LL))
925	–	return;
926	–
927	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
928	–	{
929	–	sendnick_TS(client_p, target_p);
930	–	add_lazylinkclient(client_p,target_p);
931	–	}
932	–	}
933	–
536		/*
537		* show_capabilities - show current server capabilities
538		*
#	Line 939 | Line 541 | client_burst_if_needed(struct Client *cl
541		* side effects - build up string representing capabilities of server listed
542		*/
543		const char *
544	<	show_capabilities(struct Client *target_p)
544	>	show_capabilities(const struct Client *target_p)
545		{
546	<	static char msgbuf[IRCD_BUFSIZE];
547	<	char *t = msgbuf;
946	<	dlink_node *ptr;
546	>	static char msgbuf[IRCD_BUFSIZE] = "";
547	>	const dlink_node *ptr = NULL;
548
549	<	t += ircsprintf(msgbuf, "TS ");
549	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
550
551		DLINK_FOREACH(ptr, cap_list.head)
552		{
553		const struct Capability *cap = ptr->data;
554
555	<	if (IsCapable(target_p, cap->cap))
556	<	t += ircsprintf(t, "%s ", cap->name);
555	>	if (!IsCapable(target_p, cap->cap))
556	>	continue;
557	>
558	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
559	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
560		}
957	–	#ifdef HAVE_LIBCRYPTO
958	–	if (IsCapable(target_p, CAP_ENC) &&
959	–	target_p->localClient->in_cipher &&
960	–	target_p->localClient->out_cipher)
961	–	t += ircsprintf(t, "ENC:%s ",
962	–	target_p->localClient->in_cipher->name);
963	–	#endif
964	–	*(t - 1) = '\0';
561
562	<	return(msgbuf);
562	>	return msgbuf;
563		}
564
565		/* make_server()
#	Line 977 | Line 573 | struct Server *
573		make_server(struct Client *client_p)
574		{
575		if (client_p->serv == NULL)
980	–	{
576		client_p->serv = MyMalloc(sizeof(struct Server));
982	–	client_p->serv->dep_servers = 1;
983	–	}
577
578		return client_p->serv;
579		}
580
988	–	/* server_estab()
989	–	*
990	–	* inputs       - pointer to a struct Client
991	–	* output       -
992	–	* side effects -
993	–	*/
994	–	void
995	–	server_estab(struct Client *client_p)
996	–	{
997	–	struct Client *target_p;
998	–	struct ConfItem *conf;
999	–	struct AccessItem *aconf=NULL;
1000	–	char *host;
1001	–	const char *inpath;
1002	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
1003	–	dlink_node *m;
1004	–	dlink_node *ptr;
1005	–
1006	–	assert(client_p != NULL);
1007	–
1008	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
1009	–
1010	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
1011	–	host   = client_p->name;
1012	–
1013	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
1014	–	== NULL)
1015	–	{
1016	–	/* This shouldn't happen, better tell the ops... -A1kmm */
1017	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
1018	–	"for server %s(this shouldn't happen)!", host);
1019	–	exit_client(client_p, &me, "Lost connect{} block!");
1020	–	return;
1021	–	}
1022	–
1023	–	MyFree(client_p->localClient->passwd);
1024	–	client_p->localClient->passwd = NULL;
1025	–
1026	–	/* Its got identd, since its a server */
1027	–	SetGotId(client_p);
1028	–
1029	–	/* If there is something in the serv_list, it might be this
1030	–	* connecting server..
1031	–	*/
1032	–	if (!ServerInfo.hub && serv_list.head)
1033	–	{
1034	–	if (client_p != serv_list.head->data || serv_list.head->next)
1035	–	{
1036	–	ServerStats->is_ref++;
1037	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
1038	–	exit_client(client_p, &me, "I'm a leaf");
1039	–	return;
1040	–	}
1041	–	}
1042	–
1043	–	aconf = (struct AccessItem *)map_to_conf(conf);
1044	–
1045	–	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
1046	–	{
1047	–	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1048	–	*        2.  Check aconf->spasswd, not aconf->passwd.
1049	–	*/
1050	–	if (!EmptyString(aconf->spasswd))
1051	–	{
1052	–	/* only send ts6 format PASS if we have ts6 enabled */
1053	–	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1054	–	sendto_one(client_p, "PASS %s TS %d %s",
1055	–	aconf->spasswd, TS_CURRENT, me.id);
1056	–	else
1057	–	sendto_one(client_p, "PASS %s TS 5",
1058	–	aconf->spasswd);
1059	–	}
1060	–
1061	–	/* Pass my info to the new server
1062	–	*
1063	–	* If trying to negotiate LazyLinks, pass on CAP_LL
1064	–	* If this is a HUB, pass on CAP_HUB
1065	–	* Pass on ZIP if supported
1066	–	* Pass on TB if supported.
1067	–	* - Dianora
1068	–	*/
1069	–
1070	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1071	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
1072	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1073	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1074	–
1075	–	/* SERVER is the last command sent before switching to ziplinks.
1076	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1077	–	* on the wire immediately.  Otherwise, it could be sitting in
1078	–	* a kernel buffer when we start sending zipped data, and the
1079	–	* parser on the receiving side can't hand both unzipped and zipped
1080	–	* data in one packet. --Rodder
1081	–	*
1082	–	* currently we only need to call send_queued_write,
1083	–	* Nagle is already disabled at this point --adx
1084	–	*/
1085	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
1086	–	my_name_for_link(conf),
1087	–	ConfigServerHide.hidden ? "(H) " : "",
1088	–	(me.info[0]) ? (me.info) : "IRCers United");
1089	–	send_queued_write(client_p);
1090	–	}
1091	–
1092	–	/* Hand the server off to servlink now */
1093	–	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1094	–	{
1095	–	if (fork_server(client_p) < 0)
1096	–	{
1097	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1098	–	"Warning: fork failed for server %s -- check servlink_path (%s)",
1099	–	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1100	–	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1101	–	"%s -- check servlink_path (%s)",
1102	–	get_client_name(client_p, MASK_IP),
1103	–	ConfigFileEntry.servlink_path);
1104	–	exit_client(client_p, &me, "fork failed");
1105	–	return;
1106	–	}
1107	–
1108	–	start_io(client_p);
1109	–	SetServlink(client_p);
1110	–	}
1111	–
1112	–	/* only send ts6 format SVINFO if we have ts6 enabled */
1113	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1114	–	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
1115	–	(unsigned long)CurrentTime);
1116	–
1117	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
1118	–	if (IsCapable(client_p, CAP_TS6))
1119	–	hash_add_id(client_p);
1120	–
1121	–	/* XXX Does this ever happen? I don't think so -db */
1122	–	detach_conf(client_p, OPER_TYPE);
1123	–
1124	–	/* *WARNING*
1125	–	**    In the following code in place of plain server's
1126	–	**    name we send what is returned by get_client_name
1127	–	**    which may add the "sockhost" after the name. It's
1128	–	**    *very* *important* that there is a SPACE between
1129	–	**    the name and sockhost (if present). The receiving
1130	–	**    server will start the information field from this
1131	–	**    first blank and thus puts the sockhost into info.
1132	–	**    ...a bit tricky, but you have been warned, besides
1133	–	**    code is more neat this way...  --msa
1134	–	*/
1135	–	client_p->servptr = &me;
1136	–
1137	–	if (IsClosing(client_p))
1138	–	return;
1139	–
1140	–	SetServer(client_p);
1141	–
1142	–	/* Update the capability combination usage counts. -A1kmm */
1143	–	set_chcap_usage_counts(client_p);
1144	–
1145	–	/* Some day, all these lists will be consolidated *sigh* */
1146	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
1147	–
1148	–	m = dlinkFind(&unknown_list, client_p);
1149	–	assert(NULL != m);
1150	–
1151	–	dlinkDelete(m, &unknown_list);
1152	–	dlinkAdd(client_p, m, &serv_list);
1153	–
1154	–	Count.myserver++;
1155	–
1156	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
1157	–	hash_add_client(client_p);
1158	–
1159	–	/* doesnt duplicate client_p->serv if allocated this struct already */
1160	–	make_server(client_p);
1161	–
1162	–	/* fixing eob timings.. -gnp */
1163	–	client_p->firsttime = CurrentTime;
1164	–
1165	–	/* Show the real host/IP to admins */
1166	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1167	–	"Link with %s established: (%s) link",
1168	–	inpath_ip,show_capabilities(client_p));
1169	–	/* Now show the masked hostname/IP to opers */
1170	–	sendto_realops_flags(UMODE_ALL, L_OPER,
1171	–	"Link with %s established: (%s) link",
1172	–	inpath,show_capabilities(client_p));
1173	–	ilog(L_NOTICE, "Link with %s established: (%s) link",
1174	–	inpath_ip, show_capabilities(client_p));
1175	–
1176	–	client_p->serv->sconf = conf;
1177	–
1178	–	if (HasServlink(client_p))
1179	–	{
1180	–	/* we won't overflow FD_DESC_SZ here, as it can hold
1181	–	* client_p->name + 64
1182	–	*/
1183	–	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
1184	–	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
1185	–	}
1186	–	else
1187	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
1188	–
1189	–	/* Old sendto_serv_but_one() call removed because we now
1190	–	** need to send different names to different servers
1191	–	** (domain name matching) Send new server to other servers.
1192	–	*/
1193	–	DLINK_FOREACH(ptr, serv_list.head)
1194	–	{
1195	–	target_p = ptr->data;
1196	–
1197	–	if (target_p == client_p)
1198	–	continue;
1199	–
1200	–	if ((conf = target_p->serv->sconf) &&
1201	–	match(my_name_for_link(conf), client_p->name))
1202	–	continue;
1203	–
1204	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
1205	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
1206	–	me.id, client_p->name, client_p->id,
1207	–	IsHidden(client_p) ? "(H) " : "",
1208	–	client_p->info);
1209	–	else
1210	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
1211	–	me.name, client_p->name,
1212	–	IsHidden(client_p) ? "(H) " : "",
1213	–	client_p->info);
1214	–	}
1215	–
1216	–	/* Pass on my client information to the new server
1217	–	**
1218	–	** First, pass only servers (idea is that if the link gets
1219	–	** cancelled beacause the server was already there,
1220	–	** there are no NICK's to be cancelled...). Of course,
1221	–	** if cancellation occurs, all this info is sent anyway,
1222	–	** and I guess the link dies when a read is attempted...? --msa
1223	–	**
1224	–	** Note: Link cancellation to occur at this point means
1225	–	** that at least two servers from my fragment are building
1226	–	** up connection this other fragment at the same time, it's
1227	–	** a race condition, not the normal way of operation...
1228	–	**
1229	–	** ALSO NOTE: using the get_client_name for server names--
1230	–	**    see previous *WARNING*!!! (Also, original inpath
1231	–	**    is destroyed...)
1232	–	*/
1233	–
1234	–	conf = client_p->serv->sconf;
1235	–
1236	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
1237	–	{
1238	–	target_p = ptr->data;
1239	–
1240	–	/* target_p->from == target_p for target_p == client_p */
1241	–	if (target_p->from == client_p)
1242	–	continue;
1243	–
1244	–	if (match(my_name_for_link(conf), target_p->name))
1245	–	continue;
1246	–
1247	–	if (IsCapable(client_p, CAP_TS6))
1248	–	{
1249	–	if (HasID(target_p))
1250	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
1251	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1252	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
1253	–	target_p->info);
1254	–	else  /* introducing non-ts6 server */
1255	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1256	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1257	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1258	–	}
1259	–	else
1260	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1261	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
1262	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1263	–	}
1264	–
1265	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1266	–	uplink = client_p;
1267	–
1268	–	server_burst(client_p);
1269	–	}
1270	–
1271	–	static void
1272	–	start_io(struct Client *server)
1273	–	{
1274	–	struct LocalUser *lserver = server->localClient;
1275	–	int alloclen = 1;
1276	–	char *buf;
1277	–	dlink_node *ptr;
1278	–	struct dbuf_block *block;
1279	–
1280	–	/* calculate how many bytes to allocate */
1281	–	if (IsCapable(server, CAP_ZIP))
1282	–	alloclen += 6;
1283	–	#ifdef HAVE_LIBCRYPTO
1284	–	if (IsCapable(server, CAP_ENC))
1285	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1286	–	#endif
1287	–	alloclen += dbuf_length(&lserver->buf_recvq);
1288	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1289	–	alloclen += dbuf_length(&lserver->buf_sendq);
1290	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1291	–
1292	–	/* initialize servlink control sendq */
1293	–	lserver->slinkq = buf = MyMalloc(alloclen);
1294	–	lserver->slinkq_ofs = 0;
1295	–	lserver->slinkq_len = alloclen;
1296	–
1297	–	if (IsCapable(server, CAP_ZIP))
1298	–	{
1299	–	/* ziplink */
1300	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1301	–	*buf++ = 0; /* |          */
1302	–	*buf++ = 1; /* \ len is 1 */
1303	–	*buf++ = ConfigFileEntry.compression_level;
1304	–	*buf++ = SLINKCMD_START_ZIP_IN;
1305	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1306	–	}
1307	–	#ifdef HAVE_LIBCRYPTO
1308	–	if (IsCapable(server, CAP_ENC))
1309	–	{
1310	–	/* Decryption settings */
1311	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1312	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1313	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1314	–	*buf++ = lserver->in_cipher->cipherid;
1315	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1316	–	*buf++ = 0; /* keylen < 256 */
1317	–	*buf++ = lserver->in_cipher->keylen;
1318	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1319	–	buf += lserver->in_cipher->keylen;
1320	–	/* Encryption settings */
1321	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1322	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1323	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1324	–	*buf++ = lserver->out_cipher->cipherid;
1325	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1326	–	*buf++ = 0; /* keylen < 256 */
1327	–	*buf++ = lserver->out_cipher->keylen;
1328	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1329	–	buf += lserver->out_cipher->keylen;
1330	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1331	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1332	–	}
1333	–	#endif
1334	–
1335	–	/* pass the whole recvq to servlink */
1336	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1337	–	{
1338	–	block = ptr->data;
1339	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1340	–	*buf++ = (block->size >> 8);
1341	–	*buf++ = (block->size & 0xff);
1342	–	memcpy(buf, &block->data[0], block->size);
1343	–	buf += block->size;
1344	–	}
1345	–
1346	–	dbuf_clear(&lserver->buf_recvq);
1347	–
1348	–	/* pass the whole sendq to servlink */
1349	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1350	–	{
1351	–	block = ptr->data;
1352	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1353	–	*buf++ = (block->size >> 8);
1354	–	*buf++ = (block->size & 0xff);
1355	–	memcpy(buf, &block->data[0], block->size);
1356	–	buf += block->size;
1357	–	}
1358	–
1359	–	dbuf_clear(&lserver->buf_sendq);
1360	–
1361	–	/* start io */
1362	–	*buf++ = SLINKCMD_INIT;
1363	–
1364	–	/* schedule a write */
1365	–	send_queued_slink_write(server);
1366	–	}
1367	–
1368	–	/* fork_server()
1369	–	*
1370	–	* inputs       - struct Client *server
1371	–	* output       - success: 0 / failure: -1
1372	–	* side effect  - fork, and exec SERVLINK to handle this connection
1373	–	*/
1374	–	static int
1375	–	fork_server(struct Client *server)
1376	–	{
1377	–	#ifndef HAVE_SOCKETPAIR
1378	–	return -1;
1379	–	#else
1380	–	int i;
1381	–	int slink_fds[2][2];
1382	–	/* 0? - ctrl  | 1? - data
1383	–	* ?0 - child | ?1 - parent */
1384	–
1385	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1386	–	return -1;
1387	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1388	–	goto free_ctrl_fds;
1389	–
1390	–	if ((i = fork()) < 0)
1391	–	{
1392	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1393	–	free_ctrl_fds:
1394	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1395	–	return -1;
1396	–	}
1397	–
1398	–	if (i == 0)
1399	–	{
1400	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1401	–	char *kid_argv[7];
1402	–
1403	–	#ifdef O_ASYNC
1404	–	fcntl(server->localClient->fd.fd, F_SETFL,
1405	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1406	–	#endif
1407	–	close_fds(&server->localClient->fd);
1408	–	close(slink_fds[0][1]);
1409	–	close(slink_fds[1][1]);
1410	–
1411	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1412	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1413	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1414	–
1415	–	kid_argv[0] = "-slink";
1416	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1417	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1418	–	kid_argv[5] = fd_str[2];    /* network */
1419	–	kid_argv[6] = NULL;
1420	–
1421	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1422	–
1423	–	_exit(1);
1424	–	}
1425	–
1426	–	/* close the network fd and the child ends of the pipes */
1427	–	fd_close(&server->localClient->fd);
1428	–	close(slink_fds[0][0]);
1429	–	close(slink_fds[1][0]);
1430	–
1431	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1432	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1433	–
1434	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1435	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1436	–
1437	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1438	–	read_packet(&server->localClient->fd, server);
1439	–
1440	–	return 0;
1441	–	#endif
1442	–	}
1443	–
1444	–	/* server_burst()
1445	–	*
1446	–	* inputs       - struct Client pointer server
1447	–	*              -
1448	–	* output       - none
1449	–	* side effects - send a server burst
1450	–	* bugs         - still too long
1451	–	*/
1452	–	static void
1453	–	server_burst(struct Client *client_p)
1454	–	{
1455	–	/* Send it in the shortened format with the TS, if
1456	–	** it's a TS server; walk the list of channels, sending
1457	–	** all the nicks that haven't been sent yet for each
1458	–	** channel, then send the channel itself -- it's less
1459	–	** obvious than sending all nicks first, but on the
1460	–	** receiving side memory will be allocated more nicely
1461	–	** saving a few seconds in the handling of a split
1462	–	** -orabidoo
1463	–	*/
1464	–
1465	–	/* On a "lazy link" hubs send nothing.
1466	–	* Leafs always have to send nicks plus channels
1467	–	*/
1468	–	if (IsCapable(client_p, CAP_LL))
1469	–	{
1470	–	if (!ServerInfo.hub)
1471	–	{
1472	–	/* burst all our info */
1473	–	burst_all(client_p);
1474	–
1475	–	/* Now, ask for channel info on all our current channels */
1476	–	cjoin_all(client_p);
1477	–	}
1478	–	}
1479	–	else
1480	–	{
1481	–	burst_all(client_p);
1482	–	}
1483	–
1484	–	/* EOB stuff is now in burst_all */
1485	–	/* Always send a PING after connect burst is done */
1486	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
1487	–	}
1488	–
1489	–	/* burst_all()
1490	–	*
1491	–	* inputs       - pointer to server to send burst to
1492	–	* output       - NONE
1493	–	* side effects - complete burst of channels/nicks is sent to client_p
1494	–	*/
1495	–	static void
1496	–	burst_all(struct Client *client_p)
1497	–	{
1498	–	dlink_node *ptr = NULL;
1499	–
1500	–	DLINK_FOREACH(ptr, global_channel_list.head)
1501	–	{
1502	–	struct Channel *chptr = ptr->data;
1503	–
1504	–	if (dlink_list_length(&chptr->members) != 0)
1505	–	{
1506	–	burst_members(client_p, chptr);
1507	–	send_channel_modes(client_p, chptr);
1508	–
1509	–	if (IsCapable(client_p, CAP_TBURST) ||
1510	–	IsCapable(client_p, CAP_TB))
1511	–	send_tb(client_p, chptr);
1512	–	}
1513	–	}
1514	–
1515	–	/* also send out those that are not on any channel
1516	–	*/
1517	–	DLINK_FOREACH(ptr, global_client_list.head)
1518	–	{
1519	–	struct Client *target_p = ptr->data;
1520	–
1521	–	if (!IsBursted(target_p) && target_p->from != client_p)
1522	–	sendnick_TS(client_p, target_p);
1523	–
1524	–	ClearBursted(target_p);
1525	–	}
1526	–
1527	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1528	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1529	–	*/
1530	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1531	–	if (IsCapable(client_p, CAP_EOB))
1532	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1533	–	}
1534	–
1535	–	/*
1536	–	* send_tb
1537	–	*
1538	–	* inputs       - pointer to Client
1539	–	*              - pointer to channel
1540	–	* output       - NONE
1541	–	* side effects - Called on a server burst when
1542	–	*                server is CAP_TB|CAP_TBURST capable
1543	–	*/
1544	–	static void
1545	–	send_tb(struct Client *client_p, struct Channel *chptr)
1546	–	{
1547	–	/*
1548	–	* We may also send an empty topic here, but only if topic_time isn't 0,
1549	–	* i.e. if we had a topic that got unset.  This is required for syncing
1550	–	* topics properly.
1551	–	*
1552	–	* Imagine the following scenario: Our downlink introduces a channel
1553	–	* to us with a TS that is equal to ours, but the channel topic on
1554	–	* their side got unset while the servers were in splitmode, which means
1555	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1556	–	* deal with it in a more sophisticated fashion instead of just resetting
1557	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1558	–	* for further information   -Michael
1559	–	*/
1560	–	if (chptr->topic_time != 0)
1561	–	{
1562	–	if (IsCapable(client_p, CAP_TBURST))
1563	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1564	–	me.name, (unsigned long)chptr->channelts, chptr->chname,
1565	–	(unsigned long)chptr->topic_time,
1566	–	chptr->topic_info ? chptr->topic_info : "",
1567	–	chptr->topic ? chptr->topic : "");
1568	–	else if (IsCapable(client_p, CAP_TB))
1569	–	{
1570	–	if (ConfigChannel.burst_topicwho)
1571	–	{
1572	–	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1573	–	me.name, chptr->chname,
1574	–	(unsigned long)chptr->topic_time,
1575	–	chptr->topic_info, chptr->topic ? chptr->topic : "");
1576	–	}
1577	–	else
1578	–	{
1579	–	sendto_one(client_p, ":%s TB %s %lu :%s",
1580	–	me.name, chptr->chname,
1581	–	(unsigned long)chptr->topic_time,
1582	–	chptr->topic ? chptr->topic : "");
1583	–	}
1584	–	}
1585	–	}
1586	–	}
1587	–
1588	–	/* cjoin_all()
1589	–	*
1590	–	* inputs       - server to ask for channel info from
1591	–	* output       - NONE
1592	–	* side effects - CJOINS for all the leafs known channels is sent
1593	–	*/
1594	–	static void
1595	–	cjoin_all(struct Client *client_p)
1596	–	{
1597	–	const dlink_node *gptr = NULL;
1598	–
1599	–	DLINK_FOREACH(gptr, global_channel_list.head)
1600	–	{
1601	–	const struct Channel *chptr = gptr->data;
1602	–	sendto_one(client_p, ":%s CBURST %s",
1603	–	me.name, chptr->chname);
1604	–	}
1605	–	}
1606	–
1607	–	/* burst_channel()
1608	–	*
1609	–	* inputs       - pointer to server to send sjoins to
1610	–	*              - channel pointer
1611	–	* output       - none
1612	–	* side effects - All sjoins for channel(s) given by chptr are sent
1613	–	*                for all channel members. ONLY called by hub on
1614	–	*                behalf of a lazylink so client_p is always guarunteed
1615	–	*                to be a LL leaf.
1616	–	*/
1617	–	void
1618	–	burst_channel(struct Client *client_p, struct Channel *chptr)
1619	–	{
1620	–	burst_ll_members(client_p, chptr);
1621	–
1622	–	send_channel_modes(client_p, chptr);
1623	–	add_lazylinkchannel(client_p,chptr);
1624	–
1625	–	if (chptr->topic != NULL && chptr->topic_info != NULL)
1626	–	{
1627	–	sendto_one(client_p, ":%s TOPIC %s %s %lu :%s",
1628	–	me.name, chptr->chname, chptr->topic_info,
1629	–	(unsigned long)chptr->topic_time, chptr->topic);
1630	–	}
1631	–	}
1632	–
1633	–	/* add_lazlinkchannel()
1634	–	*
1635	–	* inputs       - pointer to directly connected leaf server
1636	–	*                being introduced to this hub
1637	–	*              - pointer to channel structure being introduced
1638	–	* output       - NONE
1639	–	* side effects - The channel pointed to by chptr is now known
1640	–	*                to be on lazyleaf server given by local_server_p.
1641	–	*                mark that in the bit map and add to the list
1642	–	*                of channels to examine after this newly introduced
1643	–	*                server is squit off.
1644	–	*/
1645	–	static void
1646	–	add_lazylinkchannel(struct Client *local_server_p, struct Channel *chptr)
1647	–	{
1648	–	assert(MyConnect(local_server_p));
1649	–
1650	–	chptr->lazyLinkChannelExists |= local_server_p->localClient->serverMask;
1651	–	dlinkAdd(chptr, make_dlink_node(), &lazylink_channels);
1652	–	}
1653	–
1654	–	/* add_lazylinkclient()
1655	–	*
1656	–	* inputs       - pointer to directly connected leaf server
1657	–	*                being introduced to this hub
1658	–	*              - pointer to client being introduced
1659	–	* output       - NONE
1660	–	* side effects - The client pointed to by client_p is now known
1661	–	*                to be on lazyleaf server given by local_server_p.
1662	–	*                mark that in the bit map and add to the list
1663	–	*                of clients to examine after this newly introduced
1664	–	*                server is squit off.
1665	–	*/
1666	–	void
1667	–	add_lazylinkclient(struct Client *local_server_p, struct Client *client_p)
1668	–	{
1669	–	assert(MyConnect(local_server_p));
1670	–	client_p->lazyLinkClientExists |= local_server_p->localClient->serverMask;
1671	–	}
1672	–
1673	–	/* remove_lazylink_flags()
1674	–	*
1675	–	* inputs       - pointer to server quitting
1676	–	* output       - NONE
1677	–	* side effects - All the channels on the lazylink channel list are examined
1678	–	*                If they hold a bit corresponding to the servermask
1679	–	*                attached to client_p, clear that bit. If this bitmask
1680	–	*                goes to 0, then the channel is no longer known to
1681	–	*                be on any lazylink server, and can be removed from the
1682	–	*                link list.
1683	–	*
1684	–	*                Similar is done for lazylink clients
1685	–	*
1686	–	*                This function must be run by the HUB on any exiting
1687	–	*                lazylink leaf server, while the pointer is still valid.
1688	–	*                Hence must be run from client.c in exit_one_client()
1689	–	*
1690	–	*                The old code scanned all channels, this code only
1691	–	*                scans channels/clients on the lazylink_channels
1692	–	*                lazylink_clients lists.
1693	–	*/
1694	–	void
1695	–	remove_lazylink_flags(unsigned long mask)
1696	–	{
1697	–	dlink_node *ptr;
1698	–	dlink_node *next_ptr;
1699	–	struct Channel *chptr;
1700	–	struct Client *target_p;
1701	–	unsigned long clear_mask;
1702	–
1703	–	if (!mask) /* On 0 mask, don't do anything */
1704	–	return;
1705	–
1706	–	clear_mask = ~mask;
1707	–	freeMask |= mask;
1708	–
1709	–	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
1710	–	{
1711	–	chptr = ptr->data;
1712	–
1713	–	chptr->lazyLinkChannelExists &= clear_mask;
1714	–
1715	–	if (chptr->lazyLinkChannelExists == 0)
1716	–	{
1717	–	dlinkDelete(ptr, &lazylink_channels);
1718	–	free_dlink_node(ptr);
1719	–	}
1720	–	}
1721	–
1722	–	DLINK_FOREACH(ptr, global_client_list.head)
1723	–	{
1724	–	target_p = ptr->data;
1725	–	target_p->lazyLinkClientExists &= clear_mask;
1726	–	}
1727	–	}
1728	–
1729	–	/* burst_members()
1730	–	*
1731	–	* inputs       - pointer to server to send members to
1732	–	*              - dlink_list pointer to membership list to send
1733	–	* output       - NONE
1734	–	* side effects -
1735	–	*/
1736	–	static void
1737	–	burst_members(struct Client *client_p, struct Channel *chptr)
1738	–	{
1739	–	struct Client *target_p;
1740	–	struct Membership *ms;
1741	–	dlink_node *ptr;
1742	–
1743	–	DLINK_FOREACH(ptr, chptr->members.head)
1744	–	{
1745	–	ms       = ptr->data;
1746	–	target_p = ms->client_p;
1747	–
1748	–	if (!IsBursted(target_p))
1749	–	{
1750	–	SetBursted(target_p);
1751	–
1752	–	if (target_p->from != client_p)
1753	–	sendnick_TS(client_p, target_p);
1754	–	}
1755	–	}
1756	–	}
1757	–
1758	–	/* burst_ll_members()
1759	–	*
1760	–	* inputs       - pointer to server to send members to
1761	–	*              - dlink_list pointer to membership list to send
1762	–	* output       - NONE
1763	–	* side effects - This version also has to check the bitmap for lazylink
1764	–	*/
1765	–	static void
1766	–	burst_ll_members(struct Client *client_p, struct Channel *chptr)
1767	–	{
1768	–	struct Client *target_p;
1769	–	struct Membership *ms;
1770	–	dlink_node *ptr;
1771	–
1772	–	DLINK_FOREACH(ptr, chptr->members.head)
1773	–	{
1774	–	ms       = ptr->data;
1775	–	target_p = ms->client_p;
1776	–
1777	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
1778	–	{
1779	–	if (target_p->from != client_p)
1780	–	{
1781	–	add_lazylinkclient(client_p,target_p);
1782	–	sendnick_TS(client_p, target_p);
1783	–	}
1784	–	}
1785	–	}
1786	–	}
1787	–
1788	–	/* set_autoconn()
1789	–	*
1790	–	* inputs       - struct Client pointer to oper requesting change
1791	–	* output       - none
1792	–	* side effects - set autoconnect mode
1793	–	*/
1794	–	void
1795	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1796	–	{
1797	–	struct ConfItem *conf;
1798	–	struct AccessItem *aconf;
1799	–
1800	–	if (name != NULL)
1801	–	{
1802	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1803	–	if (conf != NULL)
1804	–	{
1805	–	aconf = (struct AccessItem *)map_to_conf(conf);
1806	–	if (newval)
1807	–	SetConfAllowAutoConn(aconf);
1808	–	else
1809	–	ClearConfAllowAutoConn(aconf);
1810	–
1811	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1812	–	"%s has changed AUTOCONN for %s to %i",
1813	–	source_p->name, name, newval);
1814	–	sendto_one(source_p,
1815	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1816	–	me.name, source_p->name, name, newval);
1817	–	}
1818	–	else
1819	–	{
1820	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1821	–	me.name, source_p->name, name);
1822	–	}
1823	–	}
1824	–	else
1825	–	{
1826	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1827	–	me.name, source_p->name);
1828	–	}
1829	–	}
1830	–
1831	–	void
1832	–	initServerMask(void)
1833	–	{
1834	–	freeMask = 0xFFFFFFFFUL;
1835	–	}
1836	–
1837	–	/* nextFreeMask()
1838	–	*
1839	–	* inputs       - NONE
1840	–	* output       - unsigned long next unused mask for use in LL
1841	–	* side effects -
1842	–	*/
1843	–	unsigned long
1844	–	nextFreeMask(void)
1845	–	{
1846	–	int i;
1847	–	unsigned long mask = 1;
1848	–
1849	–	for (i = 0; i < 32; i++)
1850	–	{
1851	–	if (mask & freeMask)
1852	–	{
1853	–	freeMask &= ~mask;
1854	–	return(mask);
1855	–	}
1856	–
1857	–	mask <<= 1;
1858	–	}
1859	–
1860	–	return(0L); /* watch this special case ... */
1861	–	}
1862	–
581		/* New server connection code
582		* Based upon the stuff floating about in s_bsd.c
583		*   -- adrian
#	Line 1867 | Line 585 | nextFreeMask(void)
585
586		/* serv_connect() - initiate a server connection
587		*
588	<	* inputs       - pointer to conf
588	>	* inputs       - pointer to conf
589		*              - pointer to client doing the connect
590		* output       -
591		* side effects -
#	Line 1882 | Line 600 | nextFreeMask(void)
600		* it suceeded or not, and 0 if it fails in here somewhere.
601		*/
602		int
603	<	serv_connect(struct AccessItem *aconf, struct Client *by)
603	>	serv_connect(struct MaskItem *conf, struct Client *by)
604		{
605	<	struct ConfItem *conf;
606	<	struct Client *client_p;
1889	<	char buf[HOSTIPLEN];
605	>	struct Client *client_p = NULL;
606	>	char buf[HOSTIPLEN + 1] = "";
607
608		/* conversion structs */
609		struct sockaddr_in *v4;
1893	–	/* Make sure aconf is useful */
1894	–	assert(aconf != NULL);
1895	–
1896	–	if(aconf == NULL)
1897	–	return (0);
610
611	<	/* XXX should be passing struct ConfItem in the first place */
612	<	conf = unmap_conf_item(aconf);
611	>	/* Make sure conf is useful */
612	>	assert(conf);
613
614	<	/* log */
615	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
616	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1905	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
614	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
615	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
616	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
617		buf);
618
619		/* Still processing a DNS lookup? -> exit */
620	<	if (aconf->dns_query != NULL)
620	>	if (conf->dns_pending)
621	>	{
622	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
623	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
624	>	conf->name);
625	>	return 0;
626	>	}
627	>
628	>	if (conf->dns_failed)
629		{
630	<	sendto_realops_flags(UMODE_ALL, L_OPER,
631	<	"Error connecting to %s: Error during DNS lookup", conf->name);
632	<	return (0);
630	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
631	>	"Error connecting to %s: DNS lookup for connect{} failed.",
632	>	conf->name);
633	>	return 0;
634		}
635
636		/* Make sure this server isn't already connected
637	<	* Note: aconf should ALWAYS be a valid C: line
637	>	* Note: conf should ALWAYS be a valid C: line
638		*/
639	<	if ((client_p = find_server(conf->name)) != NULL)
640	<	{
641	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
642	<	"Server %s already present from %s",
643	<	conf->name, get_client_name(client_p, SHOW_IP));
644	<	sendto_realops_flags(UMODE_ALL, L_OPER,
645	<	"Server %s already present from %s",
646	<	conf->name, get_client_name(client_p, MASK_IP));
639	>	if ((client_p = hash_find_server(conf->name)))
640	>	{
641	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
642	>	"Server %s already present from %s",
643	>	conf->name, get_client_name(client_p, SHOW_IP));
644	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
645	>	"Server %s already present from %s",
646	>	conf->name, get_client_name(client_p, MASK_IP));
647		if (by && IsClient(by) && !MyClient(by))
648	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
649	<	me.name, by->name, conf->name,
650	<	get_client_name(client_p, MASK_IP));
1931	<	return (0);
648	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
649	>	conf->name, get_client_name(client_p, MASK_IP));
650	>	return 0;
651		}
652	<
652	>
653		/* Create a local client */
654		client_p = make_client(NULL);
655
656		/* Copy in the server, hostname, fd */
657		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
658	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
658	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
659
660		/* We already converted the ip once, so lets use it - stu */
661	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
661	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
662
663	<	/* create a socket for the server connection */
664	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1946	<	SOCK_STREAM, 0, NULL) < 0)
663	>	/* create a socket for the server connection */
664	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
665		{
666		/* Eek, failure to create the socket */
667	<	report_error(L_ALL,
668	<	"opening stream socket to %s: %s", conf->name, errno);
667	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
668	>
669		SetDead(client_p);
670	<	exit_client(client_p, &me, "Connection failed");
671	<	return (0);
670	>	exit_client(client_p, "Connection failed");
671	>	return 0;
672		}
673
674		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1959 | Line 677 | serv_connect(struct AccessItem *aconf, s
677		/* Attach config entries to client here rather than in
678		* serv_connect_callback(). This to avoid null pointer references.
679		*/
680	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
680	>	if (!attach_connect_block(client_p, conf->name, conf->host))
681		{
682	<	sendto_realops_flags(UMODE_ALL, L_ALL,
683	<	"Host %s is not enabled for connecting:no C/N-line",
684	<	conf->name);
685	<	if (by && IsClient(by) && !MyClient(by))
686	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
687	<	me.name, by->name, client_p->name);
682	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
683	>	"Host %s is not enabled for connecting: no connect{} block",
684	>	conf->name);
685	>	if (by && IsClient(by) && !MyClient(by))
686	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
687	>
688		SetDead(client_p);
689	<	exit_client(client_p, client_p, "Connection failed");
690	<	return (0);
689	>	exit_client(client_p, "Connection failed");
690	>	return 0;
691		}
692
693		/* at this point we have a connection in progress and C/N lines
#	Line 1987 | Line 705 | serv_connect(struct AccessItem *aconf, s
705
706		SetConnecting(client_p);
707		dlinkAdd(client_p, &client_p->node, &global_client_list);
708	<	/* from def_fam */
709	<	client_p->localClient->aftype = aconf->aftype;
708	>
709	>	client_p->localClient->aftype = conf->aftype;
710
711		/* Now, initiate the connection */
712	<	/* XXX assume that a non 0 type means a specific bind address
712	>	/* XXX assume that a non 0 type means a specific bind address
713		* for this connect.
714		*/
715	<	switch (aconf->aftype)
715	>	switch (conf->aftype)
716		{
717		case AF_INET:
718	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
719	<	if (v4->sin_addr.s_addr != 0)
718	>	v4 = (struct sockaddr_in*)&conf->bind;
719	>	if (v4->sin_addr.s_addr)
720		{
721		struct irc_ssaddr ipn;
722		memset(&ipn, 0, sizeof(struct irc_ssaddr));
723		ipn.ss.ss_family = AF_INET;
724		ipn.ss_port = 0;
725	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
726	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
727	<	(struct sockaddr *)&ipn, ipn.ss_len,
728	<	serv_connect_callback, client_p, aconf->aftype,
729	<	CONNECTTIMEOUT);
725	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
726	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
727	>	(struct sockaddr *)&ipn, ipn.ss_len,
728	>	serv_connect_callback, client_p, conf->aftype,
729	>	CONNECTTIMEOUT);
730		}
731		else if (ServerInfo.specific_ipv4_vhost)
732		{
#	Line 2017 | Line 735 | serv_connect(struct AccessItem *aconf, s
735		ipn.ss.ss_family = AF_INET;
736		ipn.ss_port = 0;
737		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
738	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
738	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
739		(struct sockaddr *)&ipn, ipn.ss_len,
740	<	serv_connect_callback, client_p, aconf->aftype,
741	<	CONNECTTIMEOUT);
740	>	serv_connect_callback, client_p, conf->aftype,
741	>	CONNECTTIMEOUT);
742		}
743		else
744	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
745	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
744	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
745	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
746		CONNECTTIMEOUT);
747		break;
748		#ifdef IPV6
749		case AF_INET6:
750		{
751	<	struct irc_ssaddr ipn;
752	<	struct sockaddr_in6 *v6;
753	<	struct sockaddr_in6 *v6conf;
754	<
755	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
756	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
757	<	v6 = (struct sockaddr_in6 *)&ipn;
758	<
759	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
2042	<	sizeof(struct in6_addr)) != 0)
2043	<	{
2044	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
2045	<	ipn.ss.ss_family = AF_INET6;
2046	<	ipn.ss_port = 0;
2047	<	comm_connect_tcp(&client_p->localClient->fd,
2048	<	aconf->host, aconf->port,
2049	<	(struct sockaddr *)&ipn, ipn.ss_len,
2050	<	serv_connect_callback, client_p,
2051	<	aconf->aftype, CONNECTTIMEOUT);
2052	<	}
2053	<	else if (ServerInfo.specific_ipv6_vhost)
751	>	struct irc_ssaddr ipn;
752	>	struct sockaddr_in6 *v6;
753	>	struct sockaddr_in6 *v6conf;
754	>
755	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
756	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
757	>	v6 = (struct sockaddr_in6 *)&ipn;
758	>
759	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
760		{
761	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
762	<	ipn.ss.ss_family = AF_INET6;
763	<	ipn.ss_port = 0;
764	<	comm_connect_tcp(&client_p->localClient->fd,
765	<	aconf->host, aconf->port,
766	<	(struct sockaddr *)&ipn, ipn.ss_len,
767	<	serv_connect_callback, client_p,
768	<	aconf->aftype, CONNECTTIMEOUT);
769	<	}
770	<	else
771	<	comm_connect_tcp(&client_p->localClient->fd,
772	<	aconf->host, aconf->port,
773	<	NULL, 0, serv_connect_callback, client_p,
774	<	aconf->aftype, CONNECTTIMEOUT);
761	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
762	>	ipn.ss.ss_family = AF_INET6;
763	>	ipn.ss_port = 0;
764	>	comm_connect_tcp(&client_p->localClient->fd,
765	>	conf->host, conf->port,
766	>	(struct sockaddr *)&ipn, ipn.ss_len,
767	>	serv_connect_callback, client_p,
768	>	conf->aftype, CONNECTTIMEOUT);
769	>	}
770	>	else if (ServerInfo.specific_ipv6_vhost)
771	>	{
772	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
773	>	ipn.ss.ss_family = AF_INET6;
774	>	ipn.ss_port = 0;
775	>	comm_connect_tcp(&client_p->localClient->fd,
776	>	conf->host, conf->port,
777	>	(struct sockaddr *)&ipn, ipn.ss_len,
778	>	serv_connect_callback, client_p,
779	>	conf->aftype, CONNECTTIMEOUT);
780	>	}
781	>	else
782	>	comm_connect_tcp(&client_p->localClient->fd,
783	>	conf->host, conf->port,
784	>	NULL, 0, serv_connect_callback, client_p,
785	>	conf->aftype, CONNECTTIMEOUT);
786		}
787		#endif
788		}
789	<	return (1);
789	>	return 1;
790		}
791
792	+	#ifdef HAVE_LIBCRYPTO
793	+	static void
794	+	finish_ssl_server_handshake(struct Client *client_p)
795	+	{
796	+	struct MaskItem *conf = NULL;
797	+
798	+	conf = find_conf_name(&client_p->localClient->confs,
799	+	client_p->name, CONF_SERVER);
800	+	if (conf == NULL)
801	+	{
802	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
803	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
804	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
805	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
806	+
807	+	exit_client(client_p, "Lost connect{} block");
808	+	return;
809	+	}
810	+
811	+	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
812	+
813	+	send_capabilities(client_p, 0);
814	+
815	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
816	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
817	+	me.info);
818	+
819	+	/* If we've been marked dead because a send failed, just exit
820	+	* here now and save everyone the trouble of us ever existing.
821	+	*/
822	+	if (IsDead(client_p))
823	+	{
824	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
825	+	"%s[%s] went dead during handshake",
826	+	client_p->name,
827	+	client_p->host);
828	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
829	+	"%s went dead during handshake", client_p->name);
830	+	return;
831	+	}
832	+
833	+	/* don't move to serv_list yet -- we haven't sent a burst! */
834	+	/* If we get here, we're ok, so lets start reading some data */
835	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
836	+	}
837	+
838	+	static void
839	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
840	+	{
841	+	X509 *cert = NULL;
842	+	int ret = 0;
843	+
844	+	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
845	+	{
846	+	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
847	+	{
848	+	case SSL_ERROR_WANT_WRITE:
849	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
850	+	(PF *)ssl_server_handshake, client_p, 0);
851	+	return;
852	+	case SSL_ERROR_WANT_READ:
853	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
854	+	(PF *)ssl_server_handshake, client_p, 0);
855	+	return;
856	+	default:
857	+	{
858	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
859	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
860	+	"Error connecting to %s: %s", client_p->name,
861	+	sslerr ? sslerr : "unknown SSL error");
862	+	exit_client(client_p, "Error during SSL handshake");
863	+	return;
864	+	}
865	+	}
866	+	}
867	+
868	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
869	+	{
870	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
871	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
872	+	unsigned char md[EVP_MAX_MD_SIZE] = "";
873	+
874	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
875	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
876	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
877	+	{
878	+	unsigned int n = 0;
879	+
880	+	if (X509_digest(cert, EVP_sha256(), md, &n))
881	+	{
882	+	for (unsigned int i = 0; i < n; ++i)
883	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
884	+	client_p->certfp = xstrdup(buf);
885	+	}
886	+	}
887	+	else
888	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
889	+	client_p->name, client_p->username, client_p->host, res);
890	+	X509_free(cert);
891	+	}
892	+
893	+	finish_ssl_server_handshake(client_p);
894	+	}
895	+
896	+	static void
897	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
898	+	{
899	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
900	+	{
901	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
902	+	ERR_error_string(ERR_get_error(), NULL));
903	+	SetDead(client_p);
904	+	exit_client(client_p, "SSL_new failed");
905	+	return;
906	+	}
907	+
908	+	SSL_set_fd(fd->ssl, fd->fd);
909	+
910	+	if (!EmptyString(conf->cipher_list))
911	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
912	+
913	+	ssl_server_handshake(NULL, client_p);
914	+	}
915	+	#endif
916	+
917		/* serv_connect_callback() - complete a server connection.
918	<	*
918	>	*
919		* This routine is called after the server connection attempt has
920		* completed. If unsucessful, an error is sent to ops and the client
921		* is closed. If sucessful, it goes through the initialisation/check
#	Line 2084 | Line 926 | static void
926		serv_connect_callback(fde_t *fd, int status, void *data)
927		{
928		struct Client *client_p = data;
929	<	struct ConfItem *conf=NULL;
2088	<	struct AccessItem *aconf=NULL;
929	>	struct MaskItem *conf = NULL;
930
931		/* First, make sure its a real client! */
932	<	assert(client_p != NULL);
932	>	assert(client_p);
933		assert(&client_p->localClient->fd == fd);
934
935		/* Next, for backward purposes, record the ip of the server */
936		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
937		sizeof(struct irc_ssaddr));
938	+
939		/* Check the status */
940		if (status != COMM_OK)
941		{
#	Line 2101 | Line 943 | serv_connect_callback(fde_t *fd, int sta
943		* Admins get to see any IP, mere opers don't *sigh*
944		*/
945		if (ConfigServerHide.hide_server_ips)
946	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
946	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
947		"Error connecting to %s: %s",
948		client_p->name, comm_errstr(status));
949		else
950	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
951	<	"Error connecting to %s[%s]: %s", client_p->name,
952	<	client_p->host, comm_errstr(status));
953	<
954	<	sendto_realops_flags(UMODE_ALL, L_OPER,
955	<	"Error connecting to %s: %s",
956	<	client_p->name, comm_errstr(status));
950	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
951	>	"Error connecting to %s[%s]: %s", client_p->name,
952	>	client_p->host, comm_errstr(status));
953	>
954	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
955	>	"Error connecting to %s: %s",
956	>	client_p->name, comm_errstr(status));
957
958		/* If a fd goes bad, call dead_link() the socket is no
959		* longer valid for reading or writing.
#	Line 2123 | Line 965 | serv_connect_callback(fde_t *fd, int sta
965		/* COMM_OK, so continue the connection procedure */
966		/* Get the C/N lines */
967		conf = find_conf_name(&client_p->localClient->confs,
968	<	client_p->name, SERVER_TYPE);
968	>	client_p->name, CONF_SERVER);
969		if (conf == NULL)
970		{
971	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
972	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
973	<	sendto_realops_flags(UMODE_ALL, L_OPER,
974	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
971	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
972	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
973	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
974	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
975
976	<	exit_client(client_p, &me, "Lost connect{} block");
976	>	exit_client(client_p, "Lost connect{} block");
977		return;
978		}
979
2138	–	aconf = (struct AccessItem *)map_to_conf(conf);
980		/* Next, send the initial handshake */
981		SetHandshake(client_p);
982
983		#ifdef HAVE_LIBCRYPTO
984	<	/* Handle all CRYPTLINK links in cryptlink_init */
2144	<	if (IsConfCryptLink(aconf))
984	>	if (IsConfSSL(conf))
985		{
986	<	cryptlink_init(client_p, conf, fd);
986	>	ssl_connect_init(client_p, conf, fd);
987		return;
988		}
989		#endif
990
991	<	/* jdc -- Check and send spasswd, not passwd. */
2152	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
2153	<	/* Send TS 6 form only if id */
2154	<	sendto_one(client_p, "PASS %s TS %d %s",
2155	<	aconf->spasswd, TS_CURRENT, me.id);
2156	<	else
2157	<	sendto_one(client_p, "PASS %s TS 5",
2158	<	aconf->spasswd);
991	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
992
993	<	/* Pass my info to the new server
2161	<	*
2162	<	* If trying to negotiate LazyLinks, pass on CAP_LL
2163	<	* If this is a HUB, pass on CAP_HUB
2164	<	* Pass on ZIP if supported
2165	<	* Pass on TB if supported.
2166	<	* - Dianora
2167	<	*/
2168	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2169	<	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
2170	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
2171	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
993	>	send_capabilities(client_p, 0);
994
995	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
996	<	my_name_for_link(conf),
2175	<	ConfigServerHide.hidden ? "(H) " : "",
2176	<	me.info);
995	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
996	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
997
998		/* If we've been marked dead because a send failed, just exit
999		* here now and save everyone the trouble of us ever existing.
1000		*/
1001	<	if (IsDead(client_p))
1001	>	if (IsDead(client_p))
1002		{
1003	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1004	<	"%s[%s] went dead during handshake",
1003	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1004	>	"%s[%s] went dead during handshake",
1005		client_p->name,
1006	<	client_p->host);
1007	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1008	<	"%s went dead during handshake", client_p->name);
1006	>	client_p->host);
1007	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1008	>	"%s went dead during handshake", client_p->name);
1009		return;
1010		}
1011
#	Line 2205 | Line 1025 | find_servconn_in_progress(const char *na
1025		cptr = ptr->data;
1026
1027		if (cptr && cptr->name[0])
1028	<	if (match(cptr->name, name) || match(name, cptr->name))
1028	>	if (!match(name, cptr->name))
1029		return cptr;
1030		}
2211	–
2212	–	return NULL;
2213	–	}
2214	–
2215	–	#ifdef HAVE_LIBCRYPTO
2216	–	/*
2217	–	* sends a CRYPTLINK SERV command.
2218	–	*/
2219	–	void
2220	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
2221	–	{
2222	–	struct AccessItem *aconf;
2223	–	char *encrypted;
2224	–	unsigned char *key_to_send;
2225	–	char randkey[CIPHERKEYLEN];
2226	–	int enc_len;
2227	–
2228	–	/* get key */
2229	–	if ((!ServerInfo.rsa_private_key) ||
2230	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
2231	–	{
2232	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
2233	–	"Invalid RSA private key");
2234	–	return;
2235	–	}
2236	–
2237	–	aconf = (struct AccessItem *)map_to_conf(conf);
2238	–
2239	–	if (aconf->rsa_public_key == NULL)
2240	–	{
2241	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
2242	–	"Invalid RSA public key");
2243	–	return;
2244	–	}
2245	–
2246	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
2247	–	{
2248	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
2249	–	"Couldn't generate keyphrase");
2250	–	return;
2251	–	}
2252	–
2253	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
2254	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
2255	–	(unsigned char *)randkey,
2256	–	(unsigned char *)encrypted,
2257	–	aconf->rsa_public_key,
2258	–	RSA_PKCS1_PADDING);
2259	–
2260	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
2261	–
2262	–	if (enc_len <= 0)
2263	–	{
2264	–	report_crypto_errors();
2265	–	MyFree(encrypted);
2266	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
2267	–	"Couldn't encrypt data");
2268	–	return;
2269	–	}
2270	–
2271	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
2272	–	{
2273	–	MyFree(encrypted);
2274	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
2275	–	"Couldn't base64 encode key");
2276	–	return;
2277	–	}
2278	–
2279	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2280	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
2281	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
2282	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
2283	–
2284	–	if (me.id[0])
2285	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
2286	–
2287	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
2288	–	my_name_for_link(conf), key_to_send,
2289	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
2290	–
2291	–	SetHandshake(client_p);
2292	–	SetWaitAuth(client_p);
2293	–
2294	–	MyFree(encrypted);
2295	–	MyFree(key_to_send);
2296	–
2297	–	if (IsDead(client_p))
2298	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
2299	–	"Went dead during handshake");
2300	–	else if (fd != NULL)
2301	–	/* If we get here, we're ok, so lets start reading some data */
2302	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
2303	–	}
2304	–
2305	–	void
2306	–	cryptlink_error(struct Client *client_p, const char *type,
2307	–	const char *reason, const char *client_reason)
2308	–	{
2309	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2310	–	get_client_name(client_p, SHOW_IP), type, reason);
2311	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2312	–	get_client_name(client_p, MASK_IP), type, reason);
2313	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2314	–	get_client_name(client_p, SHOW_IP), type, reason);
2315	–
2316	–	/* If client_reason isn't NULL, then exit the client with the message
2317	–	* defined in the call.
2318	–	*/
2319	–	if ((client_reason != NULL) && (!IsDead(client_p)))
2320	–	exit_client(client_p, &me, client_reason);
2321	–	}
2322	–
2323	–	static char base64_chars[] =
2324	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2325	–
2326	–	static char base64_values[] =
2327	–	{
2328	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2329	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2330	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2331	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2332	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2333	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2334	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2335	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2336	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2337	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2338	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2339	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2340	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2341	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2342	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2343	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2344	–	};
2345	–
2346	–	/*
2347	–	* base64_block will allocate and return a new block of memory
2348	–	* using MyMalloc().  It should be freed after use.
2349	–	*/
2350	–	int
2351	–	base64_block(unsigned char **output, char *data, int len)
2352	–	{
2353	–	unsigned char *out;
2354	–	unsigned char *in = (unsigned char*)data;
2355	–	unsigned long int q_in;
2356	–	int i;
2357	–	int count = 0;
2358	–
2359	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2360	–
2361	–	/* process 24 bits at a time */
2362	–	for( i = 0; i < len; i += 3)
2363	–	{
2364	–	q_in = 0;
2365	–
2366	–	if ( i + 2 < len )
2367	–	{
2368	–	q_in  = (in[i+2] & 0xc0) << 2;
2369	–	q_in |=  in[i+2];
2370	–	}
2371	–
2372	–	if ( i + 1 < len )
2373	–	{
2374	–	q_in |= (in[i+1] & 0x0f) << 10;
2375	–	q_in |= (in[i+1] & 0xf0) << 12;
2376	–	}
2377	–
2378	–	q_in |= (in[i]   & 0x03) << 20;
2379	–	q_in |=  in[i]           << 22;
2380	–
2381	–	q_in &= 0x3f3f3f3f;
2382	–
2383	–	out[count++] = base64_chars[((q_in >> 24)       )];
2384	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2385	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2386	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2387	–	}
2388	–	if ( (i - len) > 0 )
2389	–	{
2390	–	out[count-1] = '=';
2391	–	if ( (i - len) > 1 )
2392	–	out[count-2] = '=';
2393	–	}
2394	–
2395	–	out[count] = '\0';
2396	–	*output = out;
2397	–	return (count);
2398	–	}
1031
1032	<	/*
2401	<	* unbase64_block will allocate and return a new block of memory
2402	<	* using MyMalloc().  It should be freed after use.
2403	<	*/
2404	<	int
2405	<	unbase64_block(unsigned char **output, char *data, int len)
2406	<	{
2407	<	unsigned char *out;
2408	<	unsigned char *in = (unsigned char*)data;
2409	<	unsigned long int q_in;
2410	<	int i;
2411	<	int count = 0;
2412	<
2413	<	if ((len % 4) != 0)
2414	<	return (0);
2415	<
2416	<	out = MyMalloc(((len / 4) * 3) + 1);
2417	<
2418	<	/* process 32 bits at a time */
2419	<	for( i = 0; (i + 3) < len; i+=4)
2420	<	{
2421	<	/* compress input (chars a, b, c and d) as follows:
2422	<	* (after converting ascii -> base64 value)
2423	<	*
2424	<	* |00000000aaaaaabbbbbbccccccdddddd|
2425	<	* |  765432  107654  321076  543210|
2426	<	*/
2427	<
2428	<	q_in = 0;
2429	<
2430	<	if (base64_values[in[i+3]] > -1)
2431	<	q_in |= base64_values[in[i+3]]      ;
2432	<	if (base64_values[in[i+2]] > -1)
2433	<	q_in |= base64_values[in[i+2]] <<  6;
2434	<	if (base64_values[in[i+1]] > -1)
2435	<	q_in |= base64_values[in[i+1]] << 12;
2436	<	if (base64_values[in[i  ]] > -1)
2437	<	q_in |= base64_values[in[i  ]] << 18;
2438	<
2439	<	out[count++] = (q_in >> 16) & 0xff;
2440	<	out[count++] = (q_in >>  8) & 0xff;
2441	<	out[count++] = (q_in      ) & 0xff;
2442	<	}
2443	<
2444	<	if (in[i-1] == '=') count--;
2445	<	if (in[i-2] == '=') count--;
2446	<
2447	<	out[count] = '\0';
2448	<	*output = out;
2449	<	return (count);
1032	>	return NULL;
1033		}
2451	–
2452	–	#endif /* HAVE_LIBCRYPTO */
2453	–

Diff Legend

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