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-7.2/src/s_serv.c (file contents), Revision 1013 by michael, Sun Oct 18 14:26:49 2009 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 3215 by michael, Tue Mar 25 19:23:15 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 "inet_misc.h"
41	–	#include "sprintf_irc.h"
40		#include "ircd.h"
41		#include "ircd_defs.h"
42		#include "s_bsd.h"
45	–	#include "irc_getnameinfo.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 *);
61	–	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
67	–	static void start_io(struct Client *);
66		static void burst_members(struct Client *, struct Channel *);
67
70	–	static SlinkRplHnd slink_error;
71	–	static SlinkRplHnd slink_zipstats;
72	–
73	–
74	–	#ifdef HAVE_LIBCRYPTO
75	–	struct EncCapability CipherTable[] =
76	–	{
77	–	#ifdef HAVE_EVP_BF_CFB
78	–	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
79	–	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
80	–	#endif
81	–	#ifdef HAVE_EVP_CAST5_CFB
82	–	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
83	–	#endif
84	–	#ifdef HAVE_EVP_IDEA_CFB
85	–	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
86	–	#endif
87	–	#ifdef HAVE_EVP_RC5_32_12_16_CFB
88	–	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
89	–	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
90	–	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
91	–	#endif
92	–	#ifdef HAVE_EVP_DES_EDE3_CFB
93	–	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
94	–	#endif
95	–	#ifdef HAVE_EVP_DES_CFB
96	–	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
97	–	#endif
98	–	{ 0,            0,                   0, 0             }
99	–	};
100	–	#endif
101	–
102	–	struct SlinkRplDef slinkrpltab[] = {
103	–	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
104	–	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
105	–	{ 0,                 0,              0 },
106	–	};
107	–
108	–
109	–	void
110	–	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
111	–	struct Client *server_p)
112	–	{
113	–	assert(rpl == SLINKRPL_ERROR);
114	–	assert(len < 256);
115	–
116	–	data[len-1] = '\0';
117	–
118	–	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
119	–	server_p->name, data);
120	–	/* XXX should this be exit_client? */
121	–	exit_client(server_p, &me, "servlink error -- terminating link");
122	–	}
123	–
124	–	void
125	–	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
126	–	struct Client *server_p)
127	–	{
128	–	struct ZipStats zipstats;
129	–	uint64_t in = 0, in_wire = 0, out = 0, out_wire = 0;
130	–	int i = 0;
131	–
132	–	assert(rpl == SLINKRPL_ZIPSTATS);
133	–	assert(len == 16);
134	–	assert(IsCapable(server_p, CAP_ZIP));
135	–
136	–	/* Yes, it needs to be done this way, no we cannot let the compiler
137	–	* work with the pointer to the structure.  This works around a GCC
138	–	* bug on SPARC that affects all versions at the time of this writing.
139	–	* I will feed you to the creatures living in RMS's beard if you do
140	–	* not leave this as is, without being sure that you are not causing
141	–	* regression for most of our installed SPARC base.
142	–	* -jmallett, 04/27/2002
143	–	*/
144	–	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
145	–
146	–	in |= (data[i++] << 24);
147	–	in |= (data[i++] << 16);
148	–	in |= (data[i++] <<  8);
149	–	in |= (data[i++]      );
150	–
151	–	in_wire |= (data[i++] << 24);
152	–	in_wire |= (data[i++] << 16);
153	–	in_wire |= (data[i++] <<  8);
154	–	in_wire |= (data[i++]      );
155	–
156	–	out |= (data[i++] << 24);
157	–	out |= (data[i++] << 16);
158	–	out |= (data[i++] <<  8);
159	–	out |= (data[i++]      );
160	–
161	–	out_wire |= (data[i++] << 24);
162	–	out_wire |= (data[i++] << 16);
163	–	out_wire |= (data[i++] <<  8);
164	–	out_wire |= (data[i++]      );
165	–
166	–	/* This macro adds b to a if a plus b is not an overflow, and sets the
167	–	* value of a to b if it is.
168	–	* Add and Set if No Overflow.
169	–	*/
170	–	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
171	–
172	–	ASNO(zipstats.in, in);
173	–	ASNO(zipstats.out, out);
174	–	ASNO(zipstats.in_wire, in_wire);
175	–	ASNO(zipstats.out_wire, out_wire);
176	–
177	–	if (zipstats.in > 0)
178	–	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
179	–	(double)zipstats.in) * 100.00);
180	–	else
181	–	zipstats.in_ratio = 0;
182	–
183	–	if (zipstats.out > 0)
184	–	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
185	–	(double)zipstats.out) * 100.00);
186	–	else
187	–	zipstats.out_ratio = 0;
188	–
189	–	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
190	–	}
191	–
192	–	void
193	–	collect_zipstats(void *unused)
194	–	{
195	–	dlink_node *ptr = NULL;
196	–
197	–	DLINK_FOREACH(ptr, serv_list.head)
198	–	{
199	–	struct Client *target_p = ptr->data;
200	–
201	–	if (IsCapable(target_p, CAP_ZIP))
202	–	{
203	–	/* only bother if we haven't already got something queued... */
204	–	if (!target_p->localClient->slinkq)
205	–	{
206	–	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
207	–	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
208	–	target_p->localClient->slinkq_ofs = 0;
209	–	target_p->localClient->slinkq_len = 1;
210	–	send_queued_slink_write(target_p);
211	–	}
212	–	}
213	–	}
214	–	}
215	–
216	–	#ifdef HAVE_LIBCRYPTO
217	–	struct EncCapability *
218	–	check_cipher(struct Client *client_p, struct AccessItem *aconf)
219	–	{
220	–	struct EncCapability *epref = NULL;
221	–
222	–	/* Use connect{} specific info if available */
223	–	if (aconf->cipher_preference)
224	–	epref = aconf->cipher_preference;
225	–	else if (ConfigFileEntry.default_cipher_preference)
226	–	epref = ConfigFileEntry.default_cipher_preference;
227	–
228	–	/*
229	–	* If the server supports the capability in hand, return the matching
230	–	* conf struct.  Otherwise, return NULL (an error).
231	–	*/
232	–	if (epref && IsCapableEnc(client_p, epref->cap))
233	–	return epref;
234	–
235	–	return NULL;
236	–	}
237	–	#endif /* HAVE_LIBCRYPTO */
238	–
239	–	/* my_name_for_link()
240	–	* return wildcard name of my server name
241	–	* according to given config entry --Jto
242	–	*/
243	–	const char *
244	–	my_name_for_link(struct ConfItem *conf)
245	–	{
246	–	struct AccessItem *aconf;
247	–
248	–	aconf = (struct AccessItem *)map_to_conf(conf);
249	–	if (aconf->fakename != NULL)
250	–	return aconf->fakename;
251	–	else
252	–	return me.name;
253	–	}
254	–
68		/*
69		* write_links_file
70		*
#	Line 261 | Line 74 | my_name_for_link(struct ConfItem *conf)
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;
269	<	MessageFileLine *newMessageLine = 0;
270	<	MessageFile *MessageFileptr;
271	<	const char *p;
272	<	FBFILE *file;
273	<	char buff[512];
274	<	dlink_node *ptr;
275	<
276	<	MessageFileptr = &ConfigFileEntry.linksfile;
79	>	FILE *file = NULL;
80	>	dlink_node *ptr = NULL, *ptr_next = NULL;
81	>	char buff[IRCD_BUFSIZE] = "";
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
287	–	MessageFileptr->contentsOfFile = NULL;
288	–	currentMessageLine             = NULL;
289	–
93		DLINK_FOREACH(ptr, global_serv_list.head)
94		{
95	<	size_t nbytes = 0;
293	<	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 */
300	<	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;
305	<	else
306	<	p = "(Unknown Location)";
307	<
308	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
309	<
310	<	/* 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
318	<	* default config but it is configurable..
319	<	* This should be changed to an snprintf at some point, but I'm wanting to
320	<	* know if this is a cause of a bug - cryogen
321	<	*/
322	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
323	<	MESSAGELINELEN);
324	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
325	<	target_p->name, me.name, p);
326	<	newMessageLine->next = NULL;
119	>	fputs(buff, file);
120	>	}
121
122	<	if (MessageFileptr->contentsOfFile)
123	<	{
330	<	if (currentMessageLine)
331	<	currentMessageLine->next = newMessageLine;
332	<	currentMessageLine = newMessageLine;
333	<	}
334	<	else
335	<	{
336	<	MessageFileptr->contentsOfFile = newMessageLine;
337	<	currentMessageLine = newMessageLine;
338	<	}
122	>	fclose(file);
123	>	}
124
125	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
126	<	fbputs(buff, file, nbytes);
125	>	void
126	>	read_links_file(void)
127	>	{
128	>	FILE *file = NULL;
129	>	char *p = NULL;
130	>	char buff[IRCD_BUFSIZE] = "";
131	>
132	>	if ((file = fopen(LIPATH, "r")) == NULL)
133	>	return;
134	>
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 364 | Line 163 | write_links_file(void* notused)
163		*      returns: (see #defines)
164		*/
165		int
166	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
167	<	int server, int parc, char *parv[])
166	>	hunt_server(struct Client *source_p, const char *command,
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))
381	<	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]);
188	>	target_p = find_person(source_p, parv[server]);
189
190		if (target_p)
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]);
401	<	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 407 | 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]);
414	<	return(HUNTED_NOSUCH);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 420 | 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;
223		target_p = ptr->data;
224
225	<	if (IsRegistered(target_p) && (target_p != client_p))
225	>	if (IsRegistered(target_p) && (target_p != source_p->from))
226		break;
227		}
228		}
#	Line 437 | 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),
441	<	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) &&
453	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
454	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
455	<	parv[0] = ID(source_p);
456	<
457	<	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]);
465	<	return(HUNTED_NOSUCH);
253	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
254	>	return HUNTED_NOSUCH;
255		}
256
257		/* try_connections()
#	Line 478 | 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;
483	<	struct AccessItem *aconf;
484	<	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 491 | Line 278 | try_connections(void *unused)
278		DLINK_FOREACH(ptr, server_items.head)
279		{
280		conf = ptr->data;
494	–	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 ||
499	<	!(IsConfAllowAutoConn(aconf)))
286	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
287		continue;
288
502	–	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 507 | 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 548 | 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 562 | Line 350 | try_connections(void *unused)
350		}
351
352		int
353	<	check_server(const char *name, struct Client *client_p, int cryptlink)
353	>	valid_servname(const char *name)
354	>	{
355	>	unsigned int length = 0;
356	>	unsigned int dots   = 0;
357	>	const char *p = name;
358	>
359	>	for (; *p; ++p)
360	>	{
361	>	if (!IsServChar(*p))
362	>	return 0;
363	>
364	>	++length;
365	>
366	>	if (*p == '.')
367	>	++dots;
368	>	}
369	>
370	>	return dots != 0 && length <= HOSTLEN;
371	>	}
372	>
373	>	int
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;
570	<	struct AccessItem *server_aconf = NULL;
571	<	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
576	–	if (client_p == NULL)
577	–	return(error);
578	–
579	–	if (strlen(name) > HOSTLEN)
580	–	return(-4);
581	–
383		/* loop through looking for all possible connect items that might work */
384		DLINK_FOREACH(ptr, server_items.head)
385		{
386		conf = ptr->data;
586	–	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;
599	–	#ifdef HAVE_LIBCRYPTO
600	–	if (cryptlink && IsConfCryptLink(aconf))
601	–	{
602	–	if (aconf->rsa_public_key)
603	–	server_conf = conf;
604	–	}
605	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
606	–	#endif /* HAVE_LIBCRYPTO */
607	–	{
608	–	/* A NULL password is as good as a bad one */
609	–	if (EmptyString(client_p->localClient->passwd))
610	–	return(-2);
611	–
612	–	/* code in s_conf.c should not have allowed this to be NULL */
613	–	if (aconf->passwd == NULL)
614	–	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
624	<	{
625	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
626	<	server_conf = conf;
627	<	}
628	<	}
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
637	–	/* Now find all leaf or hub config items for this server */
638	–	DLINK_FOREACH(ptr, hub_items.head)
639	–	{
640	–	conf = ptr->data;
641	–
642	–	if (!match(name, conf->name))
643	–	continue;
644	–	attach_conf(client_p, conf);
645	–	}
646	–
647	–	DLINK_FOREACH(ptr, leaf_items.head)
648	–	{
649	–	conf = ptr->data;
650	–
651	–	if (!match(name, conf->name))
652	–	continue;
653	–	attach_conf(client_p, conf);
654	–	}
655	–
656	–	server_aconf = map_to_conf(server_conf);
657	–
658	–	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
659	–	if (!IsConfCompressed(server_aconf))
660	–	#endif
661	–	ClearCap(client_p, CAP_ZIP);
662	–	if (!IsConfCryptLink(server_aconf))
663	–	ClearCap(client_p, CAP_ENC);
664	–	if (!IsConfTopicBurst(server_aconf))
665	–	{
666	–	ClearCap(client_p, CAP_TB);
667	–	ClearCap(client_p, CAP_TBURST);
668	–	}
416
417	<	/* Don't unset CAP_HUB here even if the server isn't a hub,
671	<	* it only indicates if the server thinks it's lazylinks are
672	<	* leafs or not.. if you unset it, bad things will happen
673	<	*/
674	<	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 713 | 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 742 | 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;
749	<	MyFree(cap);
488	>	default_server_capabs &= ~(cap->cap);
489	>	dlinkDelete(ptr, &cap_list);
490	>	MyFree(cap->name);
491	>	MyFree(cap);
492		}
493		}
494		}
#	Line 761 | 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 780 | Line 522 | find_capability(const char *capab)
522		/* send_capabilities()
523		*
524		* inputs       - Client pointer to send to
783	–	*              - Pointer to AccessItem (for crypt)
525		*              - int flag of capabilities that this server can send
785	–	*              - 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,
792	<	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;
799	–	#ifdef HAVE_LIBCRYPTO
800	–	const struct EncCapability *epref = NULL;
801	–	char *capend;
802	–	int sent_cipher = 0;
803	–	#endif
538
539		t = msgbuf;
540
#	Line 810 | 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		}
817	–	#ifdef HAVE_LIBCRYPTO
818	–	if (enc_can_send)
819	–	{
820	–	capend = t;
821	–	strcpy(t, "ENC:");
822	–	t += 4;
823	–
824	–	/* use connect{} specific info if available */
825	–	if (aconf->cipher_preference)
826	–	epref = aconf->cipher_preference;
827	–	else if (ConfigFileEntry.default_cipher_preference)
828	–	epref = ConfigFileEntry.default_cipher_preference;
829	–
830	–	if (epref && (epref->cap & enc_can_send))
831	–	{
832	–	/* Leave the space -- it is removed later. */
833	–	tl = ircsprintf(t, "%s ", epref->name);
834	–	t += tl;
835	–	sent_cipher = 1;
836	–	}
551
838	–	if (!sent_cipher)
839	–	t = capend; /* truncate string before ENC:, below */
840	–	}
841	–	#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 853 | 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) ?
862	<	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 867 | 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 876 | 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);
885	<
886	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
887	<	if (!EmptyString(target_p->away))
888	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
889	<	target_p->away);
596	>
597	>	if (!EmptyString(target_p->certfp))
598	>	sendto_one(client_p, ":%s CERTFP %s", target_p->id, target_p->certfp);
599	>
600	>	if (target_p->away[0])
601	>	sendto_one(client_p, ":%s AWAY :%s", target_p->id, target_p->away);
602
603		}
604
#	Line 898 | Line 610 | sendnick_TS(struct Client *client_p, str
610		* side effects - build up string representing capabilities of server listed
611		*/
612		const char *
613	<	show_capabilities(struct Client *target_p)
613	>	show_capabilities(const struct Client *target_p)
614		{
615	<	static char msgbuf[IRCD_BUFSIZE];
616	<	char *t = msgbuf;
905	<	dlink_node *ptr;
615	>	static char msgbuf[IRCD_BUFSIZE] = "";
616	>	const dlink_node *ptr = NULL;
617
618	<	t += ircsprintf(msgbuf, "TS ");
618	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
619
620		DLINK_FOREACH(ptr, cap_list.head)
621		{
622		const struct Capability *cap = ptr->data;
623
624	<	if (IsCapable(target_p, cap->cap))
625	<	t += ircsprintf(t, "%s ", cap->name);
624	>	if (!IsCapable(target_p, cap->cap))
625	>	continue;
626	>
627	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
628	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
629		}
916	–	#ifdef HAVE_LIBCRYPTO
917	–	if (IsCapable(target_p, CAP_ENC) &&
918	–	target_p->localClient->in_cipher &&
919	–	target_p->localClient->out_cipher)
920	–	t += ircsprintf(t, "ENC:%s ",
921	–	target_p->localClient->in_cipher->name);
922	–	#endif
923	–	*(t - 1) = '\0';
630
631	<	return(msgbuf);
631	>	return msgbuf;
632		}
633
634		/* make_server()
#	Line 950 | Line 656 | make_server(struct Client *client_p)
656		void
657		server_estab(struct Client *client_p)
658		{
659	<	struct Client *target_p;
954	<	struct ConfItem *conf;
955	<	struct AccessItem *aconf=NULL;
659	>	struct MaskItem *conf = NULL;
660		char *host;
661		const char *inpath;
662		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
959	–	dlink_node *m;
663		dlink_node *ptr;
664	+	#ifdef HAVE_LIBCRYPTO
665	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
666	+	#endif
667
668		assert(client_p != NULL);
669
#	Line 966 | Line 672 | server_estab(struct Client *client_p)
672		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
673		host   = client_p->name;
674
675	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
675	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
676		== NULL)
677		{
678		/* This shouldn't happen, better tell the ops... -A1kmm */
679	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
679	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
680	>	"Warning: Lost connect{} block "
681		"for server %s(this shouldn't happen)!", host);
682	<	exit_client(client_p, &me, "Lost connect{} block!");
682	>	exit_client(client_p, "Lost connect{} block!");
683		return;
684		}
685
#	Line 985 | Line 692 | server_estab(struct Client *client_p)
692		/* If there is something in the serv_list, it might be this
693		* connecting server..
694		*/
695	<	if (!ServerInfo.hub && serv_list.head)
695	>	if (!ServerInfo.hub && serv_list.head)
696		{
697		if (client_p != serv_list.head->data || serv_list.head->next)
698		{
699		++ServerStats.is_ref;
700		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
701	<	exit_client(client_p, &me, "I'm a leaf");
701	>	exit_client(client_p, "I'm a leaf");
702		return;
703		}
704		}
705
706	<	aconf = (struct AccessItem *)map_to_conf(conf);
1000	<
1001	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
706	>	if (IsUnknown(client_p))
707		{
708	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1004	<	*        2.  Check aconf->spasswd, not aconf->passwd.
1005	<	*/
1006	<	if (!EmptyString(aconf->spasswd))
1007	<	{
1008	<	/* only send ts6 format PASS if we have ts6 enabled */
1009	<	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1010	<	sendto_one(client_p, "PASS %s TS %d %s",
1011	<	aconf->spasswd, TS_CURRENT, me.id);
1012	<	else
1013	<	sendto_one(client_p, "PASS %s TS 5",
1014	<	aconf->spasswd);
1015	<	}
708	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
709
710	<	/* Pass my info to the new server
1018	<	*
1019	<	* If this is a HUB, pass on CAP_HUB
1020	<	* Pass on ZIP if supported
1021	<	* Pass on TB if supported.
1022	<	* - Dianora
1023	<	*/
710	>	send_capabilities(client_p, 0);
711
1025	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1026	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1027	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1028	–
1029	–	/* SERVER is the last command sent before switching to ziplinks.
1030	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1031	–	* on the wire immediately.  Otherwise, it could be sitting in
1032	–	* a kernel buffer when we start sending zipped data, and the
1033	–	* parser on the receiving side can't hand both unzipped and zipped
1034	–	* data in one packet. --Rodder
1035	–	*
1036	–	* currently we only need to call send_queued_write,
1037	–	* Nagle is already disabled at this point --adx
1038	–	*/
712		sendto_one(client_p, "SERVER %s 1 :%s%s",
713	<	my_name_for_link(conf),
1041	<	ConfigServerHide.hidden ? "(H) " : "",
1042	<	(me.info[0]) ? (me.info) : "IRCers United");
1043	<	send_queued_write(client_p);
1044	<	}
1045	<
1046	<	/* Hand the server off to servlink now */
1047	<	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1048	<	{
1049	<	if (fork_server(client_p) < 0)
1050	<	{
1051	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1052	<	"Warning: fork failed for server %s -- check servlink_path (%s)",
1053	<	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1054	<	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1055	<	"%s -- check servlink_path (%s)",
1056	<	get_client_name(client_p, MASK_IP),
1057	<	ConfigFileEntry.servlink_path);
1058	<	exit_client(client_p, &me, "fork failed");
1059	<	return;
1060	<	}
1061	<
1062	<	start_io(client_p);
1063	<	SetServlink(client_p);
713	>	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
714		}
715
716	<	/* only send ts6 format SVINFO if we have ts6 enabled */
1067	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1068	<	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
716	>	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
717		(unsigned long)CurrentTime);
718
1071	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
1072	–	if (IsCapable(client_p, CAP_TS6))
1073	–	hash_add_id(client_p);
1074	–
719		/* XXX Does this ever happen? I don't think so -db */
720	<	detach_conf(client_p, OPER_TYPE);
720	>	detach_conf(client_p, CONF_OPER);
721
722		/* *WARNING*
723		**    In the following code in place of plain server's
#	Line 1093 | Line 737 | server_estab(struct Client *client_p)
737
738		SetServer(client_p);
739
1096	–	/* Update the capability combination usage counts. -A1kmm */
1097	–	set_chcap_usage_counts(client_p);
1098	–
740		/* Some day, all these lists will be consolidated *sigh* */
741		dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
742
743	<	m = dlinkFind(&unknown_list, client_p);
1103	<	assert(NULL != m);
743	>	assert(dlinkFind(&unknown_list, client_p));
744
745	<	dlinkDelete(m, &unknown_list);
746	<	dlinkAdd(client_p, m, &serv_list);
745	>	dlink_move_node(&client_p->localClient->lclient_node,
746	>	&unknown_list, &serv_list);
747
748		Count.myserver++;
749
750		dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
751		hash_add_client(client_p);
752	+	hash_add_id(client_p);
753
754		/* doesnt duplicate client_p->serv if allocated this struct already */
755		make_server(client_p);
756
757		/* fixing eob timings.. -gnp */
758	<	client_p->firsttime = CurrentTime;
758	>	client_p->localClient->firsttime = CurrentTime;
759
760	<	/* Show the real host/IP to admins */
761	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1121	<	"Link with %s established: (%s) link",
1122	<	inpath_ip,show_capabilities(client_p));
1123	<	/* Now show the masked hostname/IP to opers */
1124	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1125	<	"Link with %s established: (%s) link",
1126	<	inpath,show_capabilities(client_p));
1127	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1128	<	inpath_ip, show_capabilities(client_p));
1129	<
1130	<	client_p->serv->sconf = conf;
760	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
761	>	AddFlag(client_p, FLAGS_SERVICE);
762
763	<	if (HasServlink(client_p))
763	>	/* Show the real host/IP to admins */
764	>	#ifdef HAVE_LIBCRYPTO
765	>	if (client_p->localClient->fd.ssl)
766		{
767	<	/* we won't overflow FD_DESC_SZ here, as it can hold
768	<	* client_p->name + 64
769	<	*/
770	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
771	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
767	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
768	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
769	>
770	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
771	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
772	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
773	>	compression ? SSL_COMP_get_name(compression) : "NONE",
774	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
775	>	show_capabilities(client_p));
776	>	/* Now show the masked hostname/IP to opers */
777	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
778	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
779	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
780	>	compression ? SSL_COMP_get_name(compression) : "NONE",
781	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
782	>	show_capabilities(client_p));
783	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
784	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
785	>	compression ? SSL_COMP_get_name(compression) : "NONE",
786	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
787	>	show_capabilities(client_p));
788		}
789		else
790	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
1142	<
1143	<	/* Old sendto_serv_but_one() call removed because we now
1144	<	** need to send different names to different servers
1145	<	** (domain name matching) Send new server to other servers.
1146	<	*/
1147	<	DLINK_FOREACH(ptr, serv_list.head)
790	>	#endif
791		{
792	<	target_p = ptr->data;
792	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
793	>	"Link with %s established: (Capabilities: %s)",
794	>	inpath_ip, show_capabilities(client_p));
795	>	/* Now show the masked hostname/IP to opers */
796	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
797	>	"Link with %s established: (Capabilities: %s)",
798	>	inpath, show_capabilities(client_p));
799	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
800	>	inpath_ip, show_capabilities(client_p));
801	>	}
802	>
803	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
804	>
805	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
806	>	me.id, client_p->name, client_p->id,
807	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
808
809	<	if (target_p == client_p)
810	<	continue;
811	<
812	<	if ((conf = target_p->serv->sconf) &&
813	<	match(my_name_for_link(conf), client_p->name))
814	<	continue;
815	<
816	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
817	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
818	<	me.id, client_p->name, client_p->id,
819	<	IsHidden(client_p) ? "(H) " : "",
820	<	client_p->info);
821	<	else
822	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
823	<	me.name, client_p->name,
824	<	IsHidden(client_p) ? "(H) " : "",
825	<	client_p->info);
826	<	}
1169	<
1170	<	/* Pass on my client information to the new server
1171	<	**
1172	<	** First, pass only servers (idea is that if the link gets
1173	<	** cancelled beacause the server was already there,
1174	<	** there are no NICK's to be cancelled...). Of course,
1175	<	** if cancellation occurs, all this info is sent anyway,
1176	<	** and I guess the link dies when a read is attempted...? --msa
1177	<	**
1178	<	** Note: Link cancellation to occur at this point means
1179	<	** that at least two servers from my fragment are building
1180	<	** up connection this other fragment at the same time, it's
1181	<	** a race condition, not the normal way of operation...
1182	<	**
1183	<	** ALSO NOTE: using the get_client_name for server names--
1184	<	**    see previous *WARNING*!!! (Also, original inpath
1185	<	**    is destroyed...)
1186	<	*/
1187	<
1188	<	conf = client_p->serv->sconf;
809	>	/*
810	>	* Pass on my client information to the new server
811	>	*
812	>	* First, pass only servers (idea is that if the link gets
813	>	* cancelled beacause the server was already there,
814	>	* there are no NICK's to be cancelled...). Of course,
815	>	* if cancellation occurs, all this info is sent anyway,
816	>	* and I guess the link dies when a read is attempted...? --msa
817	>	*
818	>	* Note: Link cancellation to occur at this point means
819	>	* that at least two servers from my fragment are building
820	>	* up connection this other fragment at the same time, it's
821	>	* a race condition, not the normal way of operation...
822	>	*
823	>	* ALSO NOTE: using the get_client_name for server names--
824	>	*    see previous *WARNING*!!! (Also, original inpath
825	>	*    is destroyed...)
826	>	*/
827
828		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
829		{
830	<	target_p = ptr->data;
830	>	struct Client *target_p = ptr->data;
831
832		/* target_p->from == target_p for target_p == client_p */
833	<	if (target_p->from == client_p)
833	>	if (IsMe(target_p) || target_p->from == client_p)
834		continue;
835
836	<	if (match(my_name_for_link(conf), target_p->name))
837	<	continue;
836	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
837	>	target_p->servptr->id, target_p->name, target_p->hopcount+1,
838	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
839	>	target_p->info);
840
841	<	if (IsCapable(client_p, CAP_TS6))
842	<	{
1203	<	if (HasID(target_p))
1204	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
1205	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1206	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
1207	<	target_p->info);
1208	<	else  /* introducing non-ts6 server */
1209	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1210	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1211	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
1212	<	}
1213	<	else
1214	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1215	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
1216	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
841	>	if (HasFlag(target_p, FLAGS_EOB))
842	>	sendto_one(client_p, ":%s EOB", target_p->id, client_p);
843		}
844
845		server_burst(client_p);
846		}
847
1222	–	static void
1223	–	start_io(struct Client *server)
1224	–	{
1225	–	struct LocalUser *lserver = server->localClient;
1226	–	int alloclen = 1;
1227	–	char *buf;
1228	–	dlink_node *ptr;
1229	–	struct dbuf_block *block;
1230	–
1231	–	/* calculate how many bytes to allocate */
1232	–	if (IsCapable(server, CAP_ZIP))
1233	–	alloclen += 6;
1234	–	#ifdef HAVE_LIBCRYPTO
1235	–	if (IsCapable(server, CAP_ENC))
1236	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1237	–	#endif
1238	–	alloclen += dbuf_length(&lserver->buf_recvq);
1239	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1240	–	alloclen += dbuf_length(&lserver->buf_sendq);
1241	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1242	–
1243	–	/* initialize servlink control sendq */
1244	–	lserver->slinkq = buf = MyMalloc(alloclen);
1245	–	lserver->slinkq_ofs = 0;
1246	–	lserver->slinkq_len = alloclen;
1247	–
1248	–	if (IsCapable(server, CAP_ZIP))
1249	–	{
1250	–	/* ziplink */
1251	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1252	–	*buf++ = 0; /* |          */
1253	–	*buf++ = 1; /* \ len is 1 */
1254	–	*buf++ = ConfigFileEntry.compression_level;
1255	–	*buf++ = SLINKCMD_START_ZIP_IN;
1256	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1257	–	}
1258	–	#ifdef HAVE_LIBCRYPTO
1259	–	if (IsCapable(server, CAP_ENC))
1260	–	{
1261	–	/* Decryption settings */
1262	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1263	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1264	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1265	–	*buf++ = lserver->in_cipher->cipherid;
1266	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1267	–	*buf++ = 0; /* keylen < 256 */
1268	–	*buf++ = lserver->in_cipher->keylen;
1269	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1270	–	buf += lserver->in_cipher->keylen;
1271	–	/* Encryption settings */
1272	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1273	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1274	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1275	–	*buf++ = lserver->out_cipher->cipherid;
1276	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1277	–	*buf++ = 0; /* keylen < 256 */
1278	–	*buf++ = lserver->out_cipher->keylen;
1279	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1280	–	buf += lserver->out_cipher->keylen;
1281	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1282	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1283	–	}
1284	–	#endif
1285	–
1286	–	/* pass the whole recvq to servlink */
1287	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1288	–	{
1289	–	block = ptr->data;
1290	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1291	–	*buf++ = (block->size >> 8);
1292	–	*buf++ = (block->size & 0xff);
1293	–	memcpy(buf, &block->data[0], block->size);
1294	–	buf += block->size;
1295	–	}
1296	–
1297	–	dbuf_clear(&lserver->buf_recvq);
1298	–
1299	–	/* pass the whole sendq to servlink */
1300	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1301	–	{
1302	–	block = ptr->data;
1303	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1304	–	*buf++ = (block->size >> 8);
1305	–	*buf++ = (block->size & 0xff);
1306	–	memcpy(buf, &block->data[0], block->size);
1307	–	buf += block->size;
1308	–	}
1309	–
1310	–	dbuf_clear(&lserver->buf_sendq);
1311	–
1312	–	/* start io */
1313	–	*buf++ = SLINKCMD_INIT;
1314	–
1315	–	/* schedule a write */
1316	–	send_queued_slink_write(server);
1317	–	}
1318	–
1319	–	/* fork_server()
1320	–	*
1321	–	* inputs       - struct Client *server
1322	–	* output       - success: 0 / failure: -1
1323	–	* side effect  - fork, and exec SERVLINK to handle this connection
1324	–	*/
1325	–	static int
1326	–	fork_server(struct Client *server)
1327	–	{
1328	–	#ifndef HAVE_SOCKETPAIR
1329	–	return -1;
1330	–	#else
1331	–	int i;
1332	–	int slink_fds[2][2];
1333	–	/* 0? - ctrl  | 1? - data
1334	–	* ?0 - child | ?1 - parent */
1335	–
1336	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1337	–	return -1;
1338	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1339	–	goto free_ctrl_fds;
1340	–
1341	–	if ((i = fork()) < 0)
1342	–	{
1343	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1344	–	free_ctrl_fds:
1345	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1346	–	return -1;
1347	–	}
1348	–
1349	–	if (i == 0)
1350	–	{
1351	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1352	–	char *kid_argv[7];
1353	–
1354	–	#ifdef O_ASYNC
1355	–	fcntl(server->localClient->fd.fd, F_SETFL,
1356	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1357	–	#endif
1358	–	close_fds(&server->localClient->fd);
1359	–	close(slink_fds[0][1]);
1360	–	close(slink_fds[1][1]);
1361	–
1362	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1363	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1364	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1365	–
1366	–	kid_argv[0] = "-slink";
1367	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1368	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1369	–	kid_argv[5] = fd_str[2];    /* network */
1370	–	kid_argv[6] = NULL;
1371	–
1372	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1373	–
1374	–	_exit(1);
1375	–	}
1376	–
1377	–	/* close the network fd and the child ends of the pipes */
1378	–	fd_close(&server->localClient->fd);
1379	–	close(slink_fds[0][0]);
1380	–	close(slink_fds[1][0]);
1381	–
1382	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1383	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1384	–
1385	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1386	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1387	–
1388	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1389	–	read_packet(&server->localClient->fd, server);
1390	–
1391	–	return 0;
1392	–	#endif
1393	–	}
1394	–
848		/* server_burst()
849		*
850		* inputs       - struct Client pointer server
#	Line 1417 | Line 870 | server_burst(struct Client *client_p)
870
871		/* EOB stuff is now in burst_all */
872		/* Always send a PING after connect burst is done */
873	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
873	>	sendto_one(client_p, "PING :%s", me.id);
874		}
875
876		/* burst_all()
877		*
878	<	* inputs       - pointer to server to send burst to
878	>	* inputs       - pointer to server to send burst to
879		* output       - NONE
880		* side effects - complete burst of channels/nicks is sent to client_p
881		*/
#	Line 1440 | Line 893 | burst_all(struct Client *client_p)
893		burst_members(client_p, chptr);
894		send_channel_modes(client_p, chptr);
895
896	<	if (IsCapable(client_p, CAP_TBURST) ||
897	<	IsCapable(client_p, CAP_TB))
1445	<	send_tb(client_p, chptr);
896	>	if (IsCapable(client_p, CAP_TBURST))
897	>	send_tb(client_p, chptr);
898		}
899		}
900
#	Line 1452 | Line 904 | burst_all(struct Client *client_p)
904		{
905		struct Client *target_p = ptr->data;
906
907	<	if (!IsBursted(target_p) && target_p->from != client_p)
907	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
908		sendnick_TS(client_p, target_p);
909	<
910	<	ClearBursted(target_p);
909	>
910	>	DelFlag(target_p, FLAGS_BURSTED);
911		}
912
1461	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1462	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1463	–	*/
1464	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
913		if (IsCapable(client_p, CAP_EOB))
914	<	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
914	>	sendto_one(client_p, ":%s EOB", me.id);
915		}
916
917		/*
#	Line 1473 | Line 921 | burst_all(struct Client *client_p)
921		*              - pointer to channel
922		* output       - NONE
923		* side effects - Called on a server burst when
924	<	*                server is CAP_TB|CAP_TBURST capable
924	>	*                server is CAP_TBURST capable
925		*/
926		static void
927		send_tb(struct Client *client_p, struct Channel *chptr)
#	Line 1492 | Line 940 | send_tb(struct Client *client_p, struct
940		* for further information   -Michael
941		*/
942		if (chptr->topic_time != 0)
943	<	{
944	<	if (IsCapable(client_p, CAP_TBURST))
945	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
946	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
947	<	(unsigned long)chptr->topic_time,
1500	<	chptr->topic_info ? chptr->topic_info : "",
1501	<	chptr->topic ? chptr->topic : "");
1502	<	else if (IsCapable(client_p, CAP_TB))
1503	<	{
1504	<	if (ConfigChannel.burst_topicwho)
1505	<	{
1506	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1507	<	me.name, chptr->chname,
1508	<	(unsigned long)chptr->topic_time,
1509	<	chptr->topic_info, chptr->topic ? chptr->topic : "");
1510	<	}
1511	<	else
1512	<	{
1513	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1514	<	me.name, chptr->chname,
1515	<	(unsigned long)chptr->topic_time,
1516	<	chptr->topic ? chptr->topic : "");
1517	<	}
1518	<	}
1519	<	}
943	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s", me.id,
944	>	(unsigned long)chptr->channelts, chptr->chname,
945	>	(unsigned long)chptr->topic_time,
946	>	chptr->topic_info,
947	>	chptr->topic);
948		}
949
950		/* burst_members()
#	Line 1538 | Line 966 | burst_members(struct Client *client_p, s
966		ms       = ptr->data;
967		target_p = ms->client_p;
968
969	<	if (!IsBursted(target_p))
969	>	if (!HasFlag(target_p, FLAGS_BURSTED))
970		{
971	<	SetBursted(target_p);
971	>	AddFlag(target_p, FLAGS_BURSTED);
972
973		if (target_p->from != client_p)
974		sendnick_TS(client_p, target_p);
#	Line 1555 | Line 983 | burst_members(struct Client *client_p, s
983
984		/* serv_connect() - initiate a server connection
985		*
986	<	* inputs       - pointer to conf
986	>	* inputs       - pointer to conf
987		*              - pointer to client doing the connect
988		* output       -
989		* side effects -
#	Line 1570 | Line 998 | burst_members(struct Client *client_p, s
998		* it suceeded or not, and 0 if it fails in here somewhere.
999		*/
1000		int
1001	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1001	>	serv_connect(struct MaskItem *conf, struct Client *by)
1002		{
1575	–	struct ConfItem *conf;
1003		struct Client *client_p;
1004	<	char buf[HOSTIPLEN];
1004	>	char buf[HOSTIPLEN + 1];
1005
1006		/* conversion structs */
1007		struct sockaddr_in *v4;
1008	<	/* Make sure aconf is useful */
1009	<	assert(aconf != NULL);
1583	<
1584	<	if(aconf == NULL)
1585	<	return (0);
1008	>	/* Make sure conf is useful */
1009	>	assert(conf != NULL);
1010
1587	–	/* XXX should be passing struct ConfItem in the first place */
1588	–	conf = unmap_conf_item(aconf);
1011
1012	<	/* log */
1013	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1014	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1593	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1012	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1013	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1014	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1015		buf);
1016
1017		/* Still processing a DNS lookup? -> exit */
1018	<	if (aconf->dns_pending)
1018	>	if (conf->dns_pending)
1019		{
1020	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1020	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1021		"Error connecting to %s: DNS lookup for connect{} in progress.",
1022		conf->name);
1023		return (0);
1024		}
1025
1026	<	if (aconf->dns_failed)
1026	>	if (conf->dns_failed)
1027		{
1028	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1028	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1029		"Error connecting to %s: DNS lookup for connect{} failed.",
1030		conf->name);
1031		return (0);
1032		}
1033
1034		/* Make sure this server isn't already connected
1035	<	* Note: aconf should ALWAYS be a valid C: line
1035	>	* Note: conf should ALWAYS be a valid C: line
1036		*/
1037	<	if ((client_p = find_server(conf->name)) != NULL)
1038	<	{
1039	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1040	<	"Server %s already present from %s",
1041	<	conf->name, get_client_name(client_p, SHOW_IP));
1042	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1043	<	"Server %s already present from %s",
1044	<	conf->name, get_client_name(client_p, MASK_IP));
1037	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1038	>	{
1039	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1040	>	"Server %s already present from %s",
1041	>	conf->name, get_client_name(client_p, SHOW_IP));
1042	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1043	>	"Server %s already present from %s",
1044	>	conf->name, get_client_name(client_p, MASK_IP));
1045		if (by && IsClient(by) && !MyClient(by))
1046	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1047	<	me.name, by->name, conf->name,
1048	<	get_client_name(client_p, MASK_IP));
1628	<	return (0);
1046	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1047	>	conf->name, get_client_name(client_p, MASK_IP));
1048	>	return 0;
1049		}
1050	<
1050	>
1051		/* Create a local client */
1052		client_p = make_client(NULL);
1053
1054		/* Copy in the server, hostname, fd */
1055		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1056	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1056	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1057
1058		/* We already converted the ip once, so lets use it - stu */
1059	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
1059	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1060
1061	<	/* create a socket for the server connection */
1062	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1061	>	/* create a socket for the server connection */
1062	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1063		SOCK_STREAM, 0, NULL) < 0)
1064		{
1065		/* Eek, failure to create the socket */
1066	<	report_error(L_ALL,
1067	<	"opening stream socket to %s: %s", conf->name, errno);
1066	>	report_error(L_ALL, "opening stream socket to %s: %s",
1067	>	conf->name, errno);
1068		SetDead(client_p);
1069	<	exit_client(client_p, &me, "Connection failed");
1070	<	return (0);
1069	>	exit_client(client_p, "Connection failed");
1070	>	return 0;
1071		}
1072
1073		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1656 | Line 1076 | serv_connect(struct AccessItem *aconf, s
1076		/* Attach config entries to client here rather than in
1077		* serv_connect_callback(). This to avoid null pointer references.
1078		*/
1079	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1079	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1080		{
1081	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1082	<	"Host %s is not enabled for connecting:no C/N-line",
1083	<	conf->name);
1084	<	if (by && IsClient(by) && !MyClient(by))
1085	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1086	<	me.name, by->name, client_p->name);
1081	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1082	>	"Host %s is not enabled for connecting: no connect{} block",
1083	>	conf->name);
1084	>	if (by && IsClient(by) && !MyClient(by))
1085	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1086	>
1087		SetDead(client_p);
1088	<	exit_client(client_p, client_p, "Connection failed");
1089	<	return (0);
1088	>	exit_client(client_p, "Connection failed");
1089	>	return 0;
1090		}
1091
1092		/* at this point we have a connection in progress and C/N lines
#	Line 1685 | Line 1105 | serv_connect(struct AccessItem *aconf, s
1105		SetConnecting(client_p);
1106		dlinkAdd(client_p, &client_p->node, &global_client_list);
1107		/* from def_fam */
1108	<	client_p->localClient->aftype = aconf->aftype;
1108	>	client_p->localClient->aftype = conf->aftype;
1109
1110		/* Now, initiate the connection */
1111	<	/* XXX assume that a non 0 type means a specific bind address
1111	>	/* XXX assume that a non 0 type means a specific bind address
1112		* for this connect.
1113		*/
1114	<	switch (aconf->aftype)
1114	>	switch (conf->aftype)
1115		{
1116		case AF_INET:
1117	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1117	>	v4 = (struct sockaddr_in*)&conf->bind;
1118		if (v4->sin_addr.s_addr != 0)
1119		{
1120		struct irc_ssaddr ipn;
1121		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1122		ipn.ss.ss_family = AF_INET;
1123		ipn.ss_port = 0;
1124	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1125	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1126	<	(struct sockaddr *)&ipn, ipn.ss_len,
1127	<	serv_connect_callback, client_p, aconf->aftype,
1128	<	CONNECTTIMEOUT);
1124	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1125	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1126	>	(struct sockaddr *)&ipn, ipn.ss_len,
1127	>	serv_connect_callback, client_p, conf->aftype,
1128	>	CONNECTTIMEOUT);
1129		}
1130		else if (ServerInfo.specific_ipv4_vhost)
1131		{
#	Line 1714 | Line 1134 | serv_connect(struct AccessItem *aconf, s
1134		ipn.ss.ss_family = AF_INET;
1135		ipn.ss_port = 0;
1136		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1137	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1137	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1138		(struct sockaddr *)&ipn, ipn.ss_len,
1139	<	serv_connect_callback, client_p, aconf->aftype,
1140	<	CONNECTTIMEOUT);
1139	>	serv_connect_callback, client_p, conf->aftype,
1140	>	CONNECTTIMEOUT);
1141		}
1142		else
1143	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1144	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1143	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1144	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1145		CONNECTTIMEOUT);
1146		break;
1147		#ifdef IPV6
1148		case AF_INET6:
1149		{
1150	<	struct irc_ssaddr ipn;
1151	<	struct sockaddr_in6 *v6;
1152	<	struct sockaddr_in6 *v6conf;
1153	<
1154	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1155	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1156	<	v6 = (struct sockaddr_in6 *)&ipn;
1157	<
1158	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1159	<	sizeof(struct in6_addr)) != 0)
1160	<	{
1161	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1162	<	ipn.ss.ss_family = AF_INET6;
1163	<	ipn.ss_port = 0;
1164	<	comm_connect_tcp(&client_p->localClient->fd,
1165	<	aconf->host, aconf->port,
1166	<	(struct sockaddr *)&ipn, ipn.ss_len,
1167	<	serv_connect_callback, client_p,
1168	<	aconf->aftype, CONNECTTIMEOUT);
1169	<	}
1750	<	else if (ServerInfo.specific_ipv6_vhost)
1150	>	struct irc_ssaddr ipn;
1151	>	struct sockaddr_in6 *v6;
1152	>	struct sockaddr_in6 *v6conf;
1153	>
1154	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1155	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1156	>	v6 = (struct sockaddr_in6 *)&ipn;
1157	>
1158	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1159	>	{
1160	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1161	>	ipn.ss.ss_family = AF_INET6;
1162	>	ipn.ss_port = 0;
1163	>	comm_connect_tcp(&client_p->localClient->fd,
1164	>	conf->host, conf->port,
1165	>	(struct sockaddr *)&ipn, ipn.ss_len,
1166	>	serv_connect_callback, client_p,
1167	>	conf->aftype, CONNECTTIMEOUT);
1168	>	}
1169	>	else if (ServerInfo.specific_ipv6_vhost)
1170		{
1171	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1172	<	ipn.ss.ss_family = AF_INET6;
1173	<	ipn.ss_port = 0;
1174	<	comm_connect_tcp(&client_p->localClient->fd,
1175	<	aconf->host, aconf->port,
1176	<	(struct sockaddr *)&ipn, ipn.ss_len,
1177	<	serv_connect_callback, client_p,
1178	<	aconf->aftype, CONNECTTIMEOUT);
1179	<	}
1180	<	else
1181	<	comm_connect_tcp(&client_p->localClient->fd,
1182	<	aconf->host, aconf->port,
1183	<	NULL, 0, serv_connect_callback, client_p,
1184	<	aconf->aftype, CONNECTTIMEOUT);
1171	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1172	>	ipn.ss.ss_family = AF_INET6;
1173	>	ipn.ss_port = 0;
1174	>	comm_connect_tcp(&client_p->localClient->fd,
1175	>	conf->host, conf->port,
1176	>	(struct sockaddr *)&ipn, ipn.ss_len,
1177	>	serv_connect_callback, client_p,
1178	>	conf->aftype, CONNECTTIMEOUT);
1179	>	}
1180	>	else
1181	>	comm_connect_tcp(&client_p->localClient->fd,
1182	>	conf->host, conf->port,
1183	>	NULL, 0, serv_connect_callback, client_p,
1184	>	conf->aftype, CONNECTTIMEOUT);
1185		}
1186		#endif
1187		}
1188	<	return (1);
1188	>	return 1;
1189		}
1190
1191	+	#ifdef HAVE_LIBCRYPTO
1192	+	static void
1193	+	finish_ssl_server_handshake(struct Client *client_p)
1194	+	{
1195	+	struct MaskItem *conf = NULL;
1196	+
1197	+	conf = find_conf_name(&client_p->localClient->confs,
1198	+	client_p->name, CONF_SERVER);
1199	+	if (conf == NULL)
1200	+	{
1201	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1202	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1203	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1204	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1205	+
1206	+	exit_client(client_p, "Lost connect{} block");
1207	+	return;
1208	+	}
1209	+
1210	+	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1211	+
1212	+	send_capabilities(client_p, 0);
1213	+
1214	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1215	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1216	+	me.info);
1217	+
1218	+	/* If we've been marked dead because a send failed, just exit
1219	+	* here now and save everyone the trouble of us ever existing.
1220	+	*/
1221	+	if (IsDead(client_p))
1222	+	{
1223	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1224	+	"%s[%s] went dead during handshake",
1225	+	client_p->name,
1226	+	client_p->host);
1227	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1228	+	"%s went dead during handshake", client_p->name);
1229	+	return;
1230	+	}
1231	+
1232	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1233	+	/* If we get here, we're ok, so lets start reading some data */
1234	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1235	+	}
1236	+
1237	+	static void
1238	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1239	+	{
1240	+	X509 *cert = NULL;
1241	+	int ret = 0;
1242	+
1243	+	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1244	+	{
1245	+	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1246	+	{
1247	+	case SSL_ERROR_WANT_WRITE:
1248	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1249	+	(PF *)ssl_server_handshake, client_p, 0);
1250	+	return;
1251	+	case SSL_ERROR_WANT_READ:
1252	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1253	+	(PF *)ssl_server_handshake, client_p, 0);
1254	+	return;
1255	+	default:
1256	+	{
1257	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1258	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1259	+	"Error connecting to %s: %s", client_p->name,
1260	+	sslerr ? sslerr : "unknown SSL error");
1261	+	exit_client(client_p, "Error during SSL handshake");
1262	+	return;
1263	+	}
1264	+	}
1265	+	}
1266	+
1267	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1268	+	{
1269	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1270	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1271	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1272	+
1273	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1274	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1275	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1276	+	{
1277	+	unsigned int i = 0, n = 0;
1278	+
1279	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1280	+	{
1281	+	for (; i < n; ++i)
1282	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1283	+	client_p->certfp = xstrdup(buf);
1284	+	}
1285	+	}
1286	+	else
1287	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1288	+	client_p->name, client_p->username, client_p->host, res);
1289	+	X509_free(cert);
1290	+	}
1291	+
1292	+	finish_ssl_server_handshake(client_p);
1293	+	}
1294	+
1295	+	static void
1296	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1297	+	{
1298	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1299	+	{
1300	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1301	+	ERR_error_string(ERR_get_error(), NULL));
1302	+	SetDead(client_p);
1303	+	exit_client(client_p, "SSL_new failed");
1304	+	return;
1305	+	}
1306	+
1307	+	SSL_set_fd(fd->ssl, fd->fd);
1308	+
1309	+	if (!EmptyString(conf->cipher_list))
1310	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1311	+
1312	+	ssl_server_handshake(NULL, client_p);
1313	+	}
1314	+	#endif
1315	+
1316		/* serv_connect_callback() - complete a server connection.
1317	<	*
1317	>	*
1318		* This routine is called after the server connection attempt has
1319		* completed. If unsucessful, an error is sent to ops and the client
1320		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1781 | Line 1325 | static void
1325		serv_connect_callback(fde_t *fd, int status, void *data)
1326		{
1327		struct Client *client_p = data;
1328	<	struct ConfItem *conf=NULL;
1785	<	struct AccessItem *aconf=NULL;
1328	>	struct MaskItem *conf = NULL;
1329
1330		/* First, make sure its a real client! */
1331		assert(client_p != NULL);
#	Line 1798 | Line 1341 | serv_connect_callback(fde_t *fd, int sta
1341		* Admins get to see any IP, mere opers don't *sigh*
1342		*/
1343		if (ConfigServerHide.hide_server_ips)
1344	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1344	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1345		"Error connecting to %s: %s",
1346		client_p->name, comm_errstr(status));
1347		else
1348	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1349	<	"Error connecting to %s[%s]: %s", client_p->name,
1350	<	client_p->host, comm_errstr(status));
1351	<
1352	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1353	<	"Error connecting to %s: %s",
1354	<	client_p->name, comm_errstr(status));
1348	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1349	>	"Error connecting to %s[%s]: %s", client_p->name,
1350	>	client_p->host, comm_errstr(status));
1351	>
1352	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1353	>	"Error connecting to %s: %s",
1354	>	client_p->name, comm_errstr(status));
1355
1356		/* If a fd goes bad, call dead_link() the socket is no
1357		* longer valid for reading or writing.
#	Line 1820 | Line 1363 | serv_connect_callback(fde_t *fd, int sta
1363		/* COMM_OK, so continue the connection procedure */
1364		/* Get the C/N lines */
1365		conf = find_conf_name(&client_p->localClient->confs,
1366	<	client_p->name, SERVER_TYPE);
1366	>	client_p->name, CONF_SERVER);
1367		if (conf == NULL)
1368		{
1369	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1370	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1371	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1372	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1369	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1370	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1371	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1372	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1373
1374	<	exit_client(client_p, &me, "Lost connect{} block");
1374	>	exit_client(client_p, "Lost connect{} block");
1375		return;
1376		}
1377
1835	–	aconf = (struct AccessItem *)map_to_conf(conf);
1378		/* Next, send the initial handshake */
1379		SetHandshake(client_p);
1380
1381		#ifdef HAVE_LIBCRYPTO
1382	<	/* Handle all CRYPTLINK links in cryptlink_init */
1841	<	if (IsConfCryptLink(aconf))
1382	>	if (IsConfSSL(conf))
1383		{
1384	<	cryptlink_init(client_p, conf, fd);
1384	>	ssl_connect_init(client_p, conf, fd);
1385		return;
1386		}
1387		#endif
1388
1389	<	/* jdc -- Check and send spasswd, not passwd. */
1849	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
1850	<	/* Send TS 6 form only if id */
1851	<	sendto_one(client_p, "PASS %s TS %d %s",
1852	<	aconf->spasswd, TS_CURRENT, me.id);
1853	<	else
1854	<	sendto_one(client_p, "PASS %s TS 5",
1855	<	aconf->spasswd);
1389	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1390
1391	<	/* Pass my info to the new server
1858	<	*
1859	<	* If this is a HUB, pass on CAP_HUB
1860	<	* Pass on ZIP if supported
1861	<	* Pass on TB if supported.
1862	<	* - Dianora
1863	<	*/
1864	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1865	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1866	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1391	>	send_capabilities(client_p, 0);
1392
1393	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1394	<	my_name_for_link(conf),
1870	<	ConfigServerHide.hidden ? "(H) " : "",
1871	<	me.info);
1393	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1394	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1395
1396		/* If we've been marked dead because a send failed, just exit
1397		* here now and save everyone the trouble of us ever existing.
1398		*/
1399	<	if (IsDead(client_p))
1399	>	if (IsDead(client_p))
1400		{
1401	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1402	<	"%s[%s] went dead during handshake",
1401	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1402	>	"%s[%s] went dead during handshake",
1403		client_p->name,
1404	<	client_p->host);
1405	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1406	<	"%s went dead during handshake", client_p->name);
1404	>	client_p->host);
1405	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1406	>	"%s went dead during handshake", client_p->name);
1407		return;
1408		}
1409
#	Line 1900 | Line 1423 | find_servconn_in_progress(const char *na
1423		cptr = ptr->data;
1424
1425		if (cptr && cptr->name[0])
1426	<	if (match(cptr->name, name) || match(name, cptr->name))
1426	>	if (!match(name, cptr->name))
1427		return cptr;
1428		}
1906	–
1907	–	return NULL;
1908	–	}
1909	–
1910	–	#ifdef HAVE_LIBCRYPTO
1911	–	/*
1912	–	* sends a CRYPTLINK SERV command.
1913	–	*/
1914	–	void
1915	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
1916	–	{
1917	–	struct AccessItem *aconf;
1918	–	char *encrypted;
1919	–	unsigned char *key_to_send;
1920	–	char randkey[CIPHERKEYLEN];
1921	–	int enc_len;
1922	–
1923	–	/* get key */
1924	–	if ((!ServerInfo.rsa_private_key) ||
1925	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
1926	–	{
1927	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
1928	–	"Invalid RSA private key");
1929	–	return;
1930	–	}
1931	–
1932	–	aconf = (struct AccessItem *)map_to_conf(conf);
1933	–
1934	–	if (aconf->rsa_public_key == NULL)
1935	–	{
1936	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
1937	–	"Invalid RSA public key");
1938	–	return;
1939	–	}
1940	–
1941	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
1942	–	{
1943	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
1944	–	"Couldn't generate keyphrase");
1945	–	return;
1946	–	}
1947	–
1948	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1949	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1950	–	(unsigned char *)randkey,
1951	–	(unsigned char *)encrypted,
1952	–	aconf->rsa_public_key,
1953	–	RSA_PKCS1_PADDING);
1954	–
1955	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1956	–
1957	–	if (enc_len <= 0)
1958	–	{
1959	–	report_crypto_errors();
1960	–	MyFree(encrypted);
1961	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
1962	–	"Couldn't encrypt data");
1963	–	return;
1964	–	}
1965	–
1966	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
1967	–	{
1968	–	MyFree(encrypted);
1969	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
1970	–	"Couldn't base64 encode key");
1971	–	return;
1972	–	}
1973	–
1974	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1975	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1976	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
1977	–
1978	–	if (me.id[0])
1979	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
1980	–
1981	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
1982	–	my_name_for_link(conf), key_to_send,
1983	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
1984	–
1985	–	SetHandshake(client_p);
1986	–	SetWaitAuth(client_p);
1987	–
1988	–	MyFree(encrypted);
1989	–	MyFree(key_to_send);
1990	–
1991	–	if (IsDead(client_p))
1992	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
1993	–	"Went dead during handshake");
1994	–	else if (fd != NULL)
1995	–	/* If we get here, we're ok, so lets start reading some data */
1996	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
1997	–	}
1998	–
1999	–	void
2000	–	cryptlink_error(struct Client *client_p, const char *type,
2001	–	const char *reason, const char *client_reason)
2002	–	{
2003	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2004	–	get_client_name(client_p, SHOW_IP), type, reason);
2005	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2006	–	get_client_name(client_p, MASK_IP), type, reason);
2007	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2008	–	get_client_name(client_p, SHOW_IP), type, reason);
2009	–
2010	–	/* If client_reason isn't NULL, then exit the client with the message
2011	–	* defined in the call.
2012	–	*/
2013	–	if ((client_reason != NULL) && (!IsDead(client_p)))
2014	–	exit_client(client_p, &me, client_reason);
2015	–	}
2016	–
2017	–	static char base64_chars[] =
2018	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2019	–
2020	–	static char base64_values[] =
2021	–	{
2022	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2023	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2024	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2025	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2026	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2027	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2028	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2029	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2030	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2031	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2032	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2033	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2034	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2035	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2036	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2037	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2038	–	};
2039	–
2040	–	/*
2041	–	* base64_block will allocate and return a new block of memory
2042	–	* using MyMalloc().  It should be freed after use.
2043	–	*/
2044	–	int
2045	–	base64_block(unsigned char **output, char *data, int len)
2046	–	{
2047	–	unsigned char *out;
2048	–	unsigned char *in = (unsigned char*)data;
2049	–	unsigned long int q_in;
2050	–	int i;
2051	–	int count = 0;
2052	–
2053	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2054	–
2055	–	/* process 24 bits at a time */
2056	–	for( i = 0; i < len; i += 3)
2057	–	{
2058	–	q_in = 0;
2059	–
2060	–	if ( i + 2 < len )
2061	–	{
2062	–	q_in  = (in[i+2] & 0xc0) << 2;
2063	–	q_in |=  in[i+2];
2064	–	}
2065	–
2066	–	if ( i + 1 < len )
2067	–	{
2068	–	q_in |= (in[i+1] & 0x0f) << 10;
2069	–	q_in |= (in[i+1] & 0xf0) << 12;
2070	–	}
2071	–
2072	–	q_in |= (in[i]   & 0x03) << 20;
2073	–	q_in |=  in[i]           << 22;
2074	–
2075	–	q_in &= 0x3f3f3f3f;
2076	–
2077	–	out[count++] = base64_chars[((q_in >> 24)       )];
2078	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2079	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2080	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2081	–	}
2082	–	if ( (i - len) > 0 )
2083	–	{
2084	–	out[count-1] = '=';
2085	–	if ( (i - len) > 1 )
2086	–	out[count-2] = '=';
2087	–	}
2088	–
2089	–	out[count] = '\0';
2090	–	*output = out;
2091	–	return (count);
2092	–	}
1429
1430	<	/*
2095	<	* unbase64_block will allocate and return a new block of memory
2096	<	* using MyMalloc().  It should be freed after use.
2097	<	*/
2098	<	int
2099	<	unbase64_block(unsigned char **output, char *data, int len)
2100	<	{
2101	<	unsigned char *out;
2102	<	unsigned char *in = (unsigned char*)data;
2103	<	unsigned long int q_in;
2104	<	int i;
2105	<	int count = 0;
2106	<
2107	<	if ((len % 4) != 0)
2108	<	return (0);
2109	<
2110	<	out = MyMalloc(((len / 4) * 3) + 1);
2111	<
2112	<	/* process 32 bits at a time */
2113	<	for( i = 0; (i + 3) < len; i+=4)
2114	<	{
2115	<	/* compress input (chars a, b, c and d) as follows:
2116	<	* (after converting ascii -> base64 value)
2117	<	*
2118	<	* |00000000aaaaaabbbbbbccccccdddddd|
2119	<	* |  765432  107654  321076  543210|
2120	<	*/
2121	<
2122	<	q_in = 0;
2123	<
2124	<	if (base64_values[in[i+3]] > -1)
2125	<	q_in |= base64_values[in[i+3]]      ;
2126	<	if (base64_values[in[i+2]] > -1)
2127	<	q_in |= base64_values[in[i+2]] <<  6;
2128	<	if (base64_values[in[i+1]] > -1)
2129	<	q_in |= base64_values[in[i+1]] << 12;
2130	<	if (base64_values[in[i  ]] > -1)
2131	<	q_in |= base64_values[in[i  ]] << 18;
2132	<
2133	<	out[count++] = (q_in >> 16) & 0xff;
2134	<	out[count++] = (q_in >>  8) & 0xff;
2135	<	out[count++] = (q_in      ) & 0xff;
2136	<	}
2137	<
2138	<	if (in[i-1] == '=') count--;
2139	<	if (in[i-2] == '=') count--;
2140	<
2141	<	out[count] = '\0';
2142	<	*output = out;
2143	<	return (count);
1430	>	return NULL;
1431		}
2145	–
2146	–	#endif /* HAVE_LIBCRYPTO */
2147	–

Diff Legend

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