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-8/src/s_serv.c (file contents), Revision 1243 by michael, Fri Sep 30 10:47:53 2011 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 1649 by michael, Sat Nov 10 19:27:13 2012 UTC

#	Line 43 | Line 43
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"
48	>	#include "log.h"
49	>	#include "s_misc.h"
50		#include "s_user.h"
51		#include "send.h"
52		#include "memory.h"
#	Line 56 | Line 57
57
58		static dlink_list cap_list = { NULL, NULL, 0 };
59		static void server_burst(struct Client *);
59	–	static int fork_server(struct Client *);
60		static void burst_all(struct Client *);
61		static void send_tb(struct Client *client_p, struct Channel *chptr);
62
63		static CNCB serv_connect_callback;
64
65	–	static void start_io(struct Client *);
65		static void burst_members(struct Client *, struct Channel *);
66
68	–	static SlinkRplHnd slink_error;
69	–	static SlinkRplHnd slink_zipstats;
70	–
71	–
72	–	#ifdef HAVE_LIBCRYPTO
73	–	struct EncCapability CipherTable[] =
74	–	{
75	–	#ifdef HAVE_EVP_BF_CFB
76	–	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
77	–	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
78	–	#endif
79	–	#ifdef HAVE_EVP_CAST5_CFB
80	–	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
81	–	#endif
82	–	#ifdef HAVE_EVP_IDEA_CFB
83	–	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
84	–	#endif
85	–	#ifdef HAVE_EVP_RC5_32_12_16_CFB
86	–	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
87	–	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
88	–	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
89	–	#endif
90	–	#ifdef HAVE_EVP_DES_EDE3_CFB
91	–	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
92	–	#endif
93	–	#ifdef HAVE_EVP_DES_CFB
94	–	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
95	–	#endif
96	–	{ 0,            0,                   0, 0             }
97	–	};
98	–	#endif
99	–
100	–	struct SlinkRplDef slinkrpltab[] = {
101	–	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
102	–	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
103	–	{ 0,                 0,              0 },
104	–	};
105	–
106	–
107	–	void
108	–	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
109	–	struct Client *server_p)
110	–	{
111	–	assert(rpl == SLINKRPL_ERROR);
112	–	assert(len < 256);
113	–
114	–	data[len-1] = '\0';
115	–
116	–	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
117	–	server_p->name, data);
118	–	/* XXX should this be exit_client? */
119	–	exit_client(server_p, &me, "servlink error -- terminating link");
120	–	}
121	–
122	–	void
123	–	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
124	–	struct Client *server_p)
125	–	{
126	–	struct ZipStats zipstats;
127	–	uint64_t in = 0, in_wire = 0, out = 0, out_wire = 0;
128	–	int i = 0;
129	–
130	–	assert(rpl == SLINKRPL_ZIPSTATS);
131	–	assert(len == 16);
132	–	assert(IsCapable(server_p, CAP_ZIP));
133	–
134	–	/* Yes, it needs to be done this way, no we cannot let the compiler
135	–	* work with the pointer to the structure.  This works around a GCC
136	–	* bug on SPARC that affects all versions at the time of this writing.
137	–	* I will feed you to the creatures living in RMS's beard if you do
138	–	* not leave this as is, without being sure that you are not causing
139	–	* regression for most of our installed SPARC base.
140	–	* -jmallett, 04/27/2002
141	–	*/
142	–	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
143	–
144	–	in |= (data[i++] << 24);
145	–	in |= (data[i++] << 16);
146	–	in |= (data[i++] <<  8);
147	–	in |= (data[i++]      );
148	–
149	–	in_wire |= (data[i++] << 24);
150	–	in_wire |= (data[i++] << 16);
151	–	in_wire |= (data[i++] <<  8);
152	–	in_wire |= (data[i++]      );
153	–
154	–	out |= (data[i++] << 24);
155	–	out |= (data[i++] << 16);
156	–	out |= (data[i++] <<  8);
157	–	out |= (data[i++]      );
158	–
159	–	out_wire |= (data[i++] << 24);
160	–	out_wire |= (data[i++] << 16);
161	–	out_wire |= (data[i++] <<  8);
162	–	out_wire |= (data[i++]      );
163	–
164	–	/* This macro adds b to a if a plus b is not an overflow, and sets the
165	–	* value of a to b if it is.
166	–	* Add and Set if No Overflow.
167	–	*/
168	–	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
169	–
170	–	ASNO(zipstats.in, in);
171	–	ASNO(zipstats.out, out);
172	–	ASNO(zipstats.in_wire, in_wire);
173	–	ASNO(zipstats.out_wire, out_wire);
174	–
175	–	if (zipstats.in > 0)
176	–	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
177	–	(double)zipstats.in) * 100.00);
178	–	else
179	–	zipstats.in_ratio = 0;
180	–
181	–	if (zipstats.out > 0)
182	–	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
183	–	(double)zipstats.out) * 100.00);
184	–	else
185	–	zipstats.out_ratio = 0;
186	–
187	–	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
188	–	}
189	–
190	–	void
191	–	collect_zipstats(void *unused)
192	–	{
193	–	dlink_node *ptr = NULL;
194	–
195	–	DLINK_FOREACH(ptr, serv_list.head)
196	–	{
197	–	struct Client *target_p = ptr->data;
198	–
199	–	if (IsCapable(target_p, CAP_ZIP))
200	–	{
201	–	/* only bother if we haven't already got something queued... */
202	–	if (!target_p->localClient->slinkq)
203	–	{
204	–	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
205	–	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
206	–	target_p->localClient->slinkq_ofs = 0;
207	–	target_p->localClient->slinkq_len = 1;
208	–	send_queued_slink_write(target_p);
209	–	}
210	–	}
211	–	}
212	–	}
213	–
214	–	#ifdef HAVE_LIBCRYPTO
215	–	struct EncCapability *
216	–	check_cipher(struct Client *client_p, struct AccessItem *aconf)
217	–	{
218	–	struct EncCapability *epref = NULL;
219	–
220	–	/* Use connect{} specific info if available */
221	–	if (aconf->cipher_preference)
222	–	epref = aconf->cipher_preference;
223	–	else if (ConfigFileEntry.default_cipher_preference)
224	–	epref = ConfigFileEntry.default_cipher_preference;
225	–
226	–	/*
227	–	* If the server supports the capability in hand, return the matching
228	–	* conf struct.  Otherwise, return NULL (an error).
229	–	*/
230	–	if (epref && IsCapableEnc(client_p, epref->cap))
231	–	return epref;
232	–
233	–	return NULL;
234	–	}
235	–	#endif /* HAVE_LIBCRYPTO */
236	–
67		/*
68		* write_links_file
69		*
#	Line 245 | Line 75 | check_cipher(struct Client *client_p, st
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;
254	<	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;
259	<
260	<	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 267 | Line 94 | write_links_file(void* notused)
94		}
95
96		MessageFileptr->contentsOfFile = NULL;
270	–	currentMessageLine             = NULL;
97
98		DLINK_FOREACH(ptr, global_serv_list.head)
99		{
100	<	size_t nbytes = 0;
275	<	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
285	–	if (target_p->info[0])
286	–	p = target_p->info;
287	–	else
288	–	p = "(Unknown Location)";
289	–
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	<	/*
299	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
300	<	* default config but it is configurable..
301	<	* This should be changed to an snprintf at some point, but I'm wanting to
302	<	* know if this is a cause of a bug - cryogen
303	<	*/
304	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
305	<	MESSAGELINELEN);
306	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
307	<	target_p->name, me.name, p);
308	<	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 319 | 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 354 | 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))
363	<	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
#	Line 380 | Line 191 | hunt_server(struct Client *client_p, str
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 460 | Line 271 | hunt_server(struct Client *client_p, str
271		void
272		try_connections(void *unused)
273		{
274	<	dlink_node *ptr;
275	<	struct ConfItem *conf;
465	<	struct AccessItem *aconf;
466	<	struct ClassItem *cltmp;
274	>	dlink_node *ptr = NULL;
275	>	struct MaskItem *conf;
276		int confrq;
277
278		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 473 | Line 282 | try_connections(void *unused)
282		DLINK_FOREACH(ptr, server_items.head)
283		{
284		conf = ptr->data;
285	<	aconf = map_to_conf(conf);
285	>
286	>	assert(conf->type == CONF_SERVER);
287
288		/* Also when already connecting! (update holdtimes) --SRB
289		*/
290	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
481	<	!(IsConfAllowAutoConn(aconf)))
290	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
291		continue;
292
484	–	cltmp = map_to_conf(aconf->class_ptr);
293
294		/* Skip this entry if the use of it is still on hold until
295		* future. Otherwise handle this entry (and set it on hold
#	Line 489 | Line 297 | try_connections(void *unused)
297		* made one successfull connection... [this algorithm is
298		* a bit fuzzy... -- msa >;) ]
299		*/
300	<	if (aconf->hold > CurrentTime)
300	>	if (conf->until > CurrentTime)
301		continue;
302
303	<	if (cltmp == NULL)
303	>	if (conf->class == NULL)
304		confrq = DEFAULT_CONNECTFREQUENCY;
305		else
306		{
307	<	confrq = ConFreq(cltmp);
308	<	if (confrq < MIN_CONN_FREQ )
307	>	confrq = conf->class->con_freq;
308	>	if (confrq < MIN_CONN_FREQ)
309		confrq = MIN_CONN_FREQ;
310		}
311
312	<	aconf->hold = CurrentTime + confrq;
312	>	conf->until = CurrentTime + confrq;
313
314		/* Found a CONNECT config with port specified, scan clients
315		* and see if this server is already connected?
#	Line 509 | Line 317 | try_connections(void *unused)
317		if (hash_find_server(conf->name) != NULL)
318		continue;
319
320	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
320	>	if (conf->class->ref_count < conf->class->max_total)
321		{
322		/* Go to the end of the list, if not already last */
323		if (ptr->next != NULL)
#	Line 530 | Line 338 | try_connections(void *unused)
338		*   -- adrian
339		*/
340		if (ConfigServerHide.hide_server_ips)
341	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
341	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
342	>	"Connection to %s activated.",
343		conf->name);
344		else
345	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
346	<	conf->name, aconf->host);
345	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
346	>	"Connection to %s[%s] activated.",
347	>	conf->name, conf->host);
348
349	<	serv_connect(aconf, NULL);
349	>	serv_connect(conf, NULL);
350		/* We connect only one at time... */
351		return;
352		}
#	Line 565 | Line 375 | valid_servname(const char *name)
375		}
376
377		int
378	<	check_server(const char *name, struct Client *client_p, int cryptlink)
378	>	check_server(const char *name, struct Client *client_p)
379		{
380		dlink_node *ptr;
381	<	struct ConfItem *conf           = NULL;
382	<	struct ConfItem *server_conf    = NULL;
573	<	struct AccessItem *server_aconf = NULL;
574	<	struct AccessItem *aconf        = NULL;
381	>	struct MaskItem *conf        = NULL;
382	>	struct MaskItem *server_conf = NULL;
383		int error = -1;
384
385		assert(client_p != NULL);
386
579	–	if (client_p == NULL)
580	–	return(error);
581	–
582	–	if (strlen(name) > HOSTLEN)
583	–	return(-4);
584	–
387		/* loop through looking for all possible connect items that might work */
388		DLINK_FOREACH(ptr, server_items.head)
389		{
390		conf = ptr->data;
589	–	aconf = map_to_conf(conf);
391
392		if (!match(name, conf->name))
393		continue;
#	Line 595 | Line 396 | check_server(const char *name, struct Cl
396
397		/* XXX: Fix me for IPv6                    */
398		/* XXX sockhost is the IPv4 ip as a string */
399	<	if (match(aconf->host, client_p->host) ||
400	<	match(aconf->host, client_p->sockhost))
399	>	if (match(conf->host, client_p->host) ||
400	>	match(conf->host, client_p->sockhost))
401		{
402		error = -2;
602	–	#ifdef HAVE_LIBCRYPTO
603	–	if (cryptlink && IsConfCryptLink(aconf))
604	–	{
605	–	if (aconf->rsa_public_key)
606	–	server_conf = conf;
607	–	}
608	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
609	–	#endif /* HAVE_LIBCRYPTO */
610	–	{
611	–	/* A NULL password is as good as a bad one */
612	–	if (EmptyString(client_p->localClient->passwd))
613	–	return(-2);
614	–
615	–	/* code in s_conf.c should not have allowed this to be NULL */
616	–	if (aconf->passwd == NULL)
617	–	return(-2);
403
404	<	if (IsConfEncrypted(aconf))
405	<	{
406	<	if (strcmp(aconf->passwd,
407	<	(const char *)crypt(client_p->localClient->passwd,
623	<	aconf->passwd)) == 0)
624	<	server_conf = conf;
625	<	}
626	<	else
627	<	{
628	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
629	<	server_conf = conf;
630	<	}
631	<	}
404	>	if (!match_conf_password(client_p->localClient->passwd, conf))
405	>	return -2;
406	>
407	>	server_conf = conf;
408		}
409		}
410
#	Line 637 | Line 413 | check_server(const char *name, struct Cl
413
414		attach_conf(client_p, server_conf);
415
640	–	/* Now find all leaf or hub config items for this server */
641	–	DLINK_FOREACH(ptr, hub_items.head)
642	–	{
643	–	conf = ptr->data;
644	–
645	–	if (!match(name, conf->name))
646	–	continue;
647	–	attach_conf(client_p, conf);
648	–	}
416
417	<	DLINK_FOREACH(ptr, leaf_items.head)
651	<	{
652	<	conf = ptr->data;
653	<
654	<	if (!match(name, conf->name))
655	<	continue;
656	<	attach_conf(client_p, conf);
657	<	}
658	<
659	<	server_aconf = map_to_conf(server_conf);
660	<
661	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
662	<	if (!IsConfCompressed(server_aconf))
663	<	#endif
664	<	ClearCap(client_p, CAP_ZIP);
665	<	if (!IsConfCryptLink(server_aconf))
666	<	ClearCap(client_p, CAP_ENC);
667	<	if (!IsConfTopicBurst(server_aconf))
668	<	{
669	<	ClearCap(client_p, CAP_TB);
670	<	ClearCap(client_p, CAP_TBURST);
671	<	}
672	<
673	<	if (aconf != NULL)
417	>	if (server_conf != NULL)
418		{
419		struct sockaddr_in *v4;
420		#ifdef IPV6
421		struct sockaddr_in6 *v6;
422		#endif
423	<	switch (aconf->aftype)
423	>	switch (server_conf->aftype)
424		{
425		#ifdef IPV6
426		case AF_INET6:
427	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
427	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
428
429		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
430	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
430	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
431		break;
432		#endif
433		case AF_INET:
434	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
434	>	v4 = (struct sockaddr_in *)&server_conf->addr;
435
436		if (v4->sin_addr.s_addr == INADDR_NONE)
437	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
437	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
438		break;
439		}
440		}
#	Line 712 | Line 456 | add_capability(const char *capab_name, i
456		{
457		struct Capability *cap = MyMalloc(sizeof(*cap));
458
459	<	DupString(cap->name, capab_name);
459	>	cap->name = xstrdup(capab_name);
460		cap->cap = cap_flag;
461		dlinkAdd(cap, &cap->node, &cap_list);
462
#	Line 779 | Line 523 | find_capability(const char *capab)
523		/* send_capabilities()
524		*
525		* inputs       - Client pointer to send to
782	–	*              - Pointer to AccessItem (for crypt)
526		*              - int flag of capabilities that this server can send
784	–	*              - int flag of encryption capabilities
527		* output       - NONE
528		* side effects - send the CAPAB line to a server  -orabidoo
529		*
530		*/
531		void
532	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
791	<	int cap_can_send, int enc_can_send)
532	>	send_capabilities(struct Client *client_p, int cap_can_send)
533		{
534		struct Capability *cap=NULL;
535		char msgbuf[IRCD_BUFSIZE];
536		char *t;
537		int tl;
538		dlink_node *ptr;
798	–	#ifdef HAVE_LIBCRYPTO
799	–	const struct EncCapability *epref = NULL;
800	–	char *capend;
801	–	int sent_cipher = 0;
802	–	#endif
539
540		t = msgbuf;
541
#	Line 813 | Line 549 | send_capabilities(struct Client *client_
549		t += tl;
550		}
551		}
816	–	#ifdef HAVE_LIBCRYPTO
817	–	if (enc_can_send)
818	–	{
819	–	capend = t;
820	–	strcpy(t, "ENC:");
821	–	t += 4;
822	–
823	–	/* use connect{} specific info if available */
824	–	if (aconf->cipher_preference)
825	–	epref = aconf->cipher_preference;
826	–	else if (ConfigFileEntry.default_cipher_preference)
827	–	epref = ConfigFileEntry.default_cipher_preference;
828	–
829	–	if (epref && (epref->cap & enc_can_send))
830	–	{
831	–	/* Leave the space -- it is removed later. */
832	–	tl = ircsprintf(t, "%s ", epref->name);
833	–	t += tl;
834	–	sent_cipher = 1;
835	–	}
552
837	–	if (!sent_cipher)
838	–	t = capend; /* truncate string before ENC:, below */
839	–	}
840	–	#endif
553		*(t - 1) = '\0';
554		sendto_one(client_p, "CAPAB :%s", msgbuf);
555		}
#	Line 857 | Line 569 | sendnick_TS(struct Client *client_p, str
569		if (!IsClient(target_p))
570		return;
571
572	<	send_umode(NULL, target_p, 0, HasOFlag(target_p, OPER_FLAG_HIDDEN_ADMIN) ?
861	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
572	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
573
574		if (ubuf[0] == '\0')
575		{
#	Line 866 | Line 577 | sendnick_TS(struct Client *client_p, str
577		ubuf[1] = '\0';
578		}
579
869	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
580		if (IsCapable(client_p, CAP_SVS))
581		{
582		if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
583	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
583	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
584		target_p->servptr->id,
585		target_p->name, target_p->hopcount + 1,
586		(unsigned long) target_p->tsinfo,
587		ubuf, target_p->username, target_p->host,
588		(MyClient(target_p) && IsIPSpoof(target_p)) ?
589		"0" : target_p->sockhost, target_p->id,
590	<	(unsigned long)target_p->servicestamp, target_p->info);
590	>	target_p->svid, target_p->info);
591		else
592	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
592	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
593		target_p->name, target_p->hopcount + 1,
594		(unsigned long) target_p->tsinfo,
595		ubuf, target_p->username, target_p->host,
596	<	target_p->servptr->name, (unsigned long)target_p->servicestamp,
596	>	target_p->servptr->name, target_p->svid,
597		target_p->info);
598		}
599		else
#	Line 904 | Line 614 | sendnick_TS(struct Client *client_p, str
614		target_p->servptr->name, target_p->info);
615		}
616
617	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
618	<	if (!EmptyString(target_p->away))
619	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
910	<	target_p->away);
617	>	if (target_p->away[0])
618	>	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
619	>	target_p->away);
620
621		}
622
#	Line 934 | Line 643 | show_capabilities(struct Client *target_
643		if (IsCapable(target_p, cap->cap))
644		t += ircsprintf(t, "%s ", cap->name);
645		}
937	–	#ifdef HAVE_LIBCRYPTO
938	–	if (IsCapable(target_p, CAP_ENC) &&
939	–	target_p->localClient->in_cipher &&
940	–	target_p->localClient->out_cipher)
941	–	t += ircsprintf(t, "ENC:%s ",
942	–	target_p->localClient->in_cipher->name);
943	–	#endif
944	–	*(t - 1) = '\0';
646
647	<	return(msgbuf);
647	>	*(t - 1) = '\0';
648	>	return msgbuf;
649		}
650
651		/* make_server()
#	Line 972 | Line 674 | void
674		server_estab(struct Client *client_p)
675		{
676		struct Client *target_p;
677	<	struct ConfItem *conf;
976	<	struct AccessItem *aconf=NULL;
677	>	struct MaskItem *conf = NULL;
678		char *host;
679		const char *inpath;
680		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
681		dlink_node *ptr;
682	+	#ifdef HAVE_LIBCRYPTO
683	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
684	+	#endif
685
686		assert(client_p != NULL);
687
#	Line 986 | Line 690 | server_estab(struct Client *client_p)
690		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
691		host   = client_p->name;
692
693	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
693	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
694		== NULL)
695		{
696		/* This shouldn't happen, better tell the ops... -A1kmm */
697	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
697	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
698	>	"Warning: Lost connect{} block "
699		"for server %s(this shouldn't happen)!", host);
700		exit_client(client_p, &me, "Lost connect{} block!");
701		return;
#	Line 1016 | Line 721 | server_estab(struct Client *client_p)
721		}
722		}
723
724	<	aconf = map_to_conf(conf);
1020	<
1021	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
724	>	if (IsUnknown(client_p))
725		{
726		/* jdc -- 1.  Use EmptyString(), not [0] index reference.
727	<	*        2.  Check aconf->spasswd, not aconf->passwd.
727	>	*        2.  Check conf->spasswd, not conf->passwd.
728		*/
729	<	if (!EmptyString(aconf->spasswd))
729	>	if (!EmptyString(conf->spasswd))
730		sendto_one(client_p, "PASS %s TS %d %s",
731	<	aconf->spasswd, TS_CURRENT, me.id);
731	>	conf->spasswd, TS_CURRENT, me.id);
732
733	<	/* Pass my info to the new server
1031	<	*
1032	<	* Pass on ZIP if supported
1033	<	* Pass on TB if supported.
1034	<	* - Dianora
1035	<	*/
733	>	send_capabilities(client_p, 0);
734
1037	–	send_capabilities(client_p, aconf,
1038	–	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1039	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1040	–
1041	–	/* SERVER is the last command sent before switching to ziplinks.
1042	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1043	–	* on the wire immediately.  Otherwise, it could be sitting in
1044	–	* a kernel buffer when we start sending zipped data, and the
1045	–	* parser on the receiving side can't hand both unzipped and zipped
1046	–	* data in one packet. --Rodder
1047	–	*
1048	–	* currently we only need to call send_queued_write,
1049	–	* Nagle is already disabled at this point --adx
1050	–	*/
735		sendto_one(client_p, "SERVER %s 1 :%s%s",
736		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
1053	–	send_queued_write(client_p);
1054	–	}
1055	–
1056	–	/* Hand the server off to servlink now */
1057	–	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1058	–	{
1059	–	if (fork_server(client_p) < 0)
1060	–	{
1061	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1062	–	"Warning: fork failed for server %s -- check servlink_path (%s)",
1063	–	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1064	–	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1065	–	"%s -- check servlink_path (%s)",
1066	–	get_client_name(client_p, MASK_IP),
1067	–	ConfigFileEntry.servlink_path);
1068	–	exit_client(client_p, &me, "fork failed");
1069	–	return;
1070	–	}
1071	–
1072	–	start_io(client_p);
1073	–	SetServlink(client_p);
737		}
738
739		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
#	Line 1081 | Line 744 | server_estab(struct Client *client_p)
744		hash_add_id(client_p);
745
746		/* XXX Does this ever happen? I don't think so -db */
747	<	detach_conf(client_p, OPER_TYPE);
747	>	detach_conf(client_p, CONF_OPER);
748
749		/* *WARNING*
750		**    In the following code in place of plain server's
#	Line 1123 | Line 786 | server_estab(struct Client *client_p)
786		/* fixing eob timings.. -gnp */
787		client_p->localClient->firsttime = CurrentTime;
788
789	<
1127	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
789	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
790		AddFlag(client_p, FLAGS_SERVICE);
791
792		/* Show the real host/IP to admins */
793	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
794	<	"Link with %s established: (%s) link",
1133	<	inpath_ip,show_capabilities(client_p));
1134	<	/* Now show the masked hostname/IP to opers */
1135	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1136	<	"Link with %s established: (%s) link",
1137	<	inpath,show_capabilities(client_p));
1138	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1139	<	inpath_ip, show_capabilities(client_p));
1140	<
1141	<	client_p->serv->sconf = conf;
1142	<
1143	<	if (HasServlink(client_p))
793	>	#ifdef HAVE_LIBCRYPTO
794	>	if (client_p->localClient->fd.ssl)
795		{
796	<	/* we won't overflow FD_DESC_SZ here, as it can hold
797	<	* client_p->name + 64
798	<	*/
799	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
800	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
796	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
797	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
798	>
799	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
800	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
801	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
802	>	compression ? SSL_COMP_get_name(compression) : "NONE",
803	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
804	>	show_capabilities(client_p));
805	>	/* Now show the masked hostname/IP to opers */
806	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
807	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
808	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
809	>	compression ? SSL_COMP_get_name(compression) : "NONE",
810	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
811	>	show_capabilities(client_p));
812	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
813	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
814	>	compression ? SSL_COMP_get_name(compression) : "NONE",
815	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
816	>	show_capabilities(client_p));
817		}
818		else
819	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
819	>	#endif
820	>	{
821	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
822	>	"Link with %s established: (Capabilities: %s)",
823	>	inpath_ip, show_capabilities(client_p));
824	>	/* Now show the masked hostname/IP to opers */
825	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
826	>	"Link with %s established: (Capabilities: %s)",
827	>	inpath, show_capabilities(client_p));
828	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
829	>	inpath_ip, show_capabilities(client_p));
830	>	}
831	>
832	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
833
834		/* Old sendto_serv_but_one() call removed because we now
835		** need to send different names to different servers
#	Line 1221 | Line 901 | server_estab(struct Client *client_p)
901		server_burst(client_p);
902		}
903
1224	–	static void
1225	–	start_io(struct Client *server)
1226	–	{
1227	–	struct LocalUser *lserver = server->localClient;
1228	–	int alloclen = 1;
1229	–	char *buf;
1230	–	dlink_node *ptr;
1231	–	struct dbuf_block *block;
1232	–
1233	–	/* calculate how many bytes to allocate */
1234	–	if (IsCapable(server, CAP_ZIP))
1235	–	alloclen += 6;
1236	–	#ifdef HAVE_LIBCRYPTO
1237	–	if (IsCapable(server, CAP_ENC))
1238	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1239	–	#endif
1240	–	alloclen += dbuf_length(&lserver->buf_recvq);
1241	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1242	–	alloclen += dbuf_length(&lserver->buf_sendq);
1243	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1244	–
1245	–	/* initialize servlink control sendq */
1246	–	lserver->slinkq = buf = MyMalloc(alloclen);
1247	–	lserver->slinkq_ofs = 0;
1248	–	lserver->slinkq_len = alloclen;
1249	–
1250	–	if (IsCapable(server, CAP_ZIP))
1251	–	{
1252	–	/* ziplink */
1253	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1254	–	*buf++ = 0; /* |          */
1255	–	*buf++ = 1; /* \ len is 1 */
1256	–	*buf++ = ConfigFileEntry.compression_level;
1257	–	*buf++ = SLINKCMD_START_ZIP_IN;
1258	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1259	–	}
1260	–	#ifdef HAVE_LIBCRYPTO
1261	–	if (IsCapable(server, CAP_ENC))
1262	–	{
1263	–	/* Decryption settings */
1264	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1265	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1266	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1267	–	*buf++ = lserver->in_cipher->cipherid;
1268	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1269	–	*buf++ = 0; /* keylen < 256 */
1270	–	*buf++ = lserver->in_cipher->keylen;
1271	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1272	–	buf += lserver->in_cipher->keylen;
1273	–	/* Encryption settings */
1274	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1275	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1276	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1277	–	*buf++ = lserver->out_cipher->cipherid;
1278	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1279	–	*buf++ = 0; /* keylen < 256 */
1280	–	*buf++ = lserver->out_cipher->keylen;
1281	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1282	–	buf += lserver->out_cipher->keylen;
1283	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1284	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1285	–	}
1286	–	#endif
1287	–
1288	–	/* pass the whole recvq to servlink */
1289	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1290	–	{
1291	–	block = ptr->data;
1292	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1293	–	*buf++ = (block->size >> 8);
1294	–	*buf++ = (block->size & 0xff);
1295	–	memcpy(buf, &block->data[0], block->size);
1296	–	buf += block->size;
1297	–	}
1298	–
1299	–	dbuf_clear(&lserver->buf_recvq);
1300	–
1301	–	/* pass the whole sendq to servlink */
1302	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1303	–	{
1304	–	block = ptr->data;
1305	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1306	–	*buf++ = (block->size >> 8);
1307	–	*buf++ = (block->size & 0xff);
1308	–	memcpy(buf, &block->data[0], block->size);
1309	–	buf += block->size;
1310	–	}
1311	–
1312	–	dbuf_clear(&lserver->buf_sendq);
1313	–
1314	–	/* start io */
1315	–	*buf++ = SLINKCMD_INIT;
1316	–
1317	–	/* schedule a write */
1318	–	send_queued_slink_write(server);
1319	–	}
1320	–
1321	–	/* fork_server()
1322	–	*
1323	–	* inputs       - struct Client *server
1324	–	* output       - success: 0 / failure: -1
1325	–	* side effect  - fork, and exec SERVLINK to handle this connection
1326	–	*/
1327	–	static int
1328	–	fork_server(struct Client *server)
1329	–	{
1330	–	#ifndef HAVE_SOCKETPAIR
1331	–	return -1;
1332	–	#else
1333	–	int i;
1334	–	int slink_fds[2][2];
1335	–	/* 0? - ctrl  | 1? - data
1336	–	* ?0 - child | ?1 - parent */
1337	–
1338	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1339	–	return -1;
1340	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1341	–	goto free_ctrl_fds;
1342	–
1343	–	if ((i = fork()) < 0)
1344	–	{
1345	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1346	–	free_ctrl_fds:
1347	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1348	–	return -1;
1349	–	}
1350	–
1351	–	if (i == 0)
1352	–	{
1353	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1354	–	char *kid_argv[7];
1355	–
1356	–	#ifdef O_ASYNC
1357	–	fcntl(server->localClient->fd.fd, F_SETFL,
1358	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1359	–	#endif
1360	–	close_fds(&server->localClient->fd);
1361	–	close(slink_fds[0][1]);
1362	–	close(slink_fds[1][1]);
1363	–
1364	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1365	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1366	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1367	–
1368	–	kid_argv[0] = "-slink";
1369	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1370	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1371	–	kid_argv[5] = fd_str[2];    /* network */
1372	–	kid_argv[6] = NULL;
1373	–
1374	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1375	–
1376	–	_exit(1);
1377	–	}
1378	–
1379	–	/* close the network fd and the child ends of the pipes */
1380	–	fd_close(&server->localClient->fd);
1381	–	close(slink_fds[0][0]);
1382	–	close(slink_fds[1][0]);
1383	–
1384	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1385	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1386	–
1387	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1388	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1389	–
1390	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1391	–	read_packet(&server->localClient->fd, server);
1392	–
1393	–	return 0;
1394	–	#endif
1395	–	}
1396	–
904		/* server_burst()
905		*
906		* inputs       - struct Client pointer server
#	Line 1442 | Line 949 | burst_all(struct Client *client_p)
949		burst_members(client_p, chptr);
950		send_channel_modes(client_p, chptr);
951
952	<	if (IsCapable(client_p, CAP_TBURST) ||
1446	<	IsCapable(client_p, CAP_TB))
952	>	if (IsCapable(client_p, CAP_TBURST))
953		send_tb(client_p, chptr);
954		}
955		}
#	Line 1475 | Line 981 | burst_all(struct Client *client_p)
981		*              - pointer to channel
982		* output       - NONE
983		* side effects - Called on a server burst when
984	<	*                server is CAP_TB|CAP_TBURST capable
984	>	*                server is CAP_TBURST capable
985		*/
986		static void
987		send_tb(struct Client *client_p, struct Channel *chptr)
#	Line 1494 | Line 1000 | send_tb(struct Client *client_p, struct
1000		* for further information   -Michael
1001		*/
1002		if (chptr->topic_time != 0)
1003	<	{
1004	<	if (IsCapable(client_p, CAP_TBURST))
1005	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1006	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
1007	<	(unsigned long)chptr->topic_time,
1008	<	chptr->topic_info,
1503	<	chptr->topic);
1504	<	else if (IsCapable(client_p, CAP_TB))
1505	<	{
1506	<	if (ConfigChannel.burst_topicwho)
1507	<	{
1508	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1509	<	me.name, chptr->chname,
1510	<	(unsigned long)chptr->topic_time,
1511	<	chptr->topic_info, chptr->topic);
1512	<	}
1513	<	else
1514	<	{
1515	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1516	<	me.name, chptr->chname,
1517	<	(unsigned long)chptr->topic_time,
1518	<	chptr->topic);
1519	<	}
1520	<	}
1521	<	}
1003	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1004	>	ID_or_name(&me, client_p),
1005	>	(unsigned long)chptr->channelts, chptr->chname,
1006	>	(unsigned long)chptr->topic_time,
1007	>	chptr->topic_info,
1008	>	chptr->topic);
1009		}
1010
1011		/* burst_members()
#	Line 1572 | Line 1059 | burst_members(struct Client *client_p, s
1059		* it suceeded or not, and 0 if it fails in here somewhere.
1060		*/
1061		int
1062	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1062	>	serv_connect(struct MaskItem *conf, struct Client *by)
1063		{
1577	–	struct ConfItem *conf;
1064		struct Client *client_p;
1065	<	char buf[HOSTIPLEN];
1065	>	char buf[HOSTIPLEN + 1];
1066
1067		/* conversion structs */
1068		struct sockaddr_in *v4;
1069	<	/* Make sure aconf is useful */
1070	<	assert(aconf != NULL);
1585	<
1586	<	if(aconf == NULL)
1587	<	return (0);
1069	>	/* Make sure conf is useful */
1070	>	assert(conf != NULL);
1071
1589	–	/* XXX should be passing struct ConfItem in the first place */
1590	–	conf = unmap_conf_item(aconf);
1072
1073	<	/* log */
1593	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
1073	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1074		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1075	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1075	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1076		buf);
1077
1078		/* Still processing a DNS lookup? -> exit */
1079	<	if (aconf->dns_pending)
1079	>	if (conf->dns_pending)
1080		{
1081	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1081	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1082		"Error connecting to %s: DNS lookup for connect{} in progress.",
1083		conf->name);
1084		return (0);
1085		}
1086
1087	<	if (aconf->dns_failed)
1087	>	if (conf->dns_failed)
1088		{
1089	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1089	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1090		"Error connecting to %s: DNS lookup for connect{} failed.",
1091		conf->name);
1092		return (0);
1093		}
1094
1095		/* Make sure this server isn't already connected
1096	<	* Note: aconf should ALWAYS be a valid C: line
1096	>	* Note: conf should ALWAYS be a valid C: line
1097		*/
1098		if ((client_p = hash_find_server(conf->name)) != NULL)
1099		{
1100	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1100	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1101		"Server %s already present from %s",
1102		conf->name, get_client_name(client_p, SHOW_IP));
1103	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1103	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1104		"Server %s already present from %s",
1105		conf->name, get_client_name(client_p, MASK_IP));
1106		if (by && IsClient(by) && !MyClient(by))
#	Line 1635 | Line 1115 | serv_connect(struct AccessItem *aconf, s
1115
1116		/* Copy in the server, hostname, fd */
1117		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1118	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1118	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1119
1120		/* We already converted the ip once, so lets use it - stu */
1121		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1122
1123		/* create a socket for the server connection */
1124	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1124	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1125		SOCK_STREAM, 0, NULL) < 0)
1126		{
1127		/* Eek, failure to create the socket */
#	Line 1658 | Line 1138 | serv_connect(struct AccessItem *aconf, s
1138		/* Attach config entries to client here rather than in
1139		* serv_connect_callback(). This to avoid null pointer references.
1140		*/
1141	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1141	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1142		{
1143	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1144	<	"Host %s is not enabled for connecting:no C/N-line",
1143	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1144	>	"Host %s is not enabled for connecting: no connect{} block",
1145		conf->name);
1146		if (by && IsClient(by) && !MyClient(by))
1147		sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
#	Line 1687 | Line 1167 | serv_connect(struct AccessItem *aconf, s
1167		SetConnecting(client_p);
1168		dlinkAdd(client_p, &client_p->node, &global_client_list);
1169		/* from def_fam */
1170	<	client_p->localClient->aftype = aconf->aftype;
1170	>	client_p->localClient->aftype = conf->aftype;
1171
1172		/* Now, initiate the connection */
1173		/* XXX assume that a non 0 type means a specific bind address
1174		* for this connect.
1175		*/
1176	<	switch (aconf->aftype)
1176	>	switch (conf->aftype)
1177		{
1178		case AF_INET:
1179	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1179	>	v4 = (struct sockaddr_in*)&conf->bind;
1180		if (v4->sin_addr.s_addr != 0)
1181		{
1182		struct irc_ssaddr ipn;
1183		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1184		ipn.ss.ss_family = AF_INET;
1185		ipn.ss_port = 0;
1186	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1187	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1186	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1187	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1188		(struct sockaddr *)&ipn, ipn.ss_len,
1189	<	serv_connect_callback, client_p, aconf->aftype,
1189	>	serv_connect_callback, client_p, conf->aftype,
1190		CONNECTTIMEOUT);
1191		}
1192		else if (ServerInfo.specific_ipv4_vhost)
#	Line 1716 | Line 1196 | serv_connect(struct AccessItem *aconf, s
1196		ipn.ss.ss_family = AF_INET;
1197		ipn.ss_port = 0;
1198		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1199	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1199	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1200		(struct sockaddr *)&ipn, ipn.ss_len,
1201	<	serv_connect_callback, client_p, aconf->aftype,
1201	>	serv_connect_callback, client_p, conf->aftype,
1202		CONNECTTIMEOUT);
1203		}
1204		else
1205	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1206	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1205	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1206	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1207		CONNECTTIMEOUT);
1208		break;
1209		#ifdef IPV6
#	Line 1734 | Line 1214 | serv_connect(struct AccessItem *aconf, s
1214		struct sockaddr_in6 *v6conf;
1215
1216		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1217	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1217	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1218		v6 = (struct sockaddr_in6 *)&ipn;
1219
1220		if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1221		sizeof(struct in6_addr)) != 0)
1222		{
1223	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1223	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1224		ipn.ss.ss_family = AF_INET6;
1225		ipn.ss_port = 0;
1226		comm_connect_tcp(&client_p->localClient->fd,
1227	<	aconf->host, aconf->port,
1227	>	conf->host, conf->port,
1228		(struct sockaddr *)&ipn, ipn.ss_len,
1229		serv_connect_callback, client_p,
1230	<	aconf->aftype, CONNECTTIMEOUT);
1230	>	conf->aftype, CONNECTTIMEOUT);
1231		}
1232		else if (ServerInfo.specific_ipv6_vhost)
1233		{
#	Line 1755 | Line 1235 | serv_connect(struct AccessItem *aconf, s
1235		ipn.ss.ss_family = AF_INET6;
1236		ipn.ss_port = 0;
1237		comm_connect_tcp(&client_p->localClient->fd,
1238	<	aconf->host, aconf->port,
1238	>	conf->host, conf->port,
1239		(struct sockaddr *)&ipn, ipn.ss_len,
1240		serv_connect_callback, client_p,
1241	<	aconf->aftype, CONNECTTIMEOUT);
1241	>	conf->aftype, CONNECTTIMEOUT);
1242		}
1243		else
1244		comm_connect_tcp(&client_p->localClient->fd,
1245	<	aconf->host, aconf->port,
1245	>	conf->host, conf->port,
1246		NULL, 0, serv_connect_callback, client_p,
1247	<	aconf->aftype, CONNECTTIMEOUT);
1247	>	conf->aftype, CONNECTTIMEOUT);
1248		}
1249		#endif
1250		}
1251		return (1);
1252		}
1253
1254	+	#ifdef HAVE_LIBCRYPTO
1255	+	static void
1256	+	finish_ssl_server_handshake(struct Client *client_p)
1257	+	{
1258	+	struct MaskItem *conf = NULL;
1259	+
1260	+	conf = find_conf_name(&client_p->localClient->confs,
1261	+	client_p->name, CONF_SERVER);
1262	+	if (conf == NULL)
1263	+	{
1264	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1265	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1266	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1267	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1268	+
1269	+	exit_client(client_p, &me, "Lost connect{} block");
1270	+	return;
1271	+	}
1272	+
1273	+	/* jdc -- Check and send spasswd, not passwd. */
1274	+	if (!EmptyString(conf->spasswd))
1275	+	sendto_one(client_p, "PASS %s TS %d %s",
1276	+	conf->spasswd, TS_CURRENT, me.id);
1277	+
1278	+	send_capabilities(client_p, 0);
1279	+
1280	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1281	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1282	+	me.info);
1283	+
1284	+	/* If we've been marked dead because a send failed, just exit
1285	+	* here now and save everyone the trouble of us ever existing.
1286	+	*/
1287	+	if (IsDead(client_p))
1288	+	{
1289	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1290	+	"%s[%s] went dead during handshake",
1291	+	client_p->name,
1292	+	client_p->host);
1293	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1294	+	"%s went dead during handshake", client_p->name);
1295	+	return;
1296	+	}
1297	+
1298	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1299	+	/* If we get here, we're ok, so lets start reading some data */
1300	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1301	+	}
1302	+
1303	+	static void
1304	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1305	+	{
1306	+	int ret;
1307	+	int err;
1308	+
1309	+	ret = SSL_connect(client_p->localClient->fd.ssl);
1310	+
1311	+	if (ret <= 0)
1312	+	{
1313	+	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1314	+	{
1315	+	case SSL_ERROR_WANT_WRITE:
1316	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1317	+	(PF *)ssl_server_handshake, client_p, 0);
1318	+	return;
1319	+	case SSL_ERROR_WANT_READ:
1320	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1321	+	(PF *)ssl_server_handshake, client_p, 0);
1322	+	return;
1323	+	default:
1324	+	{
1325	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1326	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1327	+	"Error connecting to %s: %s", client_p->name,
1328	+	sslerr ? sslerr : "unknown SSL error");
1329	+	exit_client(client_p, client_p, "Error during SSL handshake");
1330	+	return;
1331	+	}
1332	+	}
1333	+	}
1334	+
1335	+	finish_ssl_server_handshake(client_p);
1336	+	}
1337	+
1338	+	static void
1339	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1340	+	{
1341	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1342	+	{
1343	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1344	+	ERR_error_string(ERR_get_error(), NULL));
1345	+	SetDead(client_p);
1346	+	exit_client(client_p, client_p, "SSL_new failed");
1347	+	return;
1348	+	}
1349	+
1350	+	SSL_set_fd(fd->ssl, fd->fd);
1351	+
1352	+	if (!EmptyString(conf->cipher_list))
1353	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1354	+
1355	+	ssl_server_handshake(NULL, client_p);
1356	+	}
1357	+	#endif
1358	+
1359		/* serv_connect_callback() - complete a server connection.
1360		*
1361		* This routine is called after the server connection attempt has
#	Line 1783 | Line 1368 | static void
1368		serv_connect_callback(fde_t *fd, int status, void *data)
1369		{
1370		struct Client *client_p = data;
1371	<	struct ConfItem *conf=NULL;
1787	<	struct AccessItem *aconf=NULL;
1371	>	struct MaskItem *conf = NULL;
1372
1373		/* First, make sure its a real client! */
1374		assert(client_p != NULL);
#	Line 1800 | Line 1384 | serv_connect_callback(fde_t *fd, int sta
1384		* Admins get to see any IP, mere opers don't *sigh*
1385		*/
1386		if (ConfigServerHide.hide_server_ips)
1387	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1387	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1388		"Error connecting to %s: %s",
1389		client_p->name, comm_errstr(status));
1390		else
1391	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1391	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1392		"Error connecting to %s[%s]: %s", client_p->name,
1393		client_p->host, comm_errstr(status));
1394
1395	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1395	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1396		"Error connecting to %s: %s",
1397		client_p->name, comm_errstr(status));
1398
#	Line 1822 | Line 1406 | serv_connect_callback(fde_t *fd, int sta
1406		/* COMM_OK, so continue the connection procedure */
1407		/* Get the C/N lines */
1408		conf = find_conf_name(&client_p->localClient->confs,
1409	<	client_p->name, SERVER_TYPE);
1409	>	client_p->name, CONF_SERVER);
1410		if (conf == NULL)
1411		{
1412	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1412	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1413		"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1414	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1414	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1415		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1416
1417		exit_client(client_p, &me, "Lost connect{} block");
1418		return;
1419		}
1420
1837	–	aconf = (struct AccessItem *)map_to_conf(conf);
1421		/* Next, send the initial handshake */
1422		SetHandshake(client_p);
1423
1424		#ifdef HAVE_LIBCRYPTO
1425	<	/* Handle all CRYPTLINK links in cryptlink_init */
1843	<	if (IsConfCryptLink(aconf))
1425	>	if (IsConfSSL(conf))
1426		{
1427	<	cryptlink_init(client_p, conf, fd);
1427	>	ssl_connect_init(client_p, conf, fd);
1428		return;
1429		}
1430		#endif
1431
1432		/* jdc -- Check and send spasswd, not passwd. */
1433	<	if (!EmptyString(aconf->spasswd))
1852	<	/* Send TS 6 form only if id */
1433	>	if (!EmptyString(conf->spasswd))
1434		sendto_one(client_p, "PASS %s TS %d %s",
1435	<	aconf->spasswd, TS_CURRENT, me.id);
1435	>	conf->spasswd, TS_CURRENT, me.id);
1436
1437	<	/* Pass my info to the new server
1857	<	*
1858	<	* Pass on ZIP if supported
1859	<	* Pass on TB if supported.
1860	<	* - Dianora
1861	<	*/
1862	<	send_capabilities(client_p, aconf,
1863	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1864	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1437	>	send_capabilities(client_p, 0);
1438
1439		sendto_one(client_p, "SERVER %s 1 :%s%s",
1440		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1872 | Line 1445 | serv_connect_callback(fde_t *fd, int sta
1445		*/
1446		if (IsDead(client_p))
1447		{
1448	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1448	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1449		"%s[%s] went dead during handshake",
1450		client_p->name,
1451		client_p->host);
1452	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1452	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1453		"%s went dead during handshake", client_p->name);
1454		return;
1455		}
#	Line 1903 | Line 1476 | find_servconn_in_progress(const char *na
1476
1477		return NULL;
1478		}
1906	–
1907	–	#ifdef HAVE_LIBCRYPTO
1908	–	/*
1909	–	* sends a CRYPTLINK SERV command.
1910	–	*/
1911	–	void
1912	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
1913	–	{
1914	–	struct AccessItem *aconf;
1915	–	char *encrypted;
1916	–	unsigned char *key_to_send;
1917	–	char randkey[CIPHERKEYLEN];
1918	–	int enc_len;
1919	–
1920	–	/* get key */
1921	–	if ((!ServerInfo.rsa_private_key) ||
1922	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
1923	–	{
1924	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
1925	–	"Invalid RSA private key");
1926	–	return;
1927	–	}
1928	–
1929	–	aconf = (struct AccessItem *)map_to_conf(conf);
1930	–
1931	–	if (aconf->rsa_public_key == NULL)
1932	–	{
1933	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
1934	–	"Invalid RSA public key");
1935	–	return;
1936	–	}
1937	–
1938	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
1939	–	{
1940	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
1941	–	"Couldn't generate keyphrase");
1942	–	return;
1943	–	}
1944	–
1945	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1946	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1947	–	(unsigned char *)randkey,
1948	–	(unsigned char *)encrypted,
1949	–	aconf->rsa_public_key,
1950	–	RSA_PKCS1_PADDING);
1951	–
1952	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1953	–
1954	–	if (enc_len <= 0)
1955	–	{
1956	–	report_crypto_errors();
1957	–	MyFree(encrypted);
1958	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
1959	–	"Couldn't encrypt data");
1960	–	return;
1961	–	}
1962	–
1963	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
1964	–	{
1965	–	MyFree(encrypted);
1966	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
1967	–	"Couldn't base64 encode key");
1968	–	return;
1969	–	}
1970	–
1971	–	send_capabilities(client_p, aconf,
1972	–	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1973	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
1974	–
1975	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
1976	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
1977	–	me.name, key_to_send,
1978	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
1979	–
1980	–	SetHandshake(client_p);
1981	–	SetWaitAuth(client_p);
1982	–
1983	–	MyFree(encrypted);
1984	–	MyFree(key_to_send);
1985	–
1986	–	if (IsDead(client_p))
1987	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
1988	–	"Went dead during handshake");
1989	–	else if (fd != NULL)
1990	–	/* If we get here, we're ok, so lets start reading some data */
1991	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
1992	–	}
1993	–
1994	–	void
1995	–	cryptlink_error(struct Client *client_p, const char *type,
1996	–	const char *reason, const char *client_reason)
1997	–	{
1998	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
1999	–	get_client_name(client_p, SHOW_IP), type, reason);
2000	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2001	–	get_client_name(client_p, MASK_IP), type, reason);
2002	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2003	–	get_client_name(client_p, SHOW_IP), type, reason);
2004	–
2005	–	/* If client_reason isn't NULL, then exit the client with the message
2006	–	* defined in the call.
2007	–	*/
2008	–	if ((client_reason != NULL) && (!IsDead(client_p)))
2009	–	exit_client(client_p, &me, client_reason);
2010	–	}
2011	–
2012	–	static char base64_chars[] =
2013	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2014	–
2015	–	static char base64_values[] =
2016	–	{
2017	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2018	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2019	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2020	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2021	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2022	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2023	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2024	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2025	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2026	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2027	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2028	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2029	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2030	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2031	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2032	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2033	–	};
2034	–
2035	–	/*
2036	–	* base64_block will allocate and return a new block of memory
2037	–	* using MyMalloc().  It should be freed after use.
2038	–	*/
2039	–	int
2040	–	base64_block(unsigned char **output, char *data, int len)
2041	–	{
2042	–	unsigned char *out;
2043	–	unsigned char *in = (unsigned char*)data;
2044	–	unsigned long int q_in;
2045	–	int i;
2046	–	int count = 0;
2047	–
2048	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2049	–
2050	–	/* process 24 bits at a time */
2051	–	for( i = 0; i < len; i += 3)
2052	–	{
2053	–	q_in = 0;
2054	–
2055	–	if ( i + 2 < len )
2056	–	{
2057	–	q_in  = (in[i+2] & 0xc0) << 2;
2058	–	q_in |=  in[i+2];
2059	–	}
2060	–
2061	–	if ( i + 1 < len )
2062	–	{
2063	–	q_in |= (in[i+1] & 0x0f) << 10;
2064	–	q_in |= (in[i+1] & 0xf0) << 12;
2065	–	}
2066	–
2067	–	q_in |= (in[i]   & 0x03) << 20;
2068	–	q_in |=  in[i]           << 22;
2069	–
2070	–	q_in &= 0x3f3f3f3f;
2071	–
2072	–	out[count++] = base64_chars[((q_in >> 24)       )];
2073	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2074	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2075	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2076	–	}
2077	–	if ( (i - len) > 0 )
2078	–	{
2079	–	out[count-1] = '=';
2080	–	if ( (i - len) > 1 )
2081	–	out[count-2] = '=';
2082	–	}
2083	–
2084	–	out[count] = '\0';
2085	–	*output = out;
2086	–	return (count);
2087	–	}
2088	–
2089	–	/*
2090	–	* unbase64_block will allocate and return a new block of memory
2091	–	* using MyMalloc().  It should be freed after use.
2092	–	*/
2093	–	int
2094	–	unbase64_block(unsigned char **output, char *data, int len)
2095	–	{
2096	–	unsigned char *out;
2097	–	unsigned char *in = (unsigned char*)data;
2098	–	unsigned long int q_in;
2099	–	int i;
2100	–	int count = 0;
2101	–
2102	–	if ((len % 4) != 0)
2103	–	return (0);
2104	–
2105	–	out = MyMalloc(((len / 4) * 3) + 1);
2106	–
2107	–	/* process 32 bits at a time */
2108	–	for( i = 0; (i + 3) < len; i+=4)
2109	–	{
2110	–	/* compress input (chars a, b, c and d) as follows:
2111	–	* (after converting ascii -> base64 value)
2112	–	*
2113	–	* |00000000aaaaaabbbbbbccccccdddddd|
2114	–	* |  765432  107654  321076  543210|
2115	–	*/
2116	–
2117	–	q_in = 0;
2118	–
2119	–	if (base64_values[in[i+3]] > -1)
2120	–	q_in |= base64_values[in[i+3]]      ;
2121	–	if (base64_values[in[i+2]] > -1)
2122	–	q_in |= base64_values[in[i+2]] <<  6;
2123	–	if (base64_values[in[i+1]] > -1)
2124	–	q_in |= base64_values[in[i+1]] << 12;
2125	–	if (base64_values[in[i  ]] > -1)
2126	–	q_in |= base64_values[in[i  ]] << 18;
2127	–
2128	–	out[count++] = (q_in >> 16) & 0xff;
2129	–	out[count++] = (q_in >>  8) & 0xff;
2130	–	out[count++] = (q_in      ) & 0xff;
2131	–	}
2132	–
2133	–	if (in[i-1] == '=') count--;
2134	–	if (in[i-2] == '=') count--;
2135	–
2136	–	out[count] = '\0';
2137	–	*output = out;
2138	–	return (count);
2139	–	}
2140	–
2141	–	#endif /* HAVE_LIBCRYPTO */
2142	–

Diff Legend

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