ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_serv.c (file contents), Revision 337 by michael, Mon Dec 26 19:20:47 2005 UTC vs.
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1321 by michael, Fri Mar 30 11:23:16 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 = NULL;
231	–
232	–	/* Use connect{} specific info if available */
233	–	if (aconf->cipher_preference)
234	–	epref = aconf->cipher_preference;
235	–	else if (ConfigFileEntry.default_cipher_preference)
236	–	epref = ConfigFileEntry.default_cipher_preference;
237	–
238	–	/*
239	–	* If the server supports the capability in hand, return the matching
240	–	* conf struct.  Otherwise, return NULL (an error).
241	–	*/
242	–	if (epref && IsCapableEnc(client_p, epref->cap))
243	–	return epref;
244	–
245	–	return NULL;
246	–	}
247	–	#endif /* HAVE_LIBCRYPTO */
248	–
249	–	/* my_name_for_link()
250	–	* return wildcard name of my server name
251	–	* according to given config entry --Jto
252	–	*/
253	–	const char *
254	–	my_name_for_link(struct ConfItem *conf)
255	–	{
256	–	struct AccessItem *aconf;
257	–
258	–	aconf = (struct AccessItem *)map_to_conf(conf);
259	–	if (aconf->fakename != NULL)
260	–	return(aconf->fakename);
261	–	else
262	–	return(me.name);
263	–	}
66
67		/*
68		* write_links_file
#	Line 395 | Line 197 | hunt_server(struct Client *client_p, str
197		* non-matching lookups.
198		*/
199		if (MyClient(source_p))
200	<	target_p = find_client(parv[server]);
200	>	target_p = hash_find_client(parv[server]);
201		else
202		target_p = find_person(client_p, parv[server]);
203
#	Line 403 | Line 205 | hunt_server(struct Client *client_p, str
205		if (target_p->from == source_p->from && !MyConnect(target_p))
206		target_p = NULL;
207
208	<	if (target_p == NULL && (target_p = find_server(parv[server])))
208	>	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
209		if (target_p->from == source_p->from && !MyConnect(target_p))
210		target_p = NULL;
211
#	Line 417 | Line 219 | hunt_server(struct Client *client_p, str
219		{
220		if (!wilds)
221		{
222	<	if (!(target_p = find_server(parv[server])))
222	>	if (!(target_p = hash_find_server(parv[server])))
223		{
224		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
225	<	me.name, parv[0], parv[server]);
225	>	me.name, source_p->name, parv[server]);
226		return(HUNTED_NOSUCH);
227		}
228		}
#	Line 448 | Line 250 | hunt_server(struct Client *client_p, str
250		if(!IsRegistered(target_p))
251		{
252		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
253	<	me.name, parv[0], parv[server]);
253	>	me.name, source_p->name, parv[server]);
254		return HUNTED_NOSUCH;
255		}
256
#	Line 458 | Line 260 | hunt_server(struct Client *client_p, str
260		if (!match(target_p->name, parv[server]))
261		parv[server] = target_p->name;
262
461	–	/* Deal with lazylinks */
462	–	client_burst_if_needed(target_p, source_p);
463	–
263		/* This is a little kludgy but should work... */
264		if (IsClient(source_p) &&
265		((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
#	Line 474 | Line 273 | hunt_server(struct Client *client_p, str
273		}
274
275		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
276	<	me.name, parv[0], parv[server]);
276	>	me.name, source_p->name, parv[server]);
277		return(HUNTED_NOSUCH);
278		}
279
#	Line 504 | Line 303 | try_connections(void *unused)
303		DLINK_FOREACH(ptr, server_items.head)
304		{
305		conf = ptr->data;
306	<	aconf = (struct AccessItem *)map_to_conf(conf);
306	>	aconf = map_to_conf(conf);
307
308		/* Also when already connecting! (update holdtimes) --SRB
309		*/
310	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
310	>	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
311		!(IsConfAllowAutoConn(aconf)))
312		continue;
313
314	<	cltmp = (struct ClassItem *)map_to_conf(aconf->class_ptr);
314	>	cltmp = map_to_conf(aconf->class_ptr);
315
316		/* Skip this entry if the use of it is still on hold until
317		* future. Otherwise handle this entry (and set it on hold
#	Line 537 | Line 336 | try_connections(void *unused)
336		/* Found a CONNECT config with port specified, scan clients
337		* and see if this server is already connected?
338		*/
339	<	if (find_server(conf->name) != NULL)
339	>	if (hash_find_server(conf->name) != NULL)
340		continue;
341
342		if (CurrUserCount(cltmp) < MaxTotal(cltmp))
#	Line 575 | Line 374 | try_connections(void *unused)
374		}
375
376		int
377	<	check_server(const char *name, struct Client *client_p, int cryptlink)
377	>	valid_servname(const char *name)
378	>	{
379	>	unsigned int length = 0;
380	>	unsigned int dots   = 0;
381	>	const char *p = name;
382	>
383	>	for (; *p; ++p)
384	>	{
385	>	if (!IsServChar(*p))
386	>	return 0;
387	>
388	>	++length;
389	>
390	>	if (*p == '.')
391	>	++dots;
392	>	}
393	>
394	>	return dots != 0 && length <= HOSTLEN;
395	>	}
396	>
397	>	int
398	>	check_server(const char *name, struct Client *client_p)
399		{
400		dlink_node *ptr;
401		struct ConfItem *conf           = NULL;
#	Line 596 | Line 416 | check_server(const char *name, struct Cl
416		DLINK_FOREACH(ptr, server_items.head)
417		{
418		conf = ptr->data;
419	<	aconf = (struct AccessItem *)map_to_conf(conf);
419	>	aconf = map_to_conf(conf);
420
421		if (!match(name, conf->name))
422		continue;
#	Line 609 | Line 429 | check_server(const char *name, struct Cl
429		match(aconf->host, client_p->sockhost))
430		{
431		error = -2;
612	–	#ifdef HAVE_LIBCRYPTO
613	–	if (cryptlink && IsConfCryptLink(aconf))
614	–	{
615	–	if (aconf->rsa_public_key)
616	–	server_conf = conf;
617	–	}
618	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
619	–	#endif /* HAVE_LIBCRYPTO */
432		{
433		/* A NULL password is as good as a bad one */
434		if (EmptyString(client_p->localClient->passwd))
#	Line 666 | Line 478 | check_server(const char *name, struct Cl
478		attach_conf(client_p, conf);
479		}
480
481	<	server_aconf = (struct AccessItem *)map_to_conf(server_conf);
481	>	server_aconf = map_to_conf(server_conf);
482
671	–	if (!IsConfLazyLink(server_aconf))
672	–	ClearCap(client_p, CAP_LL);
673	–	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
674	–	if (!IsConfCompressed(server_aconf))
675	–	#endif
676	–	ClearCap(client_p, CAP_ZIP);
677	–	if (!IsConfCryptLink(server_aconf))
678	–	ClearCap(client_p, CAP_ENC);
483		if (!IsConfTopicBurst(server_aconf))
484		{
485		ClearCap(client_p, CAP_TB);
486		ClearCap(client_p, CAP_TBURST);
487		}
488
685	–	/* Don't unset CAP_HUB here even if the server isn't a hub,
686	–	* it only indicates if the server thinks it's lazylinks are
687	–	* leafs or not.. if you unset it, bad things will happen
688	–	*/
489		if (aconf != NULL)
490		{
491		struct sockaddr_in *v4;
#	Line 726 | Line 526 | check_server(const char *name, struct Cl
526		void
527		add_capability(const char *capab_name, int cap_flag, int add_to_default)
528		{
529	<	struct Capability *cap;
529	>	struct Capability *cap = MyMalloc(sizeof(*cap));
530
731	–	cap = (struct Capability *)MyMalloc(sizeof(*cap));
531		DupString(cap->name, capab_name);
532		cap->cap = cap_flag;
533		dlinkAdd(cap, &cap->node, &cap_list);
534	+
535		if (add_to_default)
536		default_server_capabs |= cap_flag;
537		}
#	Line 766 | Line 566 | delete_capability(const char *capab_name
566		}
567		}
568
569	<	return(0);
569	>	return 0;
570		}
571
572		/*
#	Line 779 | Line 579 | delete_capability(const char *capab_name
579		int
580		find_capability(const char *capab)
581		{
582	<	dlink_node *ptr;
783	<	struct Capability *cap;
582	>	const dlink_node *ptr = NULL;
583
584		DLINK_FOREACH(ptr, cap_list.head)
585		{
586	<	cap = ptr->data;
586	>	const struct Capability *cap = ptr->data;
587
588	<	if (cap->cap != 0)
589	<	{
791	<	if (irccmp(cap->name, capab) == 0)
792	<	return(cap->cap);
793	<	}
588	>	if (cap->cap && !irccmp(cap->name, capab))
589	>	return cap->cap;
590		}
591	<	return(0);
591	>
592	>	return 0;
593		}
594
595		/* send_capabilities()
#	Line 800 | Line 597 | find_capability(const char *capab)
597		* inputs       - Client pointer to send to
598		*              - Pointer to AccessItem (for crypt)
599		*              - int flag of capabilities that this server can send
803	–	*              - int flag of encryption capabilities
600		* output       - NONE
601		* side effects - send the CAPAB line to a server  -orabidoo
602		*
603		*/
604		void
605		send_capabilities(struct Client *client_p, struct AccessItem *aconf,
606	<	int cap_can_send, int enc_can_send)
606	>	int cap_can_send)
607		{
608		struct Capability *cap=NULL;
609		char msgbuf[IRCD_BUFSIZE];
610		char *t;
611		int tl;
612		dlink_node *ptr;
817	–	#ifdef HAVE_LIBCRYPTO
818	–	const struct EncCapability *epref = NULL;
819	–	char *capend;
820	–	int sent_cipher = 0;
821	–	#endif
613
614		t = msgbuf;
615
#	Line 832 | Line 623 | send_capabilities(struct Client *client_
623		t += tl;
624		}
625		}
835	–	#ifdef HAVE_LIBCRYPTO
836	–	if (enc_can_send)
837	–	{
838	–	capend = t;
839	–	strcpy(t, "ENC:");
840	–	t += 4;
841	–
842	–	/* use connect{} specific info if available */
843	–	if (aconf->cipher_preference)
844	–	epref = aconf->cipher_preference;
845	–	else if (ConfigFileEntry.default_cipher_preference)
846	–	epref = ConfigFileEntry.default_cipher_preference;
626
848	–	if (epref && (epref->cap & enc_can_send))
849	–	{
850	–	/* Leave the space -- it is removed later. */
851	–	tl = ircsprintf(t, "%s ", epref->name);
852	–	t += tl;
853	–	sent_cipher = 1;
854	–	}
855	–
856	–	if (!sent_cipher)
857	–	t = capend; /* truncate string before ENC:, below */
858	–	}
859	–	#endif
627		*(t - 1) = '\0';
628		sendto_one(client_p, "CAPAB :%s", msgbuf);
629		}
#	Line 864 | Line 631 | send_capabilities(struct Client *client_
631		/* sendnick_TS()
632		*
633		* inputs       - client (server) to send nick towards
634	<	*              - client to send nick for
634	>	*          - client to send nick for
635		* output       - NONE
636		* side effects - NICK message is sent towards given client_p
637		*/
#	Line 876 | Line 643 | sendnick_TS(struct Client *client_p, str
643		if (!IsClient(target_p))
644		return;
645
646	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
880	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
646	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
647
648		if (ubuf[0] == '\0')
649		{
#	Line 886 | Line 652 | sendnick_TS(struct Client *client_p, str
652		}
653
654		/* XXX Both of these need to have a :me.name or :mySID!?!?! */
655	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
656	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
657	<	target_p->servptr->id,
658	<	target_p->name, target_p->hopcount + 1,
659	<	(unsigned long) target_p->tsinfo,
660	<	ubuf, target_p->username, target_p->host,
661	<	((MyClient(target_p)&&!IsIPSpoof(target_p))?target_p->sockhost:"0"),
662	<	target_p->id, target_p->info);
655	>	if (IsCapable(client_p, CAP_SVS))
656	>	{
657	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
658	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
659	>	target_p->servptr->id,
660	>	target_p->name, target_p->hopcount + 1,
661	>	(unsigned long) target_p->tsinfo,
662	>	ubuf, target_p->username, target_p->host,
663	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
664	>	"0" : target_p->sockhost, target_p->id,
665	>	(unsigned long)target_p->servicestamp, target_p->info);
666	>	else
667	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
668	>	target_p->name, target_p->hopcount + 1,
669	>	(unsigned long) target_p->tsinfo,
670	>	ubuf, target_p->username, target_p->host,
671	>	target_p->servptr->name, (unsigned long)target_p->servicestamp,
672	>	target_p->info);
673	>	}
674		else
675	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
676	<	target_p->name, target_p->hopcount + 1,
677	<	(unsigned long) target_p->tsinfo,
678	<	ubuf, target_p->username, target_p->host,
679	<	target_p->servptr->name, target_p->info);
675	>	{
676	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
677	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
678	>	target_p->servptr->id,
679	>	target_p->name, target_p->hopcount + 1,
680	>	(unsigned long) target_p->tsinfo,
681	>	ubuf, target_p->username, target_p->host,
682	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
683	>	"0" : target_p->sockhost, target_p->id, target_p->info);
684	>	else
685	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
686	>	target_p->name, target_p->hopcount + 1,
687	>	(unsigned long) target_p->tsinfo,
688	>	ubuf, target_p->username, target_p->host,
689	>	target_p->servptr->name, target_p->info);
690	>	}
691	>
692		if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
693		if (!EmptyString(target_p->away))
694		sendto_one(client_p, ":%s AWAY :%s", target_p->name,
#	Line 907 | Line 696 | sendnick_TS(struct Client *client_p, str
696
697		}
698
910	–	/* client_burst_if_needed()
911	–	*
912	–	* inputs       - pointer to server
913	–	*              - pointer to client to add
914	–	* output       - NONE
915	–	* side effects - If this client is not known by this lazyleaf, send it
916	–	*/
917	–	void
918	–	client_burst_if_needed(struct Client *client_p, struct Client *target_p)
919	–	{
920	–	if (!ServerInfo.hub)
921	–	return;
922	–	if (!MyConnect(client_p))
923	–	return;
924	–	if (!IsCapable(client_p,CAP_LL))
925	–	return;
926	–
927	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
928	–	{
929	–	sendnick_TS(client_p, target_p);
930	–	add_lazylinkclient(client_p,target_p);
931	–	}
932	–	}
933	–
699		/*
700		* show_capabilities - show current server capabilities
701		*
#	Line 954 | Line 719 | show_capabilities(struct Client *target_
719		if (IsCapable(target_p, cap->cap))
720		t += ircsprintf(t, "%s ", cap->name);
721		}
957	–	#ifdef HAVE_LIBCRYPTO
958	–	if (IsCapable(target_p, CAP_ENC) &&
959	–	target_p->localClient->in_cipher &&
960	–	target_p->localClient->out_cipher)
961	–	t += ircsprintf(t, "ENC:%s ",
962	–	target_p->localClient->in_cipher->name);
963	–	#endif
964	–	*(t - 1) = '\0';
722
723	<	return(msgbuf);
723	>	*(t - 1) = '\0';
724	>	return msgbuf;
725		}
726
727		/* make_server()
#	Line 977 | Line 735 | struct Server *
735		make_server(struct Client *client_p)
736		{
737		if (client_p->serv == NULL)
980	–	{
738		client_p->serv = MyMalloc(sizeof(struct Server));
982	–	client_p->serv->dep_servers = 1;
983	–	}
739
740		return client_p->serv;
741		}
#	Line 1000 | Line 755 | server_estab(struct Client *client_p)
755		char *host;
756		const char *inpath;
757		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
1003	–	dlink_node *m;
758		dlink_node *ptr;
759	+	#ifdef HAVE_LIBCRYPTO
760	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
761	+	#endif
762
763		assert(client_p != NULL);
764
#	Line 1033 | Line 790 | server_estab(struct Client *client_p)
790		{
791		if (client_p != serv_list.head->data || serv_list.head->next)
792		{
793	<	ServerStats->is_ref++;
793	>	++ServerStats.is_ref;
794		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
795		exit_client(client_p, &me, "I'm a leaf");
796		return;
797		}
798		}
799
800	<	aconf = (struct AccessItem *)map_to_conf(conf);
800	>	aconf = map_to_conf(conf);
801
802	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
802	>	if (IsUnknown(client_p))
803		{
804		/* jdc -- 1.  Use EmptyString(), not [0] index reference.
805		*        2.  Check aconf->spasswd, not aconf->passwd.
806		*/
807		if (!EmptyString(aconf->spasswd))
808	<	{
809	<	/* only send ts6 format PASS if we have ts6 enabled */
1053	<	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1054	<	sendto_one(client_p, "PASS %s TS %d %s",
1055	<	aconf->spasswd, TS_CURRENT, me.id);
1056	<	else
1057	<	sendto_one(client_p, "PASS %s TS 5",
1058	<	aconf->spasswd);
1059	<	}
808	>	sendto_one(client_p, "PASS %s TS %d %s",
809	>	aconf->spasswd, TS_CURRENT, me.id);
810
811		/* Pass my info to the new server
812		*
1063	–	* If trying to negotiate LazyLinks, pass on CAP_LL
1064	–	* If this is a HUB, pass on CAP_HUB
813		* Pass on ZIP if supported
814		* Pass on TB if supported.
815		* - Dianora
816		*/
817
818	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
819	<	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
1072	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1073	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1074	<
1075	<	/* SERVER is the last command sent before switching to ziplinks.
1076	<	* We set TCPNODELAY on the socket to make sure it gets sent out
1077	<	* on the wire immediately.  Otherwise, it could be sitting in
1078	<	* a kernel buffer when we start sending zipped data, and the
1079	<	* parser on the receiving side can't hand both unzipped and zipped
1080	<	* data in one packet. --Rodder
1081	<	*
1082	<	* currently we only need to call send_queued_write,
1083	<	* Nagle is already disabled at this point --adx
1084	<	*/
1085	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1086	<	my_name_for_link(conf),
1087	<	ConfigServerHide.hidden ? "(H) " : "",
1088	<	(me.info[0]) ? (me.info) : "IRCers United");
1089	<	send_queued_write(client_p);
1090	<	}
1091	<
1092	<	/* Hand the server off to servlink now */
1093	<	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1094	<	{
1095	<	if (fork_server(client_p) < 0)
1096	<	{
1097	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1098	<	"Warning: fork failed for server %s -- check servlink_path (%s)",
1099	<	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1100	<	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1101	<	"%s -- check servlink_path (%s)",
1102	<	get_client_name(client_p, MASK_IP),
1103	<	ConfigFileEntry.servlink_path);
1104	<	exit_client(client_p, &me, "fork failed");
1105	<	return;
1106	<	}
818	>	send_capabilities(client_p, aconf,
819	>	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
820
821	<	start_io(client_p);
822	<	SetServlink(client_p);
821	>	sendto_one(client_p, "SERVER %s 1 :%s%s",
822	>	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
823		}
824
825	<	/* only send ts6 format SVINFO if we have ts6 enabled */
1113	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1114	<	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
825	>	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
826		(unsigned long)CurrentTime);
827
828		/* assumption here is if they passed the correct TS version, they also passed an SID */
#	Line 1143 | Line 854 | server_estab(struct Client *client_p)
854		set_chcap_usage_counts(client_p);
855
856		/* Some day, all these lists will be consolidated *sigh* */
857	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
857	>	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
858
859	<	m = dlinkFind(&unknown_list, client_p);
1149	<	assert(NULL != m);
859	>	assert(dlinkFind(&unknown_list, client_p));
860
861	<	dlinkDelete(m, &unknown_list);
862	<	dlinkAdd(client_p, m, &serv_list);
861	>	dlink_move_node(&client_p->localClient->lclient_node,
862	>	&unknown_list, &serv_list);
863
864		Count.myserver++;
865
#	Line 1160 | Line 870 | server_estab(struct Client *client_p)
870		make_server(client_p);
871
872		/* fixing eob timings.. -gnp */
873	<	client_p->firsttime = CurrentTime;
873	>	client_p->localClient->firsttime = CurrentTime;
874
875	<	/* Show the real host/IP to admins */
876	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1167	<	"Link with %s established: (%s) link",
1168	<	inpath_ip,show_capabilities(client_p));
1169	<	/* Now show the masked hostname/IP to opers */
1170	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1171	<	"Link with %s established: (%s) link",
1172	<	inpath,show_capabilities(client_p));
1173	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1174	<	inpath_ip, show_capabilities(client_p));
1175	<
1176	<	client_p->serv->sconf = conf;
875	>	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
876	>	AddFlag(client_p, FLAGS_SERVICE);
877
878	<	if (HasServlink(client_p))
878	>	/* Show the real host/IP to admins */
879	>	#ifdef HAVE_LIBCRYPTO
880	>	if (client_p->localClient->fd.ssl)
881		{
882	<	/* we won't overflow FD_DESC_SZ here, as it can hold
883	<	* client_p->name + 64
884	<	*/
885	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
886	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
882	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
883	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
884	>
885	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
886	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
887	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
888	>	compression ? SSL_COMP_get_name(compression) : "NONE",
889	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
890	>	show_capabilities(client_p));
891	>	/* Now show the masked hostname/IP to opers */
892	>	sendto_realops_flags(UMODE_ALL, L_OPER,
893	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
894	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
895	>	compression ? SSL_COMP_get_name(compression) : "NONE",
896	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
897	>	show_capabilities(client_p));
898	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
899	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
900	>	compression ? SSL_COMP_get_name(compression) : "NONE",
901	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
902	>	show_capabilities(client_p));
903		}
904		else
905	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
905	>	#endif
906	>	{
907	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
908	>	"Link with %s established: (Capabilities: %s)",
909	>	inpath_ip,show_capabilities(client_p));
910	>	/* Now show the masked hostname/IP to opers */
911	>	sendto_realops_flags(UMODE_ALL, L_OPER,
912	>	"Link with %s established: (Capabilities: %s)",
913	>	inpath,show_capabilities(client_p));
914	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
915	>	inpath_ip, show_capabilities(client_p));
916	>	}
917	>
918	>	client_p->serv->sconf = conf;
919	>
920	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
921
922		/* Old sendto_serv_but_one() call removed because we now
923		** need to send different names to different servers
#	Line 1197 | Line 930 | server_estab(struct Client *client_p)
930		if (target_p == client_p)
931		continue;
932
1200	–	if ((conf = target_p->serv->sconf) &&
1201	–	match(my_name_for_link(conf), client_p->name))
1202	–	continue;
1203	–
933		if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
934		sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
935		me.id, client_p->name, client_p->id,
#	Line 1231 | Line 960 | server_estab(struct Client *client_p)
960		**    is destroyed...)
961		*/
962
1234	–	conf = client_p->serv->sconf;
1235	–
963		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
964		{
965		target_p = ptr->data;
966
967		/* target_p->from == target_p for target_p == client_p */
968	<	if (target_p->from == client_p)
1242	<	continue;
1243	<
1244	<	if (match(my_name_for_link(conf), target_p->name))
968	>	if (IsMe(target_p) || target_p->from == client_p)
969		continue;
970
971		if (IsCapable(client_p, CAP_TS6))
#	Line 1262 | Line 986 | server_estab(struct Client *client_p)
986		IsHidden(target_p) ? "(H) " : "", target_p->info);
987		}
988
1265	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1266	–	uplink = client_p;
1267	–
989		server_burst(client_p);
990		}
991
1271	–	static void
1272	–	start_io(struct Client *server)
1273	–	{
1274	–	struct LocalUser *lserver = server->localClient;
1275	–	int alloclen = 1;
1276	–	char *buf;
1277	–	dlink_node *ptr;
1278	–	struct dbuf_block *block;
1279	–
1280	–	/* calculate how many bytes to allocate */
1281	–	if (IsCapable(server, CAP_ZIP))
1282	–	alloclen += 6;
1283	–	#ifdef HAVE_LIBCRYPTO
1284	–	if (IsCapable(server, CAP_ENC))
1285	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1286	–	#endif
1287	–	alloclen += dbuf_length(&lserver->buf_recvq);
1288	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1289	–	alloclen += dbuf_length(&lserver->buf_sendq);
1290	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1291	–
1292	–	/* initialize servlink control sendq */
1293	–	lserver->slinkq = buf = MyMalloc(alloclen);
1294	–	lserver->slinkq_ofs = 0;
1295	–	lserver->slinkq_len = alloclen;
1296	–
1297	–	if (IsCapable(server, CAP_ZIP))
1298	–	{
1299	–	/* ziplink */
1300	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1301	–	*buf++ = 0; /* |          */
1302	–	*buf++ = 1; /* \ len is 1 */
1303	–	*buf++ = ConfigFileEntry.compression_level;
1304	–	*buf++ = SLINKCMD_START_ZIP_IN;
1305	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1306	–	}
1307	–	#ifdef HAVE_LIBCRYPTO
1308	–	if (IsCapable(server, CAP_ENC))
1309	–	{
1310	–	/* Decryption settings */
1311	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1312	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1313	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1314	–	*buf++ = lserver->in_cipher->cipherid;
1315	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1316	–	*buf++ = 0; /* keylen < 256 */
1317	–	*buf++ = lserver->in_cipher->keylen;
1318	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1319	–	buf += lserver->in_cipher->keylen;
1320	–	/* Encryption settings */
1321	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1322	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1323	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1324	–	*buf++ = lserver->out_cipher->cipherid;
1325	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1326	–	*buf++ = 0; /* keylen < 256 */
1327	–	*buf++ = lserver->out_cipher->keylen;
1328	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1329	–	buf += lserver->out_cipher->keylen;
1330	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1331	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1332	–	}
1333	–	#endif
1334	–
1335	–	/* pass the whole recvq to servlink */
1336	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1337	–	{
1338	–	block = ptr->data;
1339	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1340	–	*buf++ = (block->size >> 8);
1341	–	*buf++ = (block->size & 0xff);
1342	–	memcpy(buf, &block->data[0], block->size);
1343	–	buf += block->size;
1344	–	}
1345	–
1346	–	dbuf_clear(&lserver->buf_recvq);
1347	–
1348	–	/* pass the whole sendq to servlink */
1349	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1350	–	{
1351	–	block = ptr->data;
1352	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1353	–	*buf++ = (block->size >> 8);
1354	–	*buf++ = (block->size & 0xff);
1355	–	memcpy(buf, &block->data[0], block->size);
1356	–	buf += block->size;
1357	–	}
1358	–
1359	–	dbuf_clear(&lserver->buf_sendq);
1360	–
1361	–	/* start io */
1362	–	*buf++ = SLINKCMD_INIT;
1363	–
1364	–	/* schedule a write */
1365	–	send_queued_slink_write(server);
1366	–	}
1367	–
1368	–	/* fork_server()
1369	–	*
1370	–	* inputs       - struct Client *server
1371	–	* output       - success: 0 / failure: -1
1372	–	* side effect  - fork, and exec SERVLINK to handle this connection
1373	–	*/
1374	–	static int
1375	–	fork_server(struct Client *server)
1376	–	{
1377	–	#ifndef HAVE_SOCKETPAIR
1378	–	return -1;
1379	–	#else
1380	–	int i;
1381	–	int slink_fds[2][2];
1382	–	/* 0? - ctrl  | 1? - data
1383	–	* ?0 - child | ?1 - parent */
1384	–
1385	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1386	–	return -1;
1387	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1388	–	goto free_ctrl_fds;
1389	–
1390	–	if ((i = fork()) < 0)
1391	–	{
1392	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1393	–	free_ctrl_fds:
1394	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1395	–	return -1;
1396	–	}
1397	–
1398	–	if (i == 0)
1399	–	{
1400	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1401	–	char *kid_argv[7];
1402	–
1403	–	#ifdef O_ASYNC
1404	–	fcntl(server->localClient->fd.fd, F_SETFL,
1405	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1406	–	#endif
1407	–	close_fds(&server->localClient->fd);
1408	–	close(slink_fds[0][1]);
1409	–	close(slink_fds[1][1]);
1410	–
1411	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1412	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1413	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1414	–
1415	–	kid_argv[0] = "-slink";
1416	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1417	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1418	–	kid_argv[5] = fd_str[2];    /* network */
1419	–	kid_argv[6] = NULL;
1420	–
1421	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1422	–
1423	–	_exit(1);
1424	–	}
1425	–
1426	–	/* close the network fd and the child ends of the pipes */
1427	–	fd_close(&server->localClient->fd);
1428	–	close(slink_fds[0][0]);
1429	–	close(slink_fds[1][0]);
1430	–
1431	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1432	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1433	–
1434	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1435	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1436	–
1437	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1438	–	read_packet(&server->localClient->fd, server);
1439	–
1440	–	return 0;
1441	–	#endif
1442	–	}
1443	–
992		/* server_burst()
993		*
994		* inputs       - struct Client pointer server
#	Line 1462 | Line 1010 | server_burst(struct Client *client_p)
1010		** -orabidoo
1011		*/
1012
1013	<	/* On a "lazy link" hubs send nothing.
1466	<	* Leafs always have to send nicks plus channels
1467	<	*/
1468	<	if (IsCapable(client_p, CAP_LL))
1469	<	{
1470	<	if (!ServerInfo.hub)
1471	<	{
1472	<	/* burst all our info */
1473	<	burst_all(client_p);
1474	<
1475	<	/* Now, ask for channel info on all our current channels */
1476	<	cjoin_all(client_p);
1477	<	}
1478	<	}
1479	<	else
1480	<	{
1481	<	burst_all(client_p);
1482	<	}
1013	>	burst_all(client_p);
1014
1015		/* EOB stuff is now in burst_all */
1016		/* Always send a PING after connect burst is done */
#	Line 1518 | Line 1049 | burst_all(struct Client *client_p)
1049		{
1050		struct Client *target_p = ptr->data;
1051
1052	<	if (!IsBursted(target_p) && target_p->from != client_p)
1052	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
1053		sendnick_TS(client_p, target_p);
1054
1055	<	ClearBursted(target_p);
1055	>	DelFlag(target_p, FLAGS_BURSTED);
1056		}
1057
1058		/* We send the time we started the burst, and let the remote host determine an EOB time,
#	Line 1563 | Line 1094 | send_tb(struct Client *client_p, struct
1094		sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1095		me.name, (unsigned long)chptr->channelts, chptr->chname,
1096		(unsigned long)chptr->topic_time,
1097	<	chptr->topic_info ? chptr->topic_info : "",
1098	<	chptr->topic ? chptr->topic : "");
1097	>	chptr->topic_info,
1098	>	chptr->topic);
1099		else if (IsCapable(client_p, CAP_TB))
1100		{
1101		if (ConfigChannel.burst_topicwho)
#	Line 1572 | Line 1103 | send_tb(struct Client *client_p, struct
1103		sendto_one(client_p, ":%s TB %s %lu %s :%s",
1104		me.name, chptr->chname,
1105		(unsigned long)chptr->topic_time,
1106	<	chptr->topic_info, chptr->topic ? chptr->topic : "");
1106	>	chptr->topic_info, chptr->topic);
1107		}
1108		else
1109		{
1110		sendto_one(client_p, ":%s TB %s %lu :%s",
1111		me.name, chptr->chname,
1112		(unsigned long)chptr->topic_time,
1113	<	chptr->topic ? chptr->topic : "");
1113	>	chptr->topic);
1114		}
1115		}
1116		}
1117		}
1118
1588	–	/* cjoin_all()
1589	–	*
1590	–	* inputs       - server to ask for channel info from
1591	–	* output       - NONE
1592	–	* side effects - CJOINS for all the leafs known channels is sent
1593	–	*/
1594	–	static void
1595	–	cjoin_all(struct Client *client_p)
1596	–	{
1597	–	const dlink_node *gptr = NULL;
1598	–
1599	–	DLINK_FOREACH(gptr, global_channel_list.head)
1600	–	{
1601	–	const struct Channel *chptr = gptr->data;
1602	–	sendto_one(client_p, ":%s CBURST %s",
1603	–	me.name, chptr->chname);
1604	–	}
1605	–	}
1606	–
1607	–	/* burst_channel()
1608	–	*
1609	–	* inputs       - pointer to server to send sjoins to
1610	–	*              - channel pointer
1611	–	* output       - none
1612	–	* side effects - All sjoins for channel(s) given by chptr are sent
1613	–	*                for all channel members. ONLY called by hub on
1614	–	*                behalf of a lazylink so client_p is always guarunteed
1615	–	*                to be a LL leaf.
1616	–	*/
1617	–	void
1618	–	burst_channel(struct Client *client_p, struct Channel *chptr)
1619	–	{
1620	–	burst_ll_members(client_p, chptr);
1621	–
1622	–	send_channel_modes(client_p, chptr);
1623	–	add_lazylinkchannel(client_p,chptr);
1624	–
1625	–	if (chptr->topic != NULL && chptr->topic_info != NULL)
1626	–	{
1627	–	sendto_one(client_p, ":%s TOPIC %s %s %lu :%s",
1628	–	me.name, chptr->chname, chptr->topic_info,
1629	–	(unsigned long)chptr->topic_time, chptr->topic);
1630	–	}
1631	–	}
1632	–
1633	–	/* add_lazlinkchannel()
1634	–	*
1635	–	* inputs       - pointer to directly connected leaf server
1636	–	*                being introduced to this hub
1637	–	*              - pointer to channel structure being introduced
1638	–	* output       - NONE
1639	–	* side effects - The channel pointed to by chptr is now known
1640	–	*                to be on lazyleaf server given by local_server_p.
1641	–	*                mark that in the bit map and add to the list
1642	–	*                of channels to examine after this newly introduced
1643	–	*                server is squit off.
1644	–	*/
1645	–	static void
1646	–	add_lazylinkchannel(struct Client *local_server_p, struct Channel *chptr)
1647	–	{
1648	–	assert(MyConnect(local_server_p));
1649	–
1650	–	chptr->lazyLinkChannelExists |= local_server_p->localClient->serverMask;
1651	–	dlinkAdd(chptr, make_dlink_node(), &lazylink_channels);
1652	–	}
1653	–
1654	–	/* add_lazylinkclient()
1655	–	*
1656	–	* inputs       - pointer to directly connected leaf server
1657	–	*                being introduced to this hub
1658	–	*              - pointer to client being introduced
1659	–	* output       - NONE
1660	–	* side effects - The client pointed to by client_p is now known
1661	–	*                to be on lazyleaf server given by local_server_p.
1662	–	*                mark that in the bit map and add to the list
1663	–	*                of clients to examine after this newly introduced
1664	–	*                server is squit off.
1665	–	*/
1666	–	void
1667	–	add_lazylinkclient(struct Client *local_server_p, struct Client *client_p)
1668	–	{
1669	–	assert(MyConnect(local_server_p));
1670	–	client_p->lazyLinkClientExists |= local_server_p->localClient->serverMask;
1671	–	}
1672	–
1673	–	/* remove_lazylink_flags()
1674	–	*
1675	–	* inputs       - pointer to server quitting
1676	–	* output       - NONE
1677	–	* side effects - All the channels on the lazylink channel list are examined
1678	–	*                If they hold a bit corresponding to the servermask
1679	–	*                attached to client_p, clear that bit. If this bitmask
1680	–	*                goes to 0, then the channel is no longer known to
1681	–	*                be on any lazylink server, and can be removed from the
1682	–	*                link list.
1683	–	*
1684	–	*                Similar is done for lazylink clients
1685	–	*
1686	–	*                This function must be run by the HUB on any exiting
1687	–	*                lazylink leaf server, while the pointer is still valid.
1688	–	*                Hence must be run from client.c in exit_one_client()
1689	–	*
1690	–	*                The old code scanned all channels, this code only
1691	–	*                scans channels/clients on the lazylink_channels
1692	–	*                lazylink_clients lists.
1693	–	*/
1694	–	void
1695	–	remove_lazylink_flags(unsigned long mask)
1696	–	{
1697	–	dlink_node *ptr;
1698	–	dlink_node *next_ptr;
1699	–	struct Channel *chptr;
1700	–	struct Client *target_p;
1701	–	unsigned long clear_mask;
1702	–
1703	–	if (!mask) /* On 0 mask, don't do anything */
1704	–	return;
1705	–
1706	–	clear_mask = ~mask;
1707	–	freeMask |= mask;
1708	–
1709	–	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
1710	–	{
1711	–	chptr = ptr->data;
1712	–
1713	–	chptr->lazyLinkChannelExists &= clear_mask;
1714	–
1715	–	if (chptr->lazyLinkChannelExists == 0)
1716	–	{
1717	–	dlinkDelete(ptr, &lazylink_channels);
1718	–	free_dlink_node(ptr);
1719	–	}
1720	–	}
1721	–
1722	–	DLINK_FOREACH(ptr, global_client_list.head)
1723	–	{
1724	–	target_p = ptr->data;
1725	–	target_p->lazyLinkClientExists &= clear_mask;
1726	–	}
1727	–	}
1728	–
1119		/* burst_members()
1120		*
1121		* inputs       - pointer to server to send members to
#	Line 1745 | Line 1135 | burst_members(struct Client *client_p, s
1135		ms       = ptr->data;
1136		target_p = ms->client_p;
1137
1138	<	if (!IsBursted(target_p))
1138	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1139		{
1140	<	SetBursted(target_p);
1751	<
1752	<	if (target_p->from != client_p)
1753	<	sendnick_TS(client_p, target_p);
1754	<	}
1755	<	}
1756	<	}
1757	<
1758	<	/* burst_ll_members()
1759	<	*
1760	<	* inputs       - pointer to server to send members to
1761	<	*              - dlink_list pointer to membership list to send
1762	<	* output       - NONE
1763	<	* side effects - This version also has to check the bitmap for lazylink
1764	<	*/
1765	<	static void
1766	<	burst_ll_members(struct Client *client_p, struct Channel *chptr)
1767	<	{
1768	<	struct Client *target_p;
1769	<	struct Membership *ms;
1770	<	dlink_node *ptr;
1771	<
1772	<	DLINK_FOREACH(ptr, chptr->members.head)
1773	<	{
1774	<	ms       = ptr->data;
1775	<	target_p = ms->client_p;
1140	>	AddFlag(target_p, FLAGS_BURSTED);
1141
1777	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
1778	–	{
1142		if (target_p->from != client_p)
1780	–	{
1781	–	add_lazylinkclient(client_p,target_p);
1143		sendnick_TS(client_p, target_p);
1783	–	}
1784	–	}
1785	–	}
1786	–	}
1787	–
1788	–	/* set_autoconn()
1789	–	*
1790	–	* inputs       - struct Client pointer to oper requesting change
1791	–	* output       - none
1792	–	* side effects - set autoconnect mode
1793	–	*/
1794	–	void
1795	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1796	–	{
1797	–	struct ConfItem *conf;
1798	–	struct AccessItem *aconf;
1799	–
1800	–	if (name != NULL)
1801	–	{
1802	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1803	–	if (conf != NULL)
1804	–	{
1805	–	aconf = (struct AccessItem *)map_to_conf(conf);
1806	–	if (newval)
1807	–	SetConfAllowAutoConn(aconf);
1808	–	else
1809	–	ClearConfAllowAutoConn(aconf);
1810	–
1811	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1812	–	"%s has changed AUTOCONN for %s to %i",
1813	–	source_p->name, name, newval);
1814	–	sendto_one(source_p,
1815	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1816	–	me.name, source_p->name, name, newval);
1817	–	}
1818	–	else
1819	–	{
1820	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1821	–	me.name, source_p->name, name);
1822	–	}
1823	–	}
1824	–	else
1825	–	{
1826	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1827	–	me.name, source_p->name);
1828	–	}
1829	–	}
1830	–
1831	–	void
1832	–	initServerMask(void)
1833	–	{
1834	–	freeMask = 0xFFFFFFFFUL;
1835	–	}
1836	–
1837	–	/* nextFreeMask()
1838	–	*
1839	–	* inputs       - NONE
1840	–	* output       - unsigned long next unused mask for use in LL
1841	–	* side effects -
1842	–	*/
1843	–	unsigned long
1844	–	nextFreeMask(void)
1845	–	{
1846	–	int i;
1847	–	unsigned long mask = 1;
1848	–
1849	–	for (i = 0; i < 32; i++)
1850	–	{
1851	–	if (mask & freeMask)
1852	–	{
1853	–	freeMask &= ~mask;
1854	–	return(mask);
1144		}
1856	–
1857	–	mask <<= 1;
1145		}
1859	–
1860	–	return(0L); /* watch this special case ... */
1146		}
1147
1148		/* New server connection code
#	Line 1900 | Line 1185 | serv_connect(struct AccessItem *aconf, s
1185		conf = unmap_conf_item(aconf);
1186
1187		/* log */
1188	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1189	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1190	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1188	>	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
1189	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1190	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1191		buf);
1192
1193		/* Still processing a DNS lookup? -> exit */
1194	<	if (aconf->dns_query != NULL)
1194	>	if (aconf->dns_pending)
1195		{
1196	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1197	<	"Error connecting to %s: Error during DNS lookup", conf->name);
1196	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1197	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
1198	>	conf->name);
1199	>	return (0);
1200	>	}
1201	>
1202	>	if (aconf->dns_failed)
1203	>	{
1204	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1205	>	"Error connecting to %s: DNS lookup for connect{} failed.",
1206	>	conf->name);
1207		return (0);
1208		}
1209
1210		/* Make sure this server isn't already connected
1211		* Note: aconf should ALWAYS be a valid C: line
1212		*/
1213	<	if ((client_p = find_server(conf->name)) != NULL)
1213	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1214		{
1215		sendto_realops_flags(UMODE_ALL, L_ADMIN,
1216		"Server %s already present from %s",
#	Line 1939 | Line 1233 | serv_connect(struct AccessItem *aconf, s
1233		strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1234
1235		/* We already converted the ip once, so lets use it - stu */
1236	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
1236	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1237
1238		/* create a socket for the server connection */
1239		if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
#	Line 2072 | Line 1366 | serv_connect(struct AccessItem *aconf, s
1366		return (1);
1367		}
1368
1369	+	#ifdef HAVE_LIBCRYPTO
1370	+	static void
1371	+	finish_ssl_server_handshake(struct Client *client_p)
1372	+	{
1373	+	struct ConfItem *conf=NULL;
1374	+	struct AccessItem *aconf=NULL;
1375	+
1376	+	conf = find_conf_name(&client_p->localClient->confs,
1377	+	client_p->name, SERVER_TYPE);
1378	+	if (conf == NULL)
1379	+	{
1380	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1381	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1382	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1383	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1384	+
1385	+	exit_client(client_p, &me, "Lost connect{} block");
1386	+	return;
1387	+	}
1388	+
1389	+	aconf = map_to_conf(conf);
1390	+
1391	+	/* jdc -- Check and send spasswd, not passwd. */
1392	+	if (!EmptyString(aconf->spasswd))
1393	+	sendto_one(client_p, "PASS %s TS %d %s",
1394	+	aconf->spasswd, TS_CURRENT, me.id);
1395	+
1396	+	send_capabilities(client_p, aconf,
1397	+	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
1398	+
1399	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1400	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1401	+	me.info);
1402	+
1403	+	/* If we've been marked dead because a send failed, just exit
1404	+	* here now and save everyone the trouble of us ever existing.
1405	+	*/
1406	+	if (IsDead(client_p))
1407	+	{
1408	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1409	+	"%s[%s] went dead during handshake",
1410	+	client_p->name,
1411	+	client_p->host);
1412	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1413	+	"%s went dead during handshake", client_p->name);
1414	+	return;
1415	+	}
1416	+
1417	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1418	+	/* If we get here, we're ok, so lets start reading some data */
1419	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1420	+	}
1421	+
1422	+	static void
1423	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1424	+	{
1425	+	int ret;
1426	+	int err;
1427	+
1428	+	ret = SSL_connect(client_p->localClient->fd.ssl);
1429	+
1430	+	if (ret <= 0)
1431	+	{
1432	+	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1433	+	{
1434	+	case SSL_ERROR_WANT_WRITE:
1435	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1436	+	(PF *)ssl_server_handshake, client_p, 0);
1437	+	return;
1438	+	case SSL_ERROR_WANT_READ:
1439	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1440	+	(PF *)ssl_server_handshake, client_p, 0);
1441	+	return;
1442	+	default:
1443	+	{
1444	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1445	+	sendto_realops_flags(UMODE_ALL, L_ALL,
1446	+	"Error connecting to %s: %s", client_p->name,
1447	+	sslerr ? sslerr : "unknown SSL error");
1448	+	exit_client(client_p, client_p, "Error during SSL handshake");
1449	+	return;
1450	+	}
1451	+	}
1452	+	}
1453	+
1454	+	finish_ssl_server_handshake(client_p);
1455	+	}
1456	+
1457	+	static void
1458	+	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1459	+	{
1460	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1461	+	{
1462	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1463	+	ERR_error_string(ERR_get_error(), NULL));
1464	+	SetDead(client_p);
1465	+	exit_client(client_p, client_p, "SSL_new failed");
1466	+	return;
1467	+	}
1468	+
1469	+	SSL_set_fd(fd->ssl, fd->fd);
1470	+
1471	+	if (!EmptyString(aconf->cipher_list))
1472	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1473	+
1474	+	ssl_server_handshake(NULL, client_p);
1475	+	}
1476	+	#endif
1477	+
1478		/* serv_connect_callback() - complete a server connection.
1479		*
1480		* This routine is called after the server connection attempt has
#	Line 2135 | Line 1538 | serv_connect_callback(fde_t *fd, int sta
1538		return;
1539		}
1540
1541	<	aconf = (struct AccessItem *)map_to_conf(conf);
1541	>	aconf = map_to_conf(conf);
1542		/* Next, send the initial handshake */
1543		SetHandshake(client_p);
1544
1545		#ifdef HAVE_LIBCRYPTO
1546	<	/* Handle all CRYPTLINK links in cryptlink_init */
2144	<	if (IsConfCryptLink(aconf))
1546	>	if (IsConfSSL(aconf))
1547		{
1548	<	cryptlink_init(client_p, conf, fd);
1548	>	ssl_connect_init(client_p, aconf, fd);
1549		return;
1550		}
1551		#endif
1552
1553		/* jdc -- Check and send spasswd, not passwd. */
1554	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
2153	<	/* Send TS 6 form only if id */
1554	>	if (!EmptyString(aconf->spasswd))
1555		sendto_one(client_p, "PASS %s TS %d %s",
1556		aconf->spasswd, TS_CURRENT, me.id);
2156	–	else
2157	–	sendto_one(client_p, "PASS %s TS 5",
2158	–	aconf->spasswd);
1557
1558	<	/* Pass my info to the new server
1559	<	*
2162	<	* If trying to negotiate LazyLinks, pass on CAP_LL
2163	<	* If this is a HUB, pass on CAP_HUB
2164	<	* Pass on ZIP if supported
2165	<	* Pass on TB if supported.
2166	<	* - Dianora
2167	<	*/
2168	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2169	<	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
2170	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
2171	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1558	>	send_capabilities(client_p, aconf,
1559	>	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
1560
1561		sendto_one(client_p, "SERVER %s 1 :%s%s",
1562	<	my_name_for_link(conf),
2175	<	ConfigServerHide.hidden ? "(H) " : "",
1562	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
1563		me.info);
1564
1565		/* If we've been marked dead because a send failed, just exit
#	Line 2205 | Line 1592 | find_servconn_in_progress(const char *na
1592		cptr = ptr->data;
1593
1594		if (cptr && cptr->name[0])
1595	<	if (match(cptr->name, name) || match(name, cptr->name))
1595	>	if (match(name, cptr->name))
1596		return cptr;
1597		}
1598
1599		return NULL;
1600		}
2214	–
2215	–	#ifdef HAVE_LIBCRYPTO
2216	–	/*
2217	–	* sends a CRYPTLINK SERV command.
2218	–	*/
2219	–	void
2220	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
2221	–	{
2222	–	struct AccessItem *aconf;
2223	–	char *encrypted;
2224	–	unsigned char *key_to_send;
2225	–	char randkey[CIPHERKEYLEN];
2226	–	int enc_len;
2227	–
2228	–	/* get key */
2229	–	if ((!ServerInfo.rsa_private_key) ||
2230	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
2231	–	{
2232	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
2233	–	"Invalid RSA private key");
2234	–	return;
2235	–	}
2236	–
2237	–	aconf = (struct AccessItem *)map_to_conf(conf);
2238	–
2239	–	if (aconf->rsa_public_key == NULL)
2240	–	{
2241	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
2242	–	"Invalid RSA public key");
2243	–	return;
2244	–	}
2245	–
2246	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
2247	–	{
2248	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
2249	–	"Couldn't generate keyphrase");
2250	–	return;
2251	–	}
2252	–
2253	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
2254	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
2255	–	(unsigned char *)randkey,
2256	–	(unsigned char *)encrypted,
2257	–	aconf->rsa_public_key,
2258	–	RSA_PKCS1_PADDING);
2259	–
2260	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
2261	–
2262	–	if (enc_len <= 0)
2263	–	{
2264	–	report_crypto_errors();
2265	–	MyFree(encrypted);
2266	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
2267	–	"Couldn't encrypt data");
2268	–	return;
2269	–	}
2270	–
2271	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
2272	–	{
2273	–	MyFree(encrypted);
2274	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
2275	–	"Couldn't base64 encode key");
2276	–	return;
2277	–	}
2278	–
2279	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2280	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
2281	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
2282	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
2283	–
2284	–	if (me.id[0])
2285	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
2286	–
2287	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
2288	–	my_name_for_link(conf), key_to_send,
2289	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
2290	–
2291	–	SetHandshake(client_p);
2292	–	SetWaitAuth(client_p);
2293	–
2294	–	MyFree(encrypted);
2295	–	MyFree(key_to_send);
2296	–
2297	–	if (IsDead(client_p))
2298	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
2299	–	"Went dead during handshake");
2300	–	else if (fd != NULL)
2301	–	/* If we get here, we're ok, so lets start reading some data */
2302	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
2303	–	}
2304	–
2305	–	void
2306	–	cryptlink_error(struct Client *client_p, const char *type,
2307	–	const char *reason, const char *client_reason)
2308	–	{
2309	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2310	–	get_client_name(client_p, SHOW_IP), type, reason);
2311	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2312	–	get_client_name(client_p, MASK_IP), type, reason);
2313	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2314	–	get_client_name(client_p, SHOW_IP), type, reason);
2315	–
2316	–	/* If client_reason isn't NULL, then exit the client with the message
2317	–	* defined in the call.
2318	–	*/
2319	–	if ((client_reason != NULL) && (!IsDead(client_p)))
2320	–	exit_client(client_p, &me, client_reason);
2321	–	}
2322	–
2323	–	static char base64_chars[] =
2324	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2325	–
2326	–	static char base64_values[] =
2327	–	{
2328	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2329	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2330	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2331	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2332	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2333	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2334	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2335	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2336	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2337	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2338	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2339	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2340	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2341	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2342	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2343	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2344	–	};
2345	–
2346	–	/*
2347	–	* base64_block will allocate and return a new block of memory
2348	–	* using MyMalloc().  It should be freed after use.
2349	–	*/
2350	–	int
2351	–	base64_block(unsigned char **output, char *data, int len)
2352	–	{
2353	–	unsigned char *out;
2354	–	unsigned char *in = (unsigned char*)data;
2355	–	unsigned long int q_in;
2356	–	int i;
2357	–	int count = 0;
2358	–
2359	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2360	–
2361	–	/* process 24 bits at a time */
2362	–	for( i = 0; i < len; i += 3)
2363	–	{
2364	–	q_in = 0;
2365	–
2366	–	if ( i + 2 < len )
2367	–	{
2368	–	q_in  = (in[i+2] & 0xc0) << 2;
2369	–	q_in |=  in[i+2];
2370	–	}
2371	–
2372	–	if ( i + 1 < len )
2373	–	{
2374	–	q_in |= (in[i+1] & 0x0f) << 10;
2375	–	q_in |= (in[i+1] & 0xf0) << 12;
2376	–	}
2377	–
2378	–	q_in |= (in[i]   & 0x03) << 20;
2379	–	q_in |=  in[i]           << 22;
2380	–
2381	–	q_in &= 0x3f3f3f3f;
2382	–
2383	–	out[count++] = base64_chars[((q_in >> 24)       )];
2384	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2385	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2386	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2387	–	}
2388	–	if ( (i - len) > 0 )
2389	–	{
2390	–	out[count-1] = '=';
2391	–	if ( (i - len) > 1 )
2392	–	out[count-2] = '=';
2393	–	}
2394	–
2395	–	out[count] = '\0';
2396	–	*output = out;
2397	–	return (count);
2398	–	}
2399	–
2400	–	/*
2401	–	* unbase64_block will allocate and return a new block of memory
2402	–	* using MyMalloc().  It should be freed after use.
2403	–	*/
2404	–	int
2405	–	unbase64_block(unsigned char **output, char *data, int len)
2406	–	{
2407	–	unsigned char *out;
2408	–	unsigned char *in = (unsigned char*)data;
2409	–	unsigned long int q_in;
2410	–	int i;
2411	–	int count = 0;
2412	–
2413	–	if ((len % 4) != 0)
2414	–	return (0);
2415	–
2416	–	out = MyMalloc(((len / 4) * 3) + 1);
2417	–
2418	–	/* process 32 bits at a time */
2419	–	for( i = 0; (i + 3) < len; i+=4)
2420	–	{
2421	–	/* compress input (chars a, b, c and d) as follows:
2422	–	* (after converting ascii -> base64 value)
2423	–	*
2424	–	* |00000000aaaaaabbbbbbccccccdddddd|
2425	–	* |  765432  107654  321076  543210|
2426	–	*/
2427	–
2428	–	q_in = 0;
2429	–
2430	–	if (base64_values[in[i+3]] > -1)
2431	–	q_in |= base64_values[in[i+3]]      ;
2432	–	if (base64_values[in[i+2]] > -1)
2433	–	q_in |= base64_values[in[i+2]] <<  6;
2434	–	if (base64_values[in[i+1]] > -1)
2435	–	q_in |= base64_values[in[i+1]] << 12;
2436	–	if (base64_values[in[i  ]] > -1)
2437	–	q_in |= base64_values[in[i  ]] << 18;
2438	–
2439	–	out[count++] = (q_in >> 16) & 0xff;
2440	–	out[count++] = (q_in >>  8) & 0xff;
2441	–	out[count++] = (q_in      ) & 0xff;
2442	–	}
2443	–
2444	–	if (in[i-1] == '=') count--;
2445	–	if (in[i-2] == '=') count--;
2446	–
2447	–	out[count] = '\0';
2448	–	*output = out;
2449	–	return (count);
2450	–	}
2451	–
2452	–	#endif /* HAVE_LIBCRYPTO */
2453	–

Diff Legend

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