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-8/src/s_serv.c (file contents), Revision 1545 by michael, Sun Sep 30 15:21:59 2012 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"
39		#include "sprintf_irc.h"
40		#include "ircd.h"
41		#include "ircd_defs.h"
42		#include "s_bsd.h"
45	–	#include "irc_getnameinfo.h"
46	–	#include "list.h"
43		#include "numeric.h"
44		#include "packet.h"
45		#include "irc_res.h"
46	<	#include "s_conf.h"
46	>	#include "conf.h"
47		#include "s_serv.h"
48	<	#include "s_log.h"
49	<	#include "s_stats.h"
48	>	#include "log.h"
49	>	#include "s_misc.h"
50		#include "s_user.h"
51		#include "send.h"
52		#include "memory.h"
53		#include "channel.h" /* chcap_usage_counts stuff...*/
54	+	#include "parse.h"
55
56		#define MIN_CONN_FREQ 300
57
61	–	struct Client *uplink  = NULL;
62	–
63	–
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 272 | Line 75 | my_name_for_link(struct ConfItem *conf)
75		void
76		write_links_file(void* notused)
77		{
78	<	MessageFileLine *next_mptr = 0;
79	<	MessageFileLine *mptr = 0;
80	<	MessageFileLine *currentMessageLine = 0;
81	<	MessageFileLine *newMessageLine = 0;
82	<	MessageFile *MessageFileptr;
83	<	const char *p;
281	<	FBFILE *file;
78	>	MessageFileLine *next_mptr = NULL;
79	>	MessageFileLine *mptr = NULL;
80	>	MessageFileLine *currentMessageLine = NULL;
81	>	MessageFileLine *newMessageLine = NULL;
82	>	MessageFile *MessageFileptr = &ConfigFileEntry.linksfile;
83	>	FILE *file;
84		char buff[512];
85		dlink_node *ptr;
86
87	<	MessageFileptr = &ConfigFileEntry.linksfile;
286	<
287	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
87	>	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
88		return;
89
90		for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
#	Line 294 | Line 94 | write_links_file(void* notused)
94		}
95
96		MessageFileptr->contentsOfFile = NULL;
297	–	currentMessageLine             = NULL;
97
98		DLINK_FOREACH(ptr, global_serv_list.head)
99		{
100	<	size_t nbytes = 0;
302	<	struct Client *target_p = ptr->data;
100	>	const struct Client *target_p = ptr->data;
101
102		/* skip ourselves, we send ourselves in /links */
103		if (IsMe(target_p))
104		continue;
105
106		/* skip hidden servers */
107	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
107	>	if (IsHidden(target_p))
108		continue;
109
312	–	if (target_p->info[0])
313	–	p = target_p->info;
314	–	else
315	–	p = "(Unknown Location)";
316	–
110		newMessageLine = MyMalloc(sizeof(MessageFileLine));
111
112	<	/* Attempt to format the file in such a way it follows the usual links output
112	>	/*
113	>	* Attempt to format the file in such a way it follows the usual links output
114		* ie  "servername uplink :hops info"
115		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
116		* - madmax
117		*/
118	<
119	<	/*
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;
118	>	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
119	>	target_p->name, me.name, target_p->info);
120
121		if (MessageFileptr->contentsOfFile)
122		{
#	Line 346 | Line 130 | write_links_file(void* notused)
130		currentMessageLine = newMessageLine;
131		}
132
133	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
134	<	fbputs(buff, file, nbytes);
133	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n",
134	>	target_p->name, me.name, target_p->info);
135	>	fputs(buff, file);
136		}
137
138	<	fbclose(file);
138	>	fclose(file);
139		}
140
141		/* hunt_server()
#	Line 381 | Line 166 | hunt_server(struct Client *client_p, str
166		dlink_node *ptr;
167		int wilds;
168
169	<	/* Assume it's me, if no server
170	<	*/
171	<	if (parc <= server || EmptyString(parv[server]) ||
172	<	match(me.name, parv[server]) ||
173	<	match(parv[server], me.name) ||
174	<	!strcmp(parv[server], me.id))
390	<	return(HUNTED_ISME);
169	>	/* Assume it's me, if no server */
170	>	if (parc <= server || EmptyString(parv[server]))
171	>	return HUNTED_ISME;
172	>
173	>	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
174	>	return HUNTED_ISME;
175
176		/* These are to pickup matches that would cause the following
177		* message to go in the wrong direction while doing quick fast
178		* non-matching lookups.
179		*/
180		if (MyClient(source_p))
181	<	target_p = find_client(parv[server]);
181	>	target_p = hash_find_client(parv[server]);
182		else
183		target_p = find_person(client_p, parv[server]);
184
#	Line 402 | Line 186 | hunt_server(struct Client *client_p, str
186		if (target_p->from == source_p->from && !MyConnect(target_p))
187		target_p = NULL;
188
189	<	if (target_p == NULL && (target_p = find_server(parv[server])))
189	>	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
190		if (target_p->from == source_p->from && !MyConnect(target_p))
191		target_p = NULL;
192
193		collapse(parv[server]);
194	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
194	>	wilds = has_wildcards(parv[server]);
195
196		/* Again, if there are no wild cards involved in the server
197		* name, use the hash lookup
#	Line 416 | Line 200 | hunt_server(struct Client *client_p, str
200		{
201		if (!wilds)
202		{
203	<	if (!(target_p = find_server(parv[server])))
203	>	if (!(target_p = hash_find_server(parv[server])))
204		{
205		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
206	<	me.name, parv[0], parv[server]);
206	>	me.name, source_p->name, parv[server]);
207		return(HUNTED_NOSUCH);
208		}
209		}
#	Line 447 | Line 231 | hunt_server(struct Client *client_p, str
231		if(!IsRegistered(target_p))
232		{
233		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
234	<	me.name, parv[0], parv[server]);
234	>	me.name, source_p->name, parv[server]);
235		return HUNTED_NOSUCH;
236		}
237
#	Line 457 | Line 241 | hunt_server(struct Client *client_p, str
241		if (!match(target_p->name, parv[server]))
242		parv[server] = target_p->name;
243
460	–	/* Deal with lazylinks */
461	–	client_burst_if_needed(target_p, source_p);
462	–
244		/* This is a little kludgy but should work... */
245		if (IsClient(source_p) &&
246		((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
#	Line 473 | Line 254 | hunt_server(struct Client *client_p, str
254		}
255
256		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
257	<	me.name, parv[0], parv[server]);
257	>	me.name, source_p->name, parv[server]);
258		return(HUNTED_NOSUCH);
259		}
260
#	Line 503 | Line 284 | try_connections(void *unused)
284		DLINK_FOREACH(ptr, server_items.head)
285		{
286		conf = ptr->data;
287	<	aconf = (struct AccessItem *)map_to_conf(conf);
287	>	aconf = map_to_conf(conf);
288
289		/* Also when already connecting! (update holdtimes) --SRB
290		*/
291	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
291	>	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
292		!(IsConfAllowAutoConn(aconf)))
293		continue;
294
295	<	cltmp = (struct ClassItem *)map_to_conf(aconf->class_ptr);
295	>	cltmp = map_to_conf(aconf->class_ptr);
296
297		/* Skip this entry if the use of it is still on hold until
298		* future. Otherwise handle this entry (and set it on hold
#	Line 526 | Line 307 | try_connections(void *unused)
307		confrq = DEFAULT_CONNECTFREQUENCY;
308		else
309		{
310	<	confrq = ConFreq(cltmp);
311	<	if (confrq < MIN_CONN_FREQ )
310	>	confrq = cltmp->con_freq;
311	>	if (confrq < MIN_CONN_FREQ)
312		confrq = MIN_CONN_FREQ;
313		}
314
#	Line 536 | Line 317 | try_connections(void *unused)
317		/* Found a CONNECT config with port specified, scan clients
318		* and see if this server is already connected?
319		*/
320	<	if (find_server(conf->name) != NULL)
320	>	if (hash_find_server(conf->name) != NULL)
321		continue;
322
323	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
323	>	if (cltmp->curr_user_count < cltmp->max_total)
324		{
325		/* Go to the end of the list, if not already last */
326		if (ptr->next != NULL)
#	Line 574 | Line 355 | try_connections(void *unused)
355		}
356
357		int
358	<	check_server(const char *name, struct Client *client_p, int cryptlink)
358	>	valid_servname(const char *name)
359	>	{
360	>	unsigned int length = 0;
361	>	unsigned int dots   = 0;
362	>	const char *p = name;
363	>
364	>	for (; *p; ++p)
365	>	{
366	>	if (!IsServChar(*p))
367	>	return 0;
368	>
369	>	++length;
370	>
371	>	if (*p == '.')
372	>	++dots;
373	>	}
374	>
375	>	return dots != 0 && length <= HOSTLEN;
376	>	}
377	>
378	>	int
379	>	check_server(const char *name, struct Client *client_p)
380		{
381		dlink_node *ptr;
382		struct ConfItem *conf           = NULL;
#	Line 585 | Line 387 | check_server(const char *name, struct Cl
387
388		assert(client_p != NULL);
389
588	–	if (client_p == NULL)
589	–	return(error);
590	–
591	–	if (strlen(name) > HOSTLEN)
592	–	return(-4);
593	–
390		/* loop through looking for all possible connect items that might work */
391		DLINK_FOREACH(ptr, server_items.head)
392		{
393		conf = ptr->data;
394	<	aconf = (struct AccessItem *)map_to_conf(conf);
394	>	aconf = map_to_conf(conf);
395
396		if (!match(name, conf->name))
397		continue;
#	Line 608 | Line 404 | check_server(const char *name, struct Cl
404		match(aconf->host, client_p->sockhost))
405		{
406		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);
407
408	<	if (IsConfEncrypted(aconf))
409	<	{
410	<	if (strcmp(aconf->passwd,
411	<	(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	<	}
408	>	if (!match_conf_password(client_p->localClient->passwd, aconf))
409	>	return -2;
410	>
411	>	server_conf = conf;
412		}
413		}
414
#	Line 646 | Line 417 | check_server(const char *name, struct Cl
417
418		attach_conf(client_p, server_conf);
419
420	<	/* Now find all leaf or hub config items for this server */
650	<	DLINK_FOREACH(ptr, hub_items.head)
651	<	{
652	<	conf = ptr->data;
420	>	server_aconf = map_to_conf(server_conf);
421
654	–	if (!match(name, conf->name))
655	–	continue;
656	–	attach_conf(client_p, conf);
657	–	}
658	–
659	–	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	–	*/
422		if (aconf != NULL)
423		{
424		struct sockaddr_in *v4;
#	Line 692 | Line 429 | check_server(const char *name, struct Cl
429		{
430		#ifdef IPV6
431		case AF_INET6:
432	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
432	>	v6 = (struct sockaddr_in6 *)&aconf->addr;
433
434		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
435	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
435	>	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
436		break;
437		#endif
438		case AF_INET:
439	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
439	>	v4 = (struct sockaddr_in *)&aconf->addr;
440
441		if (v4->sin_addr.s_addr == INADDR_NONE)
442	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
442	>	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
443		break;
444		}
445		}
#	Line 722 | Line 459 | check_server(const char *name, struct Cl
459		void
460		add_capability(const char *capab_name, int cap_flag, int add_to_default)
461		{
462	<	struct Capability *cap;
462	>	struct Capability *cap = MyMalloc(sizeof(*cap));
463
727	–	cap = (struct Capability *)MyMalloc(sizeof(*cap));
464		DupString(cap->name, capab_name);
465		cap->cap = cap_flag;
466		dlinkAdd(cap, &cap->node, &cap_list);
467	+
468		if (add_to_default)
469		default_server_capabs |= cap_flag;
470		}
#	Line 762 | Line 499 | delete_capability(const char *capab_name
499		}
500		}
501
502	<	return(0);
502	>	return 0;
503		}
504
505		/*
#	Line 775 | Line 512 | delete_capability(const char *capab_name
512		int
513		find_capability(const char *capab)
514		{
515	<	dlink_node *ptr;
779	<	struct Capability *cap;
515	>	const dlink_node *ptr = NULL;
516
517		DLINK_FOREACH(ptr, cap_list.head)
518		{
519	<	cap = ptr->data;
519	>	const struct Capability *cap = ptr->data;
520
521	<	if (cap->cap != 0)
522	<	{
787	<	if (irccmp(cap->name, capab) == 0)
788	<	return(cap->cap);
789	<	}
521	>	if (cap->cap && !irccmp(cap->name, capab))
522	>	return cap->cap;
523		}
524	<	return(0);
524	>
525	>	return 0;
526		}
527
528		/* send_capabilities()
#	Line 796 | Line 530 | find_capability(const char *capab)
530		* inputs       - Client pointer to send to
531		*              - Pointer to AccessItem (for crypt)
532		*              - int flag of capabilities that this server can send
799	–	*              - int flag of encryption capabilities
533		* output       - NONE
534		* side effects - send the CAPAB line to a server  -orabidoo
535		*
536		*/
537		void
538		send_capabilities(struct Client *client_p, struct AccessItem *aconf,
539	<	int cap_can_send, int enc_can_send)
539	>	int cap_can_send)
540		{
541		struct Capability *cap=NULL;
542		char msgbuf[IRCD_BUFSIZE];
543		char *t;
544		int tl;
545		dlink_node *ptr;
813	–	#ifdef HAVE_LIBCRYPTO
814	–	struct EncCapability *epref;
815	–	char *capend;
816	–	int sent_cipher = 0;
817	–	#endif
546
547		t = msgbuf;
548
#	Line 828 | Line 556 | send_capabilities(struct Client *client_
556		t += tl;
557		}
558		}
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;
559
560	<	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';
560	>	*(t - 1) = '\0';
561		sendto_one(client_p, "CAPAB :%s", msgbuf);
562		}
563
564		/* sendnick_TS()
565		*
566		* inputs       - client (server) to send nick towards
567	<	*              - client to send nick for
567	>	*          - client to send nick for
568		* output       - NONE
569		* side effects - NICK message is sent towards given client_p
570		*/
#	Line 872 | Line 576 | sendnick_TS(struct Client *client_p, str
576		if (!IsClient(target_p))
577		return;
578
579	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
876	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
579	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
580
581		if (ubuf[0] == '\0')
582		{
#	Line 881 | Line 584 | sendnick_TS(struct Client *client_p, str
584		ubuf[1] = '\0';
585		}
586
587	<	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
588	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
589	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	<	target_p->servptr->id,
591	<	target_p->name, target_p->hopcount + 1,
592	<	(unsigned long) target_p->tsinfo,
593	<	ubuf, target_p->username, target_p->host,
594	<	((MyClient(target_p)&&!IsIPSpoof(target_p))?target_p->sockhost:"0"),
595	<	target_p->id, target_p->info);
587	>	if (IsCapable(client_p, CAP_SVS))
588	>	{
589	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
590	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
591	>	target_p->servptr->id,
592	>	target_p->name, target_p->hopcount + 1,
593	>	(unsigned long) target_p->tsinfo,
594	>	ubuf, target_p->username, target_p->host,
595	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
596	>	"0" : target_p->sockhost, target_p->id,
597	>	(unsigned long)target_p->servicestamp, target_p->info);
598	>	else
599	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
600	>	target_p->name, target_p->hopcount + 1,
601	>	(unsigned long) target_p->tsinfo,
602	>	ubuf, target_p->username, target_p->host,
603	>	target_p->servptr->name, (unsigned long)target_p->servicestamp,
604	>	target_p->info);
605	>	}
606		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)
607		{
608	<	sendnick_TS(client_p, target_p);
609	<	add_lazylinkclient(client_p,target_p);
608	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
609	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
610	>	target_p->servptr->id,
611	>	target_p->name, target_p->hopcount + 1,
612	>	(unsigned long) target_p->tsinfo,
613	>	ubuf, target_p->username, target_p->host,
614	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
615	>	"0" : target_p->sockhost, target_p->id, target_p->info);
616	>	else
617	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
618	>	target_p->name, target_p->hopcount + 1,
619	>	(unsigned long) target_p->tsinfo,
620	>	ubuf, target_p->username, target_p->host,
621	>	target_p->servptr->name, target_p->info);
622		}
623	+
624	+	if (target_p->away[0])
625	+	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
626	+	target_p->away);
627	+
628		}
629
630		/*
#	Line 950 | Line 650 | show_capabilities(struct Client *target_
650		if (IsCapable(target_p, cap->cap))
651		t += ircsprintf(t, "%s ", cap->name);
652		}
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';
653
654	<	return(msgbuf);
654	>	*(t - 1) = '\0';
655	>	return msgbuf;
656		}
657
658		/* make_server()
#	Line 973 | Line 666 | struct Server *
666		make_server(struct Client *client_p)
667		{
668		if (client_p->serv == NULL)
976	–	{
669		client_p->serv = MyMalloc(sizeof(struct Server));
978	–	client_p->serv->dep_servers = 1;
979	–	}
670
671		return client_p->serv;
672		}
#	Line 996 | Line 686 | server_estab(struct Client *client_p)
686		char *host;
687		const char *inpath;
688		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
999	–	dlink_node *m;
689		dlink_node *ptr;
690	+	#ifdef HAVE_LIBCRYPTO
691	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
692	+	#endif
693
694		assert(client_p != NULL);
695
#	Line 1029 | Line 721 | server_estab(struct Client *client_p)
721		{
722		if (client_p != serv_list.head->data || serv_list.head->next)
723		{
724	<	ServerStats->is_ref++;
724	>	++ServerStats.is_ref;
725		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
726		exit_client(client_p, &me, "I'm a leaf");
727		return;
728		}
729		}
730
731	<	aconf = (struct AccessItem *)map_to_conf(conf);
731	>	aconf = map_to_conf(conf);
732
733	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
733	>	if (IsUnknown(client_p))
734		{
735		/* jdc -- 1.  Use EmptyString(), not [0] index reference.
736		*        2.  Check aconf->spasswd, not aconf->passwd.
737		*/
738		if (!EmptyString(aconf->spasswd))
739	<	{
740	<	/* 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	<	}
739	>	sendto_one(client_p, "PASS %s TS %d %s",
740	>	aconf->spasswd, TS_CURRENT, me.id);
741
742		/* Pass my info to the new server
743		*
1059	–	* If trying to negotiate LazyLinks, pass on CAP_LL
1060	–	* If this is a HUB, pass on CAP_HUB
744		* Pass on ZIP if supported
745		* Pass on TB if supported.
746		* - Dianora
747		*/
748
749	<	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	<	*/
1082	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1083	<	my_name_for_link(conf),
1084	<	ConfigServerHide.hidden ? "(H) " : "",
1085	<	(me.info[0]) ? (me.info) : "IRCers United");
1086	<	send_queued_write(client_p);
1087	<	}
749	>	send_capabilities(client_p, aconf, 0);
750
751	<	/* Hand the server off to servlink now */
752	<	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);
751	>	sendto_one(client_p, "SERVER %s 1 :%s%s",
752	>	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
753		}
754
755	<	/* 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,
755	>	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
756		(unsigned long)CurrentTime);
757
758		/* assumption here is if they passed the correct TS version, they also passed an SID */
#	Line 1140 | Line 784 | server_estab(struct Client *client_p)
784		set_chcap_usage_counts(client_p);
785
786		/* Some day, all these lists will be consolidated *sigh* */
787	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
787	>	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
788
789	<	m = dlinkFind(&unknown_list, client_p);
1146	<	assert(NULL != m);
789	>	assert(dlinkFind(&unknown_list, client_p));
790
791	<	dlinkDelete(m, &unknown_list);
792	<	dlinkAdd(client_p, m, &serv_list);
791	>	dlink_move_node(&client_p->localClient->lclient_node,
792	>	&unknown_list, &serv_list);
793
794		Count.myserver++;
795
#	Line 1157 | Line 800 | server_estab(struct Client *client_p)
800		make_server(client_p);
801
802		/* fixing eob timings.. -gnp */
803	<	client_p->firsttime = CurrentTime;
803	>	client_p->localClient->firsttime = CurrentTime;
804
805	<	/* Show the real host/IP to admins */
806	<	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));
1172	<
1173	<	client_p->serv->sconf = conf;
805	>	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
806	>	AddFlag(client_p, FLAGS_SERVICE);
807
808	<	if (HasServlink(client_p))
808	>	/* Show the real host/IP to admins */
809	>	#ifdef HAVE_LIBCRYPTO
810	>	if (client_p->localClient->fd.ssl)
811		{
812	<	/* we won't overflow FD_DESC_SZ here, as it can hold
813	<	* client_p->name + 64
814	<	*/
815	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
816	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
812	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
813	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
814	>
815	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
816	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
817	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
818	>	compression ? SSL_COMP_get_name(compression) : "NONE",
819	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
820	>	show_capabilities(client_p));
821	>	/* Now show the masked hostname/IP to opers */
822	>	sendto_realops_flags(UMODE_ALL, L_OPER,
823	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
824	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
825	>	compression ? SSL_COMP_get_name(compression) : "NONE",
826	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
827	>	show_capabilities(client_p));
828	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
829	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
830	>	compression ? SSL_COMP_get_name(compression) : "NONE",
831	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
832	>	show_capabilities(client_p));
833		}
834		else
835	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
835	>	#endif
836	>	{
837	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
838	>	"Link with %s established: (Capabilities: %s)",
839	>	inpath_ip,show_capabilities(client_p));
840	>	/* Now show the masked hostname/IP to opers */
841	>	sendto_realops_flags(UMODE_ALL, L_OPER,
842	>	"Link with %s established: (Capabilities: %s)",
843	>	inpath,show_capabilities(client_p));
844	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
845	>	inpath_ip, show_capabilities(client_p));
846	>	}
847	>
848	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
849
850		/* Old sendto_serv_but_one() call removed because we now
851		** need to send different names to different servers
#	Line 1194 | Line 858 | server_estab(struct Client *client_p)
858		if (target_p == client_p)
859		continue;
860
1197	–	if ((conf = target_p->serv->sconf) &&
1198	–	match(my_name_for_link(conf), client_p->name))
1199	–	continue;
1200	–
861		if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
862		sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
863		me.id, client_p->name, client_p->id,
#	Line 1228 | Line 888 | server_estab(struct Client *client_p)
888		**    is destroyed...)
889		*/
890
1231	–	conf = client_p->serv->sconf;
1232	–
891		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
892		{
893		target_p = ptr->data;
894
895		/* target_p->from == target_p for target_p == client_p */
896	<	if (target_p->from == client_p)
1239	<	continue;
1240	<
1241	<	if (match(my_name_for_link(conf), target_p->name))
896	>	if (IsMe(target_p) || target_p->from == client_p)
897		continue;
898
899		if (IsCapable(client_p, CAP_TS6))
#	Line 1259 | Line 914 | server_estab(struct Client *client_p)
914		IsHidden(target_p) ? "(H) " : "", target_p->info);
915		}
916
1262	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1263	–	uplink = client_p;
1264	–
917		server_burst(client_p);
918		}
919
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
1331	–
1332	–	/* pass the whole recvq to servlink */
1333	–	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;
1341	–	}
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;
1358	–
1359	–	/* 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
1437	–	}
1438	–
920		/* server_burst()
921		*
922		* inputs       - struct Client pointer server
#	Line 1457 | Line 938 | server_burst(struct Client *client_p)
938		** -orabidoo
939		*/
940
941	<	/* 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	<	}
941	>	burst_all(client_p);
942
943		/* EOB stuff is now in burst_all */
944		/* Always send a PING after connect burst is done */
#	Line 1490 | Line 954 | server_burst(struct Client *client_p)
954		static void
955		burst_all(struct Client *client_p)
956		{
957	<	struct Client *target_p;
1494	<	struct Channel *chptr;
1495	<	dlink_node *gptr;
1496	<	dlink_node *ptr;
957	>	dlink_node *ptr = NULL;
958
959	<	DLINK_FOREACH(gptr, global_channel_list.head)
959	>	DLINK_FOREACH(ptr, global_channel_list.head)
960		{
961	<	chptr = gptr->data;
961	>	struct Channel *chptr = ptr->data;
962
963		if (dlink_list_length(&chptr->members) != 0)
964		{
965		burst_members(client_p, chptr);
966		send_channel_modes(client_p, chptr);
967	<	if (IsCapable(client_p, CAP_TB))
967	>
968	>	if (IsCapable(client_p, CAP_TBURST))
969		send_tb(client_p, chptr);
970		}
971		}
#	Line 1512 | Line 974 | burst_all(struct Client *client_p)
974		*/
975		DLINK_FOREACH(ptr, global_client_list.head)
976		{
977	<	target_p = ptr->data;
977	>	struct Client *target_p = ptr->data;
978
979	<	if (!IsBursted(target_p) && target_p->from != client_p)
979	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
980		sendnick_TS(client_p, target_p);
981
982	<	ClearBursted(target_p);
982	>	DelFlag(target_p, FLAGS_BURSTED);
983		}
984
985		/* We send the time we started the burst, and let the remote host determine an EOB time,
#	Line 1531 | Line 993 | burst_all(struct Client *client_p)
993		/*
994		* send_tb
995		*
996	<	* inputs       - pointer to Client
997	<	*              - 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
996	>	* inputs       - pointer to Client
997	>	*              - pointer to channel
998		* output       - NONE
999	<	* side effects - CJOINS for all the leafs known channels is sent
1000	<	*/
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.
999	>	* side effects - Called on a server burst when
1000	>	*                server is CAP_TBURST capable
1001		*/
1002		static void
1003	<	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)
1003	>	send_tb(struct Client *client_p, struct Channel *chptr)
1004		{
1005	<	dlink_node *ptr;
1006	<	dlink_node *next_ptr;
1007	<	struct Channel *chptr;
1008	<	struct Client *target_p;
1009	<	unsigned long clear_mask;
1010	<
1011	<	if (!mask) /* On 0 mask, don't do anything */
1012	<	return;
1013	<
1014	<	clear_mask = ~mask;
1015	<	freeMask |= mask;
1016	<
1017	<	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
1018	<	{
1019	<	chptr = ptr->data;
1020	<
1021	<	chptr->lazyLinkChannelExists &= clear_mask;
1022	<
1023	<	if (chptr->lazyLinkChannelExists == 0)
1024	<	{
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	<	}
1005	>	/*
1006	>	* We may also send an empty topic here, but only if topic_time isn't 0,
1007	>	* i.e. if we had a topic that got unset.  This is required for syncing
1008	>	* topics properly.
1009	>	*
1010	>	* Imagine the following scenario: Our downlink introduces a channel
1011	>	* to us with a TS that is equal to ours, but the channel topic on
1012	>	* their side got unset while the servers were in splitmode, which means
1013	>	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1014	>	* deal with it in a more sophisticated fashion instead of just resetting
1015	>	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1016	>	* for further information   -Michael
1017	>	*/
1018	>	if (chptr->topic_time != 0)
1019	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1020	>	ID_or_name(&me, client_p),
1021	>	(unsigned long)chptr->channelts, chptr->chname,
1022	>	(unsigned long)chptr->topic_time,
1023	>	chptr->topic_info,
1024	>	chptr->topic);
1025		}
1026
1027		/* burst_members()
#	Line 1718 | Line 1043 | burst_members(struct Client *client_p, s
1043		ms       = ptr->data;
1044		target_p = ms->client_p;
1045
1046	<	if (!IsBursted(target_p))
1046	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1047		{
1048	<	SetBursted(target_p);
1048	>	AddFlag(target_p, FLAGS_BURSTED);
1049
1050		if (target_p->from != client_p)
1051		sendnick_TS(client_p, target_p);
#	Line 1728 | Line 1053 | burst_members(struct Client *client_p, s
1053		}
1054		}
1055
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	–
1056		/* New server connection code
1057		* Based upon the stuff floating about in s_bsd.c
1058		*   -- adrian
#	Line 1859 | Line 1079 | serv_connect(struct AccessItem *aconf, s
1079		{
1080		struct ConfItem *conf;
1081		struct Client *client_p;
1082	<	char buf[HOSTIPLEN];
1082	>	char buf[HOSTIPLEN + 1];
1083
1084		/* conversion structs */
1085		struct sockaddr_in *v4;
1086		/* Make sure aconf is useful */
1087		assert(aconf != NULL);
1088
1869	–	if(aconf == NULL)
1870	–	return (0);
1871	–
1089		/* XXX should be passing struct ConfItem in the first place */
1090		conf = unmap_conf_item(aconf);
1091
1092		/* log */
1093	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1094	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1095	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1093	>	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1094	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1095	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
1096		buf);
1097
1098		/* Still processing a DNS lookup? -> exit */
1099	<	if (aconf->dns_query != NULL)
1099	>	if (aconf->dns_pending)
1100		{
1101	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1102	<	"Error connecting to %s: Error during DNS lookup", conf->name);
1101	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1102	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
1103	>	conf->name);
1104	>	return (0);
1105	>	}
1106	>
1107	>	if (aconf->dns_failed)
1108	>	{
1109	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1110	>	"Error connecting to %s: DNS lookup for connect{} failed.",
1111	>	conf->name);
1112		return (0);
1113		}
1114
1115		/* Make sure this server isn't already connected
1116		* Note: aconf should ALWAYS be a valid C: line
1117		*/
1118	<	if ((client_p = find_server(conf->name)) != NULL)
1118	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1119		{
1120		sendto_realops_flags(UMODE_ALL, L_ADMIN,
1121		"Server %s already present from %s",
#	Line 1912 | Line 1138 | serv_connect(struct AccessItem *aconf, s
1138		strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1139
1140		/* We already converted the ip once, so lets use it - stu */
1141	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
1141	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1142
1143		/* create a socket for the server connection */
1144	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1144	>	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1145		SOCK_STREAM, 0, NULL) < 0)
1146		{
1147		/* Eek, failure to create the socket */
#	Line 1970 | Line 1196 | serv_connect(struct AccessItem *aconf, s
1196		switch (aconf->aftype)
1197		{
1198		case AF_INET:
1199	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1199	>	v4 = (struct sockaddr_in*)&aconf->bind;
1200		if (v4->sin_addr.s_addr != 0)
1201		{
1202		struct irc_ssaddr ipn;
1203		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1204		ipn.ss.ss_family = AF_INET;
1205		ipn.ss_port = 0;
1206	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1206	>	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1207		comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1208		(struct sockaddr *)&ipn, ipn.ss_len,
1209		serv_connect_callback, client_p, aconf->aftype,
#	Line 2008 | Line 1234 | serv_connect(struct AccessItem *aconf, s
1234		struct sockaddr_in6 *v6conf;
1235
1236		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1237	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1237	>	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1238		v6 = (struct sockaddr_in6 *)&ipn;
1239
1240		if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1241		sizeof(struct in6_addr)) != 0)
1242		{
1243	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1243	>	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1244		ipn.ss.ss_family = AF_INET6;
1245		ipn.ss_port = 0;
1246		comm_connect_tcp(&client_p->localClient->fd,
#	Line 2045 | Line 1271 | serv_connect(struct AccessItem *aconf, s
1271		return (1);
1272		}
1273
1274	+	#ifdef HAVE_LIBCRYPTO
1275	+	static void
1276	+	finish_ssl_server_handshake(struct Client *client_p)
1277	+	{
1278	+	struct ConfItem *conf=NULL;
1279	+	struct AccessItem *aconf=NULL;
1280	+
1281	+	conf = find_conf_name(&client_p->localClient->confs,
1282	+	client_p->name, SERVER_TYPE);
1283	+	if (conf == NULL)
1284	+	{
1285	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1286	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1287	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1288	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1289	+
1290	+	exit_client(client_p, &me, "Lost connect{} block");
1291	+	return;
1292	+	}
1293	+
1294	+	aconf = map_to_conf(conf);
1295	+
1296	+	/* jdc -- Check and send spasswd, not passwd. */
1297	+	if (!EmptyString(aconf->spasswd))
1298	+	sendto_one(client_p, "PASS %s TS %d %s",
1299	+	aconf->spasswd, TS_CURRENT, me.id);
1300	+
1301	+	send_capabilities(client_p, aconf, 0);
1302	+
1303	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1304	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1305	+	me.info);
1306	+
1307	+	/* If we've been marked dead because a send failed, just exit
1308	+	* here now and save everyone the trouble of us ever existing.
1309	+	*/
1310	+	if (IsDead(client_p))
1311	+	{
1312	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1313	+	"%s[%s] went dead during handshake",
1314	+	client_p->name,
1315	+	client_p->host);
1316	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1317	+	"%s went dead during handshake", client_p->name);
1318	+	return;
1319	+	}
1320	+
1321	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1322	+	/* If we get here, we're ok, so lets start reading some data */
1323	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1324	+	}
1325	+
1326	+	static void
1327	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1328	+	{
1329	+	int ret;
1330	+	int err;
1331	+
1332	+	ret = SSL_connect(client_p->localClient->fd.ssl);
1333	+
1334	+	if (ret <= 0)
1335	+	{
1336	+	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1337	+	{
1338	+	case SSL_ERROR_WANT_WRITE:
1339	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1340	+	(PF *)ssl_server_handshake, client_p, 0);
1341	+	return;
1342	+	case SSL_ERROR_WANT_READ:
1343	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1344	+	(PF *)ssl_server_handshake, client_p, 0);
1345	+	return;
1346	+	default:
1347	+	{
1348	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1349	+	sendto_realops_flags(UMODE_ALL, L_ALL,
1350	+	"Error connecting to %s: %s", client_p->name,
1351	+	sslerr ? sslerr : "unknown SSL error");
1352	+	exit_client(client_p, client_p, "Error during SSL handshake");
1353	+	return;
1354	+	}
1355	+	}
1356	+	}
1357	+
1358	+	finish_ssl_server_handshake(client_p);
1359	+	}
1360	+
1361	+	static void
1362	+	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1363	+	{
1364	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1365	+	{
1366	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1367	+	ERR_error_string(ERR_get_error(), NULL));
1368	+	SetDead(client_p);
1369	+	exit_client(client_p, client_p, "SSL_new failed");
1370	+	return;
1371	+	}
1372	+
1373	+	SSL_set_fd(fd->ssl, fd->fd);
1374	+
1375	+	if (!EmptyString(aconf->cipher_list))
1376	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1377	+
1378	+	ssl_server_handshake(NULL, client_p);
1379	+	}
1380	+	#endif
1381	+
1382		/* serv_connect_callback() - complete a server connection.
1383		*
1384		* This routine is called after the server connection attempt has
#	Line 2108 | Line 1442 | serv_connect_callback(fde_t *fd, int sta
1442		return;
1443		}
1444
1445	<	aconf = (struct AccessItem *)map_to_conf(conf);
1445	>	aconf = map_to_conf(conf);
1446		/* Next, send the initial handshake */
1447		SetHandshake(client_p);
1448
1449		#ifdef HAVE_LIBCRYPTO
1450	<	/* Handle all CRYPTLINK links in cryptlink_init */
2117	<	if (IsConfCryptLink(aconf))
1450	>	if (IsConfSSL(aconf))
1451		{
1452	<	cryptlink_init(client_p, conf, fd);
1452	>	ssl_connect_init(client_p, aconf, fd);
1453		return;
1454		}
1455		#endif
1456
1457		/* jdc -- Check and send spasswd, not passwd. */
1458	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
2126	<	/* Send TS 6 form only if id */
1458	>	if (!EmptyString(aconf->spasswd))
1459		sendto_one(client_p, "PASS %s TS %d %s",
1460		aconf->spasswd, TS_CURRENT, me.id);
2129	–	else
2130	–	sendto_one(client_p, "PASS %s TS 5",
2131	–	aconf->spasswd);
1461
1462	<	/* 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);
1462	>	send_capabilities(client_p, aconf, 0);
1463
1464		sendto_one(client_p, "SERVER %s 1 :%s%s",
1465	<	my_name_for_link(conf),
2149	<	ConfigServerHide.hidden ? "(H) " : "",
1465	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
1466		me.info);
1467
1468		/* If we've been marked dead because a send failed, just exit
#	Line 2179 | Line 1495 | find_servconn_in_progress(const char *na
1495		cptr = ptr->data;
1496
1497		if (cptr && cptr->name[0])
1498	<	if (match(cptr->name, name) || match(name, cptr->name))
1498	>	if (match(name, cptr->name))
1499		return cptr;
1500		}
1501
1502		return NULL;
1503		}
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)