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 889 by michael, Thu Nov 1 12:59:05 2007 UTC vs.
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1401 by michael, Tue May 8 18:58:13 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
58		static dlink_list cap_list = { NULL, NULL, 0 };
59		static void server_burst(struct Client *);
63	–	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
69	–	static void start_io(struct Client *);
65		static void burst_members(struct Client *, struct Channel *);
66
72	–	static SlinkRplHnd slink_error;
73	–	static SlinkRplHnd slink_zipstats;
74	–
75	–
76	–	#ifdef HAVE_LIBCRYPTO
77	–	struct EncCapability CipherTable[] =
78	–	{
79	–	#ifdef HAVE_EVP_BF_CFB
80	–	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
81	–	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
82	–	#endif
83	–	#ifdef HAVE_EVP_CAST5_CFB
84	–	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
85	–	#endif
86	–	#ifdef HAVE_EVP_IDEA_CFB
87	–	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
88	–	#endif
89	–	#ifdef HAVE_EVP_RC5_32_12_16_CFB
90	–	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
91	–	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
92	–	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
93	–	#endif
94	–	#ifdef HAVE_EVP_DES_EDE3_CFB
95	–	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
96	–	#endif
97	–	#ifdef HAVE_EVP_DES_CFB
98	–	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
99	–	#endif
100	–	{ 0,            0,                   0, 0             }
101	–	};
102	–	#endif
103	–
104	–	struct SlinkRplDef slinkrpltab[] = {
105	–	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
106	–	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
107	–	{ 0,                 0,              0 },
108	–	};
109	–
110	–
111	–	void
112	–	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
113	–	struct Client *server_p)
114	–	{
115	–	assert(rpl == SLINKRPL_ERROR);
116	–	assert(len < 256);
117	–
118	–	data[len-1] = '\0';
119	–
120	–	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
121	–	server_p->name, data);
122	–	/* XXX should this be exit_client? */
123	–	exit_client(server_p, &me, "servlink error -- terminating link");
124	–	}
125	–
126	–	void
127	–	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
128	–	struct Client *server_p)
129	–	{
130	–	struct ZipStats zipstats;
131	–	unsigned long in = 0, in_wire = 0, out = 0, out_wire = 0;
132	–	int i = 0;
133	–
134	–	assert(rpl == SLINKRPL_ZIPSTATS);
135	–	assert(len == 16);
136	–	assert(IsCapable(server_p, CAP_ZIP));
137	–
138	–	/* Yes, it needs to be done this way, no we cannot let the compiler
139	–	* work with the pointer to the structure.  This works around a GCC
140	–	* bug on SPARC that affects all versions at the time of this writing.
141	–	* I will feed you to the creatures living in RMS's beard if you do
142	–	* not leave this as is, without being sure that you are not causing
143	–	* regression for most of our installed SPARC base.
144	–	* -jmallett, 04/27/2002
145	–	*/
146	–	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
147	–
148	–	in |= (data[i++] << 24);
149	–	in |= (data[i++] << 16);
150	–	in |= (data[i++] <<  8);
151	–	in |= (data[i++]      );
152	–
153	–	in_wire |= (data[i++] << 24);
154	–	in_wire |= (data[i++] << 16);
155	–	in_wire |= (data[i++] <<  8);
156	–	in_wire |= (data[i++]      );
157	–
158	–	out |= (data[i++] << 24);
159	–	out |= (data[i++] << 16);
160	–	out |= (data[i++] <<  8);
161	–	out |= (data[i++]      );
162	–
163	–	out_wire |= (data[i++] << 24);
164	–	out_wire |= (data[i++] << 16);
165	–	out_wire |= (data[i++] <<  8);
166	–	out_wire |= (data[i++]      );
167	–
168	–	/* This macro adds b to a if a plus b is not an overflow, and sets the
169	–	* value of a to b if it is.
170	–	* Add and Set if No Overflow.
171	–	*/
172	–	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
173	–
174	–	ASNO(zipstats.in, in);
175	–	ASNO(zipstats.out, out);
176	–	ASNO(zipstats.in_wire, in_wire);
177	–	ASNO(zipstats.out_wire, out_wire);
178	–
179	–	if (zipstats.in > 0)
180	–	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
181	–	(double)zipstats.in) * 100.00);
182	–	else
183	–	zipstats.in_ratio = 0;
184	–
185	–	if (zipstats.out > 0)
186	–	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
187	–	(double)zipstats.out) * 100.00);
188	–	else
189	–	zipstats.out_ratio = 0;
190	–
191	–	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof (struct ZipStats));
192	–	}
193	–
194	–	void
195	–	collect_zipstats(void *unused)
196	–	{
197	–	dlink_node *ptr;
198	–	struct Client *target_p;
199	–
200	–	DLINK_FOREACH(ptr, serv_list.head)
201	–	{
202	–	target_p = ptr->data;
203	–
204	–	if (IsCapable(target_p, CAP_ZIP))
205	–	{
206	–	/* only bother if we haven't already got something queued... */
207	–	if (!target_p->localClient->slinkq)
208	–	{
209	–	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
210	–	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
211	–	target_p->localClient->slinkq_ofs = 0;
212	–	target_p->localClient->slinkq_len = 1;
213	–	send_queued_slink_write(target_p);
214	–	}
215	–	}
216	–	}
217	–	}
218	–
219	–	#ifdef HAVE_LIBCRYPTO
220	–	struct EncCapability *
221	–	check_cipher(struct Client *client_p, struct AccessItem *aconf)
222	–	{
223	–	struct EncCapability *epref = NULL;
224	–
225	–	/* Use connect{} specific info if available */
226	–	if (aconf->cipher_preference)
227	–	epref = aconf->cipher_preference;
228	–	else if (ConfigFileEntry.default_cipher_preference)
229	–	epref = ConfigFileEntry.default_cipher_preference;
230	–
231	–	/*
232	–	* If the server supports the capability in hand, return the matching
233	–	* conf struct.  Otherwise, return NULL (an error).
234	–	*/
235	–	if (epref && IsCapableEnc(client_p, epref->cap))
236	–	return epref;
237	–
238	–	return NULL;
239	–	}
240	–	#endif /* HAVE_LIBCRYPTO */
241	–
242	–	/* my_name_for_link()
243	–	* return wildcard name of my server name
244	–	* according to given config entry --Jto
245	–	*/
246	–	const char *
247	–	my_name_for_link(struct ConfItem *conf)
248	–	{
249	–	struct AccessItem *aconf;
250	–
251	–	aconf = (struct AccessItem *)map_to_conf(conf);
252	–	if (aconf->fakename != NULL)
253	–	return aconf->fakename;
254	–	else
255	–	return me.name;
256	–	}
257	–
67		/*
68		* write_links_file
69		*
#	Line 272 | Line 81 | write_links_file(void* notused)
81		MessageFileLine *newMessageLine = 0;
82		MessageFile *MessageFileptr;
83		const char *p;
84	<	FBFILE *file;
84	>	FILE *file;
85		char buff[512];
86		dlink_node *ptr;
87
88		MessageFileptr = &ConfigFileEntry.linksfile;
89
90	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
90	>	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
91		return;
92
93		for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
#	Line 292 | Line 101 | write_links_file(void* notused)
101
102		DLINK_FOREACH(ptr, global_serv_list.head)
103		{
104	<	size_t nbytes = 0;
296	<	struct Client *target_p = ptr->data;
104	>	const struct Client *target_p = ptr->data;
105
106		/* skip ourselves, we send ourselves in /links */
107		if (IsMe(target_p))
#	Line 324 | Line 132 | write_links_file(void* notused)
132		*/
133		assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
134		MESSAGELINELEN);
135	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
136	<	target_p->name, me.name, p);
135	>	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
136	>	target_p->name, me.name, p);
137		newMessageLine->next = NULL;
138
139		if (MessageFileptr->contentsOfFile)
#	Line 340 | Line 148 | write_links_file(void* notused)
148		currentMessageLine = newMessageLine;
149		}
150
151	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
152	<	fbputs(buff, file, nbytes);
151	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
152	>	fputs(buff, file);
153		}
154
155	<	fbclose(file);
155	>	fclose(file);
156		}
157
158		/* hunt_server()
#	Line 375 | Line 183 | hunt_server(struct Client *client_p, str
183		dlink_node *ptr;
184		int wilds;
185
186	<	/* Assume it's me, if no server
187	<	*/
188	<	if (parc <= server || EmptyString(parv[server]) ||
189	<	match(me.name, parv[server]) ||
190	<	match(parv[server], me.name) ||
191	<	!strcmp(parv[server], me.id))
384	<	return(HUNTED_ISME);
186	>	/* Assume it's me, if no server */
187	>	if (parc <= server || EmptyString(parv[server]))
188	>	return HUNTED_ISME;
189	>
190	>	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
191	>	return HUNTED_ISME;
192
193		/* These are to pickup matches that would cause the following
194		* message to go in the wrong direction while doing quick fast
195		* non-matching lookups.
196		*/
197		if (MyClient(source_p))
198	<	target_p = find_client(parv[server]);
198	>	target_p = hash_find_client(parv[server]);
199		else
200		target_p = find_person(client_p, parv[server]);
201
#	Line 396 | Line 203 | hunt_server(struct Client *client_p, str
203		if (target_p->from == source_p->from && !MyConnect(target_p))
204		target_p = NULL;
205
206	<	if (target_p == NULL && (target_p = find_server(parv[server])))
206	>	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
207		if (target_p->from == source_p->from && !MyConnect(target_p))
208		target_p = NULL;
209
210		collapse(parv[server]);
211	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
211	>	wilds = has_wildcards(parv[server]);
212
213		/* Again, if there are no wild cards involved in the server
214		* name, use the hash lookup
#	Line 410 | Line 217 | hunt_server(struct Client *client_p, str
217		{
218		if (!wilds)
219		{
220	<	if (!(target_p = find_server(parv[server])))
220	>	if (!(target_p = hash_find_server(parv[server])))
221		{
222		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
223	<	me.name, parv[0], parv[server]);
223	>	me.name, source_p->name, parv[server]);
224		return(HUNTED_NOSUCH);
225		}
226		}
#	Line 441 | Line 248 | hunt_server(struct Client *client_p, str
248		if(!IsRegistered(target_p))
249		{
250		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
251	<	me.name, parv[0], parv[server]);
251	>	me.name, source_p->name, parv[server]);
252		return HUNTED_NOSUCH;
253		}
254
#	Line 464 | Line 271 | hunt_server(struct Client *client_p, str
271		}
272
273		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
274	<	me.name, parv[0], parv[server]);
274	>	me.name, source_p->name, parv[server]);
275		return(HUNTED_NOSUCH);
276		}
277
#	Line 494 | Line 301 | try_connections(void *unused)
301		DLINK_FOREACH(ptr, server_items.head)
302		{
303		conf = ptr->data;
304	<	aconf = (struct AccessItem *)map_to_conf(conf);
304	>	aconf = map_to_conf(conf);
305
306		/* Also when already connecting! (update holdtimes) --SRB
307		*/
308	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
308	>	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
309		!(IsConfAllowAutoConn(aconf)))
310		continue;
311
312	<	cltmp = (struct ClassItem *)map_to_conf(aconf->class_ptr);
312	>	cltmp = map_to_conf(aconf->class_ptr);
313
314		/* Skip this entry if the use of it is still on hold until
315		* future. Otherwise handle this entry (and set it on hold
#	Line 517 | Line 324 | try_connections(void *unused)
324		confrq = DEFAULT_CONNECTFREQUENCY;
325		else
326		{
327	<	confrq = ConFreq(cltmp);
328	<	if (confrq < MIN_CONN_FREQ )
327	>	confrq = cltmp->con_freq;
328	>	if (confrq < MIN_CONN_FREQ)
329		confrq = MIN_CONN_FREQ;
330		}
331
#	Line 527 | Line 334 | try_connections(void *unused)
334		/* Found a CONNECT config with port specified, scan clients
335		* and see if this server is already connected?
336		*/
337	<	if (find_server(conf->name) != NULL)
337	>	if (hash_find_server(conf->name) != NULL)
338		continue;
339
340	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
340	>	if (cltmp->curr_user_count < cltmp->max_total)
341		{
342		/* Go to the end of the list, if not already last */
343		if (ptr->next != NULL)
#	Line 565 | Line 372 | try_connections(void *unused)
372		}
373
374		int
375	<	check_server(const char *name, struct Client *client_p, int cryptlink)
375	>	valid_servname(const char *name)
376	>	{
377	>	unsigned int length = 0;
378	>	unsigned int dots   = 0;
379	>	const char *p = name;
380	>
381	>	for (; *p; ++p)
382	>	{
383	>	if (!IsServChar(*p))
384	>	return 0;
385	>
386	>	++length;
387	>
388	>	if (*p == '.')
389	>	++dots;
390	>	}
391	>
392	>	return dots != 0 && length <= HOSTLEN;
393	>	}
394	>
395	>	int
396	>	check_server(const char *name, struct Client *client_p)
397		{
398		dlink_node *ptr;
399		struct ConfItem *conf           = NULL;
#	Line 586 | Line 414 | check_server(const char *name, struct Cl
414		DLINK_FOREACH(ptr, server_items.head)
415		{
416		conf = ptr->data;
417	<	aconf = (struct AccessItem *)map_to_conf(conf);
417	>	aconf = map_to_conf(conf);
418
419		if (!match(name, conf->name))
420		continue;
#	Line 599 | Line 427 | check_server(const char *name, struct Cl
427		match(aconf->host, client_p->sockhost))
428		{
429		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 */
430		{
431		/* A NULL password is as good as a bad one */
432		if (EmptyString(client_p->localClient->passwd))
#	Line 637 | Line 457 | check_server(const char *name, struct Cl
457
458		attach_conf(client_p, server_conf);
459
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	–	}
649	–
650	–	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	–
460		server_aconf = map_to_conf(server_conf);
461
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);
462		if (!IsConfTopicBurst(server_aconf))
463		{
464		ClearCap(client_p, CAP_TB);
465		ClearCap(client_p, CAP_TBURST);
466		}
467
673	–	/* Don't unset CAP_HUB here even if the server isn't a hub,
674	–	* it only indicates if the server thinks it's lazylinks are
675	–	* leafs or not.. if you unset it, bad things will happen
676	–	*/
468		if (aconf != NULL)
469		{
470		struct sockaddr_in *v4;
#	Line 684 | Line 475 | check_server(const char *name, struct Cl
475		{
476		#ifdef IPV6
477		case AF_INET6:
478	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
478	>	v6 = (struct sockaddr_in6 *)&aconf->addr;
479
480		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
481	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
481	>	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
482		break;
483		#endif
484		case AF_INET:
485	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
485	>	v4 = (struct sockaddr_in *)&aconf->addr;
486
487		if (v4->sin_addr.s_addr == INADDR_NONE)
488	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
488	>	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
489		break;
490		}
491		}
#	Line 754 | Line 545 | delete_capability(const char *capab_name
545		}
546		}
547
548	<	return(0);
548	>	return 0;
549		}
550
551		/*
#	Line 767 | Line 558 | delete_capability(const char *capab_name
558		int
559		find_capability(const char *capab)
560		{
561	<	dlink_node *ptr;
771	<	struct Capability *cap;
561	>	const dlink_node *ptr = NULL;
562
563		DLINK_FOREACH(ptr, cap_list.head)
564		{
565	<	cap = ptr->data;
565	>	const struct Capability *cap = ptr->data;
566
567	<	if (cap->cap != 0)
568	<	{
779	<	if (irccmp(cap->name, capab) == 0)
780	<	return(cap->cap);
781	<	}
567	>	if (cap->cap && !irccmp(cap->name, capab))
568	>	return cap->cap;
569		}
570	<	return(0);
570	>
571	>	return 0;
572		}
573
574		/* send_capabilities()
#	Line 788 | Line 576 | find_capability(const char *capab)
576		* inputs       - Client pointer to send to
577		*              - Pointer to AccessItem (for crypt)
578		*              - int flag of capabilities that this server can send
791	–	*              - int flag of encryption capabilities
579		* output       - NONE
580		* side effects - send the CAPAB line to a server  -orabidoo
581		*
582		*/
583		void
584		send_capabilities(struct Client *client_p, struct AccessItem *aconf,
585	<	int cap_can_send, int enc_can_send)
585	>	int cap_can_send)
586		{
587		struct Capability *cap=NULL;
588		char msgbuf[IRCD_BUFSIZE];
589		char *t;
590		int tl;
591		dlink_node *ptr;
805	–	#ifdef HAVE_LIBCRYPTO
806	–	const struct EncCapability *epref = NULL;
807	–	char *capend;
808	–	int sent_cipher = 0;
809	–	#endif
592
593		t = msgbuf;
594
#	Line 820 | Line 602 | send_capabilities(struct Client *client_
602		t += tl;
603		}
604		}
823	–	#ifdef HAVE_LIBCRYPTO
824	–	if (enc_can_send)
825	–	{
826	–	capend = t;
827	–	strcpy(t, "ENC:");
828	–	t += 4;
829	–
830	–	/* use connect{} specific info if available */
831	–	if (aconf->cipher_preference)
832	–	epref = aconf->cipher_preference;
833	–	else if (ConfigFileEntry.default_cipher_preference)
834	–	epref = ConfigFileEntry.default_cipher_preference;
835	–
836	–	if (epref && (epref->cap & enc_can_send))
837	–	{
838	–	/* Leave the space -- it is removed later. */
839	–	tl = ircsprintf(t, "%s ", epref->name);
840	–	t += tl;
841	–	sent_cipher = 1;
842	–	}
605
844	–	if (!sent_cipher)
845	–	t = capend; /* truncate string before ENC:, below */
846	–	}
847	–	#endif
606		*(t - 1) = '\0';
607		sendto_one(client_p, "CAPAB :%s", msgbuf);
608		}
#	Line 864 | Line 622 | sendnick_TS(struct Client *client_p, str
622		if (!IsClient(target_p))
623		return;
624
625	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
868	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
625	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
626
627		if (ubuf[0] == '\0')
628		{
#	Line 874 | Line 631 | sendnick_TS(struct Client *client_p, str
631		}
632
633		/* XXX Both of these need to have a :me.name or :mySID!?!?! */
634	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
635	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
636	<	target_p->servptr->id,
637	<	target_p->name, target_p->hopcount + 1,
638	<	(unsigned long) target_p->tsinfo,
639	<	ubuf, target_p->username, target_p->host,
640	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
641	<	"0" : target_p->sockhost, target_p->id, target_p->info);
634	>	if (IsCapable(client_p, CAP_SVS))
635	>	{
636	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
637	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
638	>	target_p->servptr->id,
639	>	target_p->name, target_p->hopcount + 1,
640	>	(unsigned long) target_p->tsinfo,
641	>	ubuf, target_p->username, target_p->host,
642	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
643	>	"0" : target_p->sockhost, target_p->id,
644	>	(unsigned long)target_p->servicestamp, target_p->info);
645	>	else
646	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
647	>	target_p->name, target_p->hopcount + 1,
648	>	(unsigned long) target_p->tsinfo,
649	>	ubuf, target_p->username, target_p->host,
650	>	target_p->servptr->name, (unsigned long)target_p->servicestamp,
651	>	target_p->info);
652	>	}
653		else
654	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
655	<	target_p->name, target_p->hopcount + 1,
656	<	(unsigned long) target_p->tsinfo,
657	<	ubuf, target_p->username, target_p->host,
658	<	target_p->servptr->name, target_p->info);
654	>	{
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)) ?
662	>	"0" : target_p->sockhost, target_p->id, target_p->info);
663	>	else
664	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
665	>	target_p->name, target_p->hopcount + 1,
666	>	(unsigned long) target_p->tsinfo,
667	>	ubuf, target_p->username, target_p->host,
668	>	target_p->servptr->name, target_p->info);
669	>	}
670
671	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
671	>	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->localClient->confs.head->data)))
672		if (!EmptyString(target_p->away))
673		sendto_one(client_p, ":%s AWAY :%s", target_p->name,
674		target_p->away);
#	Line 919 | Line 698 | show_capabilities(struct Client *target_
698		if (IsCapable(target_p, cap->cap))
699		t += ircsprintf(t, "%s ", cap->name);
700		}
922	–	#ifdef HAVE_LIBCRYPTO
923	–	if (IsCapable(target_p, CAP_ENC) &&
924	–	target_p->localClient->in_cipher &&
925	–	target_p->localClient->out_cipher)
926	–	t += ircsprintf(t, "ENC:%s ",
927	–	target_p->localClient->in_cipher->name);
928	–	#endif
929	–	*(t - 1) = '\0';
701
702	<	return(msgbuf);
702	>	*(t - 1) = '\0';
703	>	return msgbuf;
704		}
705
706		/* make_server()
#	Line 962 | Line 734 | server_estab(struct Client *client_p)
734		char *host;
735		const char *inpath;
736		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
965	–	dlink_node *m;
737		dlink_node *ptr;
738	+	#ifdef HAVE_LIBCRYPTO
739	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
740	+	#endif
741
742		assert(client_p != NULL);
743
#	Line 995 | Line 769 | server_estab(struct Client *client_p)
769		{
770		if (client_p != serv_list.head->data || serv_list.head->next)
771		{
772	<	ServerStats->is_ref++;
772	>	++ServerStats.is_ref;
773		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
774		exit_client(client_p, &me, "I'm a leaf");
775		return;
776		}
777		}
778
779	<	aconf = (struct AccessItem *)map_to_conf(conf);
779	>	aconf = map_to_conf(conf);
780
781	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
781	>	if (IsUnknown(client_p))
782		{
783		/* jdc -- 1.  Use EmptyString(), not [0] index reference.
784		*        2.  Check aconf->spasswd, not aconf->passwd.
785		*/
786		if (!EmptyString(aconf->spasswd))
787	<	{
788	<	/* only send ts6 format PASS if we have ts6 enabled */
1015	<	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1016	<	sendto_one(client_p, "PASS %s TS %d %s",
1017	<	aconf->spasswd, TS_CURRENT, me.id);
1018	<	else
1019	<	sendto_one(client_p, "PASS %s TS 5",
1020	<	aconf->spasswd);
1021	<	}
787	>	sendto_one(client_p, "PASS %s TS %d %s",
788	>	aconf->spasswd, TS_CURRENT, me.id);
789
790		/* Pass my info to the new server
791		*
1025	–	* If this is a HUB, pass on CAP_HUB
792		* Pass on ZIP if supported
793		* Pass on TB if supported.
794		* - Dianora
795		*/
796
797	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
798	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1033	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1034	<
1035	<	/* SERVER is the last command sent before switching to ziplinks.
1036	<	* We set TCPNODELAY on the socket to make sure it gets sent out
1037	<	* on the wire immediately.  Otherwise, it could be sitting in
1038	<	* a kernel buffer when we start sending zipped data, and the
1039	<	* parser on the receiving side can't hand both unzipped and zipped
1040	<	* data in one packet. --Rodder
1041	<	*
1042	<	* currently we only need to call send_queued_write,
1043	<	* Nagle is already disabled at this point --adx
1044	<	*/
1045	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1046	<	my_name_for_link(conf),
1047	<	ConfigServerHide.hidden ? "(H) " : "",
1048	<	(me.info[0]) ? (me.info) : "IRCers United");
1049	<	send_queued_write(client_p);
1050	<	}
1051	<
1052	<	/* Hand the server off to servlink now */
1053	<	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1054	<	{
1055	<	if (fork_server(client_p) < 0)
1056	<	{
1057	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1058	<	"Warning: fork failed for server %s -- check servlink_path (%s)",
1059	<	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1060	<	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1061	<	"%s -- check servlink_path (%s)",
1062	<	get_client_name(client_p, MASK_IP),
1063	<	ConfigFileEntry.servlink_path);
1064	<	exit_client(client_p, &me, "fork failed");
1065	<	return;
1066	<	}
797	>	send_capabilities(client_p, aconf,
798	>	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
799
800	<	start_io(client_p);
801	<	SetServlink(client_p);
800	>	sendto_one(client_p, "SERVER %s 1 :%s%s",
801	>	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
802		}
803
804	<	/* only send ts6 format SVINFO if we have ts6 enabled */
1073	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1074	<	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
804	>	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
805		(unsigned long)CurrentTime);
806
807		/* assumption here is if they passed the correct TS version, they also passed an SID */
#	Line 1105 | Line 835 | server_estab(struct Client *client_p)
835		/* Some day, all these lists will be consolidated *sigh* */
836		dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
837
838	<	m = dlinkFind(&unknown_list, client_p);
1109	<	assert(NULL != m);
838	>	assert(dlinkFind(&unknown_list, client_p));
839
840	<	dlinkDelete(m, &unknown_list);
841	<	dlinkAdd(client_p, m, &serv_list);
840	>	dlink_move_node(&client_p->localClient->lclient_node,
841	>	&unknown_list, &serv_list);
842
843		Count.myserver++;
844
#	Line 1120 | Line 849 | server_estab(struct Client *client_p)
849		make_server(client_p);
850
851		/* fixing eob timings.. -gnp */
852	<	client_p->firsttime = CurrentTime;
1124	<
1125	<	/* Show the real host/IP to admins */
1126	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1127	<	"Link with %s established: (%s) link",
1128	<	inpath_ip,show_capabilities(client_p));
1129	<	/* Now show the masked hostname/IP to opers */
1130	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1131	<	"Link with %s established: (%s) link",
1132	<	inpath,show_capabilities(client_p));
1133	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1134	<	inpath_ip, show_capabilities(client_p));
852	>	client_p->localClient->firsttime = CurrentTime;
853
854	<	client_p->serv->sconf = conf;
854	>	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
855	>	AddFlag(client_p, FLAGS_SERVICE);
856
857	<	if (HasServlink(client_p))
857	>	/* Show the real host/IP to admins */
858	>	#ifdef HAVE_LIBCRYPTO
859	>	if (client_p->localClient->fd.ssl)
860		{
861	<	/* we won't overflow FD_DESC_SZ here, as it can hold
862	<	* client_p->name + 64
863	<	*/
864	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
865	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
861	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
862	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
863	>
864	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
865	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
866	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
867	>	compression ? SSL_COMP_get_name(compression) : "NONE",
868	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
869	>	show_capabilities(client_p));
870	>	/* Now show the masked hostname/IP to opers */
871	>	sendto_realops_flags(UMODE_ALL, L_OPER,
872	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
873	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
874	>	compression ? SSL_COMP_get_name(compression) : "NONE",
875	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
876	>	show_capabilities(client_p));
877	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
878	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
879	>	compression ? SSL_COMP_get_name(compression) : "NONE",
880	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
881	>	show_capabilities(client_p));
882		}
883		else
884	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
884	>	#endif
885	>	{
886	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
887	>	"Link with %s established: (Capabilities: %s)",
888	>	inpath_ip,show_capabilities(client_p));
889	>	/* Now show the masked hostname/IP to opers */
890	>	sendto_realops_flags(UMODE_ALL, L_OPER,
891	>	"Link with %s established: (Capabilities: %s)",
892	>	inpath,show_capabilities(client_p));
893	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
894	>	inpath_ip, show_capabilities(client_p));
895	>	}
896	>
897	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
898
899		/* Old sendto_serv_but_one() call removed because we now
900		** need to send different names to different servers
#	Line 1157 | Line 907 | server_estab(struct Client *client_p)
907		if (target_p == client_p)
908		continue;
909
1160	–	if ((conf = target_p->serv->sconf) &&
1161	–	match(my_name_for_link(conf), client_p->name))
1162	–	continue;
1163	–
910		if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
911		sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
912		me.id, client_p->name, client_p->id,
#	Line 1191 | Line 937 | server_estab(struct Client *client_p)
937		**    is destroyed...)
938		*/
939
1194	–	conf = client_p->serv->sconf;
1195	–
940		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
941		{
942		target_p = ptr->data;
943
944		/* target_p->from == target_p for target_p == client_p */
945	<	if (target_p->from == client_p)
1202	<	continue;
1203	<
1204	<	if (match(my_name_for_link(conf), target_p->name))
945	>	if (IsMe(target_p) || target_p->from == client_p)
946		continue;
947
948		if (IsCapable(client_p, CAP_TS6))
#	Line 1225 | Line 966 | server_estab(struct Client *client_p)
966		server_burst(client_p);
967		}
968
1228	–	static void
1229	–	start_io(struct Client *server)
1230	–	{
1231	–	struct LocalUser *lserver = server->localClient;
1232	–	int alloclen = 1;
1233	–	char *buf;
1234	–	dlink_node *ptr;
1235	–	struct dbuf_block *block;
1236	–
1237	–	/* calculate how many bytes to allocate */
1238	–	if (IsCapable(server, CAP_ZIP))
1239	–	alloclen += 6;
1240	–	#ifdef HAVE_LIBCRYPTO
1241	–	if (IsCapable(server, CAP_ENC))
1242	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1243	–	#endif
1244	–	alloclen += dbuf_length(&lserver->buf_recvq);
1245	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1246	–	alloclen += dbuf_length(&lserver->buf_sendq);
1247	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1248	–
1249	–	/* initialize servlink control sendq */
1250	–	lserver->slinkq = buf = MyMalloc(alloclen);
1251	–	lserver->slinkq_ofs = 0;
1252	–	lserver->slinkq_len = alloclen;
1253	–
1254	–	if (IsCapable(server, CAP_ZIP))
1255	–	{
1256	–	/* ziplink */
1257	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1258	–	*buf++ = 0; /* |          */
1259	–	*buf++ = 1; /* \ len is 1 */
1260	–	*buf++ = ConfigFileEntry.compression_level;
1261	–	*buf++ = SLINKCMD_START_ZIP_IN;
1262	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1263	–	}
1264	–	#ifdef HAVE_LIBCRYPTO
1265	–	if (IsCapable(server, CAP_ENC))
1266	–	{
1267	–	/* Decryption settings */
1268	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1269	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1270	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1271	–	*buf++ = lserver->in_cipher->cipherid;
1272	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1273	–	*buf++ = 0; /* keylen < 256 */
1274	–	*buf++ = lserver->in_cipher->keylen;
1275	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1276	–	buf += lserver->in_cipher->keylen;
1277	–	/* Encryption settings */
1278	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1279	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1280	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1281	–	*buf++ = lserver->out_cipher->cipherid;
1282	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1283	–	*buf++ = 0; /* keylen < 256 */
1284	–	*buf++ = lserver->out_cipher->keylen;
1285	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1286	–	buf += lserver->out_cipher->keylen;
1287	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1288	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1289	–	}
1290	–	#endif
1291	–
1292	–	/* pass the whole recvq to servlink */
1293	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1294	–	{
1295	–	block = ptr->data;
1296	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1297	–	*buf++ = (block->size >> 8);
1298	–	*buf++ = (block->size & 0xff);
1299	–	memcpy(buf, &block->data[0], block->size);
1300	–	buf += block->size;
1301	–	}
1302	–
1303	–	dbuf_clear(&lserver->buf_recvq);
1304	–
1305	–	/* pass the whole sendq to servlink */
1306	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1307	–	{
1308	–	block = ptr->data;
1309	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1310	–	*buf++ = (block->size >> 8);
1311	–	*buf++ = (block->size & 0xff);
1312	–	memcpy(buf, &block->data[0], block->size);
1313	–	buf += block->size;
1314	–	}
1315	–
1316	–	dbuf_clear(&lserver->buf_sendq);
1317	–
1318	–	/* start io */
1319	–	*buf++ = SLINKCMD_INIT;
1320	–
1321	–	/* schedule a write */
1322	–	send_queued_slink_write(server);
1323	–	}
1324	–
1325	–	/* fork_server()
1326	–	*
1327	–	* inputs       - struct Client *server
1328	–	* output       - success: 0 / failure: -1
1329	–	* side effect  - fork, and exec SERVLINK to handle this connection
1330	–	*/
1331	–	static int
1332	–	fork_server(struct Client *server)
1333	–	{
1334	–	#ifndef HAVE_SOCKETPAIR
1335	–	return -1;
1336	–	#else
1337	–	int i;
1338	–	int slink_fds[2][2];
1339	–	/* 0? - ctrl  | 1? - data
1340	–	* ?0 - child | ?1 - parent */
1341	–
1342	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1343	–	return -1;
1344	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1345	–	goto free_ctrl_fds;
1346	–
1347	–	if ((i = fork()) < 0)
1348	–	{
1349	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1350	–	free_ctrl_fds:
1351	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1352	–	return -1;
1353	–	}
1354	–
1355	–	if (i == 0)
1356	–	{
1357	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1358	–	char *kid_argv[7];
1359	–
1360	–	#ifdef O_ASYNC
1361	–	fcntl(server->localClient->fd.fd, F_SETFL,
1362	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1363	–	#endif
1364	–	close_fds(&server->localClient->fd);
1365	–	close(slink_fds[0][1]);
1366	–	close(slink_fds[1][1]);
1367	–
1368	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1369	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1370	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1371	–
1372	–	kid_argv[0] = "-slink";
1373	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1374	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1375	–	kid_argv[5] = fd_str[2];    /* network */
1376	–	kid_argv[6] = NULL;
1377	–
1378	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1379	–
1380	–	_exit(1);
1381	–	}
1382	–
1383	–	/* close the network fd and the child ends of the pipes */
1384	–	fd_close(&server->localClient->fd);
1385	–	close(slink_fds[0][0]);
1386	–	close(slink_fds[1][0]);
1387	–
1388	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1389	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1390	–
1391	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1392	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1393	–
1394	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1395	–	read_packet(&server->localClient->fd, server);
1396	–
1397	–	return 0;
1398	–	#endif
1399	–	}
1400	–
969		/* server_burst()
970		*
971		* inputs       - struct Client pointer server
#	Line 1458 | Line 1026 | burst_all(struct Client *client_p)
1026		{
1027		struct Client *target_p = ptr->data;
1028
1029	<	if (!IsBursted(target_p) && target_p->from != client_p)
1029	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
1030		sendnick_TS(client_p, target_p);
1031
1032	<	ClearBursted(target_p);
1032	>	DelFlag(target_p, FLAGS_BURSTED);
1033		}
1034
1035		/* We send the time we started the burst, and let the remote host determine an EOB time,
#	Line 1503 | Line 1071 | send_tb(struct Client *client_p, struct
1071		sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1072		me.name, (unsigned long)chptr->channelts, chptr->chname,
1073		(unsigned long)chptr->topic_time,
1074	<	chptr->topic_info ? chptr->topic_info : "",
1075	<	chptr->topic ? chptr->topic : "");
1074	>	chptr->topic_info,
1075	>	chptr->topic);
1076		else if (IsCapable(client_p, CAP_TB))
1077	<	{
1078	<	if (ConfigChannel.burst_topicwho)
1079	<	{
1080	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1513	<	me.name, chptr->chname,
1514	<	(unsigned long)chptr->topic_time,
1515	<	chptr->topic_info, chptr->topic ? chptr->topic : "");
1516	<	}
1517	<	else
1518	<	{
1519	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1520	<	me.name, chptr->chname,
1521	<	(unsigned long)chptr->topic_time,
1522	<	chptr->topic ? chptr->topic : "");
1523	<	}
1524	<	}
1077	>	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1078	>	me.name, chptr->chname,
1079	>	(unsigned long)chptr->topic_time,
1080	>	chptr->topic_info, chptr->topic);
1081		}
1082		}
1083
#	Line 1544 | Line 1100 | burst_members(struct Client *client_p, s
1100		ms       = ptr->data;
1101		target_p = ms->client_p;
1102
1103	<	if (!IsBursted(target_p))
1103	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1104		{
1105	<	SetBursted(target_p);
1105	>	AddFlag(target_p, FLAGS_BURSTED);
1106
1107		if (target_p->from != client_p)
1108		sendnick_TS(client_p, target_p);
#	Line 1554 | Line 1110 | burst_members(struct Client *client_p, s
1110		}
1111		}
1112
1557	–	/* set_autoconn()
1558	–	*
1559	–	* inputs       - struct Client pointer to oper requesting change
1560	–	* output       - none
1561	–	* side effects - set autoconnect mode
1562	–	*/
1563	–	void
1564	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1565	–	{
1566	–	struct ConfItem *conf;
1567	–	struct AccessItem *aconf;
1568	–
1569	–	if (name != NULL)
1570	–	{
1571	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1572	–	if (conf != NULL)
1573	–	{
1574	–	aconf = (struct AccessItem *)map_to_conf(conf);
1575	–	if (newval)
1576	–	SetConfAllowAutoConn(aconf);
1577	–	else
1578	–	ClearConfAllowAutoConn(aconf);
1579	–
1580	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1581	–	"%s has changed AUTOCONN for %s to %i",
1582	–	source_p->name, name, newval);
1583	–	sendto_one(source_p,
1584	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1585	–	me.name, source_p->name, name, newval);
1586	–	}
1587	–	else
1588	–	{
1589	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1590	–	me.name, source_p->name, name);
1591	–	}
1592	–	}
1593	–	else
1594	–	{
1595	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1596	–	me.name, source_p->name);
1597	–	}
1598	–	}
1599	–
1113		/* New server connection code
1114		* Based upon the stuff floating about in s_bsd.c
1115		*   -- adrian
#	Line 1623 | Line 1136 | serv_connect(struct AccessItem *aconf, s
1136		{
1137		struct ConfItem *conf;
1138		struct Client *client_p;
1139	<	char buf[HOSTIPLEN];
1139	>	char buf[HOSTIPLEN + 1];
1140
1141		/* conversion structs */
1142		struct sockaddr_in *v4;
#	Line 1637 | Line 1150 | serv_connect(struct AccessItem *aconf, s
1150		conf = unmap_conf_item(aconf);
1151
1152		/* log */
1153	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1154	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1155	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1153	>	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1154	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1155	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1156		buf);
1157
1158		/* Still processing a DNS lookup? -> exit */
1159	<	if (aconf->dns_query != NULL)
1159	>	if (aconf->dns_pending)
1160		{
1161	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1162	<	"Error connecting to %s: Error during DNS lookup", conf->name);
1161	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1162	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
1163	>	conf->name);
1164	>	return (0);
1165	>	}
1166	>
1167	>	if (aconf->dns_failed)
1168	>	{
1169	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1170	>	"Error connecting to %s: DNS lookup for connect{} failed.",
1171	>	conf->name);
1172		return (0);
1173		}
1174
1175		/* Make sure this server isn't already connected
1176		* Note: aconf should ALWAYS be a valid C: line
1177		*/
1178	<	if ((client_p = find_server(conf->name)) != NULL)
1178	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1179		{
1180		sendto_realops_flags(UMODE_ALL, L_ADMIN,
1181		"Server %s already present from %s",
#	Line 1676 | Line 1198 | serv_connect(struct AccessItem *aconf, s
1198		strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1199
1200		/* We already converted the ip once, so lets use it - stu */
1201	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
1201	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1202
1203		/* create a socket for the server connection */
1204	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1204	>	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1205		SOCK_STREAM, 0, NULL) < 0)
1206		{
1207		/* Eek, failure to create the socket */
#	Line 1734 | Line 1256 | serv_connect(struct AccessItem *aconf, s
1256		switch (aconf->aftype)
1257		{
1258		case AF_INET:
1259	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1259	>	v4 = (struct sockaddr_in*)&aconf->bind;
1260		if (v4->sin_addr.s_addr != 0)
1261		{
1262		struct irc_ssaddr ipn;
1263		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1264		ipn.ss.ss_family = AF_INET;
1265		ipn.ss_port = 0;
1266	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1266	>	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1267		comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1268		(struct sockaddr *)&ipn, ipn.ss_len,
1269		serv_connect_callback, client_p, aconf->aftype,
#	Line 1772 | Line 1294 | serv_connect(struct AccessItem *aconf, s
1294		struct sockaddr_in6 *v6conf;
1295
1296		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1297	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1297	>	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1298		v6 = (struct sockaddr_in6 *)&ipn;
1299
1300		if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1301		sizeof(struct in6_addr)) != 0)
1302		{
1303	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1303	>	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1304		ipn.ss.ss_family = AF_INET6;
1305		ipn.ss_port = 0;
1306		comm_connect_tcp(&client_p->localClient->fd,
#	Line 1809 | Line 1331 | serv_connect(struct AccessItem *aconf, s
1331		return (1);
1332		}
1333
1334	+	#ifdef HAVE_LIBCRYPTO
1335	+	static void
1336	+	finish_ssl_server_handshake(struct Client *client_p)
1337	+	{
1338	+	struct ConfItem *conf=NULL;
1339	+	struct AccessItem *aconf=NULL;
1340	+
1341	+	conf = find_conf_name(&client_p->localClient->confs,
1342	+	client_p->name, SERVER_TYPE);
1343	+	if (conf == NULL)
1344	+	{
1345	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1346	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1347	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1348	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1349	+
1350	+	exit_client(client_p, &me, "Lost connect{} block");
1351	+	return;
1352	+	}
1353	+
1354	+	aconf = map_to_conf(conf);
1355	+
1356	+	/* jdc -- Check and send spasswd, not passwd. */
1357	+	if (!EmptyString(aconf->spasswd))
1358	+	sendto_one(client_p, "PASS %s TS %d %s",
1359	+	aconf->spasswd, TS_CURRENT, me.id);
1360	+
1361	+	send_capabilities(client_p, aconf,
1362	+	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
1363	+
1364	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1365	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1366	+	me.info);
1367	+
1368	+	/* If we've been marked dead because a send failed, just exit
1369	+	* here now and save everyone the trouble of us ever existing.
1370	+	*/
1371	+	if (IsDead(client_p))
1372	+	{
1373	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1374	+	"%s[%s] went dead during handshake",
1375	+	client_p->name,
1376	+	client_p->host);
1377	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1378	+	"%s went dead during handshake", client_p->name);
1379	+	return;
1380	+	}
1381	+
1382	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1383	+	/* If we get here, we're ok, so lets start reading some data */
1384	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1385	+	}
1386	+
1387	+	static void
1388	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1389	+	{
1390	+	int ret;
1391	+	int err;
1392	+
1393	+	ret = SSL_connect(client_p->localClient->fd.ssl);
1394	+
1395	+	if (ret <= 0)
1396	+	{
1397	+	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1398	+	{
1399	+	case SSL_ERROR_WANT_WRITE:
1400	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1401	+	(PF *)ssl_server_handshake, client_p, 0);
1402	+	return;
1403	+	case SSL_ERROR_WANT_READ:
1404	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1405	+	(PF *)ssl_server_handshake, client_p, 0);
1406	+	return;
1407	+	default:
1408	+	{
1409	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1410	+	sendto_realops_flags(UMODE_ALL, L_ALL,
1411	+	"Error connecting to %s: %s", client_p->name,
1412	+	sslerr ? sslerr : "unknown SSL error");
1413	+	exit_client(client_p, client_p, "Error during SSL handshake");
1414	+	return;
1415	+	}
1416	+	}
1417	+	}
1418	+
1419	+	finish_ssl_server_handshake(client_p);
1420	+	}
1421	+
1422	+	static void
1423	+	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1424	+	{
1425	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1426	+	{
1427	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1428	+	ERR_error_string(ERR_get_error(), NULL));
1429	+	SetDead(client_p);
1430	+	exit_client(client_p, client_p, "SSL_new failed");
1431	+	return;
1432	+	}
1433	+
1434	+	SSL_set_fd(fd->ssl, fd->fd);
1435	+
1436	+	if (!EmptyString(aconf->cipher_list))
1437	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1438	+
1439	+	ssl_server_handshake(NULL, client_p);
1440	+	}
1441	+	#endif
1442	+
1443		/* serv_connect_callback() - complete a server connection.
1444		*
1445		* This routine is called after the server connection attempt has
#	Line 1872 | Line 1503 | serv_connect_callback(fde_t *fd, int sta
1503		return;
1504		}
1505
1506	<	aconf = (struct AccessItem *)map_to_conf(conf);
1506	>	aconf = map_to_conf(conf);
1507		/* Next, send the initial handshake */
1508		SetHandshake(client_p);
1509
1510		#ifdef HAVE_LIBCRYPTO
1511	<	/* Handle all CRYPTLINK links in cryptlink_init */
1881	<	if (IsConfCryptLink(aconf))
1511	>	if (IsConfSSL(aconf))
1512		{
1513	<	cryptlink_init(client_p, conf, fd);
1513	>	ssl_connect_init(client_p, aconf, fd);
1514		return;
1515		}
1516		#endif
1517
1518		/* jdc -- Check and send spasswd, not passwd. */
1519	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
1890	<	/* Send TS 6 form only if id */
1519	>	if (!EmptyString(aconf->spasswd))
1520		sendto_one(client_p, "PASS %s TS %d %s",
1521		aconf->spasswd, TS_CURRENT, me.id);
1893	–	else
1894	–	sendto_one(client_p, "PASS %s TS 5",
1895	–	aconf->spasswd);
1522
1523	<	/* Pass my info to the new server
1524	<	*
1899	<	* If this is a HUB, pass on CAP_HUB
1900	<	* Pass on ZIP if supported
1901	<	* Pass on TB if supported.
1902	<	* - Dianora
1903	<	*/
1904	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1905	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1906	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1523	>	send_capabilities(client_p, aconf,
1524	>	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
1525
1526		sendto_one(client_p, "SERVER %s 1 :%s%s",
1527	<	my_name_for_link(conf),
1910	<	ConfigServerHide.hidden ? "(H) " : "",
1527	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
1528		me.info);
1529
1530		/* If we've been marked dead because a send failed, just exit
#	Line 1940 | Line 1557 | find_servconn_in_progress(const char *na
1557		cptr = ptr->data;
1558
1559		if (cptr && cptr->name[0])
1560	<	if (match(cptr->name, name) || match(name, cptr->name))
1560	>	if (match(name, cptr->name))
1561		return cptr;
1562		}
1563
1564		return NULL;
1565		}
1949	–
1950	–	#ifdef HAVE_LIBCRYPTO
1951	–	/*
1952	–	* sends a CRYPTLINK SERV command.
1953	–	*/
1954	–	void
1955	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
1956	–	{
1957	–	struct AccessItem *aconf;
1958	–	char *encrypted;
1959	–	unsigned char *key_to_send;
1960	–	char randkey[CIPHERKEYLEN];
1961	–	int enc_len;
1962	–
1963	–	/* get key */
1964	–	if ((!ServerInfo.rsa_private_key) ||
1965	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
1966	–	{
1967	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
1968	–	"Invalid RSA private key");
1969	–	return;
1970	–	}
1971	–
1972	–	aconf = (struct AccessItem *)map_to_conf(conf);
1973	–
1974	–	if (aconf->rsa_public_key == NULL)
1975	–	{
1976	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
1977	–	"Invalid RSA public key");
1978	–	return;
1979	–	}
1980	–
1981	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
1982	–	{
1983	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
1984	–	"Couldn't generate keyphrase");
1985	–	return;
1986	–	}
1987	–
1988	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1989	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1990	–	(unsigned char *)randkey,
1991	–	(unsigned char *)encrypted,
1992	–	aconf->rsa_public_key,
1993	–	RSA_PKCS1_PADDING);
1994	–
1995	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1996	–
1997	–	if (enc_len <= 0)
1998	–	{
1999	–	report_crypto_errors();
2000	–	MyFree(encrypted);
2001	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
2002	–	"Couldn't encrypt data");
2003	–	return;
2004	–	}
2005	–
2006	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
2007	–	{
2008	–	MyFree(encrypted);
2009	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
2010	–	"Couldn't base64 encode key");
2011	–	return;
2012	–	}
2013	–
2014	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2015	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
2016	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
2017	–
2018	–	if (me.id[0])
2019	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
2020	–
2021	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
2022	–	my_name_for_link(conf), key_to_send,
2023	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
2024	–
2025	–	SetHandshake(client_p);
2026	–	SetWaitAuth(client_p);
2027	–
2028	–	MyFree(encrypted);
2029	–	MyFree(key_to_send);
2030	–
2031	–	if (IsDead(client_p))
2032	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
2033	–	"Went dead during handshake");
2034	–	else if (fd != NULL)
2035	–	/* If we get here, we're ok, so lets start reading some data */
2036	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
2037	–	}
2038	–
2039	–	void
2040	–	cryptlink_error(struct Client *client_p, const char *type,
2041	–	const char *reason, const char *client_reason)
2042	–	{
2043	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2044	–	get_client_name(client_p, SHOW_IP), type, reason);
2045	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2046	–	get_client_name(client_p, MASK_IP), type, reason);
2047	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2048	–	get_client_name(client_p, SHOW_IP), type, reason);
2049	–
2050	–	/* If client_reason isn't NULL, then exit the client with the message
2051	–	* defined in the call.
2052	–	*/
2053	–	if ((client_reason != NULL) && (!IsDead(client_p)))
2054	–	exit_client(client_p, &me, client_reason);
2055	–	}
2056	–
2057	–	static char base64_chars[] =
2058	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2059	–
2060	–	static char base64_values[] =
2061	–	{
2062	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2063	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2064	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2065	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2066	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2067	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2068	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2069	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2070	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2071	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2072	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2073	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2074	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2075	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2076	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2077	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2078	–	};
2079	–
2080	–	/*
2081	–	* base64_block will allocate and return a new block of memory
2082	–	* using MyMalloc().  It should be freed after use.
2083	–	*/
2084	–	int
2085	–	base64_block(unsigned char **output, char *data, int len)
2086	–	{
2087	–	unsigned char *out;
2088	–	unsigned char *in = (unsigned char*)data;
2089	–	unsigned long int q_in;
2090	–	int i;
2091	–	int count = 0;
2092	–
2093	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2094	–
2095	–	/* process 24 bits at a time */
2096	–	for( i = 0; i < len; i += 3)
2097	–	{
2098	–	q_in = 0;
2099	–
2100	–	if ( i + 2 < len )
2101	–	{
2102	–	q_in  = (in[i+2] & 0xc0) << 2;
2103	–	q_in |=  in[i+2];
2104	–	}
2105	–
2106	–	if ( i + 1 < len )
2107	–	{
2108	–	q_in |= (in[i+1] & 0x0f) << 10;
2109	–	q_in |= (in[i+1] & 0xf0) << 12;
2110	–	}
2111	–
2112	–	q_in |= (in[i]   & 0x03) << 20;
2113	–	q_in |=  in[i]           << 22;
2114	–
2115	–	q_in &= 0x3f3f3f3f;
2116	–
2117	–	out[count++] = base64_chars[((q_in >> 24)       )];
2118	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2119	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2120	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2121	–	}
2122	–	if ( (i - len) > 0 )
2123	–	{
2124	–	out[count-1] = '=';
2125	–	if ( (i - len) > 1 )
2126	–	out[count-2] = '=';
2127	–	}
2128	–
2129	–	out[count] = '\0';
2130	–	*output = out;
2131	–	return (count);
2132	–	}
2133	–
2134	–	/*
2135	–	* unbase64_block will allocate and return a new block of memory
2136	–	* using MyMalloc().  It should be freed after use.
2137	–	*/
2138	–	int
2139	–	unbase64_block(unsigned char **output, char *data, int len)
2140	–	{
2141	–	unsigned char *out;
2142	–	unsigned char *in = (unsigned char*)data;
2143	–	unsigned long int q_in;
2144	–	int i;
2145	–	int count = 0;
2146	–
2147	–	if ((len % 4) != 0)
2148	–	return (0);
2149	–
2150	–	out = MyMalloc(((len / 4) * 3) + 1);
2151	–
2152	–	/* process 32 bits at a time */
2153	–	for( i = 0; (i + 3) < len; i+=4)
2154	–	{
2155	–	/* compress input (chars a, b, c and d) as follows:
2156	–	* (after converting ascii -> base64 value)
2157	–	*
2158	–	* |00000000aaaaaabbbbbbccccccdddddd|
2159	–	* |  765432  107654  321076  543210|
2160	–	*/
2161	–
2162	–	q_in = 0;
2163	–
2164	–	if (base64_values[in[i+3]] > -1)
2165	–	q_in |= base64_values[in[i+3]]      ;
2166	–	if (base64_values[in[i+2]] > -1)
2167	–	q_in |= base64_values[in[i+2]] <<  6;
2168	–	if (base64_values[in[i+1]] > -1)
2169	–	q_in |= base64_values[in[i+1]] << 12;
2170	–	if (base64_values[in[i  ]] > -1)
2171	–	q_in |= base64_values[in[i  ]] << 18;
2172	–
2173	–	out[count++] = (q_in >> 16) & 0xff;
2174	–	out[count++] = (q_in >>  8) & 0xff;
2175	–	out[count++] = (q_in      ) & 0xff;
2176	–	}
2177	–
2178	–	if (in[i-1] == '=') count--;
2179	–	if (in[i-2] == '=') count--;
2180	–
2181	–	out[count] = '\0';
2182	–	*output = out;
2183	–	return (count);
2184	–	}
2185	–
2186	–	#endif /* HAVE_LIBCRYPTO */
2187	–

Diff Legend

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