ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1156 by michael, Tue Aug 9 20:29:20 2011 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3136 by michael, Tue Mar 11 18:24:03 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_serv.c: Server related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_serv.c
23	>	* \brief Server related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 31 | Line 33
33		#include "channel.h"
34		#include "channel_mode.h"
35		#include "client.h"
34	–	#include "common.h"
35	–	#include "dbuf.h"
36		#include "event.h"
37		#include "fdlist.h"
38		#include "hash.h"
39		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
40		#include "ircd.h"
41		#include "ircd_defs.h"
42		#include "s_bsd.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"
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...*/
53	>	#include "channel.h"
54	>	#include "parse.h"
55
56		#define MIN_CONN_FREQ 300
57
58	+	dlink_list flatten_links;
59		static dlink_list cap_list = { NULL, NULL, 0 };
60		static void server_burst(struct Client *);
59	–	static int fork_server(struct Client *);
61		static void burst_all(struct Client *);
62		static void send_tb(struct Client *client_p, struct Channel *chptr);
63
64		static CNCB serv_connect_callback;
65
65	–	static void start_io(struct Client *);
66		static void burst_members(struct Client *, struct Channel *);
67
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	–
68		/*
69		* write_links_file
70		*
#	Line 243 | Line 74 | check_cipher(struct Client *client_p, st
74		*                but in no particular order.
75		*/
76		void
77	<	write_links_file(void* notused)
77	>	write_links_file(void *notused)
78		{
79	<	MessageFileLine *next_mptr = 0;
80	<	MessageFileLine *mptr = 0;
81	<	MessageFileLine *currentMessageLine = 0;
251	<	MessageFileLine *newMessageLine = 0;
252	<	MessageFile *MessageFileptr;
253	<	const char *p;
254	<	FBFILE *file;
255	<	char buff[512];
256	<	dlink_node *ptr;
257	<
258	<	MessageFileptr = &ConfigFileEntry.linksfile;
79	>	FILE *file = NULL;
80	>	dlink_node *ptr = NULL, *ptr_next = NULL;
81	>	char buff[IRCD_BUFSIZE] = { '\0' };
82
83	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
83	>	if ((file = fopen(LIPATH, "w")) == NULL)
84		return;
85
86	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
86	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
87		{
88	<	next_mptr = mptr->next;
89	<	MyFree(mptr);
88	>	dlinkDelete(ptr, &flatten_links);
89	>	MyFree(ptr->data);
90	>	free_dlink_node(ptr);
91		}
92
269	–	MessageFileptr->contentsOfFile = NULL;
270	–	currentMessageLine             = NULL;
271	–
93		DLINK_FOREACH(ptr, global_serv_list.head)
94		{
95	<	size_t nbytes = 0;
275	<	struct Client *target_p = ptr->data;
95	>	const struct Client *target_p = ptr->data;
96
97	<	/* skip ourselves, we send ourselves in /links */
98	<	if (IsMe(target_p))
97	>	/*
98	>	* Skip hidden servers, aswell as ourselves, since we already send
99	>	* ourselves in /links
100	>	*/
101	>	if (IsHidden(target_p) || IsMe(target_p))
102		continue;
103
104	<	/* skip hidden servers */
282	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
104	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
105		continue;
106
107	<	if (target_p->info[0])
108	<	p = target_p->info;
287	<	else
288	<	p = "(Unknown Location)";
289	<
290	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
291	<
292	<	/* Attempt to format the file in such a way it follows the usual links output
107	>	/*
108	>	* Attempt to format the file in such a way it follows the usual links output
109		* ie  "servername uplink :hops info"
110		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
111		* - madmax
112		*/
113	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
114	+	me.name, target_p->info);
115	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
116	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
117	+	me.name, target_p->info);
118
119	<	/*
120	<	* 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;
119	>	fputs(buff, file);
120	>	}
121
122	<	if (MessageFileptr->contentsOfFile)
123	<	{
124	<	if (currentMessageLine)
125	<	currentMessageLine->next = newMessageLine;
126	<	currentMessageLine = newMessageLine;
127	<	}
128	<	else
129	<	{
130	<	MessageFileptr->contentsOfFile = newMessageLine;
131	<	currentMessageLine = newMessageLine;
132	<	}
122	>	fclose(file);
123	>	}
124	>
125	>	void
126	>	read_links_file(void)
127	>	{
128	>	FILE *file = NULL;
129	>	char *p = NULL;
130	>	char buff[IRCD_BUFSIZE] = { '\0' };
131	>
132	>	if ((file = fopen(LIPATH, "r")) == NULL)
133	>	return;
134
135	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
136	<	fbputs(buff, file, nbytes);
135	>	while (fgets(buff, sizeof(buff), file))
136	>	{
137	>	if ((p = strchr(buff, '\n')) != NULL)
138	>	*p = '\0';
139	>
140	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
141		}
142
143	<	fbclose(file);
143	>	fclose(file);
144		}
145
146		/* hunt_server()
#	Line 347 | Line 164 | write_links_file(void* notused)
164		*/
165		int
166		hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
167	<	int server, int parc, char *parv[])
167	>	const int server, const int parc, char *parv[])
168		{
169		struct Client *target_p = NULL;
170		struct Client *target_tmp = NULL;
171		dlink_node *ptr;
172		int wilds;
173
174	<	/* Assume it's me, if no server
175	<	*/
176	<	if (parc <= server || EmptyString(parv[server]) ||
177	<	match(me.name, parv[server]) ||
178	<	match(parv[server], me.name) ||
179	<	!strcmp(parv[server], me.id))
363	<	return(HUNTED_ISME);
174	>	/* Assume it's me, if no server */
175	>	if (parc <= server || EmptyString(parv[server]))
176	>	return HUNTED_ISME;
177	>
178	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
179	>	return HUNTED_ISME;
180
181		/* These are to pickup matches that would cause the following
182		* message to go in the wrong direction while doing quick fast
183		* non-matching lookups.
184		*/
185		if (MyClient(source_p))
186	<	target_p = find_client(parv[server]);
186	>	target_p = hash_find_client(parv[server]);
187		else
188		target_p = find_person(client_p, parv[server]);
189
#	Line 375 | Line 191 | hunt_server(struct Client *client_p, str
191		if (target_p->from == source_p->from && !MyConnect(target_p))
192		target_p = NULL;
193
194	<	if (target_p == NULL && (target_p = find_server(parv[server])))
194	>	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
195		if (target_p->from == source_p->from && !MyConnect(target_p))
196		target_p = NULL;
197
198	<	collapse(parv[server]);
383	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
198	>	wilds = has_wildcards(parv[server]);
199
200		/* Again, if there are no wild cards involved in the server
201		* name, use the hash lookup
#	Line 389 | Line 204 | hunt_server(struct Client *client_p, str
204		{
205		if (!wilds)
206		{
207	<	if (!(target_p = find_server(parv[server])))
207	>	if (!(target_p = hash_find_server(parv[server])))
208		{
209	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
210	<	me.name, parv[0], parv[server]);
396	<	return(HUNTED_NOSUCH);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 402 | Line 216 | hunt_server(struct Client *client_p, str
216		{
217		target_tmp = ptr->data;
218
219	<	if (match(parv[server], target_tmp->name))
219	>	if (!match(parv[server], target_tmp->name))
220		{
221		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
222		continue;
#	Line 419 | Line 233 | hunt_server(struct Client *client_p, str
233		{
234		if(!IsRegistered(target_p))
235		{
236	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
423	<	me.name, parv[0], parv[server]);
236	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237		return HUNTED_NOSUCH;
238		}
239
240		if (IsMe(target_p) || MyClient(target_p))
241		return HUNTED_ISME;
242
243	<	if (!match(target_p->name, parv[server]))
243	>	if (match(target_p->name, parv[server]))
244		parv[server] = target_p->name;
245
246		/* This is a little kludgy but should work... */
247	<	if (IsClient(source_p) &&
435	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
436	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
437	<	parv[0] = ID(source_p);
438	<
439	<	sendto_one(target_p, command, parv[0],
247	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
248		parv[1], parv[2], parv[3], parv[4],
249		parv[5], parv[6], parv[7], parv[8]);
250	<	return(HUNTED_PASS);
251	<	}
250	>	return HUNTED_PASS;
251	>	}
252
253	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
254	<	me.name, parv[0], parv[server]);
447	<	return(HUNTED_NOSUCH);
253	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
254	>	return HUNTED_NOSUCH;
255		}
256
257		/* try_connections()
#	Line 460 | Line 267 | hunt_server(struct Client *client_p, str
267		void
268		try_connections(void *unused)
269		{
270	<	dlink_node *ptr;
271	<	struct ConfItem *conf;
465	<	struct AccessItem *aconf;
466	<	struct ClassItem *cltmp;
270	>	dlink_node *ptr = NULL;
271	>	struct MaskItem *conf;
272		int confrq;
273
274		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 473 | Line 278 | try_connections(void *unused)
278		DLINK_FOREACH(ptr, server_items.head)
279		{
280		conf = ptr->data;
476	–	aconf = map_to_conf(conf);
281
282	<	/* Also when already connecting! (update holdtimes) --SRB
282	>	assert(conf->type == CONF_SERVER);
283	>
284	>	/* Also when already connecting! (update holdtimes) --SRB
285		*/
286	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
481	<	!(IsConfAllowAutoConn(aconf)))
286	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
287		continue;
288
484	–	cltmp = map_to_conf(aconf->class_ptr);
289
290		/* Skip this entry if the use of it is still on hold until
291		* future. Otherwise handle this entry (and set it on hold
#	Line 489 | Line 293 | try_connections(void *unused)
293		* made one successfull connection... [this algorithm is
294		* a bit fuzzy... -- msa >;) ]
295		*/
296	<	if (aconf->hold > CurrentTime)
296	>	if (conf->until > CurrentTime)
297		continue;
298
299	<	if (cltmp == NULL)
299	>	if (conf->class == NULL)
300		confrq = DEFAULT_CONNECTFREQUENCY;
301		else
302		{
303	<	confrq = ConFreq(cltmp);
304	<	if (confrq < MIN_CONN_FREQ )
305	<	confrq = MIN_CONN_FREQ;
303	>	confrq = conf->class->con_freq;
304	>	if (confrq < MIN_CONN_FREQ)
305	>	confrq = MIN_CONN_FREQ;
306		}
307
308	<	aconf->hold = CurrentTime + confrq;
308	>	conf->until = CurrentTime + confrq;
309
310		/* Found a CONNECT config with port specified, scan clients
311		* and see if this server is already connected?
312		*/
313	<	if (find_server(conf->name) != NULL)
313	>	if (hash_find_server(conf->name) != NULL)
314		continue;
315
316	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
316	>	if (conf->class->ref_count < conf->class->max_total)
317		{
318		/* Go to the end of the list, if not already last */
319		if (ptr->next != NULL)
#	Line 530 | Line 334 | try_connections(void *unused)
334		*   -- adrian
335		*/
336		if (ConfigServerHide.hide_server_ips)
337	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
337	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
338	>	"Connection to %s activated.",
339		conf->name);
340		else
341	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
342	<	conf->name, aconf->host);
341	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
342	>	"Connection to %s[%s] activated.",
343	>	conf->name, conf->host);
344
345	<	serv_connect(aconf, NULL);
345	>	serv_connect(conf, NULL);
346		/* We connect only one at time... */
347		return;
348		}
#	Line 565 | Line 371 | valid_servname(const char *name)
371		}
372
373		int
374	<	check_server(const char *name, struct Client *client_p, int cryptlink)
374	>	check_server(const char *name, struct Client *client_p)
375		{
376		dlink_node *ptr;
377	<	struct ConfItem *conf           = NULL;
378	<	struct ConfItem *server_conf    = NULL;
573	<	struct AccessItem *server_aconf = NULL;
574	<	struct AccessItem *aconf        = NULL;
377	>	struct MaskItem *conf        = NULL;
378	>	struct MaskItem *server_conf = NULL;
379		int error = -1;
380
381		assert(client_p != NULL);
382
579	–	if (client_p == NULL)
580	–	return(error);
581	–
582	–	if (strlen(name) > HOSTLEN)
583	–	return(-4);
584	–
383		/* loop through looking for all possible connect items that might work */
384		DLINK_FOREACH(ptr, server_items.head)
385		{
386		conf = ptr->data;
589	–	aconf = map_to_conf(conf);
387
388	<	if (!match(name, conf->name))
388	>	if (match(name, conf->name))
389		continue;
390
391		error = -3;
392
393		/* XXX: Fix me for IPv6                    */
394		/* XXX sockhost is the IPv4 ip as a string */
395	<	if (match(aconf->host, client_p->host) ||
396	<	match(aconf->host, client_p->sockhost))
395	>	if (!match(conf->host, client_p->host) ||
396	>	!match(conf->host, client_p->sockhost))
397		{
398		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);
399
400	<	if (IsConfEncrypted(aconf))
401	<	{
402	<	if (strcmp(aconf->passwd,
403	<	(const char *)crypt(client_p->localClient->passwd,
404	<	aconf->passwd)) == 0)
405	<	server_conf = conf;
406	<	}
407	<	else
627	<	{
628	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
629	<	server_conf = conf;
630	<	}
631	<	}
400	>	if (!match_conf_password(client_p->localClient->passwd, conf))
401	>	return -2;
402	>
403	>	if (!EmptyString(conf->certfp))
404	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
405	>	return -4;
406	>
407	>	server_conf = conf;
408		}
409		}
410
411		if (server_conf == NULL)
412	<	return(error);
412	>	return error;
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	–	}
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	–
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	–	}
416
417	<	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;
426	>	case AF_INET6:
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		}
441
442	<	return(0);
442	>	return 0;
443		}
444
445		/* add_capability()
#	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 741 | Line 485 | delete_capability(const char *capab_name
485		{
486		if (irccmp(cap->name, capab_name) == 0)
487		{
488	<	default_server_capabs &= ~(cap->cap);
489	<	dlinkDelete(ptr, &cap_list);
490	<	MyFree(cap->name);
491	<	cap->name = NULL;
748	<	MyFree(cap);
488	>	default_server_capabs &= ~(cap->cap);
489	>	dlinkDelete(ptr, &cap_list);
490	>	MyFree(cap->name);
491	>	MyFree(cap);
492		}
493		}
494		}
#	Line 760 | Line 503 | delete_capability(const char *capab_name
503		* output       - 0 if not found CAPAB otherwise
504		* side effects - none
505		*/
506	<	int
506	>	unsigned int
507		find_capability(const char *capab)
508		{
509		const dlink_node *ptr = NULL;
#	Line 779 | Line 522 | find_capability(const char *capab)
522		/* send_capabilities()
523		*
524		* inputs       - Client pointer to send to
782	–	*              - Pointer to AccessItem (for crypt)
525		*              - int flag of capabilities that this server can send
784	–	*              - int flag of encryption capabilities
526		* output       - NONE
527		* side effects - send the CAPAB line to a server  -orabidoo
528		*
529		*/
530		void
531	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
791	<	int cap_can_send, int enc_can_send)
531	>	send_capabilities(struct Client *client_p, int cap_can_send)
532		{
533		struct Capability *cap=NULL;
534		char msgbuf[IRCD_BUFSIZE];
535		char *t;
536		int tl;
537		dlink_node *ptr;
798	–	#ifdef HAVE_LIBCRYPTO
799	–	const struct EncCapability *epref = NULL;
800	–	char *capend;
801	–	int sent_cipher = 0;
802	–	#endif
538
539		t = msgbuf;
540
#	Line 809 | Line 544 | send_capabilities(struct Client *client_
544
545		if (cap->cap & (cap_can_send|default_server_capabs))
546		{
547	<	tl = ircsprintf(t, "%s ", cap->name);
547	>	tl = sprintf(t, "%s ", cap->name);
548		t += tl;
549		}
550		}
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	–	}
551
837	–	if (!sent_cipher)
838	–	t = capend; /* truncate string before ENC:, below */
839	–	}
840	–	#endif
552		*(t - 1) = '\0';
553		sendto_one(client_p, "CAPAB :%s", msgbuf);
554		}
555
556		/* sendnick_TS()
557	<	*
557	>	*
558		* inputs       - client (server) to send nick towards
559		*          - client to send nick for
560		* output       - NONE
#	Line 852 | Line 563 | send_capabilities(struct Client *client_
563		void
564		sendnick_TS(struct Client *client_p, struct Client *target_p)
565		{
566	<	static char ubuf[12];
566	>	char ubuf[IRCD_BUFSIZE];
567
568		if (!IsClient(target_p))
569		return;
570
571	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
861	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
571	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
572
573		if (ubuf[0] == '\0')
574		{
#	Line 866 | Line 576 | sendnick_TS(struct Client *client_p, str
576		ubuf[1] = '\0';
577		}
578
579	<	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
580	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
579	>	if (IsCapable(client_p, CAP_SVS))
580	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
581	>	target_p->servptr->id,
582	>	target_p->name, target_p->hopcount + 1,
583	>	(unsigned long) target_p->tsinfo,
584	>	ubuf, target_p->username, target_p->host,
585	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
586	>	"0" : target_p->sockhost, target_p->id,
587	>	target_p->svid, target_p->info);
588	>	else
589		sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590		target_p->servptr->id,
591		target_p->name, target_p->hopcount + 1,
#	Line 875 | Line 593 | sendnick_TS(struct Client *client_p, str
593		ubuf, target_p->username, target_p->host,
594		(MyClient(target_p) && IsIPSpoof(target_p)) ?
595		"0" : target_p->sockhost, target_p->id, target_p->info);
596	<	else
597	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
598	<	target_p->name, target_p->hopcount + 1,
599	<	(unsigned long) target_p->tsinfo,
600	<	ubuf, target_p->username, target_p->host,
601	<	target_p->servptr->name, target_p->info);
602	<
603	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
886	<	if (!EmptyString(target_p->away))
887	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
888	<	target_p->away);
596	>
597	>	if (!EmptyString(target_p->certfp))
598	>	sendto_one(client_p, ":%s CERTFP %s",
599	>	ID_or_name(target_p, client_p), target_p->certfp);
600	>
601	>	if (target_p->away[0])
602	>	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
603	>	target_p->away);
604
605		}
606
#	Line 897 | Line 612 | sendnick_TS(struct Client *client_p, str
612		* side effects - build up string representing capabilities of server listed
613		*/
614		const char *
615	<	show_capabilities(struct Client *target_p)
615	>	show_capabilities(const struct Client *target_p)
616		{
617	<	static char msgbuf[IRCD_BUFSIZE];
618	<	char *t = msgbuf;
904	<	dlink_node *ptr;
617	>	static char msgbuf[IRCD_BUFSIZE] = "";
618	>	const dlink_node *ptr = NULL;
619
620	<	t += ircsprintf(msgbuf, "TS ");
620	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
621
622		DLINK_FOREACH(ptr, cap_list.head)
623		{
624		const struct Capability *cap = ptr->data;
625
626	<	if (IsCapable(target_p, cap->cap))
627	<	t += ircsprintf(t, "%s ", cap->name);
626	>	if (!IsCapable(target_p, cap->cap))
627	>	continue;
628	>
629	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
630	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
631		}
915	–	#ifdef HAVE_LIBCRYPTO
916	–	if (IsCapable(target_p, CAP_ENC) &&
917	–	target_p->localClient->in_cipher &&
918	–	target_p->localClient->out_cipher)
919	–	t += ircsprintf(t, "ENC:%s ",
920	–	target_p->localClient->in_cipher->name);
921	–	#endif
922	–	*(t - 1) = '\0';
632
633	<	return(msgbuf);
633	>	return msgbuf;
634		}
635
636		/* make_server()
#	Line 950 | Line 659 | void
659		server_estab(struct Client *client_p)
660		{
661		struct Client *target_p;
662	<	struct ConfItem *conf;
954	<	struct AccessItem *aconf=NULL;
662	>	struct MaskItem *conf = NULL;
663		char *host;
664		const char *inpath;
665		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
666		dlink_node *ptr;
667	+	#ifdef HAVE_LIBCRYPTO
668	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
669	+	#endif
670
671		assert(client_p != NULL);
672
#	Line 964 | Line 675 | server_estab(struct Client *client_p)
675		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
676		host   = client_p->name;
677
678	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
678	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
679		== NULL)
680		{
681		/* This shouldn't happen, better tell the ops... -A1kmm */
682	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
682	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
683	>	"Warning: Lost connect{} block "
684		"for server %s(this shouldn't happen)!", host);
685		exit_client(client_p, &me, "Lost connect{} block!");
686		return;
#	Line 983 | Line 695 | server_estab(struct Client *client_p)
695		/* If there is something in the serv_list, it might be this
696		* connecting server..
697		*/
698	<	if (!ServerInfo.hub && serv_list.head)
698	>	if (!ServerInfo.hub && serv_list.head)
699		{
700		if (client_p != serv_list.head->data || serv_list.head->next)
701		{
#	Line 994 | Line 706 | server_estab(struct Client *client_p)
706		}
707		}
708
709	<	aconf = map_to_conf(conf);
998	<
999	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
709	>	if (IsUnknown(client_p))
710		{
711	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
712	<	*        2.  Check aconf->spasswd, not aconf->passwd.
713	<	*/
1004	<	if (!EmptyString(aconf->spasswd))
1005	<	sendto_one(client_p, "PASS %s TS %d %s",
1006	<	aconf->spasswd, TS_CURRENT, me.id);
1007	<
1008	<	/* Pass my info to the new server
1009	<	*
1010	<	* Pass on ZIP if supported
1011	<	* Pass on TB if supported.
1012	<	* - Dianora
1013	<	*/
711	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
712	>
713	>	send_capabilities(client_p, 0);
714
1015	–	send_capabilities(client_p, aconf,
1016	–	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1017	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1018	–
1019	–	/* SERVER is the last command sent before switching to ziplinks.
1020	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1021	–	* on the wire immediately.  Otherwise, it could be sitting in
1022	–	* a kernel buffer when we start sending zipped data, and the
1023	–	* parser on the receiving side can't hand both unzipped and zipped
1024	–	* data in one packet. --Rodder
1025	–	*
1026	–	* currently we only need to call send_queued_write,
1027	–	* Nagle is already disabled at this point --adx
1028	–	*/
715		sendto_one(client_p, "SERVER %s 1 :%s%s",
716		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
1031	–	send_queued_write(client_p);
1032	–	}
1033	–
1034	–	/* Hand the server off to servlink now */
1035	–	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1036	–	{
1037	–	if (fork_server(client_p) < 0)
1038	–	{
1039	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1040	–	"Warning: fork failed for server %s -- check servlink_path (%s)",
1041	–	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1042	–	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1043	–	"%s -- check servlink_path (%s)",
1044	–	get_client_name(client_p, MASK_IP),
1045	–	ConfigFileEntry.servlink_path);
1046	–	exit_client(client_p, &me, "fork failed");
1047	–	return;
1048	–	}
1049	–
1050	–	start_io(client_p);
1051	–	SetServlink(client_p);
717		}
718
719		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
720		(unsigned long)CurrentTime);
721
722	<	/* assumption here is if they passed the correct TS version, they also passed an SID */
1058	<	if (IsCapable(client_p, CAP_TS6))
722	>	if (HasID(client_p))
723		hash_add_id(client_p);
724
725		/* XXX Does this ever happen? I don't think so -db */
726	<	detach_conf(client_p, OPER_TYPE);
726	>	detach_conf(client_p, CONF_OPER);
727
728		/* *WARNING*
729		**    In the following code in place of plain server's
#	Line 1099 | Line 763 | server_estab(struct Client *client_p)
763		make_server(client_p);
764
765		/* fixing eob timings.. -gnp */
766	<	client_p->firsttime = CurrentTime;
766	>	client_p->localClient->firsttime = CurrentTime;
767
768	<	/* Show the real host/IP to admins */
769	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1106	<	"Link with %s established: (%s) link",
1107	<	inpath_ip,show_capabilities(client_p));
1108	<	/* Now show the masked hostname/IP to opers */
1109	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1110	<	"Link with %s established: (%s) link",
1111	<	inpath,show_capabilities(client_p));
1112	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1113	<	inpath_ip, show_capabilities(client_p));
768	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
769	>	AddFlag(client_p, FLAGS_SERVICE);
770
771	<	client_p->serv->sconf = conf;
772	<
773	<	if (HasServlink(client_p))
771	>	/* Show the real host/IP to admins */
772	>	#ifdef HAVE_LIBCRYPTO
773	>	if (client_p->localClient->fd.ssl)
774		{
775	<	/* we won't overflow FD_DESC_SZ here, as it can hold
776	<	* client_p->name + 64
777	<	*/
778	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
779	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
775	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
776	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
777	>
778	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
779	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
780	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
781	>	compression ? SSL_COMP_get_name(compression) : "NONE",
782	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
783	>	show_capabilities(client_p));
784	>	/* Now show the masked hostname/IP to opers */
785	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
786	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
787	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
788	>	compression ? SSL_COMP_get_name(compression) : "NONE",
789	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
790	>	show_capabilities(client_p));
791	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
792	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
793	>	compression ? SSL_COMP_get_name(compression) : "NONE",
794	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
795	>	show_capabilities(client_p));
796		}
797		else
798	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
1127	<
1128	<	/* Old sendto_serv_but_one() call removed because we now
1129	<	** need to send different names to different servers
1130	<	** (domain name matching) Send new server to other servers.
1131	<	*/
1132	<	DLINK_FOREACH(ptr, serv_list.head)
798	>	#endif
799		{
800	<	target_p = ptr->data;
800	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
801	>	"Link with %s established: (Capabilities: %s)",
802	>	inpath_ip, show_capabilities(client_p));
803	>	/* Now show the masked hostname/IP to opers */
804	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
805	>	"Link with %s established: (Capabilities: %s)",
806	>	inpath, show_capabilities(client_p));
807	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
808	>	inpath_ip, show_capabilities(client_p));
809	>	}
810	>
811	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
812	>
813	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
814	>	me.id, client_p->name, client_p->id,
815	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
816
817	<	if (target_p == client_p)
818	<	continue;
819	<
820	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
821	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
822	<	me.id, client_p->name, client_p->id,
823	<	IsHidden(client_p) ? "(H) " : "",
824	<	client_p->info);
825	<	else
826	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
827	<	me.name, client_p->name,
828	<	IsHidden(client_p) ? "(H) " : "",
829	<	client_p->info);
830	<	}
831	<
832	<	/* Pass on my client information to the new server
833	<	**
834	<	** First, pass only servers (idea is that if the link gets
1154	<	** cancelled beacause the server was already there,
1155	<	** there are no NICK's to be cancelled...). Of course,
1156	<	** if cancellation occurs, all this info is sent anyway,
1157	<	** and I guess the link dies when a read is attempted...? --msa
1158	<	**
1159	<	** Note: Link cancellation to occur at this point means
1160	<	** that at least two servers from my fragment are building
1161	<	** up connection this other fragment at the same time, it's
1162	<	** a race condition, not the normal way of operation...
1163	<	**
1164	<	** ALSO NOTE: using the get_client_name for server names--
1165	<	**    see previous *WARNING*!!! (Also, original inpath
1166	<	**    is destroyed...)
1167	<	*/
817	>	/*
818	>	* Pass on my client information to the new server
819	>	*
820	>	* First, pass only servers (idea is that if the link gets
821	>	* cancelled beacause the server was already there,
822	>	* there are no NICK's to be cancelled...). Of course,
823	>	* if cancellation occurs, all this info is sent anyway,
824	>	* and I guess the link dies when a read is attempted...? --msa
825	>	*
826	>	* Note: Link cancellation to occur at this point means
827	>	* that at least two servers from my fragment are building
828	>	* up connection this other fragment at the same time, it's
829	>	* a race condition, not the normal way of operation...
830	>	*
831	>	* ALSO NOTE: using the get_client_name for server names--
832	>	*    see previous *WARNING*!!! (Also, original inpath
833	>	*    is destroyed...)
834	>	*/
835
836		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
837		{
#	Line 1174 | Line 841 | server_estab(struct Client *client_p)
841		if (IsMe(target_p) || target_p->from == client_p)
842		continue;
843
844	<	if (IsCapable(client_p, CAP_TS6))
845	<	{
846	<	if (HasID(target_p))
847	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
1181	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1182	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
1183	<	target_p->info);
1184	<	else  /* introducing non-ts6 server */
1185	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1186	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1187	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
1188	<	}
1189	<	else
1190	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1191	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
1192	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
1193	<	}
1194	<
1195	<	server_burst(client_p);
1196	<	}
1197	<
1198	<	static void
1199	<	start_io(struct Client *server)
1200	<	{
1201	<	struct LocalUser *lserver = server->localClient;
1202	<	int alloclen = 1;
1203	<	char *buf;
1204	<	dlink_node *ptr;
1205	<	struct dbuf_block *block;
1206	<
1207	<	/* calculate how many bytes to allocate */
1208	<	if (IsCapable(server, CAP_ZIP))
1209	<	alloclen += 6;
1210	<	#ifdef HAVE_LIBCRYPTO
1211	<	if (IsCapable(server, CAP_ENC))
1212	<	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1213	<	#endif
1214	<	alloclen += dbuf_length(&lserver->buf_recvq);
1215	<	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1216	<	alloclen += dbuf_length(&lserver->buf_sendq);
1217	<	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1218	<
1219	<	/* initialize servlink control sendq */
1220	<	lserver->slinkq = buf = MyMalloc(alloclen);
1221	<	lserver->slinkq_ofs = 0;
1222	<	lserver->slinkq_len = alloclen;
1223	<
1224	<	if (IsCapable(server, CAP_ZIP))
1225	<	{
1226	<	/* ziplink */
1227	<	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1228	<	*buf++ = 0; /* |          */
1229	<	*buf++ = 1; /* \ len is 1 */
1230	<	*buf++ = ConfigFileEntry.compression_level;
1231	<	*buf++ = SLINKCMD_START_ZIP_IN;
1232	<	*buf++ = SLINKCMD_START_ZIP_OUT;
1233	<	}
1234	<	#ifdef HAVE_LIBCRYPTO
1235	<	if (IsCapable(server, CAP_ENC))
1236	<	{
1237	<	/* Decryption settings */
1238	<	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1239	<	*buf++ = 0; /* /                     (upper 8-bits of len) */
1240	<	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1241	<	*buf++ = lserver->in_cipher->cipherid;
1242	<	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1243	<	*buf++ = 0; /* keylen < 256 */
1244	<	*buf++ = lserver->in_cipher->keylen;
1245	<	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1246	<	buf += lserver->in_cipher->keylen;
1247	<	/* Encryption settings */
1248	<	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1249	<	*buf++ = 0; /* /                     (upper 8-bits of len) */
1250	<	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1251	<	*buf++ = lserver->out_cipher->cipherid;
1252	<	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1253	<	*buf++ = 0; /* keylen < 256 */
1254	<	*buf++ = lserver->out_cipher->keylen;
1255	<	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1256	<	buf += lserver->out_cipher->keylen;
1257	<	*buf++ = SLINKCMD_START_CRYPT_IN;
1258	<	*buf++ = SLINKCMD_START_CRYPT_OUT;
1259	<	}
1260	<	#endif
1261	<
1262	<	/* pass the whole recvq to servlink */
1263	<	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1264	<	{
1265	<	block = ptr->data;
1266	<	*buf++ = SLINKCMD_INJECT_RECVQ;
1267	<	*buf++ = (block->size >> 8);
1268	<	*buf++ = (block->size & 0xff);
1269	<	memcpy(buf, &block->data[0], block->size);
1270	<	buf += block->size;
1271	<	}
1272	<
1273	<	dbuf_clear(&lserver->buf_recvq);
844	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
845	>	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
846	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
847	>	target_p->info);
848
849	<	/* pass the whole sendq to servlink */
850	<	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1277	<	{
1278	<	block = ptr->data;
1279	<	*buf++ = SLINKCMD_INJECT_SENDQ;
1280	<	*buf++ = (block->size >> 8);
1281	<	*buf++ = (block->size & 0xff);
1282	<	memcpy(buf, &block->data[0], block->size);
1283	<	buf += block->size;
849	>	if (HasFlag(target_p, FLAGS_EOB))
850	>	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
851		}
852
853	<	dbuf_clear(&lserver->buf_sendq);
1287	<
1288	<	/* start io */
1289	<	*buf++ = SLINKCMD_INIT;
1290	<
1291	<	/* schedule a write */
1292	<	send_queued_slink_write(server);
1293	<	}
1294	<
1295	<	/* fork_server()
1296	<	*
1297	<	* inputs       - struct Client *server
1298	<	* output       - success: 0 / failure: -1
1299	<	* side effect  - fork, and exec SERVLINK to handle this connection
1300	<	*/
1301	<	static int
1302	<	fork_server(struct Client *server)
1303	<	{
1304	<	#ifndef HAVE_SOCKETPAIR
1305	<	return -1;
1306	<	#else
1307	<	int i;
1308	<	int slink_fds[2][2];
1309	<	/* 0? - ctrl  | 1? - data
1310	<	* ?0 - child | ?1 - parent */
1311	<
1312	<	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1313	<	return -1;
1314	<	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1315	<	goto free_ctrl_fds;
1316	<
1317	<	if ((i = fork()) < 0)
1318	<	{
1319	<	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1320	<	free_ctrl_fds:
1321	<	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1322	<	return -1;
1323	<	}
1324	<
1325	<	if (i == 0)
1326	<	{
1327	<	char fd_str[3][6];   /* store 3x sizeof("65535") */
1328	<	char *kid_argv[7];
1329	<
1330	<	#ifdef O_ASYNC
1331	<	fcntl(server->localClient->fd.fd, F_SETFL,
1332	<	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1333	<	#endif
1334	<	close_fds(&server->localClient->fd);
1335	<	close(slink_fds[0][1]);
1336	<	close(slink_fds[1][1]);
1337	<
1338	<	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1339	<	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1340	<	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1341	<
1342	<	kid_argv[0] = "-slink";
1343	<	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1344	<	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1345	<	kid_argv[5] = fd_str[2];    /* network */
1346	<	kid_argv[6] = NULL;
1347	<
1348	<	execv(ConfigFileEntry.servlink_path, kid_argv);
1349	<
1350	<	_exit(1);
1351	<	}
1352	<
1353	<	/* close the network fd and the child ends of the pipes */
1354	<	fd_close(&server->localClient->fd);
1355	<	close(slink_fds[0][0]);
1356	<	close(slink_fds[1][0]);
1357	<
1358	<	execute_callback(setup_socket_cb, slink_fds[0][1]);
1359	<	execute_callback(setup_socket_cb, slink_fds[1][1]);
1360	<
1361	<	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1362	<	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1363	<
1364	<	read_ctrl_packet(&server->localClient->ctrlfd, server);
1365	<	read_packet(&server->localClient->fd, server);
1366	<
1367	<	return 0;
1368	<	#endif
853	>	server_burst(client_p);
854		}
855
856		/* server_burst()
#	Line 1398 | Line 883 | server_burst(struct Client *client_p)
883
884		/* burst_all()
885		*
886	<	* inputs       - pointer to server to send burst to
886	>	* inputs       - pointer to server to send burst to
887		* output       - NONE
888		* side effects - complete burst of channels/nicks is sent to client_p
889		*/
#	Line 1416 | Line 901 | burst_all(struct Client *client_p)
901		burst_members(client_p, chptr);
902		send_channel_modes(client_p, chptr);
903
904	<	if (IsCapable(client_p, CAP_TBURST) ||
905	<	IsCapable(client_p, CAP_TB))
1421	<	send_tb(client_p, chptr);
904	>	if (IsCapable(client_p, CAP_TBURST))
905	>	send_tb(client_p, chptr);
906		}
907		}
908
#	Line 1428 | Line 912 | burst_all(struct Client *client_p)
912		{
913		struct Client *target_p = ptr->data;
914
915	<	if (!IsBursted(target_p) && target_p->from != client_p)
915	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
916		sendnick_TS(client_p, target_p);
917	<
918	<	ClearBursted(target_p);
917	>
918	>	DelFlag(target_p, FLAGS_BURSTED);
919		}
920
1437	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1438	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1439	–	*/
1440	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
921		if (IsCapable(client_p, CAP_EOB))
922		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
923		}
#	Line 1449 | Line 929 | burst_all(struct Client *client_p)
929		*              - pointer to channel
930		* output       - NONE
931		* side effects - Called on a server burst when
932	<	*                server is CAP_TB|CAP_TBURST capable
932	>	*                server is CAP_TBURST capable
933		*/
934		static void
935		send_tb(struct Client *client_p, struct Channel *chptr)
#	Line 1468 | Line 948 | send_tb(struct Client *client_p, struct
948		* for further information   -Michael
949		*/
950		if (chptr->topic_time != 0)
951	<	{
952	<	if (IsCapable(client_p, CAP_TBURST))
953	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
954	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
955	<	(unsigned long)chptr->topic_time,
956	<	chptr->topic_info ? chptr->topic_info : "",
1477	<	chptr->topic ? chptr->topic : "");
1478	<	else if (IsCapable(client_p, CAP_TB))
1479	<	{
1480	<	if (ConfigChannel.burst_topicwho)
1481	<	{
1482	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1483	<	me.name, chptr->chname,
1484	<	(unsigned long)chptr->topic_time,
1485	<	chptr->topic_info, chptr->topic ? chptr->topic : "");
1486	<	}
1487	<	else
1488	<	{
1489	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1490	<	me.name, chptr->chname,
1491	<	(unsigned long)chptr->topic_time,
1492	<	chptr->topic ? chptr->topic : "");
1493	<	}
1494	<	}
1495	<	}
951	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
952	>	ID_or_name(&me, client_p),
953	>	(unsigned long)chptr->channelts, chptr->chname,
954	>	(unsigned long)chptr->topic_time,
955	>	chptr->topic_info,
956	>	chptr->topic);
957		}
958
959		/* burst_members()
#	Line 1514 | Line 975 | burst_members(struct Client *client_p, s
975		ms       = ptr->data;
976		target_p = ms->client_p;
977
978	<	if (!IsBursted(target_p))
978	>	if (!HasFlag(target_p, FLAGS_BURSTED))
979		{
980	<	SetBursted(target_p);
980	>	AddFlag(target_p, FLAGS_BURSTED);
981
982		if (target_p->from != client_p)
983		sendnick_TS(client_p, target_p);
#	Line 1531 | Line 992 | burst_members(struct Client *client_p, s
992
993		/* serv_connect() - initiate a server connection
994		*
995	<	* inputs       - pointer to conf
995	>	* inputs       - pointer to conf
996		*              - pointer to client doing the connect
997		* output       -
998		* side effects -
#	Line 1546 | Line 1007 | burst_members(struct Client *client_p, s
1007		* it suceeded or not, and 0 if it fails in here somewhere.
1008		*/
1009		int
1010	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1010	>	serv_connect(struct MaskItem *conf, struct Client *by)
1011		{
1551	–	struct ConfItem *conf;
1012		struct Client *client_p;
1013	<	char buf[HOSTIPLEN];
1013	>	char buf[HOSTIPLEN + 1];
1014
1015		/* conversion structs */
1016		struct sockaddr_in *v4;
1017	<	/* Make sure aconf is useful */
1018	<	assert(aconf != NULL);
1017	>	/* Make sure conf is useful */
1018	>	assert(conf != NULL);
1019
1560	–	if(aconf == NULL)
1561	–	return (0);
1020
1021	<	/* XXX should be passing struct ConfItem in the first place */
1564	<	conf = unmap_conf_item(aconf);
1565	<
1566	<	/* log */
1567	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
1021	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1022		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1023	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1023	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1024		buf);
1025
1026		/* Still processing a DNS lookup? -> exit */
1027	<	if (aconf->dns_pending)
1027	>	if (conf->dns_pending)
1028		{
1029	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1029	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1030		"Error connecting to %s: DNS lookup for connect{} in progress.",
1031		conf->name);
1032		return (0);
1033		}
1034
1035	<	if (aconf->dns_failed)
1035	>	if (conf->dns_failed)
1036		{
1037	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1037	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038		"Error connecting to %s: DNS lookup for connect{} failed.",
1039		conf->name);
1040		return (0);
1041		}
1042
1043		/* Make sure this server isn't already connected
1044	<	* Note: aconf should ALWAYS be a valid C: line
1044	>	* Note: conf should ALWAYS be a valid C: line
1045		*/
1046	<	if ((client_p = find_server(conf->name)) != NULL)
1047	<	{
1048	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1049	<	"Server %s already present from %s",
1050	<	conf->name, get_client_name(client_p, SHOW_IP));
1051	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1052	<	"Server %s already present from %s",
1053	<	conf->name, get_client_name(client_p, MASK_IP));
1046	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1047	>	{
1048	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1049	>	"Server %s already present from %s",
1050	>	conf->name, get_client_name(client_p, SHOW_IP));
1051	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1052	>	"Server %s already present from %s",
1053	>	conf->name, get_client_name(client_p, MASK_IP));
1054		if (by && IsClient(by) && !MyClient(by))
1055	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1056	<	me.name, by->name, conf->name,
1057	<	get_client_name(client_p, MASK_IP));
1604	<	return (0);
1055	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1056	>	conf->name, get_client_name(client_p, MASK_IP));
1057	>	return 0;
1058		}
1059	<
1059	>
1060		/* Create a local client */
1061		client_p = make_client(NULL);
1062
1063		/* Copy in the server, hostname, fd */
1064		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1065	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1065	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1066
1067		/* We already converted the ip once, so lets use it - stu */
1068		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1069
1070	<	/* create a socket for the server connection */
1071	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1070	>	/* create a socket for the server connection */
1071	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1072		SOCK_STREAM, 0, NULL) < 0)
1073		{
1074		/* Eek, failure to create the socket */
1075	<	report_error(L_ALL,
1076	<	"opening stream socket to %s: %s", conf->name, errno);
1075	>	report_error(L_ALL, "opening stream socket to %s: %s",
1076	>	conf->name, errno);
1077		SetDead(client_p);
1078		exit_client(client_p, &me, "Connection failed");
1079	<	return (0);
1079	>	return 0;
1080		}
1081
1082		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1632 | Line 1085 | serv_connect(struct AccessItem *aconf, s
1085		/* Attach config entries to client here rather than in
1086		* serv_connect_callback(). This to avoid null pointer references.
1087		*/
1088	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1088	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1089		{
1090	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1091	<	"Host %s is not enabled for connecting:no C/N-line",
1092	<	conf->name);
1093	<	if (by && IsClient(by) && !MyClient(by))
1094	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1095	<	me.name, by->name, client_p->name);
1090	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1091	>	"Host %s is not enabled for connecting: no connect{} block",
1092	>	conf->name);
1093	>	if (by && IsClient(by) && !MyClient(by))
1094	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1095	>
1096		SetDead(client_p);
1097		exit_client(client_p, client_p, "Connection failed");
1098	<	return (0);
1098	>	return 0;
1099		}
1100
1101		/* at this point we have a connection in progress and C/N lines
#	Line 1661 | Line 1114 | serv_connect(struct AccessItem *aconf, s
1114		SetConnecting(client_p);
1115		dlinkAdd(client_p, &client_p->node, &global_client_list);
1116		/* from def_fam */
1117	<	client_p->localClient->aftype = aconf->aftype;
1117	>	client_p->localClient->aftype = conf->aftype;
1118
1119		/* Now, initiate the connection */
1120	<	/* XXX assume that a non 0 type means a specific bind address
1120	>	/* XXX assume that a non 0 type means a specific bind address
1121		* for this connect.
1122		*/
1123	<	switch (aconf->aftype)
1123	>	switch (conf->aftype)
1124		{
1125		case AF_INET:
1126	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1126	>	v4 = (struct sockaddr_in*)&conf->bind;
1127		if (v4->sin_addr.s_addr != 0)
1128		{
1129		struct irc_ssaddr ipn;
1130		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1131		ipn.ss.ss_family = AF_INET;
1132		ipn.ss_port = 0;
1133	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1134	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1135	<	(struct sockaddr *)&ipn, ipn.ss_len,
1136	<	serv_connect_callback, client_p, aconf->aftype,
1137	<	CONNECTTIMEOUT);
1133	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1134	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1135	>	(struct sockaddr *)&ipn, ipn.ss_len,
1136	>	serv_connect_callback, client_p, conf->aftype,
1137	>	CONNECTTIMEOUT);
1138		}
1139		else if (ServerInfo.specific_ipv4_vhost)
1140		{
#	Line 1690 | Line 1143 | serv_connect(struct AccessItem *aconf, s
1143		ipn.ss.ss_family = AF_INET;
1144		ipn.ss_port = 0;
1145		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1146	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1146	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1147		(struct sockaddr *)&ipn, ipn.ss_len,
1148	<	serv_connect_callback, client_p, aconf->aftype,
1149	<	CONNECTTIMEOUT);
1148	>	serv_connect_callback, client_p, conf->aftype,
1149	>	CONNECTTIMEOUT);
1150		}
1151		else
1152	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1153	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1152	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1153	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1154		CONNECTTIMEOUT);
1155		break;
1156		#ifdef IPV6
1157		case AF_INET6:
1158		{
1159	<	struct irc_ssaddr ipn;
1160	<	struct sockaddr_in6 *v6;
1161	<	struct sockaddr_in6 *v6conf;
1162	<
1163	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1164	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1165	<	v6 = (struct sockaddr_in6 *)&ipn;
1166	<
1167	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1715	<	sizeof(struct in6_addr)) != 0)
1716	<	{
1717	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1718	<	ipn.ss.ss_family = AF_INET6;
1719	<	ipn.ss_port = 0;
1720	<	comm_connect_tcp(&client_p->localClient->fd,
1721	<	aconf->host, aconf->port,
1722	<	(struct sockaddr *)&ipn, ipn.ss_len,
1723	<	serv_connect_callback, client_p,
1724	<	aconf->aftype, CONNECTTIMEOUT);
1725	<	}
1726	<	else if (ServerInfo.specific_ipv6_vhost)
1159	>	struct irc_ssaddr ipn;
1160	>	struct sockaddr_in6 *v6;
1161	>	struct sockaddr_in6 *v6conf;
1162	>
1163	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1164	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1165	>	v6 = (struct sockaddr_in6 *)&ipn;
1166	>
1167	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1168		{
1169	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1170	<	ipn.ss.ss_family = AF_INET6;
1171	<	ipn.ss_port = 0;
1172	<	comm_connect_tcp(&client_p->localClient->fd,
1173	<	aconf->host, aconf->port,
1174	<	(struct sockaddr *)&ipn, ipn.ss_len,
1175	<	serv_connect_callback, client_p,
1176	<	aconf->aftype, CONNECTTIMEOUT);
1177	<	}
1178	<	else
1179	<	comm_connect_tcp(&client_p->localClient->fd,
1180	<	aconf->host, aconf->port,
1181	<	NULL, 0, serv_connect_callback, client_p,
1182	<	aconf->aftype, CONNECTTIMEOUT);
1169	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1170	>	ipn.ss.ss_family = AF_INET6;
1171	>	ipn.ss_port = 0;
1172	>	comm_connect_tcp(&client_p->localClient->fd,
1173	>	conf->host, conf->port,
1174	>	(struct sockaddr *)&ipn, ipn.ss_len,
1175	>	serv_connect_callback, client_p,
1176	>	conf->aftype, CONNECTTIMEOUT);
1177	>	}
1178	>	else if (ServerInfo.specific_ipv6_vhost)
1179	>	{
1180	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1181	>	ipn.ss.ss_family = AF_INET6;
1182	>	ipn.ss_port = 0;
1183	>	comm_connect_tcp(&client_p->localClient->fd,
1184	>	conf->host, conf->port,
1185	>	(struct sockaddr *)&ipn, ipn.ss_len,
1186	>	serv_connect_callback, client_p,
1187	>	conf->aftype, CONNECTTIMEOUT);
1188	>	}
1189	>	else
1190	>	comm_connect_tcp(&client_p->localClient->fd,
1191	>	conf->host, conf->port,
1192	>	NULL, 0, serv_connect_callback, client_p,
1193	>	conf->aftype, CONNECTTIMEOUT);
1194		}
1195		#endif
1196		}
1197	<	return (1);
1197	>	return 1;
1198	>	}
1199	>
1200	>	#ifdef HAVE_LIBCRYPTO
1201	>	static void
1202	>	finish_ssl_server_handshake(struct Client *client_p)
1203	>	{
1204	>	struct MaskItem *conf = NULL;
1205	>
1206	>	conf = find_conf_name(&client_p->localClient->confs,
1207	>	client_p->name, CONF_SERVER);
1208	>	if (conf == NULL)
1209	>	{
1210	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1211	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1212	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1213	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1214	>
1215	>	exit_client(client_p, &me, "Lost connect{} block");
1216	>	return;
1217	>	}
1218	>
1219	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1220	>
1221	>	send_capabilities(client_p, 0);
1222	>
1223	>	sendto_one(client_p, "SERVER %s 1 :%s%s",
1224	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
1225	>	me.info);
1226	>
1227	>	/* If we've been marked dead because a send failed, just exit
1228	>	* here now and save everyone the trouble of us ever existing.
1229	>	*/
1230	>	if (IsDead(client_p))
1231	>	{
1232	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1233	>	"%s[%s] went dead during handshake",
1234	>	client_p->name,
1235	>	client_p->host);
1236	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1237	>	"%s went dead during handshake", client_p->name);
1238	>	return;
1239	>	}
1240	>
1241	>	/* don't move to serv_list yet -- we haven't sent a burst! */
1242	>	/* If we get here, we're ok, so lets start reading some data */
1243	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1244	>	}
1245	>
1246	>	static void
1247	>	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1248	>	{
1249	>	X509 *cert = NULL;
1250	>	int ret = 0;
1251	>
1252	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1253	>	{
1254	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1255	>	{
1256	>	case SSL_ERROR_WANT_WRITE:
1257	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1258	>	(PF *)ssl_server_handshake, client_p, 0);
1259	>	return;
1260	>	case SSL_ERROR_WANT_READ:
1261	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1262	>	(PF *)ssl_server_handshake, client_p, 0);
1263	>	return;
1264	>	default:
1265	>	{
1266	>	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1267	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1268	>	"Error connecting to %s: %s", client_p->name,
1269	>	sslerr ? sslerr : "unknown SSL error");
1270	>	exit_client(client_p, client_p, "Error during SSL handshake");
1271	>	return;
1272	>	}
1273	>	}
1274	>	}
1275	>
1276	>	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1277	>	{
1278	>	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1279	>	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1280	>	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1281	>
1282	>	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1283	>	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1284	>	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1285	>	{
1286	>	unsigned int i = 0, n = 0;
1287	>
1288	>	if (X509_digest(cert, EVP_sha256(), md, &n))
1289	>	{
1290	>	for (; i < n; ++i)
1291	>	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1292	>	client_p->certfp = xstrdup(buf);
1293	>	}
1294	>	}
1295	>	else
1296	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1297	>	client_p->name, client_p->username, client_p->host, res);
1298	>	X509_free(cert);
1299	>	}
1300	>
1301	>	finish_ssl_server_handshake(client_p);
1302		}
1303
1304	+	static void
1305	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1306	+	{
1307	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1308	+	{
1309	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1310	+	ERR_error_string(ERR_get_error(), NULL));
1311	+	SetDead(client_p);
1312	+	exit_client(client_p, client_p, "SSL_new failed");
1313	+	return;
1314	+	}
1315	+
1316	+	SSL_set_fd(fd->ssl, fd->fd);
1317	+
1318	+	if (!EmptyString(conf->cipher_list))
1319	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1320	+
1321	+	ssl_server_handshake(NULL, client_p);
1322	+	}
1323	+	#endif
1324	+
1325		/* serv_connect_callback() - complete a server connection.
1326	<	*
1326	>	*
1327		* This routine is called after the server connection attempt has
1328		* completed. If unsucessful, an error is sent to ops and the client
1329		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1757 | Line 1334 | static void
1334		serv_connect_callback(fde_t *fd, int status, void *data)
1335		{
1336		struct Client *client_p = data;
1337	<	struct ConfItem *conf=NULL;
1761	<	struct AccessItem *aconf=NULL;
1337	>	struct MaskItem *conf = NULL;
1338
1339		/* First, make sure its a real client! */
1340		assert(client_p != NULL);
#	Line 1774 | Line 1350 | serv_connect_callback(fde_t *fd, int sta
1350		* Admins get to see any IP, mere opers don't *sigh*
1351		*/
1352		if (ConfigServerHide.hide_server_ips)
1353	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1353	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1354		"Error connecting to %s: %s",
1355		client_p->name, comm_errstr(status));
1356		else
1357	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1358	<	"Error connecting to %s[%s]: %s", client_p->name,
1359	<	client_p->host, comm_errstr(status));
1360	<
1361	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1362	<	"Error connecting to %s: %s",
1363	<	client_p->name, comm_errstr(status));
1357	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1358	>	"Error connecting to %s[%s]: %s", client_p->name,
1359	>	client_p->host, comm_errstr(status));
1360	>
1361	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1362	>	"Error connecting to %s: %s",
1363	>	client_p->name, comm_errstr(status));
1364
1365		/* If a fd goes bad, call dead_link() the socket is no
1366		* longer valid for reading or writing.
#	Line 1796 | Line 1372 | serv_connect_callback(fde_t *fd, int sta
1372		/* COMM_OK, so continue the connection procedure */
1373		/* Get the C/N lines */
1374		conf = find_conf_name(&client_p->localClient->confs,
1375	<	client_p->name, SERVER_TYPE);
1375	>	client_p->name, CONF_SERVER);
1376		if (conf == NULL)
1377		{
1378	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1379	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1380	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1381	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1378	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1379	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1380	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1381	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1382
1383		exit_client(client_p, &me, "Lost connect{} block");
1384		return;
1385		}
1386
1811	–	aconf = (struct AccessItem *)map_to_conf(conf);
1387		/* Next, send the initial handshake */
1388		SetHandshake(client_p);
1389
1390		#ifdef HAVE_LIBCRYPTO
1391	<	/* Handle all CRYPTLINK links in cryptlink_init */
1817	<	if (IsConfCryptLink(aconf))
1391	>	if (IsConfSSL(conf))
1392		{
1393	<	cryptlink_init(client_p, conf, fd);
1393	>	ssl_connect_init(client_p, conf, fd);
1394		return;
1395		}
1396		#endif
1397
1398	<	/* jdc -- Check and send spasswd, not passwd. */
1825	<	if (!EmptyString(aconf->spasswd))
1826	<	/* Send TS 6 form only if id */
1827	<	sendto_one(client_p, "PASS %s TS %d %s",
1828	<	aconf->spasswd, TS_CURRENT, me.id);
1398	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1399
1400	<	/* Pass my info to the new server
1831	<	*
1832	<	* Pass on ZIP if supported
1833	<	* Pass on TB if supported.
1834	<	* - Dianora
1835	<	*/
1836	<	send_capabilities(client_p, aconf,
1837	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1838	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1400	>	send_capabilities(client_p, 0);
1401
1402	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1403	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1842	<	me.info);
1402	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1403	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1404
1405		/* If we've been marked dead because a send failed, just exit
1406		* here now and save everyone the trouble of us ever existing.
1407		*/
1408	<	if (IsDead(client_p))
1408	>	if (IsDead(client_p))
1409		{
1410	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1411	<	"%s[%s] went dead during handshake",
1410	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1411	>	"%s[%s] went dead during handshake",
1412		client_p->name,
1413	<	client_p->host);
1414	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1415	<	"%s went dead during handshake", client_p->name);
1413	>	client_p->host);
1414	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1415	>	"%s went dead during handshake", client_p->name);
1416		return;
1417		}
1418
#	Line 1871 | Line 1432 | find_servconn_in_progress(const char *na
1432		cptr = ptr->data;
1433
1434		if (cptr && cptr->name[0])
1435	<	if (match(name, cptr->name))
1435	>	if (!match(name, cptr->name))
1436		return cptr;
1437		}
1877	–
1878	–	return NULL;
1879	–	}
1880	–
1881	–	#ifdef HAVE_LIBCRYPTO
1882	–	/*
1883	–	* sends a CRYPTLINK SERV command.
1884	–	*/
1885	–	void
1886	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
1887	–	{
1888	–	struct AccessItem *aconf;
1889	–	char *encrypted;
1890	–	unsigned char *key_to_send;
1891	–	char randkey[CIPHERKEYLEN];
1892	–	int enc_len;
1893	–
1894	–	/* get key */
1895	–	if ((!ServerInfo.rsa_private_key) ||
1896	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
1897	–	{
1898	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
1899	–	"Invalid RSA private key");
1900	–	return;
1901	–	}
1902	–
1903	–	aconf = (struct AccessItem *)map_to_conf(conf);
1904	–
1905	–	if (aconf->rsa_public_key == NULL)
1906	–	{
1907	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
1908	–	"Invalid RSA public key");
1909	–	return;
1910	–	}
1911	–
1912	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
1913	–	{
1914	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
1915	–	"Couldn't generate keyphrase");
1916	–	return;
1917	–	}
1918	–
1919	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1920	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1921	–	(unsigned char *)randkey,
1922	–	(unsigned char *)encrypted,
1923	–	aconf->rsa_public_key,
1924	–	RSA_PKCS1_PADDING);
1925	–
1926	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1927	–
1928	–	if (enc_len <= 0)
1929	–	{
1930	–	report_crypto_errors();
1931	–	MyFree(encrypted);
1932	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
1933	–	"Couldn't encrypt data");
1934	–	return;
1935	–	}
1438
1439	<	if (!(base64_block(&key_to_send, encrypted, enc_len)))
1938	<	{
1939	<	MyFree(encrypted);
1940	<	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
1941	<	"Couldn't base64 encode key");
1942	<	return;
1943	<	}
1944	<
1945	<	send_capabilities(client_p, aconf,
1946	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1947	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
1948	<
1949	<	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
1950	<	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
1951	<	me.name, key_to_send,
1952	<	ConfigServerHide.hidden ? "(H) " : "", me.info);
1953	<
1954	<	SetHandshake(client_p);
1955	<	SetWaitAuth(client_p);
1956	<
1957	<	MyFree(encrypted);
1958	<	MyFree(key_to_send);
1959	<
1960	<	if (IsDead(client_p))
1961	<	cryptlink_error(client_p, "SERV", "Went dead during handshake",
1962	<	"Went dead during handshake");
1963	<	else if (fd != NULL)
1964	<	/* If we get here, we're ok, so lets start reading some data */
1965	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
1966	<	}
1967	<
1968	<	void
1969	<	cryptlink_error(struct Client *client_p, const char *type,
1970	<	const char *reason, const char *client_reason)
1971	<	{
1972	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
1973	<	get_client_name(client_p, SHOW_IP), type, reason);
1974	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
1975	<	get_client_name(client_p, MASK_IP), type, reason);
1976	<	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
1977	<	get_client_name(client_p, SHOW_IP), type, reason);
1978	<
1979	<	/* If client_reason isn't NULL, then exit the client with the message
1980	<	* defined in the call.
1981	<	*/
1982	<	if ((client_reason != NULL) && (!IsDead(client_p)))
1983	<	exit_client(client_p, &me, client_reason);
1984	<	}
1985	<
1986	<	static char base64_chars[] =
1987	<	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
1988	<
1989	<	static char base64_values[] =
1990	<	{
1991	<	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1992	<	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1993	<	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
1994	<	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
1995	<	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
1996	<	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
1997	<	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
1998	<	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
1999	<	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2000	<	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2001	<	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2002	<	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2003	<	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2004	<	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2005	<	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2006	<	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2007	<	};
2008	<
2009	<	/*
2010	<	* base64_block will allocate and return a new block of memory
2011	<	* using MyMalloc().  It should be freed after use.
2012	<	*/
2013	<	int
2014	<	base64_block(unsigned char **output, char *data, int len)
2015	<	{
2016	<	unsigned char *out;
2017	<	unsigned char *in = (unsigned char*)data;
2018	<	unsigned long int q_in;
2019	<	int i;
2020	<	int count = 0;
2021	<
2022	<	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2023	<
2024	<	/* process 24 bits at a time */
2025	<	for( i = 0; i < len; i += 3)
2026	<	{
2027	<	q_in = 0;
2028	<
2029	<	if ( i + 2 < len )
2030	<	{
2031	<	q_in  = (in[i+2] & 0xc0) << 2;
2032	<	q_in |=  in[i+2];
2033	<	}
2034	<
2035	<	if ( i + 1 < len )
2036	<	{
2037	<	q_in |= (in[i+1] & 0x0f) << 10;
2038	<	q_in |= (in[i+1] & 0xf0) << 12;
2039	<	}
2040	<
2041	<	q_in |= (in[i]   & 0x03) << 20;
2042	<	q_in |=  in[i]           << 22;
2043	<
2044	<	q_in &= 0x3f3f3f3f;
2045	<
2046	<	out[count++] = base64_chars[((q_in >> 24)       )];
2047	<	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2048	<	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2049	<	out[count++] = base64_chars[((q_in      ) & 0xff)];
2050	<	}
2051	<	if ( (i - len) > 0 )
2052	<	{
2053	<	out[count-1] = '=';
2054	<	if ( (i - len) > 1 )
2055	<	out[count-2] = '=';
2056	<	}
2057	<
2058	<	out[count] = '\0';
2059	<	*output = out;
2060	<	return (count);
2061	<	}
2062	<
2063	<	/*
2064	<	* unbase64_block will allocate and return a new block of memory
2065	<	* using MyMalloc().  It should be freed after use.
2066	<	*/
2067	<	int
2068	<	unbase64_block(unsigned char **output, char *data, int len)
2069	<	{
2070	<	unsigned char *out;
2071	<	unsigned char *in = (unsigned char*)data;
2072	<	unsigned long int q_in;
2073	<	int i;
2074	<	int count = 0;
2075	<
2076	<	if ((len % 4) != 0)
2077	<	return (0);
2078	<
2079	<	out = MyMalloc(((len / 4) * 3) + 1);
2080	<
2081	<	/* process 32 bits at a time */
2082	<	for( i = 0; (i + 3) < len; i+=4)
2083	<	{
2084	<	/* compress input (chars a, b, c and d) as follows:
2085	<	* (after converting ascii -> base64 value)
2086	<	*
2087	<	* |00000000aaaaaabbbbbbccccccdddddd|
2088	<	* |  765432  107654  321076  543210|
2089	<	*/
2090	<
2091	<	q_in = 0;
2092	<
2093	<	if (base64_values[in[i+3]] > -1)
2094	<	q_in |= base64_values[in[i+3]]      ;
2095	<	if (base64_values[in[i+2]] > -1)
2096	<	q_in |= base64_values[in[i+2]] <<  6;
2097	<	if (base64_values[in[i+1]] > -1)
2098	<	q_in |= base64_values[in[i+1]] << 12;
2099	<	if (base64_values[in[i  ]] > -1)
2100	<	q_in |= base64_values[in[i  ]] << 18;
2101	<
2102	<	out[count++] = (q_in >> 16) & 0xff;
2103	<	out[count++] = (q_in >>  8) & 0xff;
2104	<	out[count++] = (q_in      ) & 0xff;
2105	<	}
2106	<
2107	<	if (in[i-1] == '=') count--;
2108	<	if (in[i-2] == '=') count--;
2109	<
2110	<	out[count] = '\0';
2111	<	*output = out;
2112	<	return (count);
1439	>	return NULL;
1440		}
2114	–
2115	–	#endif /* HAVE_LIBCRYPTO */
2116	–

Diff Legend

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