ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1203 by michael, Tue Aug 23 20:06:08 2011 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2691 by michael, Tue Dec 17 18:55:59 2013 UTC

#	Line 31 | Line 31
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
34	–	#include "common.h"
34		#include "dbuf.h"
35		#include "event.h"
36		#include "fdlist.h"
37		#include "hash.h"
38		#include "irc_string.h"
40	–	#include "sprintf_irc.h"
39		#include "ircd.h"
40		#include "ircd_defs.h"
41		#include "s_bsd.h"
42		#include "numeric.h"
43		#include "packet.h"
44		#include "irc_res.h"
45	<	#include "s_conf.h"
45	>	#include "conf.h"
46		#include "s_serv.h"
47	<	#include "s_log.h"
47	>	#include "log.h"
48	>	#include "s_misc.h"
49		#include "s_user.h"
50		#include "send.h"
51		#include "memory.h"
52		#include "channel.h" /* chcap_usage_counts stuff...*/
53	+	#include "parse.h"
54
55		#define MIN_CONN_FREQ 300
56
57	+	dlink_list flatten_links;
58		static dlink_list cap_list = { NULL, NULL, 0 };
59		static void server_burst(struct Client *);
59	–	static int fork_server(struct Client *);
60		static void burst_all(struct Client *);
61		static void send_tb(struct Client *client_p, struct Channel *chptr);
62
63		static CNCB serv_connect_callback;
64
65	–	static void start_io(struct Client *);
65		static void burst_members(struct Client *, struct Channel *);
66
68	–	static SlinkRplHnd slink_error;
69	–	static SlinkRplHnd slink_zipstats;
70	–
71	–
72	–	#ifdef HAVE_LIBCRYPTO
73	–	struct EncCapability CipherTable[] =
74	–	{
75	–	#ifdef HAVE_EVP_BF_CFB
76	–	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
77	–	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
78	–	#endif
79	–	#ifdef HAVE_EVP_CAST5_CFB
80	–	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
81	–	#endif
82	–	#ifdef HAVE_EVP_IDEA_CFB
83	–	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
84	–	#endif
85	–	#ifdef HAVE_EVP_RC5_32_12_16_CFB
86	–	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
87	–	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
88	–	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
89	–	#endif
90	–	#ifdef HAVE_EVP_DES_EDE3_CFB
91	–	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
92	–	#endif
93	–	#ifdef HAVE_EVP_DES_CFB
94	–	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
95	–	#endif
96	–	{ 0,            0,                   0, 0             }
97	–	};
98	–	#endif
99	–
100	–	struct SlinkRplDef slinkrpltab[] = {
101	–	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
102	–	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
103	–	{ 0,                 0,              0 },
104	–	};
105	–
106	–
107	–	void
108	–	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
109	–	struct Client *server_p)
110	–	{
111	–	assert(rpl == SLINKRPL_ERROR);
112	–	assert(len < 256);
113	–
114	–	data[len-1] = '\0';
115	–
116	–	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
117	–	server_p->name, data);
118	–	/* XXX should this be exit_client? */
119	–	exit_client(server_p, &me, "servlink error -- terminating link");
120	–	}
121	–
122	–	void
123	–	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
124	–	struct Client *server_p)
125	–	{
126	–	struct ZipStats zipstats;
127	–	uint64_t in = 0, in_wire = 0, out = 0, out_wire = 0;
128	–	int i = 0;
129	–
130	–	assert(rpl == SLINKRPL_ZIPSTATS);
131	–	assert(len == 16);
132	–	assert(IsCapable(server_p, CAP_ZIP));
133	–
134	–	/* Yes, it needs to be done this way, no we cannot let the compiler
135	–	* work with the pointer to the structure.  This works around a GCC
136	–	* bug on SPARC that affects all versions at the time of this writing.
137	–	* I will feed you to the creatures living in RMS's beard if you do
138	–	* not leave this as is, without being sure that you are not causing
139	–	* regression for most of our installed SPARC base.
140	–	* -jmallett, 04/27/2002
141	–	*/
142	–	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
143	–
144	–	in |= (data[i++] << 24);
145	–	in |= (data[i++] << 16);
146	–	in |= (data[i++] <<  8);
147	–	in |= (data[i++]      );
148	–
149	–	in_wire |= (data[i++] << 24);
150	–	in_wire |= (data[i++] << 16);
151	–	in_wire |= (data[i++] <<  8);
152	–	in_wire |= (data[i++]      );
153	–
154	–	out |= (data[i++] << 24);
155	–	out |= (data[i++] << 16);
156	–	out |= (data[i++] <<  8);
157	–	out |= (data[i++]      );
158	–
159	–	out_wire |= (data[i++] << 24);
160	–	out_wire |= (data[i++] << 16);
161	–	out_wire |= (data[i++] <<  8);
162	–	out_wire |= (data[i++]      );
163	–
164	–	/* This macro adds b to a if a plus b is not an overflow, and sets the
165	–	* value of a to b if it is.
166	–	* Add and Set if No Overflow.
167	–	*/
168	–	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
169	–
170	–	ASNO(zipstats.in, in);
171	–	ASNO(zipstats.out, out);
172	–	ASNO(zipstats.in_wire, in_wire);
173	–	ASNO(zipstats.out_wire, out_wire);
174	–
175	–	if (zipstats.in > 0)
176	–	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
177	–	(double)zipstats.in) * 100.00);
178	–	else
179	–	zipstats.in_ratio = 0;
180	–
181	–	if (zipstats.out > 0)
182	–	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
183	–	(double)zipstats.out) * 100.00);
184	–	else
185	–	zipstats.out_ratio = 0;
186	–
187	–	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
188	–	}
189	–
190	–	void
191	–	collect_zipstats(void *unused)
192	–	{
193	–	dlink_node *ptr = NULL;
194	–
195	–	DLINK_FOREACH(ptr, serv_list.head)
196	–	{
197	–	struct Client *target_p = ptr->data;
198	–
199	–	if (IsCapable(target_p, CAP_ZIP))
200	–	{
201	–	/* only bother if we haven't already got something queued... */
202	–	if (!target_p->localClient->slinkq)
203	–	{
204	–	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
205	–	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
206	–	target_p->localClient->slinkq_ofs = 0;
207	–	target_p->localClient->slinkq_len = 1;
208	–	send_queued_slink_write(target_p);
209	–	}
210	–	}
211	–	}
212	–	}
213	–
214	–	#ifdef HAVE_LIBCRYPTO
215	–	struct EncCapability *
216	–	check_cipher(struct Client *client_p, struct AccessItem *aconf)
217	–	{
218	–	struct EncCapability *epref = NULL;
219	–
220	–	/* Use connect{} specific info if available */
221	–	if (aconf->cipher_preference)
222	–	epref = aconf->cipher_preference;
223	–	else if (ConfigFileEntry.default_cipher_preference)
224	–	epref = ConfigFileEntry.default_cipher_preference;
225	–
226	–	/*
227	–	* If the server supports the capability in hand, return the matching
228	–	* conf struct.  Otherwise, return NULL (an error).
229	–	*/
230	–	if (epref && IsCapableEnc(client_p, epref->cap))
231	–	return epref;
232	–
233	–	return NULL;
234	–	}
235	–	#endif /* HAVE_LIBCRYPTO */
236	–
67		/*
68		* write_links_file
69		*
#	Line 243 | Line 73 | check_cipher(struct Client *client_p, st
73		*                but in no particular order.
74		*/
75		void
76	<	write_links_file(void* notused)
76	>	write_links_file(void *notused)
77		{
78	<	MessageFileLine *next_mptr = 0;
79	<	MessageFileLine *mptr = 0;
80	<	MessageFileLine *currentMessageLine = 0;
251	<	MessageFileLine *newMessageLine = 0;
252	<	MessageFile *MessageFileptr;
253	<	const char *p;
254	<	FBFILE *file;
255	<	char buff[512];
256	<	dlink_node *ptr;
257	<
258	<	MessageFileptr = &ConfigFileEntry.linksfile;
78	>	FILE *file = NULL;
79	>	dlink_node *ptr = NULL, *ptr_next = NULL;
80	>	char buff[IRCD_BUFSIZE] = { '\0' };
81
82	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
82	>	if ((file = fopen(LIPATH, "w")) == NULL)
83		return;
84
85	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
85	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
86		{
87	<	next_mptr = mptr->next;
88	<	MyFree(mptr);
87	>	dlinkDelete(ptr, &flatten_links);
88	>	MyFree(ptr->data);
89	>	free_dlink_node(ptr);
90		}
91
269	–	MessageFileptr->contentsOfFile = NULL;
270	–	currentMessageLine             = NULL;
271	–
92		DLINK_FOREACH(ptr, global_serv_list.head)
93		{
94	<	size_t nbytes = 0;
275	<	struct Client *target_p = ptr->data;
94	>	const struct Client *target_p = ptr->data;
95
96	<	/* skip ourselves, we send ourselves in /links */
97	<	if (IsMe(target_p))
96	>	/*
97	>	* Skip hidden servers, aswell as ourselves, since we already send
98	>	* ourselves in /links
99	>	*/
100	>	if (IsHidden(target_p) || IsMe(target_p))
101		continue;
102
103	<	/* skip hidden servers */
282	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
103	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
104		continue;
105
106	<	if (target_p->info[0])
107	<	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
106	>	/*
107	>	* Attempt to format the file in such a way it follows the usual links output
108		* ie  "servername uplink :hops info"
109		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
110		* - madmax
111		*/
112	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
113	+	me.name, target_p->info);
114	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
115	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
116	+	me.name, target_p->info);
117
118	<	/*
119	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
300	<	* default config but it is configurable..
301	<	* This should be changed to an snprintf at some point, but I'm wanting to
302	<	* know if this is a cause of a bug - cryogen
303	<	*/
304	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
305	<	MESSAGELINELEN);
306	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
307	<	target_p->name, me.name, p);
308	<	newMessageLine->next = NULL;
118	>	fputs(buff, file);
119	>	}
120
121	<	if (MessageFileptr->contentsOfFile)
122	<	{
312	<	if (currentMessageLine)
313	<	currentMessageLine->next = newMessageLine;
314	<	currentMessageLine = newMessageLine;
315	<	}
316	<	else
317	<	{
318	<	MessageFileptr->contentsOfFile = newMessageLine;
319	<	currentMessageLine = newMessageLine;
320	<	}
121	>	fclose(file);
122	>	}
123
124	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
125	<	fbputs(buff, file, nbytes);
124	>	void
125	>	read_links_file(void)
126	>	{
127	>	FILE *file = NULL;
128	>	char *p = NULL;
129	>	char buff[IRCD_BUFSIZE] = { '\0' };
130	>
131	>	if ((file = fopen(LIPATH, "r")) == NULL)
132	>	return;
133	>
134	>	while (fgets(buff, sizeof(buff), file))
135	>	{
136	>	if ((p = strchr(buff, '\n')) != NULL)
137	>	*p = '\0';
138	>
139	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
140		}
141
142	<	fbclose(file);
142	>	fclose(file);
143		}
144
145		/* hunt_server()
#	Line 347 | Line 163 | write_links_file(void* notused)
163		*/
164		int
165		hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
166	<	int server, int parc, char *parv[])
166	>	const int server, const int parc, char *parv[])
167		{
168		struct Client *target_p = NULL;
169		struct Client *target_tmp = NULL;
170		dlink_node *ptr;
171		int wilds;
172
173	<	/* Assume it's me, if no server
174	<	*/
175	<	if (parc <= server || EmptyString(parv[server]) ||
176	<	match(me.name, parv[server]) ||
177	<	match(parv[server], me.name) ||
178	<	!strcmp(parv[server], me.id))
363	<	return(HUNTED_ISME);
173	>	/* Assume it's me, if no server */
174	>	if (parc <= server || EmptyString(parv[server]))
175	>	return HUNTED_ISME;
176	>
177	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
178	>	return HUNTED_ISME;
179
180		/* These are to pickup matches that would cause the following
181		* message to go in the wrong direction while doing quick fast
#	Line 379 | Line 194 | hunt_server(struct Client *client_p, str
194		if (target_p->from == source_p->from && !MyConnect(target_p))
195		target_p = NULL;
196
197	<	collapse(parv[server]);
383	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
197	>	wilds = has_wildcards(parv[server]);
198
199		/* Again, if there are no wild cards involved in the server
200		* name, use the hash lookup
#	Line 392 | Line 206 | hunt_server(struct Client *client_p, str
206		if (!(target_p = hash_find_server(parv[server])))
207		{
208		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
209	<	me.name, parv[0], parv[server]);
210	<	return(HUNTED_NOSUCH);
209	>	me.name, source_p->name, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 402 | Line 216 | hunt_server(struct Client *client_p, str
216		{
217		target_tmp = ptr->data;
218
219	<	if (match(parv[server], target_tmp->name))
219	>	if (!match(parv[server], target_tmp->name))
220		{
221		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
222		continue;
#	Line 420 | Line 234 | hunt_server(struct Client *client_p, str
234		if(!IsRegistered(target_p))
235		{
236		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
237	<	me.name, parv[0], parv[server]);
237	>	me.name, source_p->name, parv[server]);
238		return HUNTED_NOSUCH;
239		}
240
241		if (IsMe(target_p) || MyClient(target_p))
242		return HUNTED_ISME;
243
244	<	if (!match(target_p->name, parv[server]))
244	>	if (match(target_p->name, parv[server]))
245		parv[server] = target_p->name;
246
247		/* This is a little kludgy but should work... */
#	Line 439 | Line 253 | hunt_server(struct Client *client_p, str
253		sendto_one(target_p, command, parv[0],
254		parv[1], parv[2], parv[3], parv[4],
255		parv[5], parv[6], parv[7], parv[8]);
256	<	return(HUNTED_PASS);
257	<	}
256	>	return HUNTED_PASS;
257	>	}
258
259		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
260	<	me.name, parv[0], parv[server]);
261	<	return(HUNTED_NOSUCH);
260	>	me.name, source_p->name, parv[server]);
261	>	return HUNTED_NOSUCH;
262		}
263
264		/* try_connections()
#	Line 460 | Line 274 | hunt_server(struct Client *client_p, str
274		void
275		try_connections(void *unused)
276		{
277	<	dlink_node *ptr;
278	<	struct ConfItem *conf;
465	<	struct AccessItem *aconf;
466	<	struct ClassItem *cltmp;
277	>	dlink_node *ptr = NULL;
278	>	struct MaskItem *conf;
279		int confrq;
280
281		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
#	Line 473 | Line 285 | try_connections(void *unused)
285		DLINK_FOREACH(ptr, server_items.head)
286		{
287		conf = ptr->data;
476	–	aconf = map_to_conf(conf);
288
289	<	/* Also when already connecting! (update holdtimes) --SRB
289	>	assert(conf->type == CONF_SERVER);
290	>
291	>	/* Also when already connecting! (update holdtimes) --SRB
292		*/
293	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
481	<	!(IsConfAllowAutoConn(aconf)))
293	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
294		continue;
295
484	–	cltmp = map_to_conf(aconf->class_ptr);
296
297		/* Skip this entry if the use of it is still on hold until
298		* future. Otherwise handle this entry (and set it on hold
#	Line 489 | Line 300 | try_connections(void *unused)
300		* made one successfull connection... [this algorithm is
301		* a bit fuzzy... -- msa >;) ]
302		*/
303	<	if (aconf->hold > CurrentTime)
303	>	if (conf->until > CurrentTime)
304		continue;
305
306	<	if (cltmp == NULL)
306	>	if (conf->class == NULL)
307		confrq = DEFAULT_CONNECTFREQUENCY;
308		else
309		{
310	<	confrq = ConFreq(cltmp);
311	<	if (confrq < MIN_CONN_FREQ )
312	<	confrq = MIN_CONN_FREQ;
310	>	confrq = conf->class->con_freq;
311	>	if (confrq < MIN_CONN_FREQ)
312	>	confrq = MIN_CONN_FREQ;
313		}
314
315	<	aconf->hold = CurrentTime + confrq;
315	>	conf->until = CurrentTime + confrq;
316
317		/* Found a CONNECT config with port specified, scan clients
318		* and see if this server is already connected?
#	Line 509 | Line 320 | try_connections(void *unused)
320		if (hash_find_server(conf->name) != NULL)
321		continue;
322
323	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
323	>	if (conf->class->ref_count < conf->class->max_total)
324		{
325		/* Go to the end of the list, if not already last */
326		if (ptr->next != NULL)
#	Line 530 | Line 341 | try_connections(void *unused)
341		*   -- adrian
342		*/
343		if (ConfigServerHide.hide_server_ips)
344	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
344	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
345	>	"Connection to %s activated.",
346		conf->name);
347		else
348	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
349	<	conf->name, aconf->host);
348	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
349	>	"Connection to %s[%s] activated.",
350	>	conf->name, conf->host);
351
352	<	serv_connect(aconf, NULL);
352	>	serv_connect(conf, NULL);
353		/* We connect only one at time... */
354		return;
355		}
#	Line 565 | Line 378 | valid_servname(const char *name)
378		}
379
380		int
381	<	check_server(const char *name, struct Client *client_p, int cryptlink)
381	>	check_server(const char *name, struct Client *client_p)
382		{
383		dlink_node *ptr;
384	<	struct ConfItem *conf           = NULL;
385	<	struct ConfItem *server_conf    = NULL;
573	<	struct AccessItem *server_aconf = NULL;
574	<	struct AccessItem *aconf        = NULL;
384	>	struct MaskItem *conf        = NULL;
385	>	struct MaskItem *server_conf = NULL;
386		int error = -1;
387
388		assert(client_p != NULL);
389
579	–	if (client_p == NULL)
580	–	return(error);
581	–
582	–	if (strlen(name) > HOSTLEN)
583	–	return(-4);
584	–
390		/* loop through looking for all possible connect items that might work */
391		DLINK_FOREACH(ptr, server_items.head)
392		{
393		conf = ptr->data;
589	–	aconf = map_to_conf(conf);
394
395	<	if (!match(name, conf->name))
395	>	if (match(name, conf->name))
396		continue;
397
398		error = -3;
399
400		/* XXX: Fix me for IPv6                    */
401		/* XXX sockhost is the IPv4 ip as a string */
402	<	if (match(aconf->host, client_p->host) ||
403	<	match(aconf->host, client_p->sockhost))
402	>	if (!match(conf->host, client_p->host) ||
403	>	!match(conf->host, client_p->sockhost))
404		{
405		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);
406
407	<	if (IsConfEncrypted(aconf))
408	<	{
409	<	if (strcmp(aconf->passwd,
410	<	(const char *)crypt(client_p->localClient->passwd,
411	<	aconf->passwd)) == 0)
412	<	server_conf = conf;
413	<	}
414	<	else
627	<	{
628	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
629	<	server_conf = conf;
630	<	}
631	<	}
407	>	if (!match_conf_password(client_p->localClient->passwd, conf))
408	>	return -2;
409	>
410	>	if (!EmptyString(conf->certfp))
411	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
412	>	return -4;
413	>
414	>	server_conf = conf;
415		}
416		}
417
418		if (server_conf == NULL)
419	<	return(error);
419	>	return error;
420
421		attach_conf(client_p, server_conf);
422
640	–	/* Now find all leaf or hub config items for this server */
641	–	DLINK_FOREACH(ptr, hub_items.head)
642	–	{
643	–	conf = ptr->data;
423
424	<	if (!match(name, conf->name))
646	<	continue;
647	<	attach_conf(client_p, conf);
648	<	}
649	<
650	<	DLINK_FOREACH(ptr, leaf_items.head)
651	<	{
652	<	conf = ptr->data;
653	<
654	<	if (!match(name, conf->name))
655	<	continue;
656	<	attach_conf(client_p, conf);
657	<	}
658	<
659	<	server_aconf = map_to_conf(server_conf);
660	<
661	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
662	<	if (!IsConfCompressed(server_aconf))
663	<	#endif
664	<	ClearCap(client_p, CAP_ZIP);
665	<	if (!IsConfCryptLink(server_aconf))
666	<	ClearCap(client_p, CAP_ENC);
667	<	if (!IsConfTopicBurst(server_aconf))
668	<	{
669	<	ClearCap(client_p, CAP_TB);
670	<	ClearCap(client_p, CAP_TBURST);
671	<	}
672	<
673	<	if (aconf != NULL)
424	>	if (server_conf != NULL)
425		{
426		struct sockaddr_in *v4;
427		#ifdef IPV6
428		struct sockaddr_in6 *v6;
429		#endif
430	<	switch (aconf->aftype)
430	>	switch (server_conf->aftype)
431		{
432		#ifdef IPV6
433	<	case AF_INET6:
434	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
433	>	case AF_INET6:
434	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
435
436		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
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		#endif
440		case AF_INET:
441	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
441	>	v4 = (struct sockaddr_in *)&server_conf->addr;
442
443		if (v4->sin_addr.s_addr == INADDR_NONE)
444	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
444	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
445		break;
446		}
447		}
448
449	<	return(0);
449	>	return 0;
450		}
451
452		/* add_capability()
#	Line 712 | Line 463 | add_capability(const char *capab_name, i
463		{
464		struct Capability *cap = MyMalloc(sizeof(*cap));
465
466	<	DupString(cap->name, capab_name);
466	>	cap->name = xstrdup(capab_name);
467		cap->cap = cap_flag;
468		dlinkAdd(cap, &cap->node, &cap_list);
469
#	Line 741 | Line 492 | delete_capability(const char *capab_name
492		{
493		if (irccmp(cap->name, capab_name) == 0)
494		{
495	<	default_server_capabs &= ~(cap->cap);
496	<	dlinkDelete(ptr, &cap_list);
497	<	MyFree(cap->name);
498	<	cap->name = NULL;
748	<	MyFree(cap);
495	>	default_server_capabs &= ~(cap->cap);
496	>	dlinkDelete(ptr, &cap_list);
497	>	MyFree(cap->name);
498	>	MyFree(cap);
499		}
500		}
501		}
#	Line 760 | Line 510 | delete_capability(const char *capab_name
510		* output       - 0 if not found CAPAB otherwise
511		* side effects - none
512		*/
513	<	int
513	>	unsigned int
514		find_capability(const char *capab)
515		{
516		const dlink_node *ptr = NULL;
#	Line 779 | Line 529 | find_capability(const char *capab)
529		/* send_capabilities()
530		*
531		* inputs       - Client pointer to send to
782	–	*              - Pointer to AccessItem (for crypt)
532		*              - int flag of capabilities that this server can send
784	–	*              - int flag of encryption capabilities
533		* output       - NONE
534		* side effects - send the CAPAB line to a server  -orabidoo
535		*
536		*/
537		void
538	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
791	<	int cap_can_send, int enc_can_send)
538	>	send_capabilities(struct Client *client_p, int cap_can_send)
539		{
540		struct Capability *cap=NULL;
541		char msgbuf[IRCD_BUFSIZE];
542		char *t;
543		int tl;
544		dlink_node *ptr;
798	–	#ifdef HAVE_LIBCRYPTO
799	–	const struct EncCapability *epref = NULL;
800	–	char *capend;
801	–	int sent_cipher = 0;
802	–	#endif
545
546		t = msgbuf;
547
#	Line 809 | Line 551 | send_capabilities(struct Client *client_
551
552		if (cap->cap & (cap_can_send|default_server_capabs))
553		{
554	<	tl = ircsprintf(t, "%s ", cap->name);
554	>	tl = sprintf(t, "%s ", cap->name);
555		t += tl;
556		}
557		}
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	–	}
558
837	–	if (!sent_cipher)
838	–	t = capend; /* truncate string before ENC:, below */
839	–	}
840	–	#endif
559		*(t - 1) = '\0';
560		sendto_one(client_p, "CAPAB :%s", msgbuf);
561		}
562
563		/* sendnick_TS()
564	<	*
564	>	*
565		* inputs       - client (server) to send nick towards
566		*          - client to send nick for
567		* output       - NONE
#	Line 852 | Line 570 | send_capabilities(struct Client *client_
570		void
571		sendnick_TS(struct Client *client_p, struct Client *target_p)
572		{
573	<	static char ubuf[12];
573	>	char ubuf[IRCD_BUFSIZE];
574
575		if (!IsClient(target_p))
576		return;
577
578	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
861	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
578	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
579
580		if (ubuf[0] == '\0')
581		{
#	Line 866 | Line 583 | sendnick_TS(struct Client *client_p, str
583		ubuf[1] = '\0';
584		}
585
869	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
586		if (IsCapable(client_p, CAP_SVS))
587		{
588		if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
589	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
589	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
590		target_p->servptr->id,
591		target_p->name, target_p->hopcount + 1,
592		(unsigned long) target_p->tsinfo,
593		ubuf, target_p->username, target_p->host,
594		(MyClient(target_p) && IsIPSpoof(target_p)) ?
595		"0" : target_p->sockhost, target_p->id,
596	<	(unsigned long)target_p->servicestamp, target_p->info);
596	>	target_p->svid, target_p->info);
597		else
598	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
598	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
599		target_p->name, target_p->hopcount + 1,
600		(unsigned long) target_p->tsinfo,
601		ubuf, target_p->username, target_p->host,
602	<	target_p->servptr->name, (unsigned long)target_p->servicestamp,
602	>	target_p->servptr->name, target_p->svid,
603		target_p->info);
604		}
605		else
#	Line 904 | Line 620 | sendnick_TS(struct Client *client_p, str
620		target_p->servptr->name, target_p->info);
621		}
622
623	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
624	<	if (!EmptyString(target_p->away))
625	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
626	<	target_p->away);
623	>	if (!EmptyString(target_p->certfp))
624	>	sendto_one(client_p, ":%s CERTFP %s",
625	>	ID_or_name(target_p, client_p), target_p->certfp);
626	>
627	>	if (target_p->away[0])
628	>	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
629	>	target_p->away);
630
631		}
632
#	Line 919 | Line 638 | sendnick_TS(struct Client *client_p, str
638		* side effects - build up string representing capabilities of server listed
639		*/
640		const char *
641	<	show_capabilities(struct Client *target_p)
641	>	show_capabilities(const struct Client *target_p)
642		{
643	<	static char msgbuf[IRCD_BUFSIZE];
644	<	char *t = msgbuf;
926	<	dlink_node *ptr;
643	>	static char msgbuf[IRCD_BUFSIZE] = "";
644	>	const dlink_node *ptr = NULL;
645
646	<	t += ircsprintf(msgbuf, "TS ");
646	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
647
648		DLINK_FOREACH(ptr, cap_list.head)
649		{
650		const struct Capability *cap = ptr->data;
651
652	<	if (IsCapable(target_p, cap->cap))
653	<	t += ircsprintf(t, "%s ", cap->name);
652	>	if (!IsCapable(target_p, cap->cap))
653	>	continue;
654	>
655	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
656	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
657		}
937	–	#ifdef HAVE_LIBCRYPTO
938	–	if (IsCapable(target_p, CAP_ENC) &&
939	–	target_p->localClient->in_cipher &&
940	–	target_p->localClient->out_cipher)
941	–	t += ircsprintf(t, "ENC:%s ",
942	–	target_p->localClient->in_cipher->name);
943	–	#endif
944	–	*(t - 1) = '\0';
658
659	<	return(msgbuf);
659	>	return msgbuf;
660		}
661
662		/* make_server()
#	Line 972 | Line 685 | void
685		server_estab(struct Client *client_p)
686		{
687		struct Client *target_p;
688	<	struct ConfItem *conf;
976	<	struct AccessItem *aconf=NULL;
688	>	struct MaskItem *conf = NULL;
689		char *host;
690		const char *inpath;
691		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
692		dlink_node *ptr;
693	+	#ifdef HAVE_LIBCRYPTO
694	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
695	+	#endif
696
697		assert(client_p != NULL);
698
#	Line 986 | Line 701 | server_estab(struct Client *client_p)
701		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
702		host   = client_p->name;
703
704	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
704	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
705		== NULL)
706		{
707		/* This shouldn't happen, better tell the ops... -A1kmm */
708	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
708	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
709	>	"Warning: Lost connect{} block "
710		"for server %s(this shouldn't happen)!", host);
711		exit_client(client_p, &me, "Lost connect{} block!");
712		return;
#	Line 1005 | Line 721 | server_estab(struct Client *client_p)
721		/* If there is something in the serv_list, it might be this
722		* connecting server..
723		*/
724	<	if (!ServerInfo.hub && serv_list.head)
724	>	if (!ServerInfo.hub && serv_list.head)
725		{
726		if (client_p != serv_list.head->data || serv_list.head->next)
727		{
#	Line 1016 | Line 732 | server_estab(struct Client *client_p)
732		}
733		}
734
735	<	aconf = map_to_conf(conf);
1020	<
1021	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
735	>	if (IsUnknown(client_p))
736		{
737	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
738	<	*        2.  Check aconf->spasswd, not aconf->passwd.
739	<	*/
1026	<	if (!EmptyString(aconf->spasswd))
1027	<	sendto_one(client_p, "PASS %s TS %d %s",
1028	<	aconf->spasswd, TS_CURRENT, me.id);
1029	<
1030	<	/* Pass my info to the new server
1031	<	*
1032	<	* Pass on ZIP if supported
1033	<	* Pass on TB if supported.
1034	<	* - Dianora
1035	<	*/
737	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
738	>
739	>	send_capabilities(client_p, 0);
740
1037	–	send_capabilities(client_p, aconf,
1038	–	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1039	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1040	–
1041	–	/* SERVER is the last command sent before switching to ziplinks.
1042	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1043	–	* on the wire immediately.  Otherwise, it could be sitting in
1044	–	* a kernel buffer when we start sending zipped data, and the
1045	–	* parser on the receiving side can't hand both unzipped and zipped
1046	–	* data in one packet. --Rodder
1047	–	*
1048	–	* currently we only need to call send_queued_write,
1049	–	* Nagle is already disabled at this point --adx
1050	–	*/
741		sendto_one(client_p, "SERVER %s 1 :%s%s",
742		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
1053	–	send_queued_write(client_p);
1054	–	}
1055	–
1056	–	/* Hand the server off to servlink now */
1057	–	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1058	–	{
1059	–	if (fork_server(client_p) < 0)
1060	–	{
1061	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1062	–	"Warning: fork failed for server %s -- check servlink_path (%s)",
1063	–	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1064	–	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1065	–	"%s -- check servlink_path (%s)",
1066	–	get_client_name(client_p, MASK_IP),
1067	–	ConfigFileEntry.servlink_path);
1068	–	exit_client(client_p, &me, "fork failed");
1069	–	return;
1070	–	}
1071	–
1072	–	start_io(client_p);
1073	–	SetServlink(client_p);
743		}
744
745		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
#	Line 1081 | Line 750 | server_estab(struct Client *client_p)
750		hash_add_id(client_p);
751
752		/* XXX Does this ever happen? I don't think so -db */
753	<	detach_conf(client_p, OPER_TYPE);
753	>	detach_conf(client_p, CONF_OPER);
754
755		/* *WARNING*
756		**    In the following code in place of plain server's
#	Line 1121 | Line 790 | server_estab(struct Client *client_p)
790		make_server(client_p);
791
792		/* fixing eob timings.. -gnp */
793	<	client_p->firsttime = CurrentTime;
1125	<
793	>	client_p->localClient->firsttime = CurrentTime;
794
795	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
796	<	SetService(client_p);
795	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
796	>	AddFlag(client_p, FLAGS_SERVICE);
797
798		/* Show the real host/IP to admins */
799	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
800	<	"Link with %s established: (%s) link",
1133	<	inpath_ip,show_capabilities(client_p));
1134	<	/* Now show the masked hostname/IP to opers */
1135	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1136	<	"Link with %s established: (%s) link",
1137	<	inpath,show_capabilities(client_p));
1138	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1139	<	inpath_ip, show_capabilities(client_p));
1140	<
1141	<	client_p->serv->sconf = conf;
1142	<
1143	<	if (HasServlink(client_p))
799	>	#ifdef HAVE_LIBCRYPTO
800	>	if (client_p->localClient->fd.ssl)
801		{
802	<	/* we won't overflow FD_DESC_SZ here, as it can hold
803	<	* client_p->name + 64
804	<	*/
805	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
806	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
802	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
803	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
804	>
805	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
806	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
807	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
808	>	compression ? SSL_COMP_get_name(compression) : "NONE",
809	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
810	>	show_capabilities(client_p));
811	>	/* Now show the masked hostname/IP to opers */
812	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
813	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
814	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
815	>	compression ? SSL_COMP_get_name(compression) : "NONE",
816	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
817	>	show_capabilities(client_p));
818	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
819	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
820	>	compression ? SSL_COMP_get_name(compression) : "NONE",
821	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
822	>	show_capabilities(client_p));
823		}
824		else
825	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
825	>	#endif
826	>	{
827	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
828	>	"Link with %s established: (Capabilities: %s)",
829	>	inpath_ip, show_capabilities(client_p));
830	>	/* Now show the masked hostname/IP to opers */
831	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
832	>	"Link with %s established: (Capabilities: %s)",
833	>	inpath, show_capabilities(client_p));
834	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
835	>	inpath_ip, show_capabilities(client_p));
836	>	}
837	>
838	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
839
840		/* Old sendto_serv_but_one() call removed because we now
841		** need to send different names to different servers
#	Line 1168 | Line 854 | server_estab(struct Client *client_p)
854		IsHidden(client_p) ? "(H) " : "",
855		client_p->info);
856		else
857	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
857	>	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
858		me.name, client_p->name,
859		IsHidden(client_p) ? "(H) " : "",
860		client_p->info);
861		}
862
863	<	/* Pass on my client information to the new server
864	<	**
865	<	** First, pass only servers (idea is that if the link gets
866	<	** cancelled beacause the server was already there,
867	<	** there are no NICK's to be cancelled...). Of course,
868	<	** if cancellation occurs, all this info is sent anyway,
869	<	** and I guess the link dies when a read is attempted...? --msa
870	<	**
871	<	** Note: Link cancellation to occur at this point means
872	<	** that at least two servers from my fragment are building
873	<	** up connection this other fragment at the same time, it's
874	<	** a race condition, not the normal way of operation...
875	<	**
876	<	** ALSO NOTE: using the get_client_name for server names--
877	<	**    see previous *WARNING*!!! (Also, original inpath
878	<	**    is destroyed...)
879	<	*/
863	>	/*
864	>	* Pass on my client information to the new server
865	>	*
866	>	* First, pass only servers (idea is that if the link gets
867	>	* cancelled beacause the server was already there,
868	>	* there are no NICK's to be cancelled...). Of course,
869	>	* if cancellation occurs, all this info is sent anyway,
870	>	* and I guess the link dies when a read is attempted...? --msa
871	>	*
872	>	* Note: Link cancellation to occur at this point means
873	>	* that at least two servers from my fragment are building
874	>	* up connection this other fragment at the same time, it's
875	>	* a race condition, not the normal way of operation...
876	>	*
877	>	* ALSO NOTE: using the get_client_name for server names--
878	>	*    see previous *WARNING*!!! (Also, original inpath
879	>	*    is destroyed...)
880	>	*/
881
882		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
883		{
#	Line 1213 | Line 900 | server_estab(struct Client *client_p)
900		IsHidden(target_p) ? "(H) " : "", target_p->info);
901		}
902		else
903	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
903	>	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
904		target_p->servptr->name, target_p->name, target_p->hopcount+1,
905		IsHidden(target_p) ? "(H) " : "", target_p->info);
1219	–	}
1220	–
1221	–	server_burst(client_p);
1222	–	}
1223	–
1224	–	static void
1225	–	start_io(struct Client *server)
1226	–	{
1227	–	struct LocalUser *lserver = server->localClient;
1228	–	int alloclen = 1;
1229	–	char *buf;
1230	–	dlink_node *ptr;
1231	–	struct dbuf_block *block;
1232	–
1233	–	/* calculate how many bytes to allocate */
1234	–	if (IsCapable(server, CAP_ZIP))
1235	–	alloclen += 6;
1236	–	#ifdef HAVE_LIBCRYPTO
1237	–	if (IsCapable(server, CAP_ENC))
1238	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1239	–	#endif
1240	–	alloclen += dbuf_length(&lserver->buf_recvq);
1241	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1242	–	alloclen += dbuf_length(&lserver->buf_sendq);
1243	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1244	–
1245	–	/* initialize servlink control sendq */
1246	–	lserver->slinkq = buf = MyMalloc(alloclen);
1247	–	lserver->slinkq_ofs = 0;
1248	–	lserver->slinkq_len = alloclen;
1249	–
1250	–	if (IsCapable(server, CAP_ZIP))
1251	–	{
1252	–	/* ziplink */
1253	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1254	–	*buf++ = 0; /* |          */
1255	–	*buf++ = 1; /* \ len is 1 */
1256	–	*buf++ = ConfigFileEntry.compression_level;
1257	–	*buf++ = SLINKCMD_START_ZIP_IN;
1258	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1259	–	}
1260	–	#ifdef HAVE_LIBCRYPTO
1261	–	if (IsCapable(server, CAP_ENC))
1262	–	{
1263	–	/* Decryption settings */
1264	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1265	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1266	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1267	–	*buf++ = lserver->in_cipher->cipherid;
1268	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1269	–	*buf++ = 0; /* keylen < 256 */
1270	–	*buf++ = lserver->in_cipher->keylen;
1271	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1272	–	buf += lserver->in_cipher->keylen;
1273	–	/* Encryption settings */
1274	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1275	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1276	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1277	–	*buf++ = lserver->out_cipher->cipherid;
1278	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1279	–	*buf++ = 0; /* keylen < 256 */
1280	–	*buf++ = lserver->out_cipher->keylen;
1281	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1282	–	buf += lserver->out_cipher->keylen;
1283	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1284	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1285	–	}
1286	–	#endif
1287	–
1288	–	/* pass the whole recvq to servlink */
1289	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1290	–	{
1291	–	block = ptr->data;
1292	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1293	–	*buf++ = (block->size >> 8);
1294	–	*buf++ = (block->size & 0xff);
1295	–	memcpy(buf, &block->data[0], block->size);
1296	–	buf += block->size;
1297	–	}
1298	–
1299	–	dbuf_clear(&lserver->buf_recvq);
1300	–
1301	–	/* pass the whole sendq to servlink */
1302	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1303	–	{
1304	–	block = ptr->data;
1305	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1306	–	*buf++ = (block->size >> 8);
1307	–	*buf++ = (block->size & 0xff);
1308	–	memcpy(buf, &block->data[0], block->size);
1309	–	buf += block->size;
1310	–	}
1311	–
1312	–	dbuf_clear(&lserver->buf_sendq);
1313	–
1314	–	/* start io */
1315	–	*buf++ = SLINKCMD_INIT;
1316	–
1317	–	/* schedule a write */
1318	–	send_queued_slink_write(server);
1319	–	}
1320	–
1321	–	/* fork_server()
1322	–	*
1323	–	* inputs       - struct Client *server
1324	–	* output       - success: 0 / failure: -1
1325	–	* side effect  - fork, and exec SERVLINK to handle this connection
1326	–	*/
1327	–	static int
1328	–	fork_server(struct Client *server)
1329	–	{
1330	–	#ifndef HAVE_SOCKETPAIR
1331	–	return -1;
1332	–	#else
1333	–	int i;
1334	–	int slink_fds[2][2];
1335	–	/* 0? - ctrl  | 1? - data
1336	–	* ?0 - child | ?1 - parent */
1337	–
1338	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1339	–	return -1;
1340	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1341	–	goto free_ctrl_fds;
1342	–
1343	–	if ((i = fork()) < 0)
1344	–	{
1345	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1346	–	free_ctrl_fds:
1347	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1348	–	return -1;
1349	–	}
1350	–
1351	–	if (i == 0)
1352	–	{
1353	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1354	–	char *kid_argv[7];
1355	–
1356	–	#ifdef O_ASYNC
1357	–	fcntl(server->localClient->fd.fd, F_SETFL,
1358	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1359	–	#endif
1360	–	close_fds(&server->localClient->fd);
1361	–	close(slink_fds[0][1]);
1362	–	close(slink_fds[1][1]);
906
907	<	sprintf(fd_str[0], "%d", slink_fds[0][0]);
908	<	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1366	<	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1367	<
1368	<	kid_argv[0] = "-slink";
1369	<	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1370	<	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1371	<	kid_argv[5] = fd_str[2];    /* network */
1372	<	kid_argv[6] = NULL;
1373	<
1374	<	execv(ConfigFileEntry.servlink_path, kid_argv);
1375	<
1376	<	_exit(1);
907	>	if (HasFlag(target_p, FLAGS_EOB))
908	>	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
909		}
910
911	<	/* close the network fd and the child ends of the pipes */
1380	<	fd_close(&server->localClient->fd);
1381	<	close(slink_fds[0][0]);
1382	<	close(slink_fds[1][0]);
1383	<
1384	<	execute_callback(setup_socket_cb, slink_fds[0][1]);
1385	<	execute_callback(setup_socket_cb, slink_fds[1][1]);
1386	<
1387	<	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1388	<	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1389	<
1390	<	read_ctrl_packet(&server->localClient->ctrlfd, server);
1391	<	read_packet(&server->localClient->fd, server);
1392	<
1393	<	return 0;
1394	<	#endif
911	>	server_burst(client_p);
912		}
913
914		/* server_burst()
#	Line 1424 | Line 941 | server_burst(struct Client *client_p)
941
942		/* burst_all()
943		*
944	<	* inputs       - pointer to server to send burst to
944	>	* inputs       - pointer to server to send burst to
945		* output       - NONE
946		* side effects - complete burst of channels/nicks is sent to client_p
947		*/
#	Line 1442 | Line 959 | burst_all(struct Client *client_p)
959		burst_members(client_p, chptr);
960		send_channel_modes(client_p, chptr);
961
962	<	if (IsCapable(client_p, CAP_TBURST) ||
963	<	IsCapable(client_p, CAP_TB))
1447	<	send_tb(client_p, chptr);
962	>	if (IsCapable(client_p, CAP_TBURST))
963	>	send_tb(client_p, chptr);
964		}
965		}
966
#	Line 1454 | Line 970 | burst_all(struct Client *client_p)
970		{
971		struct Client *target_p = ptr->data;
972
973	<	if (!IsBursted(target_p) && target_p->from != client_p)
973	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
974		sendnick_TS(client_p, target_p);
975	<
976	<	ClearBursted(target_p);
975	>
976	>	DelFlag(target_p, FLAGS_BURSTED);
977		}
978
1463	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1464	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1465	–	*/
1466	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
979		if (IsCapable(client_p, CAP_EOB))
980		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
981		}
#	Line 1475 | Line 987 | burst_all(struct Client *client_p)
987		*              - pointer to channel
988		* output       - NONE
989		* side effects - Called on a server burst when
990	<	*                server is CAP_TB|CAP_TBURST capable
990	>	*                server is CAP_TBURST capable
991		*/
992		static void
993		send_tb(struct Client *client_p, struct Channel *chptr)
#	Line 1494 | Line 1006 | send_tb(struct Client *client_p, struct
1006		* for further information   -Michael
1007		*/
1008		if (chptr->topic_time != 0)
1009	<	{
1010	<	if (IsCapable(client_p, CAP_TBURST))
1011	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1012	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
1013	<	(unsigned long)chptr->topic_time,
1014	<	chptr->topic_info,
1503	<	chptr->topic);
1504	<	else if (IsCapable(client_p, CAP_TB))
1505	<	{
1506	<	if (ConfigChannel.burst_topicwho)
1507	<	{
1508	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1509	<	me.name, chptr->chname,
1510	<	(unsigned long)chptr->topic_time,
1511	<	chptr->topic_info, chptr->topic);
1512	<	}
1513	<	else
1514	<	{
1515	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1516	<	me.name, chptr->chname,
1517	<	(unsigned long)chptr->topic_time,
1518	<	chptr->topic);
1519	<	}
1520	<	}
1521	<	}
1009	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1010	>	ID_or_name(&me, client_p),
1011	>	(unsigned long)chptr->channelts, chptr->chname,
1012	>	(unsigned long)chptr->topic_time,
1013	>	chptr->topic_info,
1014	>	chptr->topic);
1015		}
1016
1017		/* burst_members()
#	Line 1540 | Line 1033 | burst_members(struct Client *client_p, s
1033		ms       = ptr->data;
1034		target_p = ms->client_p;
1035
1036	<	if (!IsBursted(target_p))
1036	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1037		{
1038	<	SetBursted(target_p);
1038	>	AddFlag(target_p, FLAGS_BURSTED);
1039
1040		if (target_p->from != client_p)
1041		sendnick_TS(client_p, target_p);
#	Line 1557 | Line 1050 | burst_members(struct Client *client_p, s
1050
1051		/* serv_connect() - initiate a server connection
1052		*
1053	<	* inputs       - pointer to conf
1053	>	* inputs       - pointer to conf
1054		*              - pointer to client doing the connect
1055		* output       -
1056		* side effects -
#	Line 1572 | Line 1065 | burst_members(struct Client *client_p, s
1065		* it suceeded or not, and 0 if it fails in here somewhere.
1066		*/
1067		int
1068	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1068	>	serv_connect(struct MaskItem *conf, struct Client *by)
1069		{
1577	–	struct ConfItem *conf;
1070		struct Client *client_p;
1071	<	char buf[HOSTIPLEN];
1071	>	char buf[HOSTIPLEN + 1];
1072
1073		/* conversion structs */
1074		struct sockaddr_in *v4;
1075	<	/* Make sure aconf is useful */
1076	<	assert(aconf != NULL);
1585	<
1586	<	if(aconf == NULL)
1587	<	return (0);
1075	>	/* Make sure conf is useful */
1076	>	assert(conf != NULL);
1077
1589	–	/* XXX should be passing struct ConfItem in the first place */
1590	–	conf = unmap_conf_item(aconf);
1078
1079	<	/* log */
1593	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
1079	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1080		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1081	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1081	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1082		buf);
1083
1084		/* Still processing a DNS lookup? -> exit */
1085	<	if (aconf->dns_pending)
1085	>	if (conf->dns_pending)
1086		{
1087	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1087	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1088		"Error connecting to %s: DNS lookup for connect{} in progress.",
1089		conf->name);
1090		return (0);
1091		}
1092
1093	<	if (aconf->dns_failed)
1093	>	if (conf->dns_failed)
1094		{
1095	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1095	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1096		"Error connecting to %s: DNS lookup for connect{} failed.",
1097		conf->name);
1098		return (0);
1099		}
1100
1101		/* Make sure this server isn't already connected
1102	<	* Note: aconf should ALWAYS be a valid C: line
1102	>	* Note: conf should ALWAYS be a valid C: line
1103		*/
1104		if ((client_p = hash_find_server(conf->name)) != NULL)
1105	<	{
1106	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1107	<	"Server %s already present from %s",
1108	<	conf->name, get_client_name(client_p, SHOW_IP));
1109	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1110	<	"Server %s already present from %s",
1111	<	conf->name, get_client_name(client_p, MASK_IP));
1105	>	{
1106	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1107	>	"Server %s already present from %s",
1108	>	conf->name, get_client_name(client_p, SHOW_IP));
1109	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1110	>	"Server %s already present from %s",
1111	>	conf->name, get_client_name(client_p, MASK_IP));
1112		if (by && IsClient(by) && !MyClient(by))
1113		sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1114	<	me.name, by->name, conf->name,
1115	<	get_client_name(client_p, MASK_IP));
1116	<	return (0);
1114	>	me.name, by->name, conf->name,
1115	>	get_client_name(client_p, MASK_IP));
1116	>	return 0;
1117		}
1118	<
1118	>
1119		/* Create a local client */
1120		client_p = make_client(NULL);
1121
1122		/* Copy in the server, hostname, fd */
1123		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1124	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1124	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1125
1126		/* We already converted the ip once, so lets use it - stu */
1127		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1128
1129	<	/* create a socket for the server connection */
1130	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1129	>	/* create a socket for the server connection */
1130	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1131		SOCK_STREAM, 0, NULL) < 0)
1132		{
1133		/* Eek, failure to create the socket */
1134	<	report_error(L_ALL,
1135	<	"opening stream socket to %s: %s", conf->name, errno);
1134	>	report_error(L_ALL, "opening stream socket to %s: %s",
1135	>	conf->name, errno);
1136		SetDead(client_p);
1137		exit_client(client_p, &me, "Connection failed");
1138	<	return (0);
1138	>	return 0;
1139		}
1140
1141		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1658 | Line 1144 | serv_connect(struct AccessItem *aconf, s
1144		/* Attach config entries to client here rather than in
1145		* serv_connect_callback(). This to avoid null pointer references.
1146		*/
1147	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1147	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1148		{
1149	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1150	<	"Host %s is not enabled for connecting:no C/N-line",
1151	<	conf->name);
1152	<	if (by && IsClient(by) && !MyClient(by))
1149	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1150	>	"Host %s is not enabled for connecting: no connect{} block",
1151	>	conf->name);
1152	>	if (by && IsClient(by) && !MyClient(by))
1153		sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1154	<	me.name, by->name, client_p->name);
1154	>	me.name, by->name, client_p->name);
1155		SetDead(client_p);
1156		exit_client(client_p, client_p, "Connection failed");
1157	<	return (0);
1157	>	return 0;
1158		}
1159
1160		/* at this point we have a connection in progress and C/N lines
#	Line 1687 | Line 1173 | serv_connect(struct AccessItem *aconf, s
1173		SetConnecting(client_p);
1174		dlinkAdd(client_p, &client_p->node, &global_client_list);
1175		/* from def_fam */
1176	<	client_p->localClient->aftype = aconf->aftype;
1176	>	client_p->localClient->aftype = conf->aftype;
1177
1178		/* Now, initiate the connection */
1179	<	/* XXX assume that a non 0 type means a specific bind address
1179	>	/* XXX assume that a non 0 type means a specific bind address
1180		* for this connect.
1181		*/
1182	<	switch (aconf->aftype)
1182	>	switch (conf->aftype)
1183		{
1184		case AF_INET:
1185	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1185	>	v4 = (struct sockaddr_in*)&conf->bind;
1186		if (v4->sin_addr.s_addr != 0)
1187		{
1188		struct irc_ssaddr ipn;
1189		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1190		ipn.ss.ss_family = AF_INET;
1191		ipn.ss_port = 0;
1192	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1193	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1194	<	(struct sockaddr *)&ipn, ipn.ss_len,
1195	<	serv_connect_callback, client_p, aconf->aftype,
1196	<	CONNECTTIMEOUT);
1192	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1193	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1194	>	(struct sockaddr *)&ipn, ipn.ss_len,
1195	>	serv_connect_callback, client_p, conf->aftype,
1196	>	CONNECTTIMEOUT);
1197		}
1198		else if (ServerInfo.specific_ipv4_vhost)
1199		{
#	Line 1716 | Line 1202 | serv_connect(struct AccessItem *aconf, s
1202		ipn.ss.ss_family = AF_INET;
1203		ipn.ss_port = 0;
1204		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1205	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1205	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1206		(struct sockaddr *)&ipn, ipn.ss_len,
1207	<	serv_connect_callback, client_p, aconf->aftype,
1208	<	CONNECTTIMEOUT);
1207	>	serv_connect_callback, client_p, conf->aftype,
1208	>	CONNECTTIMEOUT);
1209		}
1210		else
1211	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1212	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1211	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1212	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1213		CONNECTTIMEOUT);
1214		break;
1215		#ifdef IPV6
1216		case AF_INET6:
1217		{
1218	<	struct irc_ssaddr ipn;
1219	<	struct sockaddr_in6 *v6;
1220	<	struct sockaddr_in6 *v6conf;
1221	<
1222	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1224	<	v6 = (struct sockaddr_in6 *)&ipn;
1225	<
1226	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1741	<	sizeof(struct in6_addr)) != 0)
1742	<	{
1743	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1744	<	ipn.ss.ss_family = AF_INET6;
1745	<	ipn.ss_port = 0;
1746	<	comm_connect_tcp(&client_p->localClient->fd,
1747	<	aconf->host, aconf->port,
1748	<	(struct sockaddr *)&ipn, ipn.ss_len,
1749	<	serv_connect_callback, client_p,
1750	<	aconf->aftype, CONNECTTIMEOUT);
1751	<	}
1752	<	else if (ServerInfo.specific_ipv6_vhost)
1218	>	struct irc_ssaddr ipn;
1219	>	struct sockaddr_in6 *v6;
1220	>	struct sockaddr_in6 *v6conf;
1221	>
1222	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1224	>	v6 = (struct sockaddr_in6 *)&ipn;
1225	>
1226	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1227		{
1228	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1229	<	ipn.ss.ss_family = AF_INET6;
1230	<	ipn.ss_port = 0;
1231	<	comm_connect_tcp(&client_p->localClient->fd,
1232	<	aconf->host, aconf->port,
1233	<	(struct sockaddr *)&ipn, ipn.ss_len,
1234	<	serv_connect_callback, client_p,
1235	<	aconf->aftype, CONNECTTIMEOUT);
1236	<	}
1237	<	else
1238	<	comm_connect_tcp(&client_p->localClient->fd,
1239	<	aconf->host, aconf->port,
1240	<	NULL, 0, serv_connect_callback, client_p,
1241	<	aconf->aftype, CONNECTTIMEOUT);
1228	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1229	>	ipn.ss.ss_family = AF_INET6;
1230	>	ipn.ss_port = 0;
1231	>	comm_connect_tcp(&client_p->localClient->fd,
1232	>	conf->host, conf->port,
1233	>	(struct sockaddr *)&ipn, ipn.ss_len,
1234	>	serv_connect_callback, client_p,
1235	>	conf->aftype, CONNECTTIMEOUT);
1236	>	}
1237	>	else if (ServerInfo.specific_ipv6_vhost)
1238	>	{
1239	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1240	>	ipn.ss.ss_family = AF_INET6;
1241	>	ipn.ss_port = 0;
1242	>	comm_connect_tcp(&client_p->localClient->fd,
1243	>	conf->host, conf->port,
1244	>	(struct sockaddr *)&ipn, ipn.ss_len,
1245	>	serv_connect_callback, client_p,
1246	>	conf->aftype, CONNECTTIMEOUT);
1247	>	}
1248	>	else
1249	>	comm_connect_tcp(&client_p->localClient->fd,
1250	>	conf->host, conf->port,
1251	>	NULL, 0, serv_connect_callback, client_p,
1252	>	conf->aftype, CONNECTTIMEOUT);
1253		}
1254		#endif
1255		}
1256	<	return (1);
1256	>	return 1;
1257	>	}
1258	>
1259	>	#ifdef HAVE_LIBCRYPTO
1260	>	static void
1261	>	finish_ssl_server_handshake(struct Client *client_p)
1262	>	{
1263	>	struct MaskItem *conf = NULL;
1264	>
1265	>	conf = find_conf_name(&client_p->localClient->confs,
1266	>	client_p->name, CONF_SERVER);
1267	>	if (conf == NULL)
1268	>	{
1269	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1270	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1271	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1272	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1273	>
1274	>	exit_client(client_p, &me, "Lost connect{} block");
1275	>	return;
1276	>	}
1277	>
1278	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1279	>
1280	>	send_capabilities(client_p, 0);
1281	>
1282	>	sendto_one(client_p, "SERVER %s 1 :%s%s",
1283	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
1284	>	me.info);
1285	>
1286	>	/* If we've been marked dead because a send failed, just exit
1287	>	* here now and save everyone the trouble of us ever existing.
1288	>	*/
1289	>	if (IsDead(client_p))
1290	>	{
1291	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1292	>	"%s[%s] went dead during handshake",
1293	>	client_p->name,
1294	>	client_p->host);
1295	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1296	>	"%s went dead during handshake", client_p->name);
1297	>	return;
1298	>	}
1299	>
1300	>	/* don't move to serv_list yet -- we haven't sent a burst! */
1301	>	/* If we get here, we're ok, so lets start reading some data */
1302	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1303	>	}
1304	>
1305	>	static void
1306	>	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1307	>	{
1308	>	X509 *cert = NULL;
1309	>	int ret = 0;
1310	>
1311	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1312	>	{
1313	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1314	>	{
1315	>	case SSL_ERROR_WANT_WRITE:
1316	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1317	>	(PF *)ssl_server_handshake, client_p, 0);
1318	>	return;
1319	>	case SSL_ERROR_WANT_READ:
1320	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1321	>	(PF *)ssl_server_handshake, client_p, 0);
1322	>	return;
1323	>	default:
1324	>	{
1325	>	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1326	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1327	>	"Error connecting to %s: %s", client_p->name,
1328	>	sslerr ? sslerr : "unknown SSL error");
1329	>	exit_client(client_p, client_p, "Error during SSL handshake");
1330	>	return;
1331	>	}
1332	>	}
1333	>	}
1334	>
1335	>	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1336	>	{
1337	>	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1338	>	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1339	>	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1340	>
1341	>	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1342	>	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1343	>	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1344	>	{
1345	>	unsigned int i = 0, n = 0;
1346	>
1347	>	if (X509_digest(cert, EVP_sha256(), md, &n))
1348	>	{
1349	>	for (; i < n; ++i)
1350	>	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1351	>	client_p->certfp = xstrdup(buf);
1352	>	}
1353	>	}
1354	>	else
1355	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1356	>	client_p->name, client_p->username, client_p->host, res);
1357	>	X509_free(cert);
1358	>	}
1359	>
1360	>	finish_ssl_server_handshake(client_p);
1361	>	}
1362	>
1363	>	static void
1364	>	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1365	>	{
1366	>	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1367	>	{
1368	>	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1369	>	ERR_error_string(ERR_get_error(), NULL));
1370	>	SetDead(client_p);
1371	>	exit_client(client_p, client_p, "SSL_new failed");
1372	>	return;
1373	>	}
1374	>
1375	>	SSL_set_fd(fd->ssl, fd->fd);
1376	>
1377	>	if (!EmptyString(conf->cipher_list))
1378	>	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1379	>
1380	>	ssl_server_handshake(NULL, client_p);
1381		}
1382	+	#endif
1383
1384		/* serv_connect_callback() - complete a server connection.
1385	<	*
1385	>	*
1386		* This routine is called after the server connection attempt has
1387		* completed. If unsucessful, an error is sent to ops and the client
1388		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1783 | Line 1393 | static void
1393		serv_connect_callback(fde_t *fd, int status, void *data)
1394		{
1395		struct Client *client_p = data;
1396	<	struct ConfItem *conf=NULL;
1787	<	struct AccessItem *aconf=NULL;
1396	>	struct MaskItem *conf = NULL;
1397
1398		/* First, make sure its a real client! */
1399		assert(client_p != NULL);
#	Line 1800 | Line 1409 | serv_connect_callback(fde_t *fd, int sta
1409		* Admins get to see any IP, mere opers don't *sigh*
1410		*/
1411		if (ConfigServerHide.hide_server_ips)
1412	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1412	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1413		"Error connecting to %s: %s",
1414		client_p->name, comm_errstr(status));
1415		else
1416	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1417	<	"Error connecting to %s[%s]: %s", client_p->name,
1418	<	client_p->host, comm_errstr(status));
1419	<
1420	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1421	<	"Error connecting to %s: %s",
1422	<	client_p->name, comm_errstr(status));
1416	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1417	>	"Error connecting to %s[%s]: %s", client_p->name,
1418	>	client_p->host, comm_errstr(status));
1419	>
1420	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1421	>	"Error connecting to %s: %s",
1422	>	client_p->name, comm_errstr(status));
1423
1424		/* If a fd goes bad, call dead_link() the socket is no
1425		* longer valid for reading or writing.
#	Line 1822 | Line 1431 | serv_connect_callback(fde_t *fd, int sta
1431		/* COMM_OK, so continue the connection procedure */
1432		/* Get the C/N lines */
1433		conf = find_conf_name(&client_p->localClient->confs,
1434	<	client_p->name, SERVER_TYPE);
1434	>	client_p->name, CONF_SERVER);
1435		if (conf == NULL)
1436		{
1437	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1438	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1439	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1440	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1437	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1438	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1439	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1440	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1441
1442		exit_client(client_p, &me, "Lost connect{} block");
1443		return;
1444		}
1445
1837	–	aconf = (struct AccessItem *)map_to_conf(conf);
1446		/* Next, send the initial handshake */
1447		SetHandshake(client_p);
1448
1449		#ifdef HAVE_LIBCRYPTO
1450	<	/* Handle all CRYPTLINK links in cryptlink_init */
1843	<	if (IsConfCryptLink(aconf))
1450	>	if (IsConfSSL(conf))
1451		{
1452	<	cryptlink_init(client_p, conf, fd);
1452	>	ssl_connect_init(client_p, conf, fd);
1453		return;
1454		}
1455		#endif
1456
1457	<	/* jdc -- Check and send spasswd, not passwd. */
1851	<	if (!EmptyString(aconf->spasswd))
1852	<	/* Send TS 6 form only if id */
1853	<	sendto_one(client_p, "PASS %s TS %d %s",
1854	<	aconf->spasswd, TS_CURRENT, me.id);
1457	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1458
1459	<	/* Pass my info to the new server
1857	<	*
1858	<	* Pass on ZIP if supported
1859	<	* Pass on TB if supported.
1860	<	* - Dianora
1861	<	*/
1862	<	send_capabilities(client_p, aconf,
1863	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1864	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1459	>	send_capabilities(client_p, 0);
1460
1461	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1462	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1868	<	me.info);
1461	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1462	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1463
1464		/* If we've been marked dead because a send failed, just exit
1465		* here now and save everyone the trouble of us ever existing.
1466		*/
1467	<	if (IsDead(client_p))
1467	>	if (IsDead(client_p))
1468		{
1469	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1470	<	"%s[%s] went dead during handshake",
1469	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1470	>	"%s[%s] went dead during handshake",
1471		client_p->name,
1472	<	client_p->host);
1473	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1474	<	"%s went dead during handshake", client_p->name);
1472	>	client_p->host);
1473	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1474	>	"%s went dead during handshake", client_p->name);
1475		return;
1476		}
1477
#	Line 1897 | Line 1491 | find_servconn_in_progress(const char *na
1491		cptr = ptr->data;
1492
1493		if (cptr && cptr->name[0])
1494	<	if (match(name, cptr->name))
1494	>	if (!match(name, cptr->name))
1495		return cptr;
1496		}
1903	–
1904	–	return NULL;
1905	–	}
1906	–
1907	–	#ifdef HAVE_LIBCRYPTO
1908	–	/*
1909	–	* sends a CRYPTLINK SERV command.
1910	–	*/
1911	–	void
1912	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
1913	–	{
1914	–	struct AccessItem *aconf;
1915	–	char *encrypted;
1916	–	unsigned char *key_to_send;
1917	–	char randkey[CIPHERKEYLEN];
1918	–	int enc_len;
1919	–
1920	–	/* get key */
1921	–	if ((!ServerInfo.rsa_private_key) ||
1922	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
1923	–	{
1924	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
1925	–	"Invalid RSA private key");
1926	–	return;
1927	–	}
1497
1498	<	aconf = (struct AccessItem *)map_to_conf(conf);
1930	<
1931	<	if (aconf->rsa_public_key == NULL)
1932	<	{
1933	<	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
1934	<	"Invalid RSA public key");
1935	<	return;
1936	<	}
1937	<
1938	<	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
1939	<	{
1940	<	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
1941	<	"Couldn't generate keyphrase");
1942	<	return;
1943	<	}
1944	<
1945	<	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1946	<	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1947	<	(unsigned char *)randkey,
1948	<	(unsigned char *)encrypted,
1949	<	aconf->rsa_public_key,
1950	<	RSA_PKCS1_PADDING);
1951	<
1952	<	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1953	<
1954	<	if (enc_len <= 0)
1955	<	{
1956	<	report_crypto_errors();
1957	<	MyFree(encrypted);
1958	<	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
1959	<	"Couldn't encrypt data");
1960	<	return;
1961	<	}
1962	<
1963	<	if (!(base64_block(&key_to_send, encrypted, enc_len)))
1964	<	{
1965	<	MyFree(encrypted);
1966	<	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
1967	<	"Couldn't base64 encode key");
1968	<	return;
1969	<	}
1970	<
1971	<	send_capabilities(client_p, aconf,
1972	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1973	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
1974	<
1975	<	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
1976	<	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
1977	<	me.name, key_to_send,
1978	<	ConfigServerHide.hidden ? "(H) " : "", me.info);
1979	<
1980	<	SetHandshake(client_p);
1981	<	SetWaitAuth(client_p);
1982	<
1983	<	MyFree(encrypted);
1984	<	MyFree(key_to_send);
1985	<
1986	<	if (IsDead(client_p))
1987	<	cryptlink_error(client_p, "SERV", "Went dead during handshake",
1988	<	"Went dead during handshake");
1989	<	else if (fd != NULL)
1990	<	/* If we get here, we're ok, so lets start reading some data */
1991	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
1992	<	}
1993	<
1994	<	void
1995	<	cryptlink_error(struct Client *client_p, const char *type,
1996	<	const char *reason, const char *client_reason)
1997	<	{
1998	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
1999	<	get_client_name(client_p, SHOW_IP), type, reason);
2000	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2001	<	get_client_name(client_p, MASK_IP), type, reason);
2002	<	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2003	<	get_client_name(client_p, SHOW_IP), type, reason);
2004	<
2005	<	/* If client_reason isn't NULL, then exit the client with the message
2006	<	* defined in the call.
2007	<	*/
2008	<	if ((client_reason != NULL) && (!IsDead(client_p)))
2009	<	exit_client(client_p, &me, client_reason);
2010	<	}
2011	<
2012	<	static char base64_chars[] =
2013	<	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2014	<
2015	<	static char base64_values[] =
2016	<	{
2017	<	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2018	<	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2019	<	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2020	<	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2021	<	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2022	<	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2023	<	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2024	<	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2025	<	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2026	<	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2027	<	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2028	<	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2029	<	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2030	<	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2031	<	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2032	<	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2033	<	};
2034	<
2035	<	/*
2036	<	* base64_block will allocate and return a new block of memory
2037	<	* using MyMalloc().  It should be freed after use.
2038	<	*/
2039	<	int
2040	<	base64_block(unsigned char **output, char *data, int len)
2041	<	{
2042	<	unsigned char *out;
2043	<	unsigned char *in = (unsigned char*)data;
2044	<	unsigned long int q_in;
2045	<	int i;
2046	<	int count = 0;
2047	<
2048	<	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2049	<
2050	<	/* process 24 bits at a time */
2051	<	for( i = 0; i < len; i += 3)
2052	<	{
2053	<	q_in = 0;
2054	<
2055	<	if ( i + 2 < len )
2056	<	{
2057	<	q_in  = (in[i+2] & 0xc0) << 2;
2058	<	q_in |=  in[i+2];
2059	<	}
2060	<
2061	<	if ( i + 1 < len )
2062	<	{
2063	<	q_in |= (in[i+1] & 0x0f) << 10;
2064	<	q_in |= (in[i+1] & 0xf0) << 12;
2065	<	}
2066	<
2067	<	q_in |= (in[i]   & 0x03) << 20;
2068	<	q_in |=  in[i]           << 22;
2069	<
2070	<	q_in &= 0x3f3f3f3f;
2071	<
2072	<	out[count++] = base64_chars[((q_in >> 24)       )];
2073	<	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2074	<	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2075	<	out[count++] = base64_chars[((q_in      ) & 0xff)];
2076	<	}
2077	<	if ( (i - len) > 0 )
2078	<	{
2079	<	out[count-1] = '=';
2080	<	if ( (i - len) > 1 )
2081	<	out[count-2] = '=';
2082	<	}
2083	<
2084	<	out[count] = '\0';
2085	<	*output = out;
2086	<	return (count);
2087	<	}
2088	<
2089	<	/*
2090	<	* unbase64_block will allocate and return a new block of memory
2091	<	* using MyMalloc().  It should be freed after use.
2092	<	*/
2093	<	int
2094	<	unbase64_block(unsigned char **output, char *data, int len)
2095	<	{
2096	<	unsigned char *out;
2097	<	unsigned char *in = (unsigned char*)data;
2098	<	unsigned long int q_in;
2099	<	int i;
2100	<	int count = 0;
2101	<
2102	<	if ((len % 4) != 0)
2103	<	return (0);
2104	<
2105	<	out = MyMalloc(((len / 4) * 3) + 1);
2106	<
2107	<	/* process 32 bits at a time */
2108	<	for( i = 0; (i + 3) < len; i+=4)
2109	<	{
2110	<	/* compress input (chars a, b, c and d) as follows:
2111	<	* (after converting ascii -> base64 value)
2112	<	*
2113	<	* |00000000aaaaaabbbbbbccccccdddddd|
2114	<	* |  765432  107654  321076  543210|
2115	<	*/
2116	<
2117	<	q_in = 0;
2118	<
2119	<	if (base64_values[in[i+3]] > -1)
2120	<	q_in |= base64_values[in[i+3]]      ;
2121	<	if (base64_values[in[i+2]] > -1)
2122	<	q_in |= base64_values[in[i+2]] <<  6;
2123	<	if (base64_values[in[i+1]] > -1)
2124	<	q_in |= base64_values[in[i+1]] << 12;
2125	<	if (base64_values[in[i  ]] > -1)
2126	<	q_in |= base64_values[in[i  ]] << 18;
2127	<
2128	<	out[count++] = (q_in >> 16) & 0xff;
2129	<	out[count++] = (q_in >>  8) & 0xff;
2130	<	out[count++] = (q_in      ) & 0xff;
2131	<	}
2132	<
2133	<	if (in[i-1] == '=') count--;
2134	<	if (in[i-2] == '=') count--;
2135	<
2136	<	out[count] = '\0';
2137	<	*output = out;
2138	<	return (count);
1498	>	return NULL;
1499		}
2140	–
2141	–	#endif /* HAVE_LIBCRYPTO */
2142	–

Diff Legend

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