ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/server.c

Comparing:
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1169 by michael, Fri Aug 12 18:45:03 2011 UTC vs.
ircd-hybrid/branches/8.2.x/src/server.c (file contents), Revision 3452 by michael, Thu May 1 19:20:08 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 28 | Line 30
30		#include "rsa.h"
31		#endif
32		#include "list.h"
31	–	#include "channel.h"
32	–	#include "channel_mode.h"
33		#include "client.h"
34	–	#include "common.h"
35	–	#include "dbuf.h"
34		#include "event.h"
37	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
37		#include "ircd.h"
38		#include "ircd_defs.h"
39		#include "s_bsd.h"
40		#include "numeric.h"
41		#include "packet.h"
42	<	#include "irc_res.h"
43	<	#include "s_conf.h"
44	<	#include "s_serv.h"
45	<	#include "s_log.h"
50	<	#include "s_user.h"
42	>	#include "conf.h"
43	>	#include "server.h"
44	>	#include "log.h"
45	>	#include "user.h"
46		#include "send.h"
47		#include "memory.h"
48	<	#include "channel.h" /* chcap_usage_counts stuff...*/
48	>	#include "channel.h"
49	>	#include "parse.h"
50
51		#define MIN_CONN_FREQ 300
52
53	+	dlink_list flatten_links;
54		static dlink_list cap_list = { NULL, NULL, 0 };
58	–	static void server_burst(struct Client *);
59	–	static int fork_server(struct Client *);
60	–	static void burst_all(struct Client *);
61	–	static void send_tb(struct Client *client_p, struct Channel *chptr);
62	–
55		static CNCB serv_connect_callback;
56
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 */
57
58		/*
59		* write_links_file
#	Line 243 | Line 64 | check_cipher(struct Client *client_p, st
64		*                but in no particular order.
65		*/
66		void
67	<	write_links_file(void* notused)
67	>	write_links_file(void *notused)
68		{
69	<	MessageFileLine *next_mptr = 0;
70	<	MessageFileLine *mptr = 0;
71	<	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;
69	>	FILE *file = NULL;
70	>	dlink_node *ptr = NULL, *ptr_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73	<	MessageFileptr = &ConfigFileEntry.linksfile;
259	<
260	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
73	>	if ((file = fopen(LIPATH, "w")) == NULL)
74		return;
75
76	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
76	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
77		{
78	<	next_mptr = mptr->next;
79	<	MyFree(mptr);
78	>	dlinkDelete(ptr, &flatten_links);
79	>	MyFree(ptr->data);
80	>	free_dlink_node(ptr);
81		}
82
269	–	MessageFileptr->contentsOfFile = NULL;
270	–	currentMessageLine             = NULL;
271	–
83		DLINK_FOREACH(ptr, global_serv_list.head)
84		{
85	<	size_t nbytes = 0;
275	<	struct Client *target_p = ptr->data;
85	>	const struct Client *target_p = ptr->data;
86
87	<	/* skip ourselves, we send ourselves in /links */
88	<	if (IsMe(target_p))
87	>	/*
88	>	* Skip hidden servers, aswell as ourselves, since we already send
89	>	* ourselves in /links
90	>	*/
91	>	if (IsHidden(target_p) || IsMe(target_p))
92		continue;
93
94	<	/* skip hidden servers */
282	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
94	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
95		continue;
96
97	<	if (target_p->info[0])
98	<	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
97	>	/*
98	>	* Attempt to format the file in such a way it follows the usual links output
99		* ie  "servername uplink :hops info"
100		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
101		* - madmax
102		*/
103	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
104	+	me.name, target_p->info);
105	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
106	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
107	+	me.name, target_p->info);
108
109	<	/*
110	<	* 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;
109	>	fputs(buff, file);
110	>	}
111
112	<	if (MessageFileptr->contentsOfFile)
113	<	{
114	<	if (currentMessageLine)
115	<	currentMessageLine->next = newMessageLine;
116	<	currentMessageLine = newMessageLine;
117	<	}
118	<	else
119	<	{
120	<	MessageFileptr->contentsOfFile = newMessageLine;
121	<	currentMessageLine = newMessageLine;
122	<	}
112	>	fclose(file);
113	>	}
114	>
115	>	void
116	>	read_links_file(void)
117	>	{
118	>	FILE *file = NULL;
119	>	char *p = NULL;
120	>	char buff[IRCD_BUFSIZE] = "";
121	>
122	>	if ((file = fopen(LIPATH, "r")) == NULL)
123	>	return;
124	>
125	>	while (fgets(buff, sizeof(buff), file))
126	>	{
127	>	if ((p = strchr(buff, '\n')))
128	>	*p = '\0';
129
130	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
323	<	fbputs(buff, file, nbytes);
130	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
131		}
132
133	<	fbclose(file);
133	>	fclose(file);
134		}
135
136		/* hunt_server()
#	Line 346 | Line 153 | write_links_file(void* notused)
153		*      returns: (see #defines)
154		*/
155		int
156	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
157	<	int server, int parc, char *parv[])
156	>	hunt_server(struct Client *source_p, const char *command,
157	>	const int server, const int parc, char *parv[])
158		{
159		struct Client *target_p = NULL;
160		struct Client *target_tmp = NULL;
161		dlink_node *ptr;
355	–	int wilds;
162
163	<	/* Assume it's me, if no server
164	<	*/
165	<	if (parc <= server || EmptyString(parv[server]) ||
166	<	match(me.name, parv[server]) ||
167	<	match(parv[server], me.name) ||
168	<	!strcmp(parv[server], me.id))
363	<	return(HUNTED_ISME);
163	>	/* Assume it's me, if no server */
164	>	if (parc <= server || EmptyString(parv[server]))
165	>	return HUNTED_ISME;
166	>
167	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
168	>	return HUNTED_ISME;
169
170		/* These are to pickup matches that would cause the following
171		* message to go in the wrong direction while doing quick fast
#	Line 369 | Line 174 | hunt_server(struct Client *client_p, str
174		if (MyClient(source_p))
175		target_p = hash_find_client(parv[server]);
176		else
177	<	target_p = find_person(client_p, parv[server]);
177	>	target_p = find_person(source_p, parv[server]);
178
179		if (target_p)
180		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 379 | Line 184 | hunt_server(struct Client *client_p, str
184		if (target_p->from == source_p->from && !MyConnect(target_p))
185		target_p = NULL;
186
382	–	collapse(parv[server]);
383	–	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
384	–
187		/* Again, if there are no wild cards involved in the server
188		* name, use the hash lookup
189		*/
190		if (target_p == NULL)
191		{
192	<	if (!wilds)
192	>	if (!has_wildcards(parv[server]))
193		{
194		if (!(target_p = hash_find_server(parv[server])))
195		{
196	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
197	<	me.name, parv[0], parv[server]);
396	<	return(HUNTED_NOSUCH);
196	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
197	>	return HUNTED_NOSUCH;
198		}
199		}
200		else
#	Line 402 | Line 203 | hunt_server(struct Client *client_p, str
203		{
204		target_tmp = ptr->data;
205
206	<	if (match(parv[server], target_tmp->name))
206	>	if (!match(parv[server], target_tmp->name))
207		{
208		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
209		continue;
210		target_p = ptr->data;
211
212	<	if (IsRegistered(target_p) && (target_p != client_p))
212	>	if (IsRegistered(target_p) && (target_p != source_p->from))
213		break;
214		}
215		}
216		}
217		}
218
219	<	if (target_p != NULL)
219	>	if (target_p)
220		{
221	<	if(!IsRegistered(target_p))
221	>	if (!IsRegistered(target_p))
222		{
223	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
423	<	me.name, parv[0], parv[server]);
223	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
224		return HUNTED_NOSUCH;
225		}
226
227		if (IsMe(target_p) || MyClient(target_p))
228		return HUNTED_ISME;
229
230	<	if (!match(target_p->name, parv[server]))
230	>	if (match(target_p->name, parv[server]))
231		parv[server] = target_p->name;
232
233		/* This is a little kludgy but should work... */
234	<	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],
234	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
235		parv[1], parv[2], parv[3], parv[4],
236		parv[5], parv[6], parv[7], parv[8]);
237	<	return(HUNTED_PASS);
238	<	}
237	>	return HUNTED_PASS;
238	>	}
239
240	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
241	<	me.name, parv[0], parv[server]);
447	<	return(HUNTED_NOSUCH);
240	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
241	>	return HUNTED_NOSUCH;
242		}
243
244		/* try_connections()
#	Line 460 | Line 254 | hunt_server(struct Client *client_p, str
254		void
255		try_connections(void *unused)
256		{
257	<	dlink_node *ptr;
258	<	struct ConfItem *conf;
465	<	struct AccessItem *aconf;
466	<	struct ClassItem *cltmp;
467	<	int confrq;
257	>	dlink_node *ptr = NULL;
258	>	int confrq = 0;
259
260		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
261		if (GlobalSetOptions.autoconn == 0)
#	Line 472 | Line 263 | try_connections(void *unused)
263
264		DLINK_FOREACH(ptr, server_items.head)
265		{
266	<	conf = ptr->data;
476	<	aconf = map_to_conf(conf);
266	>	struct MaskItem *conf = ptr->data;
267
268	<	/* Also when already connecting! (update holdtimes) --SRB
268	>	assert(conf->type == CONF_SERVER);
269	>
270	>	/* Also when already connecting! (update holdtimes) --SRB
271		*/
272	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
481	<	!(IsConfAllowAutoConn(aconf)))
272	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
273		continue;
274
484	–	cltmp = map_to_conf(aconf->class_ptr);
275
276		/* Skip this entry if the use of it is still on hold until
277		* future. Otherwise handle this entry (and set it on hold
#	Line 489 | Line 279 | try_connections(void *unused)
279		* made one successfull connection... [this algorithm is
280		* a bit fuzzy... -- msa >;) ]
281		*/
282	<	if (aconf->hold > CurrentTime)
282	>	if (conf->until > CurrentTime)
283		continue;
284
285	<	if (cltmp == NULL)
285	>	if (conf->class == NULL)
286		confrq = DEFAULT_CONNECTFREQUENCY;
287		else
288		{
289	<	confrq = ConFreq(cltmp);
290	<	if (confrq < MIN_CONN_FREQ )
291	<	confrq = MIN_CONN_FREQ;
289	>	confrq = conf->class->con_freq;
290	>	if (confrq < MIN_CONN_FREQ)
291	>	confrq = MIN_CONN_FREQ;
292		}
293
294	<	aconf->hold = CurrentTime + confrq;
294	>	conf->until = CurrentTime + confrq;
295
296	<	/* Found a CONNECT config with port specified, scan clients
296	>	/*
297	>	* Found a CONNECT config with port specified, scan clients
298		* and see if this server is already connected?
299		*/
300	<	if (hash_find_server(conf->name) != NULL)
300	>	if (hash_find_server(conf->name))
301		continue;
302
303	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
303	>	if (conf->class->ref_count < conf->class->max_total)
304		{
305		/* Go to the end of the list, if not already last */
306	<	if (ptr->next != NULL)
306	>	if (ptr->next)
307		{
308		dlinkDelete(ptr, &server_items);
309		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 521 | Line 312 | try_connections(void *unused)
312		if (find_servconn_in_progress(conf->name))
313		return;
314
315	<	/* We used to only print this if serv_connect() actually
315	>	/*
316	>	* We used to only print this if serv_connect() actually
317		* succeeded, but since comm_tcp_connect() can call the callback
318		* immediately if there is an error, we were getting error messages
319		* in the wrong order. SO, we just print out the activated line,
#	Line 530 | Line 322 | try_connections(void *unused)
322		*   -- adrian
323		*/
324		if (ConfigServerHide.hide_server_ips)
325	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
325	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
326	>	"Connection to %s activated.",
327		conf->name);
328		else
329	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
330	<	conf->name, aconf->host);
329	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
330	>	"Connection to %s[%s] activated.",
331	>	conf->name, conf->host);
332
333	<	serv_connect(aconf, NULL);
333	>	serv_connect(conf, NULL);
334		/* We connect only one at time... */
335		return;
336		}
#	Line 546 | Line 340 | try_connections(void *unused)
340		int
341		valid_servname(const char *name)
342		{
343	<	unsigned int length = 0;
550	<	unsigned int dots   = 0;
343	>	unsigned int dots = 0;
344		const char *p = name;
345
346		for (; *p; ++p)
#	Line 555 | Line 348 | valid_servname(const char *name)
348		if (!IsServChar(*p))
349		return 0;
350
558	–	++length;
559	–
351		if (*p == '.')
352		++dots;
353		}
354
355	<	return dots != 0 && length <= HOSTLEN;
355	>	return dots && (p - name) <= HOSTLEN;
356		}
357
358		int
359	<	check_server(const char *name, struct Client *client_p, int cryptlink)
359	>	check_server(const char *name, struct Client *client_p)
360		{
361		dlink_node *ptr;
362	<	struct ConfItem *conf           = NULL;
363	<	struct ConfItem *server_conf    = NULL;
573	<	struct AccessItem *server_aconf = NULL;
574	<	struct AccessItem *aconf        = NULL;
362	>	struct MaskItem *conf        = NULL;
363	>	struct MaskItem *server_conf = NULL;
364		int error = -1;
365
366	<	assert(client_p != NULL);
578	<
579	<	if (client_p == NULL)
580	<	return(error);
581	<
582	<	if (strlen(name) > HOSTLEN)
583	<	return(-4);
366	>	assert(client_p);
367
368		/* loop through looking for all possible connect items that might work */
369		DLINK_FOREACH(ptr, server_items.head)
370		{
371		conf = ptr->data;
589	–	aconf = map_to_conf(conf);
372
373	<	if (!match(name, conf->name))
373	>	if (match(name, conf->name))
374		continue;
375
376		error = -3;
377
378		/* XXX: Fix me for IPv6                    */
379		/* XXX sockhost is the IPv4 ip as a string */
380	<	if (match(aconf->host, client_p->host) ||
381	<	match(aconf->host, client_p->sockhost))
380	>	if (!match(conf->host, client_p->host) ||
381	>	!match(conf->host, client_p->sockhost))
382		{
383		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);
384
385	<	if (IsConfEncrypted(aconf))
386	<	{
387	<	if (strcmp(aconf->passwd,
388	<	(const char *)crypt(client_p->localClient->passwd,
389	<	aconf->passwd)) == 0)
390	<	server_conf = conf;
391	<	}
392	<	else
627	<	{
628	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
629	<	server_conf = conf;
630	<	}
631	<	}
385	>	if (!match_conf_password(client_p->localClient->passwd, conf))
386	>	return -2;
387	>
388	>	if (!EmptyString(conf->certfp))
389	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
390	>	return -4;
391	>
392	>	server_conf = conf;
393		}
394		}
395
396		if (server_conf == NULL)
397	<	return(error);
397	>	return error;
398
399		attach_conf(client_p, server_conf);
400
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	–	}
401
402	<	DLINK_FOREACH(ptr, leaf_items.head)
651	<	{
652	<	conf = ptr->data;
653	<
654	<	if (!match(name, conf->name))
655	<	continue;
656	<	attach_conf(client_p, conf);
657	<	}
658	<
659	<	server_aconf = map_to_conf(server_conf);
660	<
661	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
662	<	if (!IsConfCompressed(server_aconf))
663	<	#endif
664	<	ClearCap(client_p, CAP_ZIP);
665	<	if (!IsConfCryptLink(server_aconf))
666	<	ClearCap(client_p, CAP_ENC);
667	<	if (!IsConfTopicBurst(server_aconf))
668	<	{
669	<	ClearCap(client_p, CAP_TB);
670	<	ClearCap(client_p, CAP_TBURST);
671	<	}
672	<
673	<	if (aconf != NULL)
402	>	if (server_conf)
403		{
404		struct sockaddr_in *v4;
405		#ifdef IPV6
406		struct sockaddr_in6 *v6;
407		#endif
408	<	switch (aconf->aftype)
408	>	switch (server_conf->aftype)
409		{
410		#ifdef IPV6
411	<	case AF_INET6:
412	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
411	>	case AF_INET6:
412	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
413
414		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
415	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
415	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
416		break;
417		#endif
418		case AF_INET:
419	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
419	>	v4 = (struct sockaddr_in *)&server_conf->addr;
420
421		if (v4->sin_addr.s_addr == INADDR_NONE)
422	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
422	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
423		break;
424		}
425		}
426
427	<	return(0);
427	>	return 0;
428		}
429
430		/* add_capability()
#	Line 712 | Line 441 | add_capability(const char *capab_name, i
441		{
442		struct Capability *cap = MyMalloc(sizeof(*cap));
443
444	<	DupString(cap->name, capab_name);
444	>	cap->name = xstrdup(capab_name);
445		cap->cap = cap_flag;
446		dlinkAdd(cap, &cap->node, &cap_list);
447
#	Line 729 | Line 458 | add_capability(const char *capab_name, i
458		int
459		delete_capability(const char *capab_name)
460		{
461	<	dlink_node *ptr;
733	<	dlink_node *next_ptr;
734	<	struct Capability *cap;
461	>	dlink_node *ptr = NULL, *ptr_next = NULL;
462
463	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
463	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
464		{
465	<	cap = ptr->data;
465	>	struct Capability *cap = ptr->data;
466
467	<	if (cap->cap != 0)
467	>	if (cap->cap)
468		{
469	<	if (irccmp(cap->name, capab_name) == 0)
469	>	if (!irccmp(cap->name, capab_name))
470		{
471	<	default_server_capabs &= ~(cap->cap);
472	<	dlinkDelete(ptr, &cap_list);
473	<	MyFree(cap->name);
474	<	cap->name = NULL;
748	<	MyFree(cap);
471	>	default_server_capabs &= ~(cap->cap);
472	>	dlinkDelete(ptr, &cap_list);
473	>	MyFree(cap->name);
474	>	MyFree(cap);
475		}
476		}
477		}
#	Line 760 | Line 486 | delete_capability(const char *capab_name
486		* output       - 0 if not found CAPAB otherwise
487		* side effects - none
488		*/
489	<	int
489	>	unsigned int
490		find_capability(const char *capab)
491		{
492		const dlink_node *ptr = NULL;
#	Line 779 | Line 505 | find_capability(const char *capab)
505		/* send_capabilities()
506		*
507		* inputs       - Client pointer to send to
782	–	*              - Pointer to AccessItem (for crypt)
508		*              - int flag of capabilities that this server can send
784	–	*              - int flag of encryption capabilities
509		* output       - NONE
510		* side effects - send the CAPAB line to a server  -orabidoo
511		*
512		*/
513		void
514	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
791	<	int cap_can_send, int enc_can_send)
514	>	send_capabilities(struct Client *client_p, int cap_can_send)
515		{
516	<	struct Capability *cap=NULL;
517	<	char msgbuf[IRCD_BUFSIZE];
795	<	char *t;
516	>	char msgbuf[IRCD_BUFSIZE] = "";
517	>	char *t = msgbuf;
518		int tl;
519	<	dlink_node *ptr;
798	<	#ifdef HAVE_LIBCRYPTO
799	<	const struct EncCapability *epref = NULL;
800	<	char *capend;
801	<	int sent_cipher = 0;
802	<	#endif
803	<
804	<	t = msgbuf;
519	>	dlink_node *ptr = NULL;
520
521		DLINK_FOREACH(ptr, cap_list.head)
522		{
523	<	cap = ptr->data;
523	>	struct Capability *cap = ptr->data;
524
525		if (cap->cap & (cap_can_send|default_server_capabs))
526		{
527	<	tl = ircsprintf(t, "%s ", cap->name);
527	>	tl = sprintf(t, "%s ", cap->name);
528		t += tl;
529		}
530		}
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	–	}
531
837	–	if (!sent_cipher)
838	–	t = capend; /* truncate string before ENC:, below */
839	–	}
840	–	#endif
532		*(t - 1) = '\0';
533		sendto_one(client_p, "CAPAB :%s", msgbuf);
534		}
535
845	–	/* sendnick_TS()
846	–	*
847	–	* inputs       - client (server) to send nick towards
848	–	*          - client to send nick for
849	–	* output       - NONE
850	–	* side effects - NICK message is sent towards given client_p
851	–	*/
852	–	void
853	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
854	–	{
855	–	static char ubuf[12];
856	–
857	–	if (!IsClient(target_p))
858	–	return;
859	–
860	–	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
861	–	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
862	–
863	–	if (ubuf[0] == '\0')
864	–	{
865	–	ubuf[0] = '+';
866	–	ubuf[1] = '\0';
867	–	}
868	–
869	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
870	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
871	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
872	–	target_p->servptr->id,
873	–	target_p->name, target_p->hopcount + 1,
874	–	(unsigned long) target_p->tsinfo,
875	–	ubuf, target_p->username, target_p->host,
876	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
877	–	"0" : target_p->sockhost, target_p->id, target_p->info);
878	–	else
879	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
880	–	target_p->name, target_p->hopcount + 1,
881	–	(unsigned long) target_p->tsinfo,
882	–	ubuf, target_p->username, target_p->host,
883	–	target_p->servptr->name, target_p->info);
884	–
885	–	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);
889	–
890	–	}
891	–
536		/*
537		* show_capabilities - show current server capabilities
538		*
#	Line 897 | Line 541 | sendnick_TS(struct Client *client_p, str
541		* side effects - build up string representing capabilities of server listed
542		*/
543		const char *
544	<	show_capabilities(struct Client *target_p)
544	>	show_capabilities(const struct Client *target_p)
545		{
546	<	static char msgbuf[IRCD_BUFSIZE];
547	<	char *t = msgbuf;
904	<	dlink_node *ptr;
546	>	static char msgbuf[IRCD_BUFSIZE] = "";
547	>	const dlink_node *ptr = NULL;
548
549	<	t += ircsprintf(msgbuf, "TS ");
549	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
550
551		DLINK_FOREACH(ptr, cap_list.head)
552		{
553		const struct Capability *cap = ptr->data;
554
555	<	if (IsCapable(target_p, cap->cap))
556	<	t += ircsprintf(t, "%s ", cap->name);
555	>	if (!IsCapable(target_p, cap->cap))
556	>	continue;
557	>
558	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
559	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
560		}
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';
561
562	<	return(msgbuf);
562	>	return msgbuf;
563		}
564
565		/* make_server()
#	Line 940 | Line 578 | make_server(struct Client *client_p)
578		return client_p->serv;
579		}
580
943	–	/* server_estab()
944	–	*
945	–	* inputs       - pointer to a struct Client
946	–	* output       -
947	–	* side effects -
948	–	*/
949	–	void
950	–	server_estab(struct Client *client_p)
951	–	{
952	–	struct Client *target_p;
953	–	struct ConfItem *conf;
954	–	struct AccessItem *aconf=NULL;
955	–	char *host;
956	–	const char *inpath;
957	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
958	–	dlink_node *ptr;
959	–
960	–	assert(client_p != NULL);
961	–
962	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
963	–
964	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
965	–	host   = client_p->name;
966	–
967	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
968	–	== NULL)
969	–	{
970	–	/* This shouldn't happen, better tell the ops... -A1kmm */
971	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
972	–	"for server %s(this shouldn't happen)!", host);
973	–	exit_client(client_p, &me, "Lost connect{} block!");
974	–	return;
975	–	}
976	–
977	–	MyFree(client_p->localClient->passwd);
978	–	client_p->localClient->passwd = NULL;
979	–
980	–	/* Its got identd, since its a server */
981	–	SetGotId(client_p);
982	–
983	–	/* If there is something in the serv_list, it might be this
984	–	* connecting server..
985	–	*/
986	–	if (!ServerInfo.hub && serv_list.head)
987	–	{
988	–	if (client_p != serv_list.head->data || serv_list.head->next)
989	–	{
990	–	++ServerStats.is_ref;
991	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
992	–	exit_client(client_p, &me, "I'm a leaf");
993	–	return;
994	–	}
995	–	}
996	–
997	–	aconf = map_to_conf(conf);
998	–
999	–	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
1000	–	{
1001	–	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1002	–	*        2.  Check aconf->spasswd, not aconf->passwd.
1003	–	*/
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	–	*/
1014	–
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	–	*/
1029	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
1030	–	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);
1052	–	}
1053	–
1054	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
1055	–	(unsigned long)CurrentTime);
1056	–
1057	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
1058	–	if (IsCapable(client_p, CAP_TS6))
1059	–	hash_add_id(client_p);
1060	–
1061	–	/* XXX Does this ever happen? I don't think so -db */
1062	–	detach_conf(client_p, OPER_TYPE);
1063	–
1064	–	/* *WARNING*
1065	–	**    In the following code in place of plain server's
1066	–	**    name we send what is returned by get_client_name
1067	–	**    which may add the "sockhost" after the name. It's
1068	–	**    *very* *important* that there is a SPACE between
1069	–	**    the name and sockhost (if present). The receiving
1070	–	**    server will start the information field from this
1071	–	**    first blank and thus puts the sockhost into info.
1072	–	**    ...a bit tricky, but you have been warned, besides
1073	–	**    code is more neat this way...  --msa
1074	–	*/
1075	–	client_p->servptr = &me;
1076	–
1077	–	if (IsClosing(client_p))
1078	–	return;
1079	–
1080	–	SetServer(client_p);
1081	–
1082	–	/* Update the capability combination usage counts. -A1kmm */
1083	–	set_chcap_usage_counts(client_p);
1084	–
1085	–	/* Some day, all these lists will be consolidated *sigh* */
1086	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
1087	–
1088	–	assert(dlinkFind(&unknown_list, client_p));
1089	–
1090	–	dlink_move_node(&client_p->localClient->lclient_node,
1091	–	&unknown_list, &serv_list);
1092	–
1093	–	Count.myserver++;
1094	–
1095	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
1096	–	hash_add_client(client_p);
1097	–
1098	–	/* doesnt duplicate client_p->serv if allocated this struct already */
1099	–	make_server(client_p);
1100	–
1101	–	/* fixing eob timings.. -gnp */
1102	–	client_p->firsttime = CurrentTime;
1103	–
1104	–
1105	–	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
1106	–	SetService(client_p);
1107	–
1108	–	/* Show the real host/IP to admins */
1109	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1110	–	"Link with %s established: (%s) link",
1111	–	inpath_ip,show_capabilities(client_p));
1112	–	/* Now show the masked hostname/IP to opers */
1113	–	sendto_realops_flags(UMODE_ALL, L_OPER,
1114	–	"Link with %s established: (%s) link",
1115	–	inpath,show_capabilities(client_p));
1116	–	ilog(L_NOTICE, "Link with %s established: (%s) link",
1117	–	inpath_ip, show_capabilities(client_p));
1118	–
1119	–	client_p->serv->sconf = conf;
1120	–
1121	–	if (HasServlink(client_p))
1122	–	{
1123	–	/* we won't overflow FD_DESC_SZ here, as it can hold
1124	–	* client_p->name + 64
1125	–	*/
1126	–	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
1127	–	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
1128	–	}
1129	–	else
1130	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
1131	–
1132	–	/* Old sendto_serv_but_one() call removed because we now
1133	–	** need to send different names to different servers
1134	–	** (domain name matching) Send new server to other servers.
1135	–	*/
1136	–	DLINK_FOREACH(ptr, serv_list.head)
1137	–	{
1138	–	target_p = ptr->data;
1139	–
1140	–	if (target_p == client_p)
1141	–	continue;
1142	–
1143	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
1144	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
1145	–	me.id, client_p->name, client_p->id,
1146	–	IsHidden(client_p) ? "(H) " : "",
1147	–	client_p->info);
1148	–	else
1149	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
1150	–	me.name, client_p->name,
1151	–	IsHidden(client_p) ? "(H) " : "",
1152	–	client_p->info);
1153	–	}
1154	–
1155	–	/* Pass on my client information to the new server
1156	–	**
1157	–	** First, pass only servers (idea is that if the link gets
1158	–	** cancelled beacause the server was already there,
1159	–	** there are no NICK's to be cancelled...). Of course,
1160	–	** if cancellation occurs, all this info is sent anyway,
1161	–	** and I guess the link dies when a read is attempted...? --msa
1162	–	**
1163	–	** Note: Link cancellation to occur at this point means
1164	–	** that at least two servers from my fragment are building
1165	–	** up connection this other fragment at the same time, it's
1166	–	** a race condition, not the normal way of operation...
1167	–	**
1168	–	** ALSO NOTE: using the get_client_name for server names--
1169	–	**    see previous *WARNING*!!! (Also, original inpath
1170	–	**    is destroyed...)
1171	–	*/
1172	–
1173	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
1174	–	{
1175	–	target_p = ptr->data;
1176	–
1177	–	/* target_p->from == target_p for target_p == client_p */
1178	–	if (IsMe(target_p) || target_p->from == client_p)
1179	–	continue;
1180	–
1181	–	if (IsCapable(client_p, CAP_TS6))
1182	–	{
1183	–	if (HasID(target_p))
1184	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
1185	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1186	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
1187	–	target_p->info);
1188	–	else  /* introducing non-ts6 server */
1189	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1190	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1191	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1192	–	}
1193	–	else
1194	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1195	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
1196	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1197	–	}
1198	–
1199	–	server_burst(client_p);
1200	–	}
1201	–
1202	–	static void
1203	–	start_io(struct Client *server)
1204	–	{
1205	–	struct LocalUser *lserver = server->localClient;
1206	–	int alloclen = 1;
1207	–	char *buf;
1208	–	dlink_node *ptr;
1209	–	struct dbuf_block *block;
1210	–
1211	–	/* calculate how many bytes to allocate */
1212	–	if (IsCapable(server, CAP_ZIP))
1213	–	alloclen += 6;
1214	–	#ifdef HAVE_LIBCRYPTO
1215	–	if (IsCapable(server, CAP_ENC))
1216	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1217	–	#endif
1218	–	alloclen += dbuf_length(&lserver->buf_recvq);
1219	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1220	–	alloclen += dbuf_length(&lserver->buf_sendq);
1221	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1222	–
1223	–	/* initialize servlink control sendq */
1224	–	lserver->slinkq = buf = MyMalloc(alloclen);
1225	–	lserver->slinkq_ofs = 0;
1226	–	lserver->slinkq_len = alloclen;
1227	–
1228	–	if (IsCapable(server, CAP_ZIP))
1229	–	{
1230	–	/* ziplink */
1231	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1232	–	*buf++ = 0; /* |          */
1233	–	*buf++ = 1; /* \ len is 1 */
1234	–	*buf++ = ConfigFileEntry.compression_level;
1235	–	*buf++ = SLINKCMD_START_ZIP_IN;
1236	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1237	–	}
1238	–	#ifdef HAVE_LIBCRYPTO
1239	–	if (IsCapable(server, CAP_ENC))
1240	–	{
1241	–	/* Decryption settings */
1242	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1243	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1244	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1245	–	*buf++ = lserver->in_cipher->cipherid;
1246	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1247	–	*buf++ = 0; /* keylen < 256 */
1248	–	*buf++ = lserver->in_cipher->keylen;
1249	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1250	–	buf += lserver->in_cipher->keylen;
1251	–	/* Encryption settings */
1252	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1253	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1254	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1255	–	*buf++ = lserver->out_cipher->cipherid;
1256	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1257	–	*buf++ = 0; /* keylen < 256 */
1258	–	*buf++ = lserver->out_cipher->keylen;
1259	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1260	–	buf += lserver->out_cipher->keylen;
1261	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1262	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1263	–	}
1264	–	#endif
1265	–
1266	–	/* pass the whole recvq to servlink */
1267	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1268	–	{
1269	–	block = ptr->data;
1270	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1271	–	*buf++ = (block->size >> 8);
1272	–	*buf++ = (block->size & 0xff);
1273	–	memcpy(buf, &block->data[0], block->size);
1274	–	buf += block->size;
1275	–	}
1276	–
1277	–	dbuf_clear(&lserver->buf_recvq);
1278	–
1279	–	/* pass the whole sendq to servlink */
1280	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1281	–	{
1282	–	block = ptr->data;
1283	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1284	–	*buf++ = (block->size >> 8);
1285	–	*buf++ = (block->size & 0xff);
1286	–	memcpy(buf, &block->data[0], block->size);
1287	–	buf += block->size;
1288	–	}
1289	–
1290	–	dbuf_clear(&lserver->buf_sendq);
1291	–
1292	–	/* start io */
1293	–	*buf++ = SLINKCMD_INIT;
1294	–
1295	–	/* schedule a write */
1296	–	send_queued_slink_write(server);
1297	–	}
1298	–
1299	–	/* fork_server()
1300	–	*
1301	–	* inputs       - struct Client *server
1302	–	* output       - success: 0 / failure: -1
1303	–	* side effect  - fork, and exec SERVLINK to handle this connection
1304	–	*/
1305	–	static int
1306	–	fork_server(struct Client *server)
1307	–	{
1308	–	#ifndef HAVE_SOCKETPAIR
1309	–	return -1;
1310	–	#else
1311	–	int i;
1312	–	int slink_fds[2][2];
1313	–	/* 0? - ctrl  | 1? - data
1314	–	* ?0 - child | ?1 - parent */
1315	–
1316	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1317	–	return -1;
1318	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1319	–	goto free_ctrl_fds;
1320	–
1321	–	if ((i = fork()) < 0)
1322	–	{
1323	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1324	–	free_ctrl_fds:
1325	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1326	–	return -1;
1327	–	}
1328	–
1329	–	if (i == 0)
1330	–	{
1331	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1332	–	char *kid_argv[7];
1333	–
1334	–	#ifdef O_ASYNC
1335	–	fcntl(server->localClient->fd.fd, F_SETFL,
1336	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1337	–	#endif
1338	–	close_fds(&server->localClient->fd);
1339	–	close(slink_fds[0][1]);
1340	–	close(slink_fds[1][1]);
1341	–
1342	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1343	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1344	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1345	–
1346	–	kid_argv[0] = "-slink";
1347	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1348	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1349	–	kid_argv[5] = fd_str[2];    /* network */
1350	–	kid_argv[6] = NULL;
1351	–
1352	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1353	–
1354	–	_exit(1);
1355	–	}
1356	–
1357	–	/* close the network fd and the child ends of the pipes */
1358	–	fd_close(&server->localClient->fd);
1359	–	close(slink_fds[0][0]);
1360	–	close(slink_fds[1][0]);
1361	–
1362	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1363	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1364	–
1365	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1366	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1367	–
1368	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1369	–	read_packet(&server->localClient->fd, server);
1370	–
1371	–	return 0;
1372	–	#endif
1373	–	}
1374	–
1375	–	/* server_burst()
1376	–	*
1377	–	* inputs       - struct Client pointer server
1378	–	*              -
1379	–	* output       - none
1380	–	* side effects - send a server burst
1381	–	* bugs         - still too long
1382	–	*/
1383	–	static void
1384	–	server_burst(struct Client *client_p)
1385	–	{
1386	–	/* Send it in the shortened format with the TS, if
1387	–	** it's a TS server; walk the list of channels, sending
1388	–	** all the nicks that haven't been sent yet for each
1389	–	** channel, then send the channel itself -- it's less
1390	–	** obvious than sending all nicks first, but on the
1391	–	** receiving side memory will be allocated more nicely
1392	–	** saving a few seconds in the handling of a split
1393	–	** -orabidoo
1394	–	*/
1395	–
1396	–	burst_all(client_p);
1397	–
1398	–	/* EOB stuff is now in burst_all */
1399	–	/* Always send a PING after connect burst is done */
1400	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
1401	–	}
1402	–
1403	–	/* burst_all()
1404	–	*
1405	–	* inputs       - pointer to server to send burst to
1406	–	* output       - NONE
1407	–	* side effects - complete burst of channels/nicks is sent to client_p
1408	–	*/
1409	–	static void
1410	–	burst_all(struct Client *client_p)
1411	–	{
1412	–	dlink_node *ptr = NULL;
1413	–
1414	–	DLINK_FOREACH(ptr, global_channel_list.head)
1415	–	{
1416	–	struct Channel *chptr = ptr->data;
1417	–
1418	–	if (dlink_list_length(&chptr->members) != 0)
1419	–	{
1420	–	burst_members(client_p, chptr);
1421	–	send_channel_modes(client_p, chptr);
1422	–
1423	–	if (IsCapable(client_p, CAP_TBURST) ||
1424	–	IsCapable(client_p, CAP_TB))
1425	–	send_tb(client_p, chptr);
1426	–	}
1427	–	}
1428	–
1429	–	/* also send out those that are not on any channel
1430	–	*/
1431	–	DLINK_FOREACH(ptr, global_client_list.head)
1432	–	{
1433	–	struct Client *target_p = ptr->data;
1434	–
1435	–	if (!IsBursted(target_p) && target_p->from != client_p)
1436	–	sendnick_TS(client_p, target_p);
1437	–
1438	–	ClearBursted(target_p);
1439	–	}
1440	–
1441	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1442	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1443	–	*/
1444	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1445	–	if (IsCapable(client_p, CAP_EOB))
1446	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1447	–	}
1448	–
1449	–	/*
1450	–	* send_tb
1451	–	*
1452	–	* inputs       - pointer to Client
1453	–	*              - pointer to channel
1454	–	* output       - NONE
1455	–	* side effects - Called on a server burst when
1456	–	*                server is CAP_TB|CAP_TBURST capable
1457	–	*/
1458	–	static void
1459	–	send_tb(struct Client *client_p, struct Channel *chptr)
1460	–	{
1461	–	/*
1462	–	* We may also send an empty topic here, but only if topic_time isn't 0,
1463	–	* i.e. if we had a topic that got unset.  This is required for syncing
1464	–	* topics properly.
1465	–	*
1466	–	* Imagine the following scenario: Our downlink introduces a channel
1467	–	* to us with a TS that is equal to ours, but the channel topic on
1468	–	* their side got unset while the servers were in splitmode, which means
1469	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1470	–	* deal with it in a more sophisticated fashion instead of just resetting
1471	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1472	–	* for further information   -Michael
1473	–	*/
1474	–	if (chptr->topic_time != 0)
1475	–	{
1476	–	if (IsCapable(client_p, CAP_TBURST))
1477	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1478	–	me.name, (unsigned long)chptr->channelts, chptr->chname,
1479	–	(unsigned long)chptr->topic_time,
1480	–	chptr->topic_info ? chptr->topic_info : "",
1481	–	chptr->topic ? chptr->topic : "");
1482	–	else if (IsCapable(client_p, CAP_TB))
1483	–	{
1484	–	if (ConfigChannel.burst_topicwho)
1485	–	{
1486	–	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1487	–	me.name, chptr->chname,
1488	–	(unsigned long)chptr->topic_time,
1489	–	chptr->topic_info, chptr->topic ? chptr->topic : "");
1490	–	}
1491	–	else
1492	–	{
1493	–	sendto_one(client_p, ":%s TB %s %lu :%s",
1494	–	me.name, chptr->chname,
1495	–	(unsigned long)chptr->topic_time,
1496	–	chptr->topic ? chptr->topic : "");
1497	–	}
1498	–	}
1499	–	}
1500	–	}
1501	–
1502	–	/* burst_members()
1503	–	*
1504	–	* inputs       - pointer to server to send members to
1505	–	*              - dlink_list pointer to membership list to send
1506	–	* output       - NONE
1507	–	* side effects -
1508	–	*/
1509	–	static void
1510	–	burst_members(struct Client *client_p, struct Channel *chptr)
1511	–	{
1512	–	struct Client *target_p;
1513	–	struct Membership *ms;
1514	–	dlink_node *ptr;
1515	–
1516	–	DLINK_FOREACH(ptr, chptr->members.head)
1517	–	{
1518	–	ms       = ptr->data;
1519	–	target_p = ms->client_p;
1520	–
1521	–	if (!IsBursted(target_p))
1522	–	{
1523	–	SetBursted(target_p);
1524	–
1525	–	if (target_p->from != client_p)
1526	–	sendnick_TS(client_p, target_p);
1527	–	}
1528	–	}
1529	–	}
1530	–
581		/* New server connection code
582		* Based upon the stuff floating about in s_bsd.c
583		*   -- adrian
#	Line 1535 | Line 585 | burst_members(struct Client *client_p, s
585
586		/* serv_connect() - initiate a server connection
587		*
588	<	* inputs       - pointer to conf
588	>	* inputs       - pointer to conf
589		*              - pointer to client doing the connect
590		* output       -
591		* side effects -
#	Line 1550 | Line 600 | burst_members(struct Client *client_p, s
600		* it suceeded or not, and 0 if it fails in here somewhere.
601		*/
602		int
603	<	serv_connect(struct AccessItem *aconf, struct Client *by)
603	>	serv_connect(struct MaskItem *conf, struct Client *by)
604		{
605	<	struct ConfItem *conf;
606	<	struct Client *client_p;
1557	<	char buf[HOSTIPLEN];
605	>	struct Client *client_p = NULL;
606	>	char buf[HOSTIPLEN + 1] = "";
607
608		/* conversion structs */
609		struct sockaddr_in *v4;
1561	–	/* Make sure aconf is useful */
1562	–	assert(aconf != NULL);
610
611	<	if(aconf == NULL)
612	<	return (0);
611	>	/* Make sure conf is useful */
612	>	assert(conf);
613
614	<	/* XXX should be passing struct ConfItem in the first place */
1568	<	conf = unmap_conf_item(aconf);
1569	<
1570	<	/* log */
1571	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
614	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
615		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
616	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
616	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
617		buf);
618
619		/* Still processing a DNS lookup? -> exit */
620	<	if (aconf->dns_pending)
620	>	if (conf->dns_pending)
621		{
622	<	sendto_realops_flags(UMODE_ALL, L_ALL,
622	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
623		"Error connecting to %s: DNS lookup for connect{} in progress.",
624		conf->name);
625	<	return (0);
625	>	return 0;
626		}
627
628	<	if (aconf->dns_failed)
628	>	if (conf->dns_failed)
629		{
630	<	sendto_realops_flags(UMODE_ALL, L_ALL,
630	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
631		"Error connecting to %s: DNS lookup for connect{} failed.",
632		conf->name);
633	<	return (0);
633	>	return 0;
634		}
635
636		/* Make sure this server isn't already connected
637	<	* Note: aconf should ALWAYS be a valid C: line
637	>	* Note: conf should ALWAYS be a valid C: line
638		*/
639	<	if ((client_p = hash_find_server(conf->name)) != NULL)
640	<	{
641	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
642	<	"Server %s already present from %s",
643	<	conf->name, get_client_name(client_p, SHOW_IP));
644	<	sendto_realops_flags(UMODE_ALL, L_OPER,
645	<	"Server %s already present from %s",
646	<	conf->name, get_client_name(client_p, MASK_IP));
639	>	if ((client_p = hash_find_server(conf->name)))
640	>	{
641	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
642	>	"Server %s already present from %s",
643	>	conf->name, get_client_name(client_p, SHOW_IP));
644	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
645	>	"Server %s already present from %s",
646	>	conf->name, get_client_name(client_p, MASK_IP));
647		if (by && IsClient(by) && !MyClient(by))
648	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
649	<	me.name, by->name, conf->name,
650	<	get_client_name(client_p, MASK_IP));
1608	<	return (0);
648	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
649	>	conf->name, get_client_name(client_p, MASK_IP));
650	>	return 0;
651		}
652	<
652	>
653		/* Create a local client */
654		client_p = make_client(NULL);
655
656		/* Copy in the server, hostname, fd */
657		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
658	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
658	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
659
660		/* We already converted the ip once, so lets use it - stu */
661		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
662
663	<	/* create a socket for the server connection */
664	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1623	<	SOCK_STREAM, 0, NULL) < 0)
663	>	/* create a socket for the server connection */
664	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
665		{
666		/* Eek, failure to create the socket */
667	<	report_error(L_ALL,
668	<	"opening stream socket to %s: %s", conf->name, errno);
667	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
668	>
669		SetDead(client_p);
670	<	exit_client(client_p, &me, "Connection failed");
671	<	return (0);
670	>	exit_client(client_p, "Connection failed");
671	>	return 0;
672		}
673
674		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1636 | Line 677 | serv_connect(struct AccessItem *aconf, s
677		/* Attach config entries to client here rather than in
678		* serv_connect_callback(). This to avoid null pointer references.
679		*/
680	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
680	>	if (!attach_connect_block(client_p, conf->name, conf->host))
681		{
682	<	sendto_realops_flags(UMODE_ALL, L_ALL,
683	<	"Host %s is not enabled for connecting:no C/N-line",
684	<	conf->name);
685	<	if (by && IsClient(by) && !MyClient(by))
686	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
687	<	me.name, by->name, client_p->name);
682	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
683	>	"Host %s is not enabled for connecting: no connect{} block",
684	>	conf->name);
685	>	if (by && IsClient(by) && !MyClient(by))
686	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
687	>
688		SetDead(client_p);
689	<	exit_client(client_p, client_p, "Connection failed");
690	<	return (0);
689	>	exit_client(client_p, "Connection failed");
690	>	return 0;
691		}
692
693		/* at this point we have a connection in progress and C/N lines
#	Line 1664 | Line 705 | serv_connect(struct AccessItem *aconf, s
705
706		SetConnecting(client_p);
707		dlinkAdd(client_p, &client_p->node, &global_client_list);
708	<	/* from def_fam */
709	<	client_p->localClient->aftype = aconf->aftype;
708	>
709	>	client_p->localClient->aftype = conf->aftype;
710
711		/* Now, initiate the connection */
712	<	/* XXX assume that a non 0 type means a specific bind address
712	>	/* XXX assume that a non 0 type means a specific bind address
713		* for this connect.
714		*/
715	<	switch (aconf->aftype)
715	>	switch (conf->aftype)
716		{
717		case AF_INET:
718	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
719	<	if (v4->sin_addr.s_addr != 0)
718	>	v4 = (struct sockaddr_in*)&conf->bind;
719	>	if (v4->sin_addr.s_addr)
720		{
721		struct irc_ssaddr ipn;
722		memset(&ipn, 0, sizeof(struct irc_ssaddr));
723		ipn.ss.ss_family = AF_INET;
724		ipn.ss_port = 0;
725	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
726	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
727	<	(struct sockaddr *)&ipn, ipn.ss_len,
728	<	serv_connect_callback, client_p, aconf->aftype,
729	<	CONNECTTIMEOUT);
725	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
726	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
727	>	(struct sockaddr *)&ipn, ipn.ss_len,
728	>	serv_connect_callback, client_p, conf->aftype,
729	>	CONNECTTIMEOUT);
730		}
731		else if (ServerInfo.specific_ipv4_vhost)
732		{
#	Line 1694 | Line 735 | serv_connect(struct AccessItem *aconf, s
735		ipn.ss.ss_family = AF_INET;
736		ipn.ss_port = 0;
737		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
738	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
738	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
739		(struct sockaddr *)&ipn, ipn.ss_len,
740	<	serv_connect_callback, client_p, aconf->aftype,
741	<	CONNECTTIMEOUT);
740	>	serv_connect_callback, client_p, conf->aftype,
741	>	CONNECTTIMEOUT);
742		}
743		else
744	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
745	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
744	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
745	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
746		CONNECTTIMEOUT);
747		break;
748		#ifdef IPV6
749		case AF_INET6:
750		{
751	<	struct irc_ssaddr ipn;
752	<	struct sockaddr_in6 *v6;
753	<	struct sockaddr_in6 *v6conf;
754	<
755	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
756	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
757	<	v6 = (struct sockaddr_in6 *)&ipn;
758	<
759	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
760	<	sizeof(struct in6_addr)) != 0)
761	<	{
762	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
763	<	ipn.ss.ss_family = AF_INET6;
764	<	ipn.ss_port = 0;
765	<	comm_connect_tcp(&client_p->localClient->fd,
766	<	aconf->host, aconf->port,
767	<	(struct sockaddr *)&ipn, ipn.ss_len,
768	<	serv_connect_callback, client_p,
769	<	aconf->aftype, CONNECTTIMEOUT);
770	<	}
1730	<	else if (ServerInfo.specific_ipv6_vhost)
751	>	struct irc_ssaddr ipn;
752	>	struct sockaddr_in6 *v6;
753	>	struct sockaddr_in6 *v6conf;
754	>
755	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
756	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
757	>	v6 = (struct sockaddr_in6 *)&ipn;
758	>
759	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
760	>	{
761	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
762	>	ipn.ss.ss_family = AF_INET6;
763	>	ipn.ss_port = 0;
764	>	comm_connect_tcp(&client_p->localClient->fd,
765	>	conf->host, conf->port,
766	>	(struct sockaddr *)&ipn, ipn.ss_len,
767	>	serv_connect_callback, client_p,
768	>	conf->aftype, CONNECTTIMEOUT);
769	>	}
770	>	else if (ServerInfo.specific_ipv6_vhost)
771		{
772	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
773	<	ipn.ss.ss_family = AF_INET6;
774	<	ipn.ss_port = 0;
775	<	comm_connect_tcp(&client_p->localClient->fd,
776	<	aconf->host, aconf->port,
777	<	(struct sockaddr *)&ipn, ipn.ss_len,
778	<	serv_connect_callback, client_p,
779	<	aconf->aftype, CONNECTTIMEOUT);
780	<	}
781	<	else
782	<	comm_connect_tcp(&client_p->localClient->fd,
783	<	aconf->host, aconf->port,
784	<	NULL, 0, serv_connect_callback, client_p,
785	<	aconf->aftype, CONNECTTIMEOUT);
772	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
773	>	ipn.ss.ss_family = AF_INET6;
774	>	ipn.ss_port = 0;
775	>	comm_connect_tcp(&client_p->localClient->fd,
776	>	conf->host, conf->port,
777	>	(struct sockaddr *)&ipn, ipn.ss_len,
778	>	serv_connect_callback, client_p,
779	>	conf->aftype, CONNECTTIMEOUT);
780	>	}
781	>	else
782	>	comm_connect_tcp(&client_p->localClient->fd,
783	>	conf->host, conf->port,
784	>	NULL, 0, serv_connect_callback, client_p,
785	>	conf->aftype, CONNECTTIMEOUT);
786		}
787		#endif
788		}
789	<	return (1);
789	>	return 1;
790		}
791
792	+	#ifdef HAVE_LIBCRYPTO
793	+	static void
794	+	finish_ssl_server_handshake(struct Client *client_p)
795	+	{
796	+	struct MaskItem *conf = NULL;
797	+
798	+	conf = find_conf_name(&client_p->localClient->confs,
799	+	client_p->name, CONF_SERVER);
800	+	if (conf == NULL)
801	+	{
802	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
803	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
804	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
805	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
806	+
807	+	exit_client(client_p, "Lost connect{} block");
808	+	return;
809	+	}
810	+
811	+	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
812	+
813	+	send_capabilities(client_p, 0);
814	+
815	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
816	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
817	+	me.info);
818	+
819	+	/* If we've been marked dead because a send failed, just exit
820	+	* here now and save everyone the trouble of us ever existing.
821	+	*/
822	+	if (IsDead(client_p))
823	+	{
824	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
825	+	"%s[%s] went dead during handshake",
826	+	client_p->name,
827	+	client_p->host);
828	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
829	+	"%s went dead during handshake", client_p->name);
830	+	return;
831	+	}
832	+
833	+	/* don't move to serv_list yet -- we haven't sent a burst! */
834	+	/* If we get here, we're ok, so lets start reading some data */
835	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
836	+	}
837	+
838	+	static void
839	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
840	+	{
841	+	X509 *cert = NULL;
842	+	int ret = 0;
843	+
844	+	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
845	+	{
846	+	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
847	+	{
848	+	case SSL_ERROR_WANT_WRITE:
849	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
850	+	(PF *)ssl_server_handshake, client_p, 0);
851	+	return;
852	+	case SSL_ERROR_WANT_READ:
853	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
854	+	(PF *)ssl_server_handshake, client_p, 0);
855	+	return;
856	+	default:
857	+	{
858	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
859	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
860	+	"Error connecting to %s: %s", client_p->name,
861	+	sslerr ? sslerr : "unknown SSL error");
862	+	exit_client(client_p, "Error during SSL handshake");
863	+	return;
864	+	}
865	+	}
866	+	}
867	+
868	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
869	+	{
870	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
871	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
872	+	unsigned char md[EVP_MAX_MD_SIZE] = "";
873	+
874	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
875	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
876	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
877	+	{
878	+	unsigned int n = 0;
879	+
880	+	if (X509_digest(cert, EVP_sha256(), md, &n))
881	+	{
882	+	for (unsigned int i = 0; i < n; ++i)
883	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
884	+	client_p->certfp = xstrdup(buf);
885	+	}
886	+	}
887	+	else
888	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
889	+	client_p->name, client_p->username, client_p->host, res);
890	+	X509_free(cert);
891	+	}
892	+
893	+	finish_ssl_server_handshake(client_p);
894	+	}
895	+
896	+	static void
897	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
898	+	{
899	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
900	+	{
901	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
902	+	ERR_error_string(ERR_get_error(), NULL));
903	+	SetDead(client_p);
904	+	exit_client(client_p, "SSL_new failed");
905	+	return;
906	+	}
907	+
908	+	SSL_set_fd(fd->ssl, fd->fd);
909	+
910	+	if (!EmptyString(conf->cipher_list))
911	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
912	+
913	+	ssl_server_handshake(NULL, client_p);
914	+	}
915	+	#endif
916	+
917		/* serv_connect_callback() - complete a server connection.
918	<	*
918	>	*
919		* This routine is called after the server connection attempt has
920		* completed. If unsucessful, an error is sent to ops and the client
921		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1761 | Line 926 | static void
926		serv_connect_callback(fde_t *fd, int status, void *data)
927		{
928		struct Client *client_p = data;
929	<	struct ConfItem *conf=NULL;
1765	<	struct AccessItem *aconf=NULL;
929	>	struct MaskItem *conf = NULL;
930
931		/* First, make sure its a real client! */
932	<	assert(client_p != NULL);
932	>	assert(client_p);
933		assert(&client_p->localClient->fd == fd);
934
935		/* Next, for backward purposes, record the ip of the server */
936		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
937		sizeof(struct irc_ssaddr));
938	+
939		/* Check the status */
940		if (status != COMM_OK)
941		{
#	Line 1778 | Line 943 | serv_connect_callback(fde_t *fd, int sta
943		* Admins get to see any IP, mere opers don't *sigh*
944		*/
945		if (ConfigServerHide.hide_server_ips)
946	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
946	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
947		"Error connecting to %s: %s",
948		client_p->name, comm_errstr(status));
949		else
950	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
951	<	"Error connecting to %s[%s]: %s", client_p->name,
952	<	client_p->host, comm_errstr(status));
953	<
954	<	sendto_realops_flags(UMODE_ALL, L_OPER,
955	<	"Error connecting to %s: %s",
956	<	client_p->name, comm_errstr(status));
950	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
951	>	"Error connecting to %s[%s]: %s", client_p->name,
952	>	client_p->host, comm_errstr(status));
953	>
954	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
955	>	"Error connecting to %s: %s",
956	>	client_p->name, comm_errstr(status));
957
958		/* If a fd goes bad, call dead_link() the socket is no
959		* longer valid for reading or writing.
#	Line 1800 | Line 965 | serv_connect_callback(fde_t *fd, int sta
965		/* COMM_OK, so continue the connection procedure */
966		/* Get the C/N lines */
967		conf = find_conf_name(&client_p->localClient->confs,
968	<	client_p->name, SERVER_TYPE);
968	>	client_p->name, CONF_SERVER);
969		if (conf == NULL)
970		{
971	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
972	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
973	<	sendto_realops_flags(UMODE_ALL, L_OPER,
974	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
971	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
972	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
973	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
974	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
975
976	<	exit_client(client_p, &me, "Lost connect{} block");
976	>	exit_client(client_p, "Lost connect{} block");
977		return;
978		}
979
1815	–	aconf = (struct AccessItem *)map_to_conf(conf);
980		/* Next, send the initial handshake */
981		SetHandshake(client_p);
982
983		#ifdef HAVE_LIBCRYPTO
984	<	/* Handle all CRYPTLINK links in cryptlink_init */
1821	<	if (IsConfCryptLink(aconf))
984	>	if (IsConfSSL(conf))
985		{
986	<	cryptlink_init(client_p, conf, fd);
986	>	ssl_connect_init(client_p, conf, fd);
987		return;
988		}
989		#endif
990
991	<	/* jdc -- Check and send spasswd, not passwd. */
1829	<	if (!EmptyString(aconf->spasswd))
1830	<	/* Send TS 6 form only if id */
1831	<	sendto_one(client_p, "PASS %s TS %d %s",
1832	<	aconf->spasswd, TS_CURRENT, me.id);
991	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
992
993	<	/* Pass my info to the new server
1835	<	*
1836	<	* Pass on ZIP if supported
1837	<	* Pass on TB if supported.
1838	<	* - Dianora
1839	<	*/
1840	<	send_capabilities(client_p, aconf,
1841	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1842	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
993	>	send_capabilities(client_p, 0);
994
995	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
996	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1846	<	me.info);
995	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
996	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
997
998		/* If we've been marked dead because a send failed, just exit
999		* here now and save everyone the trouble of us ever existing.
1000		*/
1001	<	if (IsDead(client_p))
1001	>	if (IsDead(client_p))
1002		{
1003	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1004	<	"%s[%s] went dead during handshake",
1003	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1004	>	"%s[%s] went dead during handshake",
1005		client_p->name,
1006	<	client_p->host);
1007	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1008	<	"%s went dead during handshake", client_p->name);
1006	>	client_p->host);
1007	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1008	>	"%s went dead during handshake", client_p->name);
1009		return;
1010		}
1011
#	Line 1875 | Line 1025 | find_servconn_in_progress(const char *na
1025		cptr = ptr->data;
1026
1027		if (cptr && cptr->name[0])
1028	<	if (match(name, cptr->name))
1028	>	if (!match(name, cptr->name))
1029		return cptr;
1030		}
1881	–
1882	–	return NULL;
1883	–	}
1884	–
1885	–	#ifdef HAVE_LIBCRYPTO
1886	–	/*
1887	–	* sends a CRYPTLINK SERV command.
1888	–	*/
1889	–	void
1890	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
1891	–	{
1892	–	struct AccessItem *aconf;
1893	–	char *encrypted;
1894	–	unsigned char *key_to_send;
1895	–	char randkey[CIPHERKEYLEN];
1896	–	int enc_len;
1897	–
1898	–	/* get key */
1899	–	if ((!ServerInfo.rsa_private_key) ||
1900	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
1901	–	{
1902	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
1903	–	"Invalid RSA private key");
1904	–	return;
1905	–	}
1906	–
1907	–	aconf = (struct AccessItem *)map_to_conf(conf);
1908	–
1909	–	if (aconf->rsa_public_key == NULL)
1910	–	{
1911	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
1912	–	"Invalid RSA public key");
1913	–	return;
1914	–	}
1915	–
1916	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
1917	–	{
1918	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
1919	–	"Couldn't generate keyphrase");
1920	–	return;
1921	–	}
1922	–
1923	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1924	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1925	–	(unsigned char *)randkey,
1926	–	(unsigned char *)encrypted,
1927	–	aconf->rsa_public_key,
1928	–	RSA_PKCS1_PADDING);
1929	–
1930	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1931	–
1932	–	if (enc_len <= 0)
1933	–	{
1934	–	report_crypto_errors();
1935	–	MyFree(encrypted);
1936	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
1937	–	"Couldn't encrypt data");
1938	–	return;
1939	–	}
1940	–
1941	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
1942	–	{
1943	–	MyFree(encrypted);
1944	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
1945	–	"Couldn't base64 encode key");
1946	–	return;
1947	–	}
1948	–
1949	–	send_capabilities(client_p, aconf,
1950	–	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1951	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
1952	–
1953	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
1954	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
1955	–	me.name, key_to_send,
1956	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
1031
1032	<	SetHandshake(client_p);
1959	<	SetWaitAuth(client_p);
1960	<
1961	<	MyFree(encrypted);
1962	<	MyFree(key_to_send);
1963	<
1964	<	if (IsDead(client_p))
1965	<	cryptlink_error(client_p, "SERV", "Went dead during handshake",
1966	<	"Went dead during handshake");
1967	<	else if (fd != NULL)
1968	<	/* If we get here, we're ok, so lets start reading some data */
1969	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
1970	<	}
1971	<
1972	<	void
1973	<	cryptlink_error(struct Client *client_p, const char *type,
1974	<	const char *reason, const char *client_reason)
1975	<	{
1976	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
1977	<	get_client_name(client_p, SHOW_IP), type, reason);
1978	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
1979	<	get_client_name(client_p, MASK_IP), type, reason);
1980	<	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
1981	<	get_client_name(client_p, SHOW_IP), type, reason);
1982	<
1983	<	/* If client_reason isn't NULL, then exit the client with the message
1984	<	* defined in the call.
1985	<	*/
1986	<	if ((client_reason != NULL) && (!IsDead(client_p)))
1987	<	exit_client(client_p, &me, client_reason);
1988	<	}
1989	<
1990	<	static char base64_chars[] =
1991	<	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
1992	<
1993	<	static char base64_values[] =
1994	<	{
1995	<	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1996	<	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1997	<	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
1998	<	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
1999	<	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2000	<	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2001	<	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2002	<	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2003	<	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2004	<	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2005	<	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2006	<	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2007	<	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2008	<	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2009	<	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2010	<	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2011	<	};
2012	<
2013	<	/*
2014	<	* base64_block will allocate and return a new block of memory
2015	<	* using MyMalloc().  It should be freed after use.
2016	<	*/
2017	<	int
2018	<	base64_block(unsigned char **output, char *data, int len)
2019	<	{
2020	<	unsigned char *out;
2021	<	unsigned char *in = (unsigned char*)data;
2022	<	unsigned long int q_in;
2023	<	int i;
2024	<	int count = 0;
2025	<
2026	<	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2027	<
2028	<	/* process 24 bits at a time */
2029	<	for( i = 0; i < len; i += 3)
2030	<	{
2031	<	q_in = 0;
2032	<
2033	<	if ( i + 2 < len )
2034	<	{
2035	<	q_in  = (in[i+2] & 0xc0) << 2;
2036	<	q_in |=  in[i+2];
2037	<	}
2038	<
2039	<	if ( i + 1 < len )
2040	<	{
2041	<	q_in |= (in[i+1] & 0x0f) << 10;
2042	<	q_in |= (in[i+1] & 0xf0) << 12;
2043	<	}
2044	<
2045	<	q_in |= (in[i]   & 0x03) << 20;
2046	<	q_in |=  in[i]           << 22;
2047	<
2048	<	q_in &= 0x3f3f3f3f;
2049	<
2050	<	out[count++] = base64_chars[((q_in >> 24)       )];
2051	<	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2052	<	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2053	<	out[count++] = base64_chars[((q_in      ) & 0xff)];
2054	<	}
2055	<	if ( (i - len) > 0 )
2056	<	{
2057	<	out[count-1] = '=';
2058	<	if ( (i - len) > 1 )
2059	<	out[count-2] = '=';
2060	<	}
2061	<
2062	<	out[count] = '\0';
2063	<	*output = out;
2064	<	return (count);
2065	<	}
2066	<
2067	<	/*
2068	<	* unbase64_block will allocate and return a new block of memory
2069	<	* using MyMalloc().  It should be freed after use.
2070	<	*/
2071	<	int
2072	<	unbase64_block(unsigned char **output, char *data, int len)
2073	<	{
2074	<	unsigned char *out;
2075	<	unsigned char *in = (unsigned char*)data;
2076	<	unsigned long int q_in;
2077	<	int i;
2078	<	int count = 0;
2079	<
2080	<	if ((len % 4) != 0)
2081	<	return (0);
2082	<
2083	<	out = MyMalloc(((len / 4) * 3) + 1);
2084	<
2085	<	/* process 32 bits at a time */
2086	<	for( i = 0; (i + 3) < len; i+=4)
2087	<	{
2088	<	/* compress input (chars a, b, c and d) as follows:
2089	<	* (after converting ascii -> base64 value)
2090	<	*
2091	<	* |00000000aaaaaabbbbbbccccccdddddd|
2092	<	* |  765432  107654  321076  543210|
2093	<	*/
2094	<
2095	<	q_in = 0;
2096	<
2097	<	if (base64_values[in[i+3]] > -1)
2098	<	q_in |= base64_values[in[i+3]]      ;
2099	<	if (base64_values[in[i+2]] > -1)
2100	<	q_in |= base64_values[in[i+2]] <<  6;
2101	<	if (base64_values[in[i+1]] > -1)
2102	<	q_in |= base64_values[in[i+1]] << 12;
2103	<	if (base64_values[in[i  ]] > -1)
2104	<	q_in |= base64_values[in[i  ]] << 18;
2105	<
2106	<	out[count++] = (q_in >> 16) & 0xff;
2107	<	out[count++] = (q_in >>  8) & 0xff;
2108	<	out[count++] = (q_in      ) & 0xff;
2109	<	}
2110	<
2111	<	if (in[i-1] == '=') count--;
2112	<	if (in[i-2] == '=') count--;
2113	<
2114	<	out[count] = '\0';
2115	<	*output = out;
2116	<	return (count);
1032	>	return NULL;
1033		}
2118	–
2119	–	#endif /* HAVE_LIBCRYPTO */
2120	–

Diff Legend

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