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 42 by adx, Sun Oct 2 23:25:27 2005 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2182 by michael, Tue Jun 4 12:19:04 2013 UTC

#	Line 27 | Line 27
27		#include <openssl/rsa.h>
28		#include "rsa.h"
29		#endif
30	<	#include "tools.h"
30	>	#include "list.h"
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
34	–	#include "common.h"
34		#include "dbuf.h"
35		#include "event.h"
36		#include "fdlist.h"
37		#include "hash.h"
38		#include "irc_string.h"
40	–	#include "inet_misc.h"
41	–	#include "sprintf_irc.h"
39		#include "ircd.h"
40		#include "ircd_defs.h"
41		#include "s_bsd.h"
45	–	#include "irc_getnameinfo.h"
46	–	#include "list.h"
42		#include "numeric.h"
43		#include "packet.h"
44		#include "irc_res.h"
45	<	#include "s_conf.h"
45	>	#include "conf.h"
46		#include "s_serv.h"
47	<	#include "s_log.h"
48	<	#include "s_stats.h"
47	>	#include "log.h"
48	>	#include "s_misc.h"
49		#include "s_user.h"
50		#include "send.h"
51		#include "memory.h"
52		#include "channel.h" /* chcap_usage_counts stuff...*/
53	+	#include "parse.h"
54
55		#define MIN_CONN_FREQ 300
56
57	<	struct Client *uplink  = NULL;
62	<
63	<
57	>	dlink_list flatten_links;
58		static dlink_list cap_list = { NULL, NULL, 0 };
65	–	static unsigned long freeMask;
59		static void server_burst(struct Client *);
67	–	static int fork_server(struct Client *);
60		static void burst_all(struct Client *);
69	–	static void cjoin_all(struct Client *);
61		static void send_tb(struct Client *client_p, struct Channel *chptr);
62
63		static CNCB serv_connect_callback;
64
74	–	static void start_io(struct Client *);
65		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;
231	–
232	–	/* Use connect{} specific info if available */
233	–	if (aconf->cipher_preference)
234	–	epref = aconf->cipher_preference;
235	–	else
236	–	epref = ConfigFileEntry.default_cipher_preference;
237	–
238	–	/* If the server supports the capability in hand, return the matching
239	–	* conf struct.  Otherwise, return NULL (an error).
240	–	*/
241	–	if (IsCapableEnc(client_p, epref->cap))
242	–	return(epref);
243	–
244	–	return(NULL);
245	–	}
246	–	#endif /* HAVE_LIBCRYPTO */
247	–
248	–	/* my_name_for_link()
249	–	* return wildcard name of my server name
250	–	* according to given config entry --Jto
251	–	*/
252	–	const char *
253	–	my_name_for_link(struct ConfItem *conf)
254	–	{
255	–	struct AccessItem *aconf;
256	–
257	–	aconf = (struct AccessItem *)map_to_conf(conf);
258	–	if (aconf->fakename != NULL)
259	–	return(aconf->fakename);
260	–	else
261	–	return(me.name);
262	–	}
66
67		/*
68		* write_links_file
#	Line 270 | Line 73 | my_name_for_link(struct ConfItem *conf)
73		*                but in no particular order.
74		*/
75		void
76	<	write_links_file(void* notused)
76	>	write_links_file(void *notused)
77		{
78	<	MessageFileLine *next_mptr = 0;
79	<	MessageFileLine *mptr = 0;
80	<	MessageFileLine *currentMessageLine = 0;
278	<	MessageFileLine *newMessageLine = 0;
279	<	MessageFile *MessageFileptr;
280	<	const char *p;
281	<	FBFILE *file;
282	<	char buff[512];
283	<	dlink_node *ptr;
78	>	FILE *file = NULL;
79	>	dlink_node *ptr = NULL, *ptr_next = NULL;;
80	>	char buff[IRCD_BUFSIZE] = { '\0' };
81
82	<	MessageFileptr = &ConfigFileEntry.linksfile;
286	<
287	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
82	>	if ((file = fopen(LIPATH, "w")) == NULL)
83		return;
84
85	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
85	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
86		{
87	<	next_mptr = mptr->next;
88	<	MyFree(mptr);
87	>	dlinkDelete(ptr, &flatten_links);
88	>	MyFree(ptr->data);
89	>	free_dlink_node(ptr);
90		}
91
296	–	MessageFileptr->contentsOfFile = NULL;
297	–	currentMessageLine             = NULL;
298	–
92		DLINK_FOREACH(ptr, global_serv_list.head)
93		{
94	<	size_t nbytes = 0;
302	<	struct Client *target_p = ptr->data;
94	>	const struct Client *target_p = ptr->data;
95
96	<	/* skip ourselves, we send ourselves in /links */
97	<	if (IsMe(target_p))
96	>	/*
97	>	* Skip hidden servers, aswell as ourselves, since we already send
98	>	* ourselves in /links
99	>	*/
100	>	if (IsHidden(target_p) || IsMe(target_p))
101		continue;
102
103	<	/* skip hidden servers */
309	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
103	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
104		continue;
105
106	<	if (target_p->info[0])
107	<	p = target_p->info;
314	<	else
315	<	p = "(Unknown Location)";
316	<
317	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
318	<
319	<	/* Attempt to format the file in such a way it follows the usual links output
106	>	/*
107	>	* Attempt to format the file in such a way it follows the usual links output
108		* ie  "servername uplink :hops info"
109		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
110		* - madmax
111		*/
112	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
113	+	me.name, target_p->info);
114	+	dlinkAdd(xstrdup(buff), make_dlink_node(), &flatten_links);
115	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
116	+	me.name, target_p->info);
117
118	<	/*
326	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
327	<	* default config but it is configurable..
328	<	* This should be changed to an snprintf at some point, but I'm wanting to
329	<	* know if this is a cause of a bug - cryogen
330	<	*/
331	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
332	<	MESSAGELINELEN);
333	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
334	<	target_p->name, me.name, p);
335	<	newMessageLine->next = NULL;
336	<
337	<	if (MessageFileptr->contentsOfFile)
338	<	{
339	<	if (currentMessageLine)
340	<	currentMessageLine->next = newMessageLine;
341	<	currentMessageLine = newMessageLine;
342	<	}
343	<	else
344	<	{
345	<	MessageFileptr->contentsOfFile = newMessageLine;
346	<	currentMessageLine = newMessageLine;
347	<	}
348	<
349	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
350	<	fbputs(buff, file, nbytes);
118	>	fputs(buff, file);
119		}
120
121	<	fbclose(file);
121	>	fclose(file);
122		}
123
124		/* hunt_server()
#	Line 374 | Line 142 | write_links_file(void* notused)
142		*/
143		int
144		hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
145	<	int server, int parc, char *parv[])
145	>	const int server, const int parc, char *parv[])
146		{
147		struct Client *target_p = NULL;
148		struct Client *target_tmp = NULL;
149		dlink_node *ptr;
150		int wilds;
151
152	<	/* Assume it's me, if no server
153	<	*/
154	<	if (parc <= server || EmptyString(parv[server]) ||
155	<	match(me.name, parv[server]) ||
156	<	match(parv[server], me.name) ||
157	<	!strcmp(parv[server], me.id))
390	<	return(HUNTED_ISME);
152	>	/* Assume it's me, if no server */
153	>	if (parc <= server || EmptyString(parv[server]))
154	>	return HUNTED_ISME;
155	>
156	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
157	>	return HUNTED_ISME;
158
159		/* These are to pickup matches that would cause the following
160		* message to go in the wrong direction while doing quick fast
161		* non-matching lookups.
162		*/
163		if (MyClient(source_p))
164	<	target_p = find_client(parv[server]);
164	>	target_p = hash_find_client(parv[server]);
165		else
166		target_p = find_person(client_p, parv[server]);
167
#	Line 402 | Line 169 | hunt_server(struct Client *client_p, str
169		if (target_p->from == source_p->from && !MyConnect(target_p))
170		target_p = NULL;
171
172	<	if (target_p == NULL && (target_p = find_server(parv[server])))
172	>	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
173		if (target_p->from == source_p->from && !MyConnect(target_p))
174		target_p = NULL;
175
176	<	collapse(parv[server]);
410	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
176	>	wilds = has_wildcards(parv[server]);
177
178		/* Again, if there are no wild cards involved in the server
179		* name, use the hash lookup
#	Line 416 | Line 182 | hunt_server(struct Client *client_p, str
182		{
183		if (!wilds)
184		{
185	<	if (!(target_p = find_server(parv[server])))
185	>	if (!(target_p = hash_find_server(parv[server])))
186		{
187		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
188	<	me.name, parv[0], parv[server]);
189	<	return(HUNTED_NOSUCH);
188	>	me.name, source_p->name, parv[server]);
189	>	return HUNTED_NOSUCH;
190		}
191		}
192		else
#	Line 429 | Line 195 | hunt_server(struct Client *client_p, str
195		{
196		target_tmp = ptr->data;
197
198	<	if (match(parv[server], target_tmp->name))
198	>	if (!match(parv[server], target_tmp->name))
199		{
200		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
201		continue;
#	Line 447 | Line 213 | hunt_server(struct Client *client_p, str
213		if(!IsRegistered(target_p))
214		{
215		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
216	<	me.name, parv[0], parv[server]);
216	>	me.name, source_p->name, parv[server]);
217		return HUNTED_NOSUCH;
218		}
219
220		if (IsMe(target_p) || MyClient(target_p))
221		return HUNTED_ISME;
222
223	<	if (!match(target_p->name, parv[server]))
223	>	if (match(target_p->name, parv[server]))
224		parv[server] = target_p->name;
225
460	–	/* Deal with lazylinks */
461	–	client_burst_if_needed(target_p, source_p);
462	–
226		/* This is a little kludgy but should work... */
227		if (IsClient(source_p) &&
228		((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
#	Line 469 | Line 232 | hunt_server(struct Client *client_p, str
232		sendto_one(target_p, command, parv[0],
233		parv[1], parv[2], parv[3], parv[4],
234		parv[5], parv[6], parv[7], parv[8]);
235	<	return(HUNTED_PASS);
235	>	return HUNTED_PASS;
236		}
237
238		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
239	<	me.name, parv[0], parv[server]);
240	<	return(HUNTED_NOSUCH);
239	>	me.name, source_p->name, parv[server]);
240	>	return HUNTED_NOSUCH;
241		}
242
243		/* try_connections()
#	Line 490 | Line 253 | hunt_server(struct Client *client_p, str
253		void
254		try_connections(void *unused)
255		{
256	<	dlink_node *ptr;
257	<	struct ConfItem *conf;
495	<	struct AccessItem *aconf;
496	<	struct ClassItem *cltmp;
256	>	dlink_node *ptr = NULL;
257	>	struct MaskItem *conf;
258		int confrq;
259
260		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 503 | Line 264 | try_connections(void *unused)
264		DLINK_FOREACH(ptr, server_items.head)
265		{
266		conf = ptr->data;
267	<	aconf = (struct AccessItem *)map_to_conf(conf);
267	>
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 ||
511	<	!(IsConfAllowAutoConn(aconf)))
272	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
273		continue;
274
514	–	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 519 | 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
297		* and see if this server is already connected?
298		*/
299	<	if (find_server(conf->name) != NULL)
299	>	if (hash_find_server(conf->name) != NULL)
300		continue;
301
302	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
302	>	if (conf->class->ref_count < conf->class->max_total)
303		{
304		/* Go to the end of the list, if not already last */
305		if (ptr->next != NULL)
#	Line 560 | Line 320 | try_connections(void *unused)
320		*   -- adrian
321		*/
322		if (ConfigServerHide.hide_server_ips)
323	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
323	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
324	>	"Connection to %s activated.",
325		conf->name);
326		else
327	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
328	<	conf->name, aconf->host);
327	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
328	>	"Connection to %s[%s] activated.",
329	>	conf->name, conf->host);
330
331	<	serv_connect(aconf, NULL);
331	>	serv_connect(conf, NULL);
332		/* We connect only one at time... */
333		return;
334		}
#	Line 574 | Line 336 | try_connections(void *unused)
336		}
337
338		int
339	<	check_server(const char *name, struct Client *client_p, int cryptlink)
339	>	valid_servname(const char *name)
340	>	{
341	>	unsigned int length = 0;
342	>	unsigned int dots   = 0;
343	>	const char *p = name;
344	>
345	>	for (; *p; ++p)
346	>	{
347	>	if (!IsServChar(*p))
348	>	return 0;
349	>
350	>	++length;
351	>
352	>	if (*p == '.')
353	>	++dots;
354	>	}
355	>
356	>	return dots != 0 && length <= HOSTLEN;
357	>	}
358	>
359	>	int
360	>	check_server(const char *name, struct Client *client_p)
361		{
362		dlink_node *ptr;
363	<	struct ConfItem *conf           = NULL;
364	<	struct ConfItem *server_conf    = NULL;
582	<	struct AccessItem *server_aconf = NULL;
583	<	struct AccessItem *aconf        = NULL;
363	>	struct MaskItem *conf        = NULL;
364	>	struct MaskItem *server_conf = NULL;
365		int error = -1;
366
367		assert(client_p != NULL);
368
588	–	if (client_p == NULL)
589	–	return(error);
590	–
591	–	if (strlen(name) > HOSTLEN)
592	–	return(-4);
593	–
369		/* loop through looking for all possible connect items that might work */
370		DLINK_FOREACH(ptr, server_items.head)
371		{
372		conf = ptr->data;
598	–	aconf = (struct AccessItem *)map_to_conf(conf);
373
374	<	if (!match(name, conf->name))
374	>	if (match(name, conf->name))
375		continue;
376
377		error = -3;
378
379		/* XXX: Fix me for IPv6                    */
380		/* XXX sockhost is the IPv4 ip as a string */
381	<	if (match(aconf->host, client_p->host) ||
382	<	match(aconf->host, client_p->sockhost))
381	>	if (!match(conf->host, client_p->host) ||
382	>	!match(conf->host, client_p->sockhost))
383		{
384		error = -2;
611	–	#ifdef HAVE_LIBCRYPTO
612	–	if (cryptlink && IsConfCryptLink(aconf))
613	–	{
614	–	if (aconf->rsa_public_key)
615	–	server_conf = conf;
616	–	}
617	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
618	–	#endif /* HAVE_LIBCRYPTO */
619	–	{
620	–	/* A NULL password is as good as a bad one */
621	–	if (EmptyString(client_p->localClient->passwd))
622	–	return(-2);
623	–
624	–	/* code in s_conf.c should not have allowed this to be NULL */
625	–	if (aconf->passwd == NULL)
626	–	return(-2);
385
386	<	if (IsConfEncrypted(aconf))
387	<	{
388	<	if (strcmp(aconf->passwd,
389	<	(const char *)crypt(client_p->localClient->passwd,
632	<	aconf->passwd)) == 0)
633	<	server_conf = conf;
634	<	}
635	<	else
636	<	{
637	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
638	<	server_conf = conf;
639	<	}
640	<	}
386	>	if (!match_conf_password(client_p->localClient->passwd, conf))
387	>	return -2;
388	>
389	>	server_conf = conf;
390		}
391		}
392
393		if (server_conf == NULL)
394	<	return(error);
394	>	return error;
395
396		attach_conf(client_p, server_conf);
397
649	–	/* Now find all leaf or hub config items for this server */
650	–	DLINK_FOREACH(ptr, hub_items.head)
651	–	{
652	–	conf = ptr->data;
653	–
654	–	if (!match(name, conf->name))
655	–	continue;
656	–	attach_conf(client_p, conf);
657	–	}
398
399	<	DLINK_FOREACH(ptr, leaf_items.head)
660	<	{
661	<	conf = ptr->data;
662	<
663	<	if (!match(name, conf->name))
664	<	continue;
665	<	attach_conf(client_p, conf);
666	<	}
667	<
668	<	server_aconf = (struct AccessItem *)map_to_conf(server_conf);
669	<
670	<	if (!IsConfLazyLink(server_aconf))
671	<	ClearCap(client_p, CAP_LL);
672	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
673	<	if (!IsConfCompressed(server_aconf))
674	<	#endif
675	<	ClearCap(client_p, CAP_ZIP);
676	<	if (!IsConfCryptLink(server_aconf))
677	<	ClearCap(client_p, CAP_ENC);
678	<	if (!IsConfTopicBurst(server_aconf))
679	<	ClearCap(client_p, CAP_TB);
680	<
681	<	/* Don't unset CAP_HUB here even if the server isn't a hub,
682	<	* it only indicates if the server thinks it's lazylinks are
683	<	* leafs or not.. if you unset it, bad things will happen
684	<	*/
685	<	if (aconf != NULL)
399	>	if (server_conf != NULL)
400		{
401		struct sockaddr_in *v4;
402		#ifdef IPV6
403		struct sockaddr_in6 *v6;
404		#endif
405	<	switch (aconf->aftype)
405	>	switch (server_conf->aftype)
406		{
407		#ifdef IPV6
408		case AF_INET6:
409	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
409	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
410
411		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
412	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
412	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
413		break;
414		#endif
415		case AF_INET:
416	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
416	>	v4 = (struct sockaddr_in *)&server_conf->addr;
417
418		if (v4->sin_addr.s_addr == INADDR_NONE)
419	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
419	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
420		break;
421		}
422		}
423
424	<	return(0);
424	>	return 0;
425		}
426
427		/* add_capability()
#	Line 722 | Line 436 | check_server(const char *name, struct Cl
436		void
437		add_capability(const char *capab_name, int cap_flag, int add_to_default)
438		{
439	<	struct Capability *cap;
439	>	struct Capability *cap = MyMalloc(sizeof(*cap));
440
441	<	cap = (struct Capability *)MyMalloc(sizeof(*cap));
728	<	DupString(cap->name, capab_name);
441	>	cap->name = xstrdup(capab_name);
442		cap->cap = cap_flag;
443		dlinkAdd(cap, &cap->node, &cap_list);
444	+
445		if (add_to_default)
446		default_server_capabs |= cap_flag;
447		}
#	Line 753 | Line 467 | delete_capability(const char *capab_name
467		{
468		if (irccmp(cap->name, capab_name) == 0)
469		{
470	<	default_server_capabs &= ~(cap->cap);
471	<	dlinkDelete(ptr, &cap_list);
472	<	MyFree(cap->name);
473	<	cap->name = NULL;
760	<	MyFree(cap);
470	>	default_server_capabs &= ~(cap->cap);
471	>	dlinkDelete(ptr, &cap_list);
472	>	MyFree(cap->name);
473	>	MyFree(cap);
474		}
475		}
476		}
477
478	<	return(0);
478	>	return 0;
479		}
480
481		/*
#	Line 772 | Line 485 | delete_capability(const char *capab_name
485		* output       - 0 if not found CAPAB otherwise
486		* side effects - none
487		*/
488	<	int
488	>	unsigned int
489		find_capability(const char *capab)
490		{
491	<	dlink_node *ptr;
779	<	struct Capability *cap;
491	>	const dlink_node *ptr = NULL;
492
493		DLINK_FOREACH(ptr, cap_list.head)
494		{
495	<	cap = ptr->data;
495	>	const struct Capability *cap = ptr->data;
496
497	<	if (cap->cap != 0)
498	<	{
787	<	if (irccmp(cap->name, capab) == 0)
788	<	return(cap->cap);
789	<	}
497	>	if (cap->cap && !irccmp(cap->name, capab))
498	>	return cap->cap;
499		}
500	<	return(0);
500	>
501	>	return 0;
502		}
503
504		/* send_capabilities()
505		*
506		* inputs       - Client pointer to send to
797	–	*              - Pointer to AccessItem (for crypt)
507		*              - int flag of capabilities that this server can send
799	–	*              - int flag of encryption capabilities
508		* output       - NONE
509		* side effects - send the CAPAB line to a server  -orabidoo
510		*
511		*/
512		void
513	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
806	<	int cap_can_send, int enc_can_send)
513	>	send_capabilities(struct Client *client_p, int cap_can_send)
514		{
515		struct Capability *cap=NULL;
516		char msgbuf[IRCD_BUFSIZE];
517		char *t;
518		int tl;
519		dlink_node *ptr;
813	–	#ifdef HAVE_LIBCRYPTO
814	–	struct EncCapability *epref;
815	–	char *capend;
816	–	int sent_cipher = 0;
817	–	#endif
520
521		t = msgbuf;
522
#	Line 824 | Line 526 | send_capabilities(struct Client *client_
526
527		if (cap->cap & (cap_can_send|default_server_capabs))
528		{
529	<	tl = ircsprintf(t, "%s ", cap->name);
529	>	tl = sprintf(t, "%s ", cap->name);
530		t += tl;
531		}
532		}
831	–	#ifdef HAVE_LIBCRYPTO
832	–	if (enc_can_send)
833	–	{
834	–	capend = t;
835	–	strcpy(t, "ENC:");
836	–	t += 4;
837	–
838	–	/* use connect{} specific info if available */
839	–	if (aconf->cipher_preference)
840	–	epref = aconf->cipher_preference;
841	–	else
842	–	epref = ConfigFileEntry.default_cipher_preference;
533
534	<	if ((epref->cap & enc_can_send))
845	<	{
846	<	/* Leave the space -- it is removed later. */
847	<	tl = ircsprintf(t, "%s ", epref->name);
848	<	t += tl;
849	<	sent_cipher = 1;
850	<	}
851	<
852	<	if (!sent_cipher)
853	<	t = capend; /* truncate string before ENC:, below */
854	<	}
855	<	#endif
856	<	*(t-1) = '\0';
534	>	*(t - 1) = '\0';
535		sendto_one(client_p, "CAPAB :%s", msgbuf);
536		}
537
538		/* sendnick_TS()
539		*
540		* inputs       - client (server) to send nick towards
541	<	*              - client to send nick for
541	>	*          - client to send nick for
542		* output       - NONE
543		* side effects - NICK message is sent towards given client_p
544		*/
#	Line 872 | Line 550 | sendnick_TS(struct Client *client_p, str
550		if (!IsClient(target_p))
551		return;
552
553	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
876	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
553	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
554
555		if (ubuf[0] == '\0')
556		{
#	Line 881 | Line 558 | sendnick_TS(struct Client *client_p, str
558		ubuf[1] = '\0';
559		}
560
561	<	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
562	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
563	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
564	<	target_p->servptr->id,
565	<	target_p->name, target_p->hopcount + 1,
566	<	(unsigned long) target_p->tsinfo,
567	<	ubuf, target_p->username, target_p->host,
568	<	((MyClient(target_p)&&!IsIPSpoof(target_p))?target_p->sockhost:"0"),
569	<	target_p->id, target_p->info);
561	>	if (IsCapable(client_p, CAP_SVS))
562	>	{
563	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
564	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
565	>	target_p->servptr->id,
566	>	target_p->name, target_p->hopcount + 1,
567	>	(unsigned long) target_p->tsinfo,
568	>	ubuf, target_p->username, target_p->host,
569	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
570	>	"0" : target_p->sockhost, target_p->id,
571	>	target_p->svid, target_p->info);
572	>	else
573	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
574	>	target_p->name, target_p->hopcount + 1,
575	>	(unsigned long) target_p->tsinfo,
576	>	ubuf, target_p->username, target_p->host,
577	>	target_p->servptr->name, target_p->svid,
578	>	target_p->info);
579	>	}
580		else
894	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
895	–	target_p->name, target_p->hopcount + 1,
896	–	(unsigned long) target_p->tsinfo,
897	–	ubuf, target_p->username, target_p->host,
898	–	target_p->servptr->name, target_p->info);
899	–	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
900	–	if (!EmptyString(target_p->away))
901	–	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
902	–	target_p->away);
903	–
904	–	}
905	–
906	–	/* client_burst_if_needed()
907	–	*
908	–	* inputs       - pointer to server
909	–	*              - pointer to client to add
910	–	* output       - NONE
911	–	* side effects - If this client is not known by this lazyleaf, send it
912	–	*/
913	–	void
914	–	client_burst_if_needed(struct Client *client_p, struct Client *target_p)
915	–	{
916	–	if (!ServerInfo.hub)
917	–	return;
918	–	if (!MyConnect(client_p))
919	–	return;
920	–	if (!IsCapable(client_p,CAP_LL))
921	–	return;
922	–
923	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
581		{
582	<	sendnick_TS(client_p, target_p);
583	<	add_lazylinkclient(client_p,target_p);
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",
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, target_p->info);
590	>	else
591	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
592	>	target_p->name, target_p->hopcount + 1,
593	>	(unsigned long) target_p->tsinfo,
594	>	ubuf, target_p->username, target_p->host,
595	>	target_p->servptr->name, target_p->info);
596		}
597	+
598	+	if (target_p->away[0])
599	+	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
600	+	target_p->away);
601	+
602		}
603
604		/*
#	Line 941 | Line 615 | show_capabilities(struct Client *target_
615		char *t = msgbuf;
616		dlink_node *ptr;
617
618	<	t += ircsprintf(msgbuf, "TS ");
618	>	t += sprintf(msgbuf, "TS ");
619
620		DLINK_FOREACH(ptr, cap_list.head)
621		{
622		const struct Capability *cap = ptr->data;
623
624		if (IsCapable(target_p, cap->cap))
625	<	t += ircsprintf(t, "%s ", cap->name);
625	>	t += sprintf(t, "%s ", cap->name);
626		}
953	–	#ifdef HAVE_LIBCRYPTO
954	–	if (IsCapable(target_p, CAP_ENC) &&
955	–	target_p->localClient->in_cipher &&
956	–	target_p->localClient->out_cipher)
957	–	t += ircsprintf(t, "ENC:%s ",
958	–	target_p->localClient->in_cipher->name);
959	–	#endif
960	–	*(t - 1) = '\0';
627
628	<	return(msgbuf);
628	>	*(t - 1) = '\0';
629	>	return msgbuf;
630		}
631
632		/* make_server()
#	Line 973 | Line 640 | struct Server *
640		make_server(struct Client *client_p)
641		{
642		if (client_p->serv == NULL)
976	–	{
643		client_p->serv = MyMalloc(sizeof(struct Server));
978	–	client_p->serv->dep_servers = 1;
979	–	}
644
645		return client_p->serv;
646		}
#	Line 991 | Line 655 | void
655		server_estab(struct Client *client_p)
656		{
657		struct Client *target_p;
658	<	struct ConfItem *conf;
995	<	struct AccessItem *aconf=NULL;
658	>	struct MaskItem *conf = NULL;
659		char *host;
660		const char *inpath;
661		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
999	–	dlink_node *m;
662		dlink_node *ptr;
663	+	#ifdef HAVE_LIBCRYPTO
664	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
665	+	#endif
666
667		assert(client_p != NULL);
668
#	Line 1006 | Line 671 | server_estab(struct Client *client_p)
671		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
672		host   = client_p->name;
673
674	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
674	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
675		== NULL)
676		{
677		/* This shouldn't happen, better tell the ops... -A1kmm */
678	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
678	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
679	>	"Warning: Lost connect{} block "
680		"for server %s(this shouldn't happen)!", host);
681		exit_client(client_p, &me, "Lost connect{} block!");
682		return;
#	Line 1029 | Line 695 | server_estab(struct Client *client_p)
695		{
696		if (client_p != serv_list.head->data || serv_list.head->next)
697		{
698	<	ServerStats->is_ref++;
698	>	++ServerStats.is_ref;
699		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
700		exit_client(client_p, &me, "I'm a leaf");
701		return;
702		}
703		}
704
705	<	aconf = (struct AccessItem *)map_to_conf(conf);
1040	<
1041	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
705	>	if (IsUnknown(client_p))
706		{
707	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1044	<	*        2.  Check aconf->spasswd, not aconf->passwd.
1045	<	*/
1046	<	if (!EmptyString(aconf->spasswd))
1047	<	{
1048	<	/* only send ts6 format PASS if we have ts6 enabled */
1049	<	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1050	<	sendto_one(client_p, "PASS %s TS %d %s",
1051	<	aconf->spasswd, TS_CURRENT, me.id);
1052	<	else
1053	<	sendto_one(client_p, "PASS %s TS 5",
1054	<	aconf->spasswd);
1055	<	}
707	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
708
709	<	/* Pass my info to the new server
1058	<	*
1059	<	* If trying to negotiate LazyLinks, pass on CAP_LL
1060	<	* If this is a HUB, pass on CAP_HUB
1061	<	* Pass on ZIP if supported
1062	<	* Pass on TB if supported.
1063	<	* - Dianora
1064	<	*/
709	>	send_capabilities(client_p, 0);
710
1066	–	send_capabilities(client_p, aconf,
1067	–	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
1068	–	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
1069	–	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
1070	–	, 0);
1071	–
1072	–	/* SERVER is the last command sent before switching to ziplinks.
1073	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1074	–	* on the wire immediately.  Otherwise, it could be sitting in
1075	–	* a kernel buffer when we start sending zipped data, and the
1076	–	* parser on the receiving side can't hand both unzipped and zipped
1077	–	* data in one packet. --Rodder
1078	–	*
1079	–	* currently we only need to call send_queued_write,
1080	–	* Nagle is already disabled at this point --adx
1081	–	*/
711		sendto_one(client_p, "SERVER %s 1 :%s%s",
712	<	my_name_for_link(conf),
1084	<	ConfigServerHide.hidden ? "(H) " : "",
1085	<	(me.info[0]) ? (me.info) : "IRCers United");
1086	<	send_queued_write(client_p);
712	>	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
713		}
714
715	<	/* Hand the server off to servlink now */
1090	<	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1091	<	{
1092	<	if (fork_server(client_p) < 0)
1093	<	{
1094	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1095	<	"Warning: fork failed for server %s -- check servlink_path (%s)",
1096	<	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1097	<	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1098	<	"%s -- check servlink_path (%s)",
1099	<	get_client_name(client_p, MASK_IP),
1100	<	ConfigFileEntry.servlink_path);
1101	<	exit_client(client_p, &me, "fork failed");
1102	<	return;
1103	<	}
1104	<
1105	<	start_io(client_p);
1106	<	SetServlink(client_p);
1107	<	}
1108	<
1109	<	/* only send ts6 format SVINFO if we have ts6 enabled */
1110	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1111	<	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
715	>	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
716		(unsigned long)CurrentTime);
717
718		/* assumption here is if they passed the correct TS version, they also passed an SID */
#	Line 1116 | Line 720 | server_estab(struct Client *client_p)
720		hash_add_id(client_p);
721
722		/* XXX Does this ever happen? I don't think so -db */
723	<	detach_conf(client_p, OPER_TYPE);
723	>	detach_conf(client_p, CONF_OPER);
724
725		/* *WARNING*
726		**    In the following code in place of plain server's
#	Line 1140 | Line 744 | server_estab(struct Client *client_p)
744		set_chcap_usage_counts(client_p);
745
746		/* Some day, all these lists will be consolidated *sigh* */
747	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
747	>	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
748
749	<	m = dlinkFind(&unknown_list, client_p);
1146	<	assert(NULL != m);
749	>	assert(dlinkFind(&unknown_list, client_p));
750
751	<	dlinkDelete(m, &unknown_list);
752	<	dlinkAdd(client_p, m, &serv_list);
751	>	dlink_move_node(&client_p->localClient->lclient_node,
752	>	&unknown_list, &serv_list);
753
754		Count.myserver++;
755
#	Line 1157 | Line 760 | server_estab(struct Client *client_p)
760		make_server(client_p);
761
762		/* fixing eob timings.. -gnp */
763	<	client_p->firsttime = CurrentTime;
1161	<
1162	<	/* Show the real host/IP to admins */
1163	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1164	<	"Link with %s established: (%s) link",
1165	<	inpath_ip,show_capabilities(client_p));
1166	<	/* Now show the masked hostname/IP to opers */
1167	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1168	<	"Link with %s established: (%s) link",
1169	<	inpath,show_capabilities(client_p));
1170	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1171	<	inpath_ip, show_capabilities(client_p));
763	>	client_p->localClient->firsttime = CurrentTime;
764
765	<	client_p->serv->sconf = conf;
765	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
766	>	AddFlag(client_p, FLAGS_SERVICE);
767
768	<	if (HasServlink(client_p))
768	>	/* Show the real host/IP to admins */
769	>	#ifdef HAVE_LIBCRYPTO
770	>	if (client_p->localClient->fd.ssl)
771		{
772	<	/* we won't overflow FD_DESC_SZ here, as it can hold
773	<	* client_p->name + 64
774	<	*/
775	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
776	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
772	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
773	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
774	>
775	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
776	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
777	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
778	>	compression ? SSL_COMP_get_name(compression) : "NONE",
779	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
780	>	show_capabilities(client_p));
781	>	/* Now show the masked hostname/IP to opers */
782	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
783	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
784	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
785	>	compression ? SSL_COMP_get_name(compression) : "NONE",
786	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
787	>	show_capabilities(client_p));
788	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
789	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
790	>	compression ? SSL_COMP_get_name(compression) : "NONE",
791	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
792	>	show_capabilities(client_p));
793		}
794		else
795	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
795	>	#endif
796	>	{
797	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
798	>	"Link with %s established: (Capabilities: %s)",
799	>	inpath_ip, show_capabilities(client_p));
800	>	/* Now show the masked hostname/IP to opers */
801	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
802	>	"Link with %s established: (Capabilities: %s)",
803	>	inpath, show_capabilities(client_p));
804	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
805	>	inpath_ip, show_capabilities(client_p));
806	>	}
807	>
808	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
809
810		/* Old sendto_serv_but_one() call removed because we now
811		** need to send different names to different servers
#	Line 1194 | Line 818 | server_estab(struct Client *client_p)
818		if (target_p == client_p)
819		continue;
820
1197	–	if ((conf = target_p->serv->sconf) &&
1198	–	match(my_name_for_link(conf), client_p->name))
1199	–	continue;
1200	–
821		if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
822		sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
823		me.id, client_p->name, client_p->id,
#	Line 1228 | Line 848 | server_estab(struct Client *client_p)
848		**    is destroyed...)
849		*/
850
1231	–	conf = client_p->serv->sconf;
1232	–
851		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
852		{
853		target_p = ptr->data;
854
855		/* target_p->from == target_p for target_p == client_p */
856	<	if (target_p->from == client_p)
1239	<	continue;
1240	<
1241	<	if (match(my_name_for_link(conf), target_p->name))
856	>	if (IsMe(target_p) || target_p->from == client_p)
857		continue;
858
859		if (IsCapable(client_p, CAP_TS6))
#	Line 1257 | Line 872 | server_estab(struct Client *client_p)
872		sendto_one(client_p, ":%s SERVER %s %d :%s%s",
873		target_p->servptr->name, target_p->name, target_p->hopcount+1,
874		IsHidden(target_p) ? "(H) " : "", target_p->info);
1260	–	}
1261	–
1262	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1263	–	uplink = client_p;
1264	–
1265	–	server_burst(client_p);
1266	–	}
1267	–
1268	–	static void
1269	–	start_io(struct Client *server)
1270	–	{
1271	–	struct LocalUser *lserver = server->localClient;
1272	–	int alloclen = 1;
1273	–	char *buf;
1274	–	dlink_node *ptr;
1275	–	struct dbuf_block *block;
1276	–
1277	–	/* calculate how many bytes to allocate */
1278	–	if (IsCapable(server, CAP_ZIP))
1279	–	alloclen += 6;
1280	–	#ifdef HAVE_LIBCRYPTO
1281	–	if (IsCapable(server, CAP_ENC))
1282	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1283	–	#endif
1284	–	alloclen += dbuf_length(&lserver->buf_recvq);
1285	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1286	–	alloclen += dbuf_length(&lserver->buf_sendq);
1287	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1288	–
1289	–	/* initialize servlink control sendq */
1290	–	lserver->slinkq = buf = MyMalloc(alloclen);
1291	–	lserver->slinkq_ofs = 0;
1292	–	lserver->slinkq_len = alloclen;
1293	–
1294	–	if (IsCapable(server, CAP_ZIP))
1295	–	{
1296	–	/* ziplink */
1297	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1298	–	*buf++ = 0; /* |          */
1299	–	*buf++ = 1; /* \ len is 1 */
1300	–	*buf++ = ConfigFileEntry.compression_level;
1301	–	*buf++ = SLINKCMD_START_ZIP_IN;
1302	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1303	–	}
1304	–	#ifdef HAVE_LIBCRYPTO
1305	–	if (IsCapable(server, CAP_ENC))
1306	–	{
1307	–	/* Decryption settings */
1308	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1309	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1310	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1311	–	*buf++ = lserver->in_cipher->cipherid;
1312	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1313	–	*buf++ = 0; /* keylen < 256 */
1314	–	*buf++ = lserver->in_cipher->keylen;
1315	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1316	–	buf += lserver->in_cipher->keylen;
1317	–	/* Encryption settings */
1318	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1319	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1320	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1321	–	*buf++ = lserver->out_cipher->cipherid;
1322	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1323	–	*buf++ = 0; /* keylen < 256 */
1324	–	*buf++ = lserver->out_cipher->keylen;
1325	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1326	–	buf += lserver->out_cipher->keylen;
1327	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1328	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1329	–	}
1330	–	#endif
875
876	<	/* pass the whole recvq to servlink */
877	<	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1334	<	{
1335	<	block = ptr->data;
1336	<	*buf++ = SLINKCMD_INJECT_RECVQ;
1337	<	*buf++ = (block->size >> 8);
1338	<	*buf++ = (block->size & 0xff);
1339	<	memcpy(buf, &block->data[0], block->size);
1340	<	buf += block->size;
876	>	if (HasFlag(target_p, FLAGS_EOB))
877	>	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
878		}
1342	–	dbuf_clear(&lserver->buf_recvq);
1343	–
1344	–	/* pass the whole sendq to servlink */
1345	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1346	–	{
1347	–	block = ptr->data;
1348	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1349	–	*buf++ = (block->size >> 8);
1350	–	*buf++ = (block->size & 0xff);
1351	–	memcpy(buf, &block->data[0], block->size);
1352	–	buf += block->size;
1353	–	}
1354	–	dbuf_clear(&lserver->buf_sendq);
1355	–
1356	–	/* start io */
1357	–	*buf++ = SLINKCMD_INIT;
879
880	<	/* schedule a write */
1360	<	send_queued_slink_write(server);
1361	<	}
1362	<
1363	<	/* fork_server()
1364	<	*
1365	<	* inputs       - struct Client *server
1366	<	* output       - success: 0 / failure: -1
1367	<	* side effect  - fork, and exec SERVLINK to handle this connection
1368	<	*/
1369	<	static int
1370	<	fork_server(struct Client *server)
1371	<	{
1372	<	#ifndef HAVE_SOCKETPAIR
1373	<	return -1;
1374	<	#else
1375	<	int i;
1376	<	int slink_fds[2][2];
1377	<	/* 0? - ctrl  | 1? - data
1378	<	* ?0 - child | ?1 - parent */
1379	<
1380	<	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1381	<	return -1;
1382	<	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1383	<	goto free_ctrl_fds;
1384	<
1385	<	if ((i = fork()) < 0)
1386	<	{
1387	<	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1388	<	free_ctrl_fds:
1389	<	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1390	<	return -1;
1391	<	}
1392	<
1393	<	if (i == 0)
1394	<	{
1395	<	char fd_str[3][6];   /* store 3x sizeof("65535") */
1396	<	char *kid_argv[7];
1397	<
1398	<	#ifdef O_ASYNC
1399	<	fcntl(server->localClient->fd.fd, F_SETFL,
1400	<	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1401	<	#endif
1402	<	close_fds(&server->localClient->fd);
1403	<	close(slink_fds[0][1]);
1404	<	close(slink_fds[1][1]);
1405	<
1406	<	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1407	<	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1408	<	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1409	<
1410	<	kid_argv[0] = "-slink";
1411	<	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1412	<	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1413	<	kid_argv[5] = fd_str[2];    /* network */
1414	<	kid_argv[6] = NULL;
1415	<
1416	<	execv(ConfigFileEntry.servlink_path, kid_argv);
1417	<
1418	<	_exit(1);
1419	<	}
1420	<
1421	<	/* close the network fd and the child ends of the pipes */
1422	<	fd_close(&server->localClient->fd);
1423	<	close(slink_fds[0][0]);
1424	<	close(slink_fds[1][0]);
1425	<
1426	<	execute_callback(setup_socket_cb, slink_fds[0][1]);
1427	<	execute_callback(setup_socket_cb, slink_fds[1][1]);
1428	<
1429	<	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1430	<	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1431	<
1432	<	read_ctrl_packet(&server->localClient->ctrlfd, server);
1433	<	read_packet(&server->localClient->fd, server);
1434	<
1435	<	return 0;
1436	<	#endif
880	>	server_burst(client_p);
881		}
882
883		/* server_burst()
#	Line 1457 | Line 901 | server_burst(struct Client *client_p)
901		** -orabidoo
902		*/
903
904	<	/* On a "lazy link" hubs send nothing.
1461	<	* Leafs always have to send nicks plus channels
1462	<	*/
1463	<	if (IsCapable(client_p, CAP_LL))
1464	<	{
1465	<	if (!ServerInfo.hub)
1466	<	{
1467	<	/* burst all our info */
1468	<	burst_all(client_p);
1469	<
1470	<	/* Now, ask for channel info on all our current channels */
1471	<	cjoin_all(client_p);
1472	<	}
1473	<	}
1474	<	else
1475	<	{
1476	<	burst_all(client_p);
1477	<	}
904	>	burst_all(client_p);
905
906		/* EOB stuff is now in burst_all */
907		/* Always send a PING after connect burst is done */
#	Line 1490 | Line 917 | server_burst(struct Client *client_p)
917		static void
918		burst_all(struct Client *client_p)
919		{
920	<	struct Client *target_p;
1494	<	struct Channel *chptr;
1495	<	dlink_node *gptr;
1496	<	dlink_node *ptr;
920	>	dlink_node *ptr = NULL;
921
922	<	DLINK_FOREACH(gptr, global_channel_list.head)
922	>	DLINK_FOREACH(ptr, global_channel_list.head)
923		{
924	<	chptr = gptr->data;
924	>	struct Channel *chptr = ptr->data;
925
926		if (dlink_list_length(&chptr->members) != 0)
927		{
928		burst_members(client_p, chptr);
929		send_channel_modes(client_p, chptr);
930	<	if (IsCapable(client_p, CAP_TB))
931	<	send_tb(client_p, chptr);
930	>
931	>	if (IsCapable(client_p, CAP_TBURST))
932	>	send_tb(client_p, chptr);
933		}
934		}
935
#	Line 1512 | Line 937 | burst_all(struct Client *client_p)
937		*/
938		DLINK_FOREACH(ptr, global_client_list.head)
939		{
940	<	target_p = ptr->data;
940	>	struct Client *target_p = ptr->data;
941
942	<	if (!IsBursted(target_p) && target_p->from != client_p)
942	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
943		sendnick_TS(client_p, target_p);
944
945	<	ClearBursted(target_p);
945	>	DelFlag(target_p, FLAGS_BURSTED);
946		}
947
1523	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1524	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1525	–	*/
1526	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
948		if (IsCapable(client_p, CAP_EOB))
949		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
950		}
#	Line 1531 | Line 952 | burst_all(struct Client *client_p)
952		/*
953		* send_tb
954		*
955	<	* inputs       - pointer to Client
956	<	*              - pointer to channel
1536	<	* output       - NONE
1537	<	* side effects - Called on a server burst when
1538	<	*                server is CAP_TB capable
1539	<	*/
1540	<	static void
1541	<	send_tb(struct Client *client_p, struct Channel *chptr)
1542	<	{
1543	<	if (chptr->topic != NULL && IsCapable(client_p, CAP_TB))
1544	<	{
1545	<	if (ConfigChannel.burst_topicwho)
1546	<	{
1547	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1548	<	me.name, chptr->chname,
1549	<	(unsigned long)chptr->topic_time,
1550	<	chptr->topic_info, chptr->topic);
1551	<	}
1552	<	else
1553	<	{
1554	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1555	<	me.name, chptr->chname,
1556	<	(unsigned long)chptr->topic_time, chptr->topic);
1557	<	}
1558	<	}
1559	<	}
1560	<
1561	<	/* cjoin_all()
1562	<	*
1563	<	* inputs       - server to ask for channel info from
955	>	* inputs       - pointer to Client
956	>	*              - pointer to channel
957		* output       - NONE
958	<	* side effects - CJOINS for all the leafs known channels is sent
959	<	*/
1567	<	static void
1568	<	cjoin_all(struct Client *client_p)
1569	<	{
1570	<	const dlink_node *gptr = NULL;
1571	<
1572	<	DLINK_FOREACH(gptr, global_channel_list.head)
1573	<	{
1574	<	const struct Channel *chptr = gptr->data;
1575	<	sendto_one(client_p, ":%s CBURST %s",
1576	<	me.name, chptr->chname);
1577	<	}
1578	<	}
1579	<
1580	<	/* burst_channel()
1581	<	*
1582	<	* inputs       - pointer to server to send sjoins to
1583	<	*              - channel pointer
1584	<	* output       - none
1585	<	* side effects - All sjoins for channel(s) given by chptr are sent
1586	<	*                for all channel members. ONLY called by hub on
1587	<	*                behalf of a lazylink so client_p is always guarunteed
1588	<	*                to be a LL leaf.
1589	<	*/
1590	<	void
1591	<	burst_channel(struct Client *client_p, struct Channel *chptr)
1592	<	{
1593	<	burst_ll_members(client_p, chptr);
1594	<
1595	<	send_channel_modes(client_p, chptr);
1596	<	add_lazylinkchannel(client_p,chptr);
1597	<
1598	<	if (chptr->topic != NULL && chptr->topic_info != NULL)
1599	<	{
1600	<	sendto_one(client_p, ":%s TOPIC %s %s %lu :%s",
1601	<	me.name, chptr->chname, chptr->topic_info,
1602	<	(unsigned long)chptr->topic_time, chptr->topic);
1603	<	}
1604	<	}
1605	<
1606	<	/* add_lazlinkchannel()
1607	<	*
1608	<	* inputs       - pointer to directly connected leaf server
1609	<	*                being introduced to this hub
1610	<	*              - pointer to channel structure being introduced
1611	<	* output       - NONE
1612	<	* side effects - The channel pointed to by chptr is now known
1613	<	*                to be on lazyleaf server given by local_server_p.
1614	<	*                mark that in the bit map and add to the list
1615	<	*                of channels to examine after this newly introduced
1616	<	*                server is squit off.
958	>	* side effects - Called on a server burst when
959	>	*                server is CAP_TBURST capable
960		*/
961		static void
962	<	add_lazylinkchannel(struct Client *local_server_p, struct Channel *chptr)
1620	<	{
1621	<	assert(MyConnect(local_server_p));
1622	<
1623	<	chptr->lazyLinkChannelExists |= local_server_p->localClient->serverMask;
1624	<	dlinkAdd(chptr, make_dlink_node(), &lazylink_channels);
1625	<	}
1626	<
1627	<	/* add_lazylinkclient()
1628	<	*
1629	<	* inputs       - pointer to directly connected leaf server
1630	<	*                being introduced to this hub
1631	<	*              - pointer to client being introduced
1632	<	* output       - NONE
1633	<	* side effects - The client pointed to by client_p is now known
1634	<	*                to be on lazyleaf server given by local_server_p.
1635	<	*                mark that in the bit map and add to the list
1636	<	*                of clients to examine after this newly introduced
1637	<	*                server is squit off.
1638	<	*/
1639	<	void
1640	<	add_lazylinkclient(struct Client *local_server_p, struct Client *client_p)
1641	<	{
1642	<	assert(MyConnect(local_server_p));
1643	<	client_p->lazyLinkClientExists |= local_server_p->localClient->serverMask;
1644	<	}
1645	<
1646	<	/* remove_lazylink_flags()
1647	<	*
1648	<	* inputs       - pointer to server quitting
1649	<	* output       - NONE
1650	<	* side effects - All the channels on the lazylink channel list are examined
1651	<	*                If they hold a bit corresponding to the servermask
1652	<	*                attached to client_p, clear that bit. If this bitmask
1653	<	*                goes to 0, then the channel is no longer known to
1654	<	*                be on any lazylink server, and can be removed from the
1655	<	*                link list.
1656	<	*
1657	<	*                Similar is done for lazylink clients
1658	<	*
1659	<	*                This function must be run by the HUB on any exiting
1660	<	*                lazylink leaf server, while the pointer is still valid.
1661	<	*                Hence must be run from client.c in exit_one_client()
1662	<	*
1663	<	*                The old code scanned all channels, this code only
1664	<	*                scans channels/clients on the lazylink_channels
1665	<	*                lazylink_clients lists.
1666	<	*/
1667	<	void
1668	<	remove_lazylink_flags(unsigned long mask)
962	>	send_tb(struct Client *client_p, struct Channel *chptr)
963		{
964	<	dlink_node *ptr;
965	<	dlink_node *next_ptr;
966	<	struct Channel *chptr;
967	<	struct Client *target_p;
968	<	unsigned long clear_mask;
969	<
970	<	if (!mask) /* On 0 mask, don't do anything */
971	<	return;
972	<
973	<	clear_mask = ~mask;
974	<	freeMask |= mask;
975	<
976	<	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
977	<	{
978	<	chptr = ptr->data;
979	<
980	<	chptr->lazyLinkChannelExists &= clear_mask;
981	<
982	<	if (chptr->lazyLinkChannelExists == 0)
983	<	{
1690	<	dlinkDelete(ptr, &lazylink_channels);
1691	<	free_dlink_node(ptr);
1692	<	}
1693	<	}
1694	<
1695	<	DLINK_FOREACH(ptr, global_client_list.head)
1696	<	{
1697	<	target_p = ptr->data;
1698	<	target_p->lazyLinkClientExists &= clear_mask;
1699	<	}
964	>	/*
965	>	* We may also send an empty topic here, but only if topic_time isn't 0,
966	>	* i.e. if we had a topic that got unset.  This is required for syncing
967	>	* topics properly.
968	>	*
969	>	* Imagine the following scenario: Our downlink introduces a channel
970	>	* to us with a TS that is equal to ours, but the channel topic on
971	>	* their side got unset while the servers were in splitmode, which means
972	>	* their 'topic' is newer.  They simply wanted to unset it, so we have to
973	>	* deal with it in a more sophisticated fashion instead of just resetting
974	>	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
975	>	* for further information   -Michael
976	>	*/
977	>	if (chptr->topic_time != 0)
978	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
979	>	ID_or_name(&me, client_p),
980	>	(unsigned long)chptr->channelts, chptr->chname,
981	>	(unsigned long)chptr->topic_time,
982	>	chptr->topic_info,
983	>	chptr->topic);
984		}
985
986		/* burst_members()
#	Line 1718 | Line 1002 | burst_members(struct Client *client_p, s
1002		ms       = ptr->data;
1003		target_p = ms->client_p;
1004
1005	<	if (!IsBursted(target_p))
1005	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1006		{
1007	<	SetBursted(target_p);
1007	>	AddFlag(target_p, FLAGS_BURSTED);
1008
1009		if (target_p->from != client_p)
1010		sendnick_TS(client_p, target_p);
#	Line 1728 | Line 1012 | burst_members(struct Client *client_p, s
1012		}
1013		}
1014
1731	–	/* burst_ll_members()
1732	–	*
1733	–	* inputs       - pointer to server to send members to
1734	–	*              - dlink_list pointer to membership list to send
1735	–	* output       - NONE
1736	–	* side effects - This version also has to check the bitmap for lazylink
1737	–	*/
1738	–	static void
1739	–	burst_ll_members(struct Client *client_p, struct Channel *chptr)
1740	–	{
1741	–	struct Client *target_p;
1742	–	struct Membership *ms;
1743	–	dlink_node *ptr;
1744	–
1745	–	DLINK_FOREACH(ptr, chptr->members.head)
1746	–	{
1747	–	ms       = ptr->data;
1748	–	target_p = ms->client_p;
1749	–
1750	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
1751	–	{
1752	–	if (target_p->from != client_p)
1753	–	{
1754	–	add_lazylinkclient(client_p,target_p);
1755	–	sendnick_TS(client_p, target_p);
1756	–	}
1757	–	}
1758	–	}
1759	–	}
1760	–
1761	–	/* set_autoconn()
1762	–	*
1763	–	* inputs       - struct Client pointer to oper requesting change
1764	–	* output       - none
1765	–	* side effects - set autoconnect mode
1766	–	*/
1767	–	void
1768	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1769	–	{
1770	–	struct ConfItem *conf;
1771	–	struct AccessItem *aconf;
1772	–
1773	–	if (name != NULL)
1774	–	{
1775	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1776	–	if (conf != NULL)
1777	–	{
1778	–	aconf = (struct AccessItem *)map_to_conf(conf);
1779	–	if (newval)
1780	–	SetConfAllowAutoConn(aconf);
1781	–	else
1782	–	ClearConfAllowAutoConn(aconf);
1783	–
1784	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1785	–	"%s has changed AUTOCONN for %s to %i",
1786	–	source_p->name, name, newval);
1787	–	sendto_one(source_p,
1788	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1789	–	me.name, source_p->name, name, newval);
1790	–	}
1791	–	else
1792	–	{
1793	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1794	–	me.name, source_p->name, name);
1795	–	}
1796	–	}
1797	–	else
1798	–	{
1799	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1800	–	me.name, source_p->name);
1801	–	}
1802	–	}
1803	–
1804	–	void
1805	–	initServerMask(void)
1806	–	{
1807	–	freeMask = 0xFFFFFFFFUL;
1808	–	}
1809	–
1810	–	/* nextFreeMask()
1811	–	*
1812	–	* inputs       - NONE
1813	–	* output       - unsigned long next unused mask for use in LL
1814	–	* side effects -
1815	–	*/
1816	–	unsigned long
1817	–	nextFreeMask(void)
1818	–	{
1819	–	int i;
1820	–	unsigned long mask = 1;
1821	–
1822	–	for (i = 0; i < 32; i++)
1823	–	{
1824	–	if (mask & freeMask)
1825	–	{
1826	–	freeMask &= ~mask;
1827	–	return(mask);
1828	–	}
1829	–
1830	–	mask <<= 1;
1831	–	}
1832	–
1833	–	return(0L); /* watch this special case ... */
1834	–	}
1835	–
1015		/* New server connection code
1016		* Based upon the stuff floating about in s_bsd.c
1017		*   -- adrian
#	Line 1855 | Line 1034 | nextFreeMask(void)
1034		* it suceeded or not, and 0 if it fails in here somewhere.
1035		*/
1036		int
1037	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1037	>	serv_connect(struct MaskItem *conf, struct Client *by)
1038		{
1860	–	struct ConfItem *conf;
1039		struct Client *client_p;
1040	<	char buf[HOSTIPLEN];
1040	>	char buf[HOSTIPLEN + 1];
1041
1042		/* conversion structs */
1043		struct sockaddr_in *v4;
1044	<	/* Make sure aconf is useful */
1045	<	assert(aconf != NULL);
1868	<
1869	<	if(aconf == NULL)
1870	<	return (0);
1044	>	/* Make sure conf is useful */
1045	>	assert(conf != NULL);
1046
1872	–	/* XXX should be passing struct ConfItem in the first place */
1873	–	conf = unmap_conf_item(aconf);
1047
1048	<	/* log */
1049	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1050	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1878	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1048	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1049	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1050	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1051		buf);
1052
1053		/* Still processing a DNS lookup? -> exit */
1054	<	if (aconf->dns_query != NULL)
1054	>	if (conf->dns_pending)
1055	>	{
1056	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1057	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
1058	>	conf->name);
1059	>	return (0);
1060	>	}
1061	>
1062	>	if (conf->dns_failed)
1063		{
1064	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1065	<	"Error connecting to %s: Error during DNS lookup", conf->name);
1064	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1065	>	"Error connecting to %s: DNS lookup for connect{} failed.",
1066	>	conf->name);
1067		return (0);
1068		}
1069
1070		/* Make sure this server isn't already connected
1071	<	* Note: aconf should ALWAYS be a valid C: line
1071	>	* Note: conf should ALWAYS be a valid C: line
1072		*/
1073	<	if ((client_p = find_server(conf->name)) != NULL)
1073	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1074		{
1075	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1076	<	"Server %s already present from %s",
1077	<	conf->name, get_client_name(client_p, SHOW_IP));
1078	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1079	<	"Server %s already present from %s",
1080	<	conf->name, get_client_name(client_p, MASK_IP));
1075	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1076	>	"Server %s already present from %s",
1077	>	conf->name, get_client_name(client_p, SHOW_IP));
1078	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1079	>	"Server %s already present from %s",
1080	>	conf->name, get_client_name(client_p, MASK_IP));
1081		if (by && IsClient(by) && !MyClient(by))
1082		sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1083	<	me.name, by->name, conf->name,
1084	<	get_client_name(client_p, MASK_IP));
1085	<	return (0);
1083	>	me.name, by->name, conf->name,
1084	>	get_client_name(client_p, MASK_IP));
1085	>	return 0;
1086		}
1087
1088		/* Create a local client */
#	Line 1909 | Line 1090 | serv_connect(struct AccessItem *aconf, s
1090
1091		/* Copy in the server, hostname, fd */
1092		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1093	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1093	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1094
1095		/* We already converted the ip once, so lets use it - stu */
1096	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
1096	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1097
1098		/* create a socket for the server connection */
1099	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1099	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1100		SOCK_STREAM, 0, NULL) < 0)
1101		{
1102		/* Eek, failure to create the socket */
1103	<	report_error(L_ALL,
1104	<	"opening stream socket to %s: %s", conf->name, errno);
1103	>	report_error(L_ALL, "opening stream socket to %s: %s",
1104	>	conf->name, errno);
1105		SetDead(client_p);
1106		exit_client(client_p, &me, "Connection failed");
1107	<	return (0);
1107	>	return 0;
1108		}
1109
1110		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1932 | Line 1113 | serv_connect(struct AccessItem *aconf, s
1113		/* Attach config entries to client here rather than in
1114		* serv_connect_callback(). This to avoid null pointer references.
1115		*/
1116	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1116	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1117		{
1118	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1119	<	"Host %s is not enabled for connecting:no C/N-line",
1120	<	conf->name);
1118	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1119	>	"Host %s is not enabled for connecting: no connect{} block",
1120	>	conf->name);
1121		if (by && IsClient(by) && !MyClient(by))
1122		sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1123	<	me.name, by->name, client_p->name);
1123	>	me.name, by->name, client_p->name);
1124		SetDead(client_p);
1125		exit_client(client_p, client_p, "Connection failed");
1126	<	return (0);
1126	>	return 0;
1127		}
1128
1129		/* at this point we have a connection in progress and C/N lines
#	Line 1961 | Line 1142 | serv_connect(struct AccessItem *aconf, s
1142		SetConnecting(client_p);
1143		dlinkAdd(client_p, &client_p->node, &global_client_list);
1144		/* from def_fam */
1145	<	client_p->localClient->aftype = aconf->aftype;
1145	>	client_p->localClient->aftype = conf->aftype;
1146
1147		/* Now, initiate the connection */
1148		/* XXX assume that a non 0 type means a specific bind address
1149		* for this connect.
1150		*/
1151	<	switch (aconf->aftype)
1151	>	switch (conf->aftype)
1152		{
1153		case AF_INET:
1154	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1154	>	v4 = (struct sockaddr_in*)&conf->bind;
1155		if (v4->sin_addr.s_addr != 0)
1156		{
1157		struct irc_ssaddr ipn;
1158		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1159		ipn.ss.ss_family = AF_INET;
1160		ipn.ss_port = 0;
1161	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1162	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1163	<	(struct sockaddr *)&ipn, ipn.ss_len,
1164	<	serv_connect_callback, client_p, aconf->aftype,
1165	<	CONNECTTIMEOUT);
1161	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1162	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1163	>	(struct sockaddr *)&ipn, ipn.ss_len,
1164	>	serv_connect_callback, client_p, conf->aftype,
1165	>	CONNECTTIMEOUT);
1166		}
1167		else if (ServerInfo.specific_ipv4_vhost)
1168		{
#	Line 1990 | Line 1171 | serv_connect(struct AccessItem *aconf, s
1171		ipn.ss.ss_family = AF_INET;
1172		ipn.ss_port = 0;
1173		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1174	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1174	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1175		(struct sockaddr *)&ipn, ipn.ss_len,
1176	<	serv_connect_callback, client_p, aconf->aftype,
1177	<	CONNECTTIMEOUT);
1176	>	serv_connect_callback, client_p, conf->aftype,
1177	>	CONNECTTIMEOUT);
1178		}
1179		else
1180	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1181	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1180	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1181	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1182		CONNECTTIMEOUT);
1183		break;
1184		#ifdef IPV6
1185		case AF_INET6:
1186		{
1187	<	struct irc_ssaddr ipn;
1188	<	struct sockaddr_in6 *v6;
1189	<	struct sockaddr_in6 *v6conf;
1190	<
1191	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1192	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1193	<	v6 = (struct sockaddr_in6 *)&ipn;
1194	<
1195	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
2015	<	sizeof(struct in6_addr)) != 0)
2016	<	{
2017	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
2018	<	ipn.ss.ss_family = AF_INET6;
2019	<	ipn.ss_port = 0;
2020	<	comm_connect_tcp(&client_p->localClient->fd,
2021	<	aconf->host, aconf->port,
2022	<	(struct sockaddr *)&ipn, ipn.ss_len,
2023	<	serv_connect_callback, client_p,
2024	<	aconf->aftype, CONNECTTIMEOUT);
2025	<	}
2026	<	else if (ServerInfo.specific_ipv6_vhost)
1187	>	struct irc_ssaddr ipn;
1188	>	struct sockaddr_in6 *v6;
1189	>	struct sockaddr_in6 *v6conf;
1190	>
1191	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1192	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1193	>	v6 = (struct sockaddr_in6 *)&ipn;
1194	>
1195	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1196		{
1197	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1198	<	ipn.ss.ss_family = AF_INET6;
1199	<	ipn.ss_port = 0;
1200	<	comm_connect_tcp(&client_p->localClient->fd,
1201	<	aconf->host, aconf->port,
1202	<	(struct sockaddr *)&ipn, ipn.ss_len,
1203	<	serv_connect_callback, client_p,
1204	<	aconf->aftype, CONNECTTIMEOUT);
1205	<	}
1206	<	else
1207	<	comm_connect_tcp(&client_p->localClient->fd,
1208	<	aconf->host, aconf->port,
1209	<	NULL, 0, serv_connect_callback, client_p,
1210	<	aconf->aftype, CONNECTTIMEOUT);
1197	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1198	>	ipn.ss.ss_family = AF_INET6;
1199	>	ipn.ss_port = 0;
1200	>	comm_connect_tcp(&client_p->localClient->fd,
1201	>	conf->host, conf->port,
1202	>	(struct sockaddr *)&ipn, ipn.ss_len,
1203	>	serv_connect_callback, client_p,
1204	>	conf->aftype, CONNECTTIMEOUT);
1205	>	}
1206	>	else if (ServerInfo.specific_ipv6_vhost)
1207	>	{
1208	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1209	>	ipn.ss.ss_family = AF_INET6;
1210	>	ipn.ss_port = 0;
1211	>	comm_connect_tcp(&client_p->localClient->fd,
1212	>	conf->host, conf->port,
1213	>	(struct sockaddr *)&ipn, ipn.ss_len,
1214	>	serv_connect_callback, client_p,
1215	>	conf->aftype, CONNECTTIMEOUT);
1216	>	}
1217	>	else
1218	>	comm_connect_tcp(&client_p->localClient->fd,
1219	>	conf->host, conf->port,
1220	>	NULL, 0, serv_connect_callback, client_p,
1221	>	conf->aftype, CONNECTTIMEOUT);
1222		}
1223		#endif
1224		}
1225	<	return (1);
1225	>	return 1;
1226		}
1227
1228	+	#ifdef HAVE_LIBCRYPTO
1229	+	static void
1230	+	finish_ssl_server_handshake(struct Client *client_p)
1231	+	{
1232	+	struct MaskItem *conf = NULL;
1233	+
1234	+	conf = find_conf_name(&client_p->localClient->confs,
1235	+	client_p->name, CONF_SERVER);
1236	+	if (conf == NULL)
1237	+	{
1238	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1239	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1240	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1241	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1242	+
1243	+	exit_client(client_p, &me, "Lost connect{} block");
1244	+	return;
1245	+	}
1246	+
1247	+	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1248	+
1249	+	send_capabilities(client_p, 0);
1250	+
1251	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1252	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1253	+	me.info);
1254	+
1255	+	/* If we've been marked dead because a send failed, just exit
1256	+	* here now and save everyone the trouble of us ever existing.
1257	+	*/
1258	+	if (IsDead(client_p))
1259	+	{
1260	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1261	+	"%s[%s] went dead during handshake",
1262	+	client_p->name,
1263	+	client_p->host);
1264	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1265	+	"%s went dead during handshake", client_p->name);
1266	+	return;
1267	+	}
1268	+
1269	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1270	+	/* If we get here, we're ok, so lets start reading some data */
1271	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1272	+	}
1273	+
1274	+	static void
1275	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1276	+	{
1277	+	int ret;
1278	+	int err;
1279	+
1280	+	ret = SSL_connect(client_p->localClient->fd.ssl);
1281	+
1282	+	if (ret <= 0)
1283	+	{
1284	+	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1285	+	{
1286	+	case SSL_ERROR_WANT_WRITE:
1287	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1288	+	(PF *)ssl_server_handshake, client_p, 0);
1289	+	return;
1290	+	case SSL_ERROR_WANT_READ:
1291	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1292	+	(PF *)ssl_server_handshake, client_p, 0);
1293	+	return;
1294	+	default:
1295	+	{
1296	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1297	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1298	+	"Error connecting to %s: %s", client_p->name,
1299	+	sslerr ? sslerr : "unknown SSL error");
1300	+	exit_client(client_p, client_p, "Error during SSL handshake");
1301	+	return;
1302	+	}
1303	+	}
1304	+	}
1305	+
1306	+	finish_ssl_server_handshake(client_p);
1307	+	}
1308	+
1309	+	static void
1310	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1311	+	{
1312	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1313	+	{
1314	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1315	+	ERR_error_string(ERR_get_error(), NULL));
1316	+	SetDead(client_p);
1317	+	exit_client(client_p, client_p, "SSL_new failed");
1318	+	return;
1319	+	}
1320	+
1321	+	SSL_set_fd(fd->ssl, fd->fd);
1322	+
1323	+	if (!EmptyString(conf->cipher_list))
1324	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1325	+
1326	+	ssl_server_handshake(NULL, client_p);
1327	+	}
1328	+	#endif
1329	+
1330		/* serv_connect_callback() - complete a server connection.
1331		*
1332		* This routine is called after the server connection attempt has
#	Line 2057 | Line 1339 | static void
1339		serv_connect_callback(fde_t *fd, int status, void *data)
1340		{
1341		struct Client *client_p = data;
1342	<	struct ConfItem *conf=NULL;
2061	<	struct AccessItem *aconf=NULL;
1342	>	struct MaskItem *conf = NULL;
1343
1344		/* First, make sure its a real client! */
1345		assert(client_p != NULL);
#	Line 2074 | Line 1355 | serv_connect_callback(fde_t *fd, int sta
1355		* Admins get to see any IP, mere opers don't *sigh*
1356		*/
1357		if (ConfigServerHide.hide_server_ips)
1358	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1358	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1359		"Error connecting to %s: %s",
1360		client_p->name, comm_errstr(status));
1361		else
1362	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1363	<	"Error connecting to %s[%s]: %s", client_p->name,
1364	<	client_p->host, comm_errstr(status));
1365	<
1366	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1367	<	"Error connecting to %s: %s",
1368	<	client_p->name, comm_errstr(status));
1362	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1363	>	"Error connecting to %s[%s]: %s", client_p->name,
1364	>	client_p->host, comm_errstr(status));
1365	>
1366	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1367	>	"Error connecting to %s: %s",
1368	>	client_p->name, comm_errstr(status));
1369
1370		/* If a fd goes bad, call dead_link() the socket is no
1371		* longer valid for reading or writing.
#	Line 2096 | Line 1377 | serv_connect_callback(fde_t *fd, int sta
1377		/* COMM_OK, so continue the connection procedure */
1378		/* Get the C/N lines */
1379		conf = find_conf_name(&client_p->localClient->confs,
1380	<	client_p->name, SERVER_TYPE);
1380	>	client_p->name, CONF_SERVER);
1381		if (conf == NULL)
1382		{
1383	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1384	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1385	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1386	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1383	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1384	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1385	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1386	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1387
1388		exit_client(client_p, &me, "Lost connect{} block");
1389		return;
1390		}
1391
2111	–	aconf = (struct AccessItem *)map_to_conf(conf);
1392		/* Next, send the initial handshake */
1393		SetHandshake(client_p);
1394
1395		#ifdef HAVE_LIBCRYPTO
1396	<	/* Handle all CRYPTLINK links in cryptlink_init */
2117	<	if (IsConfCryptLink(aconf))
1396	>	if (IsConfSSL(conf))
1397		{
1398	<	cryptlink_init(client_p, conf, fd);
1398	>	ssl_connect_init(client_p, conf, fd);
1399		return;
1400		}
1401		#endif
1402
1403	<	/* jdc -- Check and send spasswd, not passwd. */
2125	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
2126	<	/* Send TS 6 form only if id */
2127	<	sendto_one(client_p, "PASS %s TS %d %s",
2128	<	aconf->spasswd, TS_CURRENT, me.id);
2129	<	else
2130	<	sendto_one(client_p, "PASS %s TS 5",
2131	<	aconf->spasswd);
1403	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1404
1405	<	/* Pass my info to the new server
2134	<	*
2135	<	* If trying to negotiate LazyLinks, pass on CAP_LL
2136	<	* If this is a HUB, pass on CAP_HUB
2137	<	* Pass on ZIP if supported
2138	<	* Pass on TB if supported.
2139	<	* - Dianora
2140	<	*/
2141	<	send_capabilities(client_p, aconf,
2142	<	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
2143	<	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
2144	<	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
2145	<	, 0);
1405	>	send_capabilities(client_p, 0);
1406
1407	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1408	<	my_name_for_link(conf),
2149	<	ConfigServerHide.hidden ? "(H) " : "",
2150	<	me.info);
1407	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1408	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1409
1410		/* If we've been marked dead because a send failed, just exit
1411		* here now and save everyone the trouble of us ever existing.
1412		*/
1413		if (IsDead(client_p))
1414		{
1415	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1416	<	"%s[%s] went dead during handshake",
1415	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1416	>	"%s[%s] went dead during handshake",
1417		client_p->name,
1418	<	client_p->host);
1419	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1420	<	"%s went dead during handshake", client_p->name);
1418	>	client_p->host);
1419	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1420	>	"%s went dead during handshake", client_p->name);
1421		return;
1422		}
1423
#	Line 2179 | Line 1437 | find_servconn_in_progress(const char *na
1437		cptr = ptr->data;
1438
1439		if (cptr && cptr->name[0])
1440	<	if (match(cptr->name, name) || match(name, cptr->name))
1440	>	if (!match(name, cptr->name))
1441		return cptr;
1442		}
1443
1444		return NULL;
1445		}
2188	–
2189	–	#ifdef HAVE_LIBCRYPTO
2190	–	/*
2191	–	* sends a CRYPTLINK SERV command.
2192	–	*/
2193	–	void
2194	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
2195	–	{
2196	–	struct AccessItem *aconf;
2197	–	char *encrypted;
2198	–	unsigned char *key_to_send;
2199	–	char randkey[CIPHERKEYLEN];
2200	–	int enc_len;
2201	–
2202	–	/* get key */
2203	–	if ((!ServerInfo.rsa_private_key) ||
2204	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
2205	–	{
2206	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
2207	–	"Invalid RSA private key");
2208	–	return;
2209	–	}
2210	–
2211	–	aconf = (struct AccessItem *)map_to_conf(conf);
2212	–
2213	–	if (aconf->rsa_public_key == NULL)
2214	–	{
2215	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
2216	–	"Invalid RSA public key");
2217	–	return;
2218	–	}
2219	–
2220	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
2221	–	{
2222	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
2223	–	"Couldn't generate keyphrase");
2224	–	return;
2225	–	}
2226	–
2227	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
2228	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
2229	–	(unsigned char *)randkey,
2230	–	(unsigned char *)encrypted,
2231	–	aconf->rsa_public_key,
2232	–	RSA_PKCS1_PADDING);
2233	–
2234	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
2235	–
2236	–	if (enc_len <= 0)
2237	–	{
2238	–	report_crypto_errors();
2239	–	MyFree(encrypted);
2240	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
2241	–	"Couldn't encrypt data");
2242	–	return;
2243	–	}
2244	–
2245	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
2246	–	{
2247	–	MyFree(encrypted);
2248	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
2249	–	"Couldn't base64 encode key");
2250	–	return;
2251	–	}
2252	–
2253	–	send_capabilities(client_p, aconf,
2254	–	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
2255	–	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
2256	–	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
2257	–	, CAP_ENC_MASK);
2258	–
2259	–	if (me.id[0])
2260	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
2261	–
2262	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
2263	–	my_name_for_link(conf), key_to_send,
2264	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
2265	–
2266	–	SetHandshake(client_p);
2267	–	SetWaitAuth(client_p);
2268	–
2269	–	MyFree(encrypted);
2270	–	MyFree(key_to_send);
2271	–
2272	–	if (IsDead(client_p))
2273	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
2274	–	"Went dead during handshake");
2275	–	else if (fd != NULL)
2276	–	/* If we get here, we're ok, so lets start reading some data */
2277	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
2278	–	}
2279	–
2280	–	void
2281	–	cryptlink_error(struct Client *client_p, const char *type,
2282	–	const char *reason, const char *client_reason)
2283	–	{
2284	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2285	–	get_client_name(client_p, SHOW_IP), type, reason);
2286	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2287	–	get_client_name(client_p, MASK_IP), type, reason);
2288	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2289	–	get_client_name(client_p, SHOW_IP), type, reason);
2290	–
2291	–	/* If client_reason isn't NULL, then exit the client with the message
2292	–	* defined in the call.
2293	–	*/
2294	–	if ((client_reason != NULL) && (!IsDead(client_p)))
2295	–	exit_client(client_p, &me, client_reason);
2296	–	}
2297	–
2298	–	static char base64_chars[] =
2299	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2300	–
2301	–	static char base64_values[] =
2302	–	{
2303	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2304	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2305	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2306	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2307	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2308	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2309	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2310	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2311	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2312	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2313	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2314	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2315	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2316	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2317	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2318	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2319	–	};
2320	–
2321	–	/*
2322	–	* base64_block will allocate and return a new block of memory
2323	–	* using MyMalloc().  It should be freed after use.
2324	–	*/
2325	–	int
2326	–	base64_block(unsigned char **output, char *data, int len)
2327	–	{
2328	–	unsigned char *out;
2329	–	unsigned char *in = (unsigned char*)data;
2330	–	unsigned long int q_in;
2331	–	int i;
2332	–	int count = 0;
2333	–
2334	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2335	–
2336	–	/* process 24 bits at a time */
2337	–	for( i = 0; i < len; i += 3)
2338	–	{
2339	–	q_in = 0;
2340	–
2341	–	if ( i + 2 < len )
2342	–	{
2343	–	q_in  = (in[i+2] & 0xc0) << 2;
2344	–	q_in |=  in[i+2];
2345	–	}
2346	–
2347	–	if ( i + 1 < len )
2348	–	{
2349	–	q_in |= (in[i+1] & 0x0f) << 10;
2350	–	q_in |= (in[i+1] & 0xf0) << 12;
2351	–	}
2352	–
2353	–	q_in |= (in[i]   & 0x03) << 20;
2354	–	q_in |=  in[i]           << 22;
2355	–
2356	–	q_in &= 0x3f3f3f3f;
2357	–
2358	–	out[count++] = base64_chars[((q_in >> 24)       )];
2359	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2360	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2361	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2362	–	}
2363	–	if ( (i - len) > 0 )
2364	–	{
2365	–	out[count-1] = '=';
2366	–	if ( (i - len) > 1 )
2367	–	out[count-2] = '=';
2368	–	}
2369	–
2370	–	out[count] = '\0';
2371	–	*output = out;
2372	–	return (count);
2373	–	}
2374	–
2375	–	/*
2376	–	* unbase64_block will allocate and return a new block of memory
2377	–	* using MyMalloc().  It should be freed after use.
2378	–	*/
2379	–	int
2380	–	unbase64_block(unsigned char **output, char *data, int len)
2381	–	{
2382	–	unsigned char *out;
2383	–	unsigned char *in = (unsigned char*)data;
2384	–	unsigned long int q_in;
2385	–	int i;
2386	–	int count = 0;
2387	–
2388	–	if ((len % 4) != 0)
2389	–	return (0);
2390	–
2391	–	out = MyMalloc(((len / 4) * 3) + 1);
2392	–
2393	–	/* process 32 bits at a time */
2394	–	for( i = 0; (i + 3) < len; i+=4)
2395	–	{
2396	–	/* compress input (chars a, b, c and d) as follows:
2397	–	* (after converting ascii -> base64 value)
2398	–	*
2399	–	* |00000000aaaaaabbbbbbccccccdddddd|
2400	–	* |  765432  107654  321076  543210|
2401	–	*/
2402	–
2403	–	q_in = 0;
2404	–
2405	–	if (base64_values[in[i+3]] > -1)
2406	–	q_in |= base64_values[in[i+3]]      ;
2407	–	if (base64_values[in[i+2]] > -1)
2408	–	q_in |= base64_values[in[i+2]] <<  6;
2409	–	if (base64_values[in[i+1]] > -1)
2410	–	q_in |= base64_values[in[i+1]] << 12;
2411	–	if (base64_values[in[i  ]] > -1)
2412	–	q_in |= base64_values[in[i  ]] << 18;
2413	–
2414	–	out[count++] = (q_in >> 16) & 0xff;
2415	–	out[count++] = (q_in >>  8) & 0xff;
2416	–	out[count++] = (q_in      ) & 0xff;
2417	–	}
2418	–
2419	–	if (in[i-1] == '=') count--;
2420	–	if (in[i-2] == '=') count--;
2421	–
2422	–	out[count] = '\0';
2423	–	*output = out;
2424	–	return (count);
2425	–	}
2426	–
2427	–	#endif /* HAVE_LIBCRYPTO */
2428	–

Diff Legend

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