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 42 by adx, Sun Oct 2 23:25:27 2005 UTC vs.
ircd-hybrid/branches/8.2.x/src/server.c (file contents), Revision 4299 by michael, Sun Jul 20 13:51:28 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 27 | Line 29
29		#include <openssl/rsa.h>
30		#include "rsa.h"
31		#endif
32	<	#include "tools.h"
31	<	#include "channel.h"
32	<	#include "channel_mode.h"
32	>	#include "list.h"
33		#include "client.h"
34	–	#include "common.h"
35	–	#include "dbuf.h"
34		#include "event.h"
37	–	#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
40	–	#include "inet_misc.h"
41	–	#include "sprintf_irc.h"
37		#include "ircd.h"
38		#include "ircd_defs.h"
39		#include "s_bsd.h"
45	–	#include "irc_getnameinfo.h"
46	–	#include "list.h"
40		#include "numeric.h"
41		#include "packet.h"
42	<	#include "irc_res.h"
43	<	#include "s_conf.h"
44	<	#include "s_serv.h"
45	<	#include "s_log.h"
53	<	#include "s_stats.h"
54	<	#include "s_user.h"
42	>	#include "conf.h"
43	>	#include "server.h"
44	>	#include "log.h"
45	>	#include "user.h"
46		#include "send.h"
47		#include "memory.h"
48	<	#include "channel.h" /* chcap_usage_counts stuff...*/
48	>	#include "channel.h"
49	>	#include "parse.h"
50
51		#define MIN_CONN_FREQ 300
52
53	<	struct Client *uplink  = NULL;
62	<
63	<
53	>	dlink_list flatten_links;
54		static dlink_list cap_list = { NULL, NULL, 0 };
65	–	static unsigned long freeMask;
66	–	static void server_burst(struct Client *);
67	–	static int fork_server(struct Client *);
68	–	static void burst_all(struct Client *);
69	–	static void cjoin_all(struct Client *);
70	–	static void send_tb(struct Client *client_p, struct Channel *chptr);
71	–
55		static CNCB serv_connect_callback;
56
74	–	static void start_io(struct Client *);
75	–	static void burst_members(struct Client *, struct Channel *);
76	–	static void burst_ll_members(struct Client *, struct Channel *);
77	–	static void add_lazylinkchannel(struct Client *, struct Channel *);
78	–
79	–	static SlinkRplHnd slink_error;
80	–	static SlinkRplHnd slink_zipstats;
81	–
82	–
83	–	#ifdef HAVE_LIBCRYPTO
84	–	struct EncCapability CipherTable[] =
85	–	{
86	–	#ifdef HAVE_EVP_BF_CFB
87	–	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
88	–	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
89	–	#endif
90	–	#ifdef HAVE_EVP_CAST5_CFB
91	–	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
92	–	#endif
93	–	#ifdef HAVE_EVP_IDEA_CFB
94	–	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
95	–	#endif
96	–	#ifdef HAVE_EVP_RC5_32_12_16_CFB
97	–	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
98	–	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
99	–	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
100	–	#endif
101	–	#ifdef HAVE_EVP_DES_EDE3_CFB
102	–	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
103	–	#endif
104	–	#ifdef HAVE_EVP_DES_CFB
105	–	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
106	–	#endif
107	–	{ 0,            0,                   0, 0             }
108	–	};
109	–	#endif
110	–
111	–	struct SlinkRplDef slinkrpltab[] = {
112	–	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
113	–	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
114	–	{ 0,                 0,              0 },
115	–	};
116	–
117	–
118	–	void
119	–	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
120	–	struct Client *server_p)
121	–	{
122	–	assert(rpl == SLINKRPL_ERROR);
123	–	assert(len < 256);
124	–
125	–	data[len-1] = '\0';
126	–
127	–	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
128	–	server_p->name, data);
129	–	/* XXX should this be exit_client? */
130	–	exit_client(server_p, &me, "servlink error -- terminating link");
131	–	}
132	–
133	–	void
134	–	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
135	–	struct Client *server_p)
136	–	{
137	–	struct ZipStats zipstats;
138	–	unsigned long in = 0, in_wire = 0, out = 0, out_wire = 0;
139	–	int i = 0;
140	–
141	–	assert(rpl == SLINKRPL_ZIPSTATS);
142	–	assert(len == 16);
143	–	assert(IsCapable(server_p, CAP_ZIP));
144	–
145	–	/* Yes, it needs to be done this way, no we cannot let the compiler
146	–	* work with the pointer to the structure.  This works around a GCC
147	–	* bug on SPARC that affects all versions at the time of this writing.
148	–	* I will feed you to the creatures living in RMS's beard if you do
149	–	* not leave this as is, without being sure that you are not causing
150	–	* regression for most of our installed SPARC base.
151	–	* -jmallett, 04/27/2002
152	–	*/
153	–	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
154	–
155	–	in |= (data[i++] << 24);
156	–	in |= (data[i++] << 16);
157	–	in |= (data[i++] <<  8);
158	–	in |= (data[i++]      );
159	–
160	–	in_wire |= (data[i++] << 24);
161	–	in_wire |= (data[i++] << 16);
162	–	in_wire |= (data[i++] <<  8);
163	–	in_wire |= (data[i++]      );
164	–
165	–	out |= (data[i++] << 24);
166	–	out |= (data[i++] << 16);
167	–	out |= (data[i++] <<  8);
168	–	out |= (data[i++]      );
169	–
170	–	out_wire |= (data[i++] << 24);
171	–	out_wire |= (data[i++] << 16);
172	–	out_wire |= (data[i++] <<  8);
173	–	out_wire |= (data[i++]      );
174	–
175	–	/* This macro adds b to a if a plus b is not an overflow, and sets the
176	–	* value of a to b if it is.
177	–	* Add and Set if No Overflow.
178	–	*/
179	–	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
180	–
181	–	ASNO(zipstats.in, in);
182	–	ASNO(zipstats.out, out);
183	–	ASNO(zipstats.in_wire, in_wire);
184	–	ASNO(zipstats.out_wire, out_wire);
185	–
186	–	if (zipstats.in > 0)
187	–	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
188	–	(double)zipstats.in) * 100.00);
189	–	else
190	–	zipstats.in_ratio = 0;
191	–
192	–	if (zipstats.out > 0)
193	–	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
194	–	(double)zipstats.out) * 100.00);
195	–	else
196	–	zipstats.out_ratio = 0;
197	–
198	–	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof (struct ZipStats));
199	–	}
200	–
201	–	void
202	–	collect_zipstats(void *unused)
203	–	{
204	–	dlink_node *ptr;
205	–	struct Client *target_p;
206	–
207	–	DLINK_FOREACH(ptr, serv_list.head)
208	–	{
209	–	target_p = ptr->data;
210	–
211	–	if (IsCapable(target_p, CAP_ZIP))
212	–	{
213	–	/* only bother if we haven't already got something queued... */
214	–	if (!target_p->localClient->slinkq)
215	–	{
216	–	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
217	–	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
218	–	target_p->localClient->slinkq_ofs = 0;
219	–	target_p->localClient->slinkq_len = 1;
220	–	send_queued_slink_write(target_p);
221	–	}
222	–	}
223	–	}
224	–	}
225	–
226	–	#ifdef HAVE_LIBCRYPTO
227	–	struct EncCapability *
228	–	check_cipher(struct Client *client_p, struct AccessItem *aconf)
229	–	{
230	–	struct EncCapability *epref;
231	–
232	–	/* Use connect{} specific info if available */
233	–	if (aconf->cipher_preference)
234	–	epref = aconf->cipher_preference;
235	–	else
236	–	epref = ConfigFileEntry.default_cipher_preference;
237	–
238	–	/* If the server supports the capability in hand, return the matching
239	–	* conf struct.  Otherwise, return NULL (an error).
240	–	*/
241	–	if (IsCapableEnc(client_p, epref->cap))
242	–	return(epref);
243	–
244	–	return(NULL);
245	–	}
246	–	#endif /* HAVE_LIBCRYPTO */
247	–
248	–	/* my_name_for_link()
249	–	* return wildcard name of my server name
250	–	* according to given config entry --Jto
251	–	*/
252	–	const char *
253	–	my_name_for_link(struct ConfItem *conf)
254	–	{
255	–	struct AccessItem *aconf;
256	–
257	–	aconf = (struct AccessItem *)map_to_conf(conf);
258	–	if (aconf->fakename != NULL)
259	–	return(aconf->fakename);
260	–	else
261	–	return(me.name);
262	–	}
57
58		/*
59		* write_links_file
#	Line 270 | Line 64 | my_name_for_link(struct ConfItem *conf)
64		*                but in no particular order.
65		*/
66		void
67	<	write_links_file(void* notused)
67	>	write_links_file(void *notused)
68		{
69	<	MessageFileLine *next_mptr = 0;
70	<	MessageFileLine *mptr = 0;
71	<	MessageFileLine *currentMessageLine = 0;
278	<	MessageFileLine *newMessageLine = 0;
279	<	MessageFile *MessageFileptr;
280	<	const char *p;
281	<	FBFILE *file;
282	<	char buff[512];
283	<	dlink_node *ptr;
284	<
285	<	MessageFileptr = &ConfigFileEntry.linksfile;
69	>	FILE *file = NULL;
70	>	dlink_node *ptr = NULL, *ptr_next = NULL;
71	>	char buff[IRCD_BUFSIZE] = "";
72
73	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
73	>	if ((file = fopen(LIPATH, "w")) == NULL)
74		return;
75
76	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
76	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
77		{
78	<	next_mptr = mptr->next;
79	<	MyFree(mptr);
78	>	dlinkDelete(ptr, &flatten_links);
79	>	MyFree(ptr->data);
80	>	free_dlink_node(ptr);
81		}
82
83	<	MessageFileptr->contentsOfFile = NULL;
297	<	currentMessageLine             = NULL;
298	<
299	<	DLINK_FOREACH(ptr, global_serv_list.head)
83	>	DLINK_FOREACH(ptr, global_server_list.head)
84		{
85	<	size_t nbytes = 0;
302	<	struct Client *target_p = ptr->data;
85	>	const struct Client *target_p = ptr->data;
86
87	<	/* skip ourselves, we send ourselves in /links */
88	<	if (IsMe(target_p))
87	>	/*
88	>	* Skip hidden servers, aswell as ourselves, since we already send
89	>	* ourselves in /links
90	>	*/
91	>	if (IsHidden(target_p) || IsMe(target_p))
92		continue;
93
94	<	/* skip hidden servers */
309	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
94	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
95		continue;
96
97	<	if (target_p->info[0])
98	<	p = target_p->info;
314	<	else
315	<	p = "(Unknown Location)";
316	<
317	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
318	<
319	<	/* Attempt to format the file in such a way it follows the usual links output
97	>	/*
98	>	* Attempt to format the file in such a way it follows the usual links output
99		* ie  "servername uplink :hops info"
100		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
101		* - madmax
102		*/
103	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
104	+	me.name, target_p->info);
105	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
106	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
107	+	me.name, target_p->info);
108
109	<	/*
110	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
327	<	* default config but it is configurable..
328	<	* This should be changed to an snprintf at some point, but I'm wanting to
329	<	* know if this is a cause of a bug - cryogen
330	<	*/
331	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
332	<	MESSAGELINELEN);
333	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
334	<	target_p->name, me.name, p);
335	<	newMessageLine->next = NULL;
109	>	fputs(buff, file);
110	>	}
111
112	<	if (MessageFileptr->contentsOfFile)
113	<	{
339	<	if (currentMessageLine)
340	<	currentMessageLine->next = newMessageLine;
341	<	currentMessageLine = newMessageLine;
342	<	}
343	<	else
344	<	{
345	<	MessageFileptr->contentsOfFile = newMessageLine;
346	<	currentMessageLine = newMessageLine;
347	<	}
112	>	fclose(file);
113	>	}
114
115	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
116	<	fbputs(buff, file, nbytes);
115	>	void
116	>	read_links_file(void)
117	>	{
118	>	FILE *file = NULL;
119	>	char *p = NULL;
120	>	char buff[IRCD_BUFSIZE] = "";
121	>
122	>	if ((file = fopen(LIPATH, "r")) == NULL)
123	>	return;
124	>
125	>	while (fgets(buff, sizeof(buff), file))
126	>	{
127	>	if ((p = strchr(buff, '\n')))
128	>	*p = '\0';
129	>
130	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
131		}
132
133	<	fbclose(file);
133	>	fclose(file);
134		}
135
136		/* hunt_server()
#	Line 373 | Line 153 | write_links_file(void* notused)
153		*      returns: (see #defines)
154		*/
155		int
156	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
157	<	int server, int parc, char *parv[])
156	>	hunt_server(struct Client *source_p, const char *command,
157	>	const int server, const int parc, char *parv[])
158		{
159		struct Client *target_p = NULL;
160	<	struct Client *target_tmp = NULL;
381	<	dlink_node *ptr;
382	<	int wilds;
160	>	dlink_node *ptr = NULL;
161
162	<	/* Assume it's me, if no server
163	<	*/
164	<	if (parc <= server || EmptyString(parv[server]) ||
387	<	match(me.name, parv[server]) ||
388	<	match(parv[server], me.name) ||
389	<	!strcmp(parv[server], me.id))
390	<	return(HUNTED_ISME);
162	>	/* Assume it's me, if no server */
163	>	if (parc <= server || EmptyString(parv[server]))
164	>	return HUNTED_ISME;
165
166	<	/* These are to pickup matches that would cause the following
166	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
167	>	target_p = hash_find_server(parv[server]);
168	>
169	>	/*
170	>	* These are to pickup matches that would cause the following
171		* message to go in the wrong direction while doing quick fast
172		* non-matching lookups.
173		*/
396	–	if (MyClient(source_p))
397	–	target_p = find_client(parv[server]);
398	–	else
399	–	target_p = find_person(client_p, parv[server]);
400	–
174		if (target_p)
175		if (target_p->from == source_p->from && !MyConnect(target_p))
176		target_p = NULL;
177
178	<	if (target_p == NULL && (target_p = find_server(parv[server])))
406	<	if (target_p->from == source_p->from && !MyConnect(target_p))
407	<	target_p = NULL;
408	<
409	<	collapse(parv[server]);
410	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
411	<
412	<	/* Again, if there are no wild cards involved in the server
413	<	* name, use the hash lookup
414	<	*/
415	<	if (target_p == NULL)
178	>	if (!target_p && has_wildcards(parv[server]))
179		{
180	<	if (!wilds)
418	<	{
419	<	if (!(target_p = find_server(parv[server])))
420	<	{
421	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
422	<	me.name, parv[0], parv[server]);
423	<	return(HUNTED_NOSUCH);
424	<	}
425	<	}
426	<	else
180	>	DLINK_FOREACH(ptr, global_client_list.head)
181		{
182	<	DLINK_FOREACH(ptr, global_client_list.head)
429	<	{
430	<	target_tmp = ptr->data;
182	>	struct Client *tmp = ptr->data;
183
184	<	if (match(parv[server], target_tmp->name))
185	<	{
186	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
187	<	continue;
188	<	target_p = ptr->data;
184	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
185	>	if (!match(parv[server], tmp->name))
186	>	{
187	>	if (tmp->from == source_p->from && !MyConnect(tmp))
188	>	continue;
189
190	<	if (IsRegistered(target_p) && (target_p != client_p))
191	<	break;
440	<	}
190	>	target_p = ptr->data;
191	>	break;
192		}
193		}
194		}
195
196	<	if (target_p != NULL)
196	>	if (target_p)
197		{
198	<	if(!IsRegistered(target_p))
448	<	{
449	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
450	<	me.name, parv[0], parv[server]);
451	<	return HUNTED_NOSUCH;
452	<	}
453	<
198	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
199		if (IsMe(target_p) || MyClient(target_p))
200		return HUNTED_ISME;
201
202	<	if (!match(target_p->name, parv[server]))
203	<	parv[server] = target_p->name;
459	<
460	<	/* Deal with lazylinks */
461	<	client_burst_if_needed(target_p, source_p);
462	<
463	<	/* This is a little kludgy but should work... */
464	<	if (IsClient(source_p) &&
465	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
466	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
467	<	parv[0] = ID(source_p);
468	<
469	<	sendto_one(target_p, command, parv[0],
202	>	parv[server] = target_p->id;
203	>	sendto_one(target_p, command, source_p->id,
204		parv[1], parv[2], parv[3], parv[4],
205		parv[5], parv[6], parv[7], parv[8]);
206	<	return(HUNTED_PASS);
207	<	}
206	>	return HUNTED_PASS;
207	>	}
208
209	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
210	<	me.name, parv[0], parv[server]);
477	<	return(HUNTED_NOSUCH);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210	>	return HUNTED_NOSUCH;
211		}
212
213		/* try_connections()
#	Line 490 | Line 223 | hunt_server(struct Client *client_p, str
223		void
224		try_connections(void *unused)
225		{
226	<	dlink_node *ptr;
227	<	struct ConfItem *conf;
495	<	struct AccessItem *aconf;
496	<	struct ClassItem *cltmp;
497	<	int confrq;
226	>	dlink_node *ptr = NULL;
227	>	int confrq = 0;
228
229		/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
230		if (GlobalSetOptions.autoconn == 0)
#	Line 502 | Line 232 | try_connections(void *unused)
232
233		DLINK_FOREACH(ptr, server_items.head)
234		{
235	<	conf = ptr->data;
236	<	aconf = (struct AccessItem *)map_to_conf(conf);
235	>	struct MaskItem *conf = ptr->data;
236	>
237	>	assert(conf->type == CONF_SERVER);
238
239	<	/* Also when already connecting! (update holdtimes) --SRB
239	>	/* Also when already connecting! (update holdtimes) --SRB
240		*/
241	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
511	<	!(IsConfAllowAutoConn(aconf)))
241	>	if (!conf->port || !IsConfAllowAutoConn(conf))
242		continue;
243
514	–	cltmp = (struct ClassItem *)map_to_conf(aconf->class_ptr);
244
245		/* Skip this entry if the use of it is still on hold until
246		* future. Otherwise handle this entry (and set it on hold
#	Line 519 | Line 248 | try_connections(void *unused)
248		* made one successfull connection... [this algorithm is
249		* a bit fuzzy... -- msa >;) ]
250		*/
251	<	if (aconf->hold > CurrentTime)
251	>	if (conf->until > CurrentTime)
252		continue;
253
254	<	if (cltmp == NULL)
526	<	confrq = DEFAULT_CONNECTFREQUENCY;
527	<	else
528	<	{
529	<	confrq = ConFreq(cltmp);
530	<	if (confrq < MIN_CONN_FREQ )
531	<	confrq = MIN_CONN_FREQ;
532	<	}
254	>	assert(conf->class);
255
256	<	aconf->hold = CurrentTime + confrq;
256	>	confrq = conf->class->con_freq;
257	>	if (confrq < MIN_CONN_FREQ)
258	>	confrq = MIN_CONN_FREQ;
259
260	<	/* Found a CONNECT config with port specified, scan clients
260	>	conf->until = CurrentTime + confrq;
261	>
262	>	/*
263	>	* Found a CONNECT config with port specified, scan clients
264		* and see if this server is already connected?
265		*/
266	<	if (find_server(conf->name) != NULL)
266	>	if (hash_find_server(conf->name))
267		continue;
268
269	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
269	>	if (conf->class->ref_count < conf->class->max_total)
270		{
271		/* Go to the end of the list, if not already last */
272	<	if (ptr->next != NULL)
272	>	if (ptr->next)
273		{
274		dlinkDelete(ptr, &server_items);
275		dlinkAddTail(conf, &conf->node, &server_items);
#	Line 551 | Line 278 | try_connections(void *unused)
278		if (find_servconn_in_progress(conf->name))
279		return;
280
281	<	/* We used to only print this if serv_connect() actually
281	>	/*
282	>	* We used to only print this if serv_connect() actually
283		* succeeded, but since comm_tcp_connect() can call the callback
284		* immediately if there is an error, we were getting error messages
285		* in the wrong order. SO, we just print out the activated line,
#	Line 560 | Line 288 | try_connections(void *unused)
288		*   -- adrian
289		*/
290		if (ConfigServerHide.hide_server_ips)
291	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
291	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
292	>	"Connection to %s activated.",
293		conf->name);
294		else
295	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
296	<	conf->name, aconf->host);
295	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
296	>	"Connection to %s[%s] activated.",
297	>	conf->name, conf->host);
298
299	<	serv_connect(aconf, NULL);
299	>	serv_connect(conf, NULL);
300		/* We connect only one at time... */
301		return;
302		}
#	Line 574 | Line 304 | try_connections(void *unused)
304		}
305
306		int
307	<	check_server(const char *name, struct Client *client_p, int cryptlink)
307	>	valid_servname(const char *name)
308		{
309	<	dlink_node *ptr;
310	<	struct ConfItem *conf           = NULL;
581	<	struct ConfItem *server_conf    = NULL;
582	<	struct AccessItem *server_aconf = NULL;
583	<	struct AccessItem *aconf        = NULL;
584	<	int error = -1;
309	>	unsigned int dots = 0;
310	>	const char *p = name;
311
312	<	assert(client_p != NULL);
312	>	for (; *p; ++p)
313	>	{
314	>	if (!IsServChar(*p))
315	>	return 0;
316
317	<	if (client_p == NULL)
318	<	return(error);
317	>	if (*p == '.')
318	>	++dots;
319	>	}
320
321	<	if (strlen(name) > HOSTLEN)
322	<	return(-4);
321	>	return dots && (p - name) <= HOSTLEN;
322	>	}
323	>
324	>	int
325	>	check_server(const char *name, struct Client *client_p)
326	>	{
327	>	dlink_node *ptr;
328	>	struct MaskItem *conf        = NULL;
329	>	struct MaskItem *server_conf = NULL;
330	>	int error = -1;
331	>
332	>	assert(client_p);
333
334		/* loop through looking for all possible connect items that might work */
335		DLINK_FOREACH(ptr, server_items.head)
336		{
337		conf = ptr->data;
598	–	aconf = (struct AccessItem *)map_to_conf(conf);
338
339	<	if (!match(name, conf->name))
339	>	if (match(name, conf->name))
340		continue;
341
342		error = -3;
343
344		/* XXX: Fix me for IPv6                    */
345		/* XXX sockhost is the IPv4 ip as a string */
346	<	if (match(aconf->host, client_p->host) ||
347	<	match(aconf->host, client_p->sockhost))
346	>	if (!match(conf->host, client_p->host) ||
347	>	!match(conf->host, client_p->sockhost))
348		{
349		error = -2;
611	–	#ifdef HAVE_LIBCRYPTO
612	–	if (cryptlink && IsConfCryptLink(aconf))
613	–	{
614	–	if (aconf->rsa_public_key)
615	–	server_conf = conf;
616	–	}
617	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
618	–	#endif /* HAVE_LIBCRYPTO */
619	–	{
620	–	/* A NULL password is as good as a bad one */
621	–	if (EmptyString(client_p->localClient->passwd))
622	–	return(-2);
623	–
624	–	/* code in s_conf.c should not have allowed this to be NULL */
625	–	if (aconf->passwd == NULL)
626	–	return(-2);
350
351	<	if (IsConfEncrypted(aconf))
352	<	{
353	<	if (strcmp(aconf->passwd,
354	<	(const char *)crypt(client_p->localClient->passwd,
355	<	aconf->passwd)) == 0)
356	<	server_conf = conf;
357	<	}
358	<	else
636	<	{
637	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
638	<	server_conf = conf;
639	<	}
640	<	}
351	>	if (!match_conf_password(client_p->localClient->passwd, conf))
352	>	return -2;
353	>
354	>	if (!EmptyString(conf->certfp))
355	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
356	>	return -4;
357	>
358	>	server_conf = conf;
359		}
360		}
361
362		if (server_conf == NULL)
363	<	return(error);
363	>	return error;
364
365		attach_conf(client_p, server_conf);
366
649	–	/* Now find all leaf or hub config items for this server */
650	–	DLINK_FOREACH(ptr, hub_items.head)
651	–	{
652	–	conf = ptr->data;
653	–
654	–	if (!match(name, conf->name))
655	–	continue;
656	–	attach_conf(client_p, conf);
657	–	}
367
368	<	DLINK_FOREACH(ptr, leaf_items.head)
660	<	{
661	<	conf = ptr->data;
662	<
663	<	if (!match(name, conf->name))
664	<	continue;
665	<	attach_conf(client_p, conf);
666	<	}
667	<
668	<	server_aconf = (struct AccessItem *)map_to_conf(server_conf);
669	<
670	<	if (!IsConfLazyLink(server_aconf))
671	<	ClearCap(client_p, CAP_LL);
672	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
673	<	if (!IsConfCompressed(server_aconf))
674	<	#endif
675	<	ClearCap(client_p, CAP_ZIP);
676	<	if (!IsConfCryptLink(server_aconf))
677	<	ClearCap(client_p, CAP_ENC);
678	<	if (!IsConfTopicBurst(server_aconf))
679	<	ClearCap(client_p, CAP_TB);
680	<
681	<	/* Don't unset CAP_HUB here even if the server isn't a hub,
682	<	* it only indicates if the server thinks it's lazylinks are
683	<	* leafs or not.. if you unset it, bad things will happen
684	<	*/
685	<	if (aconf != NULL)
368	>	if (server_conf)
369		{
370		struct sockaddr_in *v4;
371		#ifdef IPV6
372		struct sockaddr_in6 *v6;
373		#endif
374	<	switch (aconf->aftype)
374	>	switch (server_conf->aftype)
375		{
376		#ifdef IPV6
377	<	case AF_INET6:
378	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
377	>	case AF_INET6:
378	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
379
380		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
381	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
381	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
382		break;
383		#endif
384		case AF_INET:
385	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
385	>	v4 = (struct sockaddr_in *)&server_conf->addr;
386
387		if (v4->sin_addr.s_addr == INADDR_NONE)
388	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
388	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
389		break;
390		}
391		}
392
393	<	return(0);
393	>	return 0;
394		}
395
396		/* add_capability()
#	Line 722 | Line 405 | check_server(const char *name, struct Cl
405		void
406		add_capability(const char *capab_name, int cap_flag, int add_to_default)
407		{
408	<	struct Capability *cap;
408	>	struct Capability *cap = MyCalloc(sizeof(*cap));
409
410	<	cap = (struct Capability *)MyMalloc(sizeof(*cap));
728	<	DupString(cap->name, capab_name);
410	>	cap->name = xstrdup(capab_name);
411		cap->cap = cap_flag;
412		dlinkAdd(cap, &cap->node, &cap_list);
413	+
414		if (add_to_default)
415		default_server_capabs |= cap_flag;
416		}
#	Line 741 | Line 424 | add_capability(const char *capab_name, i
424		int
425		delete_capability(const char *capab_name)
426		{
427	<	dlink_node *ptr;
745	<	dlink_node *next_ptr;
746	<	struct Capability *cap;
427	>	dlink_node *ptr = NULL, *ptr_next = NULL;
428
429	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
429	>	DLINK_FOREACH_SAFE(ptr, ptr_next, cap_list.head)
430		{
431	<	cap = ptr->data;
431	>	struct Capability *cap = ptr->data;
432
433	<	if (cap->cap != 0)
433	>	if (cap->cap)
434		{
435	<	if (irccmp(cap->name, capab_name) == 0)
435	>	if (!irccmp(cap->name, capab_name))
436		{
437	<	default_server_capabs &= ~(cap->cap);
438	<	dlinkDelete(ptr, &cap_list);
439	<	MyFree(cap->name);
440	<	cap->name = NULL;
760	<	MyFree(cap);
437	>	default_server_capabs &= ~(cap->cap);
438	>	dlinkDelete(ptr, &cap_list);
439	>	MyFree(cap->name);
440	>	MyFree(cap);
441		}
442		}
443		}
444
445	<	return(0);
445	>	return 0;
446		}
447
448		/*
#	Line 772 | Line 452 | delete_capability(const char *capab_name
452		* output       - 0 if not found CAPAB otherwise
453		* side effects - none
454		*/
455	<	int
455	>	unsigned int
456		find_capability(const char *capab)
457		{
458	<	dlink_node *ptr;
779	<	struct Capability *cap;
458	>	const dlink_node *ptr = NULL;
459
460		DLINK_FOREACH(ptr, cap_list.head)
461		{
462	<	cap = ptr->data;
462	>	const struct Capability *cap = ptr->data;
463
464	<	if (cap->cap != 0)
465	<	{
787	<	if (irccmp(cap->name, capab) == 0)
788	<	return(cap->cap);
789	<	}
464	>	if (cap->cap && !irccmp(cap->name, capab))
465	>	return cap->cap;
466		}
467	<	return(0);
467	>
468	>	return 0;
469		}
470
471		/* send_capabilities()
472		*
473		* inputs       - Client pointer to send to
797	–	*              - Pointer to AccessItem (for crypt)
474		*              - int flag of capabilities that this server can send
799	–	*              - int flag of encryption capabilities
475		* output       - NONE
476		* side effects - send the CAPAB line to a server  -orabidoo
477		*
478		*/
479		void
480	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
806	<	int cap_can_send, int enc_can_send)
480	>	send_capabilities(struct Client *client_p, int cap_can_send)
481		{
482	<	struct Capability *cap=NULL;
483	<	char msgbuf[IRCD_BUFSIZE];
810	<	char *t;
811	<	int tl;
812	<	dlink_node *ptr;
813	<	#ifdef HAVE_LIBCRYPTO
814	<	struct EncCapability *epref;
815	<	char *capend;
816	<	int sent_cipher = 0;
817	<	#endif
818	<
819	<	t = msgbuf;
482	>	char buf[IRCD_BUFSIZE] = "";
483	>	const dlink_node *ptr = NULL;
484
485		DLINK_FOREACH(ptr, cap_list.head)
486		{
487	<	cap = ptr->data;
487	>	const struct Capability *cap = ptr->data;
488
489		if (cap->cap & (cap_can_send|default_server_capabs))
490		{
491	<	tl = ircsprintf(t, "%s ", cap->name);
492	<	t += tl;
493	<	}
830	<	}
831	<	#ifdef HAVE_LIBCRYPTO
832	<	if (enc_can_send)
833	<	{
834	<	capend = t;
835	<	strcpy(t, "ENC:");
836	<	t += 4;
837	<
838	<	/* use connect{} specific info if available */
839	<	if (aconf->cipher_preference)
840	<	epref = aconf->cipher_preference;
841	<	else
842	<	epref = ConfigFileEntry.default_cipher_preference;
843	<
844	<	if ((epref->cap & enc_can_send))
845	<	{
846	<	/* Leave the space -- it is removed later. */
847	<	tl = ircsprintf(t, "%s ", epref->name);
848	<	t += tl;
849	<	sent_cipher = 1;
491	>	strlcat(buf, cap->name, sizeof(buf));
492	>	if (ptr->next)
493	>	strlcat(buf, " ", sizeof(buf));
494		}
851	–
852	–	if (!sent_cipher)
853	–	t = capend; /* truncate string before ENC:, below */
495		}
855	–	#endif
856	–	*(t-1) = '\0';
857	–	sendto_one(client_p, "CAPAB :%s", msgbuf);
858	–	}
859	–
860	–	/* sendnick_TS()
861	–	*
862	–	* inputs       - client (server) to send nick towards
863	–	*              - client to send nick for
864	–	* output       - NONE
865	–	* side effects - NICK message is sent towards given client_p
866	–	*/
867	–	void
868	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
869	–	{
870	–	static char ubuf[12];
871	–
872	–	if (!IsClient(target_p))
873	–	return;
874	–
875	–	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
876	–	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
877	–
878	–	if (ubuf[0] == '\0')
879	–	{
880	–	ubuf[0] = '+';
881	–	ubuf[1] = '\0';
882	–	}
883	–
884	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
885	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
886	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
887	–	target_p->servptr->id,
888	–	target_p->name, target_p->hopcount + 1,
889	–	(unsigned long) target_p->tsinfo,
890	–	ubuf, target_p->username, target_p->host,
891	–	((MyClient(target_p)&&!IsIPSpoof(target_p))?target_p->sockhost:"0"),
892	–	target_p->id, target_p->info);
893	–	else
894	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
895	–	target_p->name, target_p->hopcount + 1,
896	–	(unsigned long) target_p->tsinfo,
897	–	ubuf, target_p->username, target_p->host,
898	–	target_p->servptr->name, target_p->info);
899	–	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
900	–	if (!EmptyString(target_p->away))
901	–	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
902	–	target_p->away);
903	–
904	–	}
905	–
906	–	/* client_burst_if_needed()
907	–	*
908	–	* inputs       - pointer to server
909	–	*              - pointer to client to add
910	–	* output       - NONE
911	–	* side effects - If this client is not known by this lazyleaf, send it
912	–	*/
913	–	void
914	–	client_burst_if_needed(struct Client *client_p, struct Client *target_p)
915	–	{
916	–	if (!ServerInfo.hub)
917	–	return;
918	–	if (!MyConnect(client_p))
919	–	return;
920	–	if (!IsCapable(client_p,CAP_LL))
921	–	return;
496
497	<	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
924	<	{
925	<	sendnick_TS(client_p, target_p);
926	<	add_lazylinkclient(client_p,target_p);
927	<	}
497	>	sendto_one(client_p, "CAPAB :%s", buf);
498		}
499
500		/*
#	Line 935 | Line 505 | client_burst_if_needed(struct Client *cl
505		* side effects - build up string representing capabilities of server listed
506		*/
507		const char *
508	<	show_capabilities(struct Client *target_p)
508	>	show_capabilities(const struct Client *target_p)
509		{
510	<	static char msgbuf[IRCD_BUFSIZE];
511	<	char *t = msgbuf;
942	<	dlink_node *ptr;
510	>	static char msgbuf[IRCD_BUFSIZE] = "";
511	>	const dlink_node *ptr = NULL;
512
513	<	t += ircsprintf(msgbuf, "TS ");
513	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
514
515		DLINK_FOREACH(ptr, cap_list.head)
516		{
517		const struct Capability *cap = ptr->data;
518
519	<	if (IsCapable(target_p, cap->cap))
520	<	t += ircsprintf(t, "%s ", cap->name);
519	>	if (!IsCapable(target_p, cap->cap))
520	>	continue;
521	>
522	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
523	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
524		}
953	–	#ifdef HAVE_LIBCRYPTO
954	–	if (IsCapable(target_p, CAP_ENC) &&
955	–	target_p->localClient->in_cipher &&
956	–	target_p->localClient->out_cipher)
957	–	t += ircsprintf(t, "ENC:%s ",
958	–	target_p->localClient->in_cipher->name);
959	–	#endif
960	–	*(t - 1) = '\0';
525
526	<	return(msgbuf);
526	>	return msgbuf;
527		}
528
529		/* make_server()
#	Line 973 | Line 537 | struct Server *
537		make_server(struct Client *client_p)
538		{
539		if (client_p->serv == NULL)
540	<	{
977	<	client_p->serv = MyMalloc(sizeof(struct Server));
978	<	client_p->serv->dep_servers = 1;
979	<	}
540	>	client_p->serv = MyCalloc(sizeof(struct Server));
541
542		return client_p->serv;
543		}
544
984	–	/* server_estab()
985	–	*
986	–	* inputs       - pointer to a struct Client
987	–	* output       -
988	–	* side effects -
989	–	*/
990	–	void
991	–	server_estab(struct Client *client_p)
992	–	{
993	–	struct Client *target_p;
994	–	struct ConfItem *conf;
995	–	struct AccessItem *aconf=NULL;
996	–	char *host;
997	–	const char *inpath;
998	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
999	–	dlink_node *m;
1000	–	dlink_node *ptr;
1001	–
1002	–	assert(client_p != NULL);
1003	–
1004	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
1005	–
1006	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
1007	–	host   = client_p->name;
1008	–
1009	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
1010	–	== NULL)
1011	–	{
1012	–	/* This shouldn't happen, better tell the ops... -A1kmm */
1013	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
1014	–	"for server %s(this shouldn't happen)!", host);
1015	–	exit_client(client_p, &me, "Lost connect{} block!");
1016	–	return;
1017	–	}
1018	–
1019	–	MyFree(client_p->localClient->passwd);
1020	–	client_p->localClient->passwd = NULL;
1021	–
1022	–	/* Its got identd, since its a server */
1023	–	SetGotId(client_p);
1024	–
1025	–	/* If there is something in the serv_list, it might be this
1026	–	* connecting server..
1027	–	*/
1028	–	if (!ServerInfo.hub && serv_list.head)
1029	–	{
1030	–	if (client_p != serv_list.head->data || serv_list.head->next)
1031	–	{
1032	–	ServerStats->is_ref++;
1033	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
1034	–	exit_client(client_p, &me, "I'm a leaf");
1035	–	return;
1036	–	}
1037	–	}
1038	–
1039	–	aconf = (struct AccessItem *)map_to_conf(conf);
1040	–
1041	–	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
1042	–	{
1043	–	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1044	–	*        2.  Check aconf->spasswd, not aconf->passwd.
1045	–	*/
1046	–	if (!EmptyString(aconf->spasswd))
1047	–	{
1048	–	/* only send ts6 format PASS if we have ts6 enabled */
1049	–	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1050	–	sendto_one(client_p, "PASS %s TS %d %s",
1051	–	aconf->spasswd, TS_CURRENT, me.id);
1052	–	else
1053	–	sendto_one(client_p, "PASS %s TS 5",
1054	–	aconf->spasswd);
1055	–	}
1056	–
1057	–	/* Pass my info to the new server
1058	–	*
1059	–	* If trying to negotiate LazyLinks, pass on CAP_LL
1060	–	* If this is a HUB, pass on CAP_HUB
1061	–	* Pass on ZIP if supported
1062	–	* Pass on TB if supported.
1063	–	* - Dianora
1064	–	*/
1065	–
1066	–	send_capabilities(client_p, aconf,
1067	–	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
1068	–	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
1069	–	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
1070	–	, 0);
1071	–
1072	–	/* SERVER is the last command sent before switching to ziplinks.
1073	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1074	–	* on the wire immediately.  Otherwise, it could be sitting in
1075	–	* a kernel buffer when we start sending zipped data, and the
1076	–	* parser on the receiving side can't hand both unzipped and zipped
1077	–	* data in one packet. --Rodder
1078	–	*
1079	–	* currently we only need to call send_queued_write,
1080	–	* Nagle is already disabled at this point --adx
1081	–	*/
1082	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
1083	–	my_name_for_link(conf),
1084	–	ConfigServerHide.hidden ? "(H) " : "",
1085	–	(me.info[0]) ? (me.info) : "IRCers United");
1086	–	send_queued_write(client_p);
1087	–	}
1088	–
1089	–	/* Hand the server off to servlink now */
1090	–	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1091	–	{
1092	–	if (fork_server(client_p) < 0)
1093	–	{
1094	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1095	–	"Warning: fork failed for server %s -- check servlink_path (%s)",
1096	–	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1097	–	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1098	–	"%s -- check servlink_path (%s)",
1099	–	get_client_name(client_p, MASK_IP),
1100	–	ConfigFileEntry.servlink_path);
1101	–	exit_client(client_p, &me, "fork failed");
1102	–	return;
1103	–	}
1104	–
1105	–	start_io(client_p);
1106	–	SetServlink(client_p);
1107	–	}
1108	–
1109	–	/* only send ts6 format SVINFO if we have ts6 enabled */
1110	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1111	–	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
1112	–	(unsigned long)CurrentTime);
1113	–
1114	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
1115	–	if (IsCapable(client_p, CAP_TS6))
1116	–	hash_add_id(client_p);
1117	–
1118	–	/* XXX Does this ever happen? I don't think so -db */
1119	–	detach_conf(client_p, OPER_TYPE);
1120	–
1121	–	/* *WARNING*
1122	–	**    In the following code in place of plain server's
1123	–	**    name we send what is returned by get_client_name
1124	–	**    which may add the "sockhost" after the name. It's
1125	–	**    *very* *important* that there is a SPACE between
1126	–	**    the name and sockhost (if present). The receiving
1127	–	**    server will start the information field from this
1128	–	**    first blank and thus puts the sockhost into info.
1129	–	**    ...a bit tricky, but you have been warned, besides
1130	–	**    code is more neat this way...  --msa
1131	–	*/
1132	–	client_p->servptr = &me;
1133	–
1134	–	if (IsClosing(client_p))
1135	–	return;
1136	–
1137	–	SetServer(client_p);
1138	–
1139	–	/* Update the capability combination usage counts. -A1kmm */
1140	–	set_chcap_usage_counts(client_p);
1141	–
1142	–	/* Some day, all these lists will be consolidated *sigh* */
1143	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
1144	–
1145	–	m = dlinkFind(&unknown_list, client_p);
1146	–	assert(NULL != m);
1147	–
1148	–	dlinkDelete(m, &unknown_list);
1149	–	dlinkAdd(client_p, m, &serv_list);
1150	–
1151	–	Count.myserver++;
1152	–
1153	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
1154	–	hash_add_client(client_p);
1155	–
1156	–	/* doesnt duplicate client_p->serv if allocated this struct already */
1157	–	make_server(client_p);
1158	–
1159	–	/* fixing eob timings.. -gnp */
1160	–	client_p->firsttime = CurrentTime;
1161	–
1162	–	/* Show the real host/IP to admins */
1163	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1164	–	"Link with %s established: (%s) link",
1165	–	inpath_ip,show_capabilities(client_p));
1166	–	/* Now show the masked hostname/IP to opers */
1167	–	sendto_realops_flags(UMODE_ALL, L_OPER,
1168	–	"Link with %s established: (%s) link",
1169	–	inpath,show_capabilities(client_p));
1170	–	ilog(L_NOTICE, "Link with %s established: (%s) link",
1171	–	inpath_ip, show_capabilities(client_p));
1172	–
1173	–	client_p->serv->sconf = conf;
1174	–
1175	–	if (HasServlink(client_p))
1176	–	{
1177	–	/* we won't overflow FD_DESC_SZ here, as it can hold
1178	–	* client_p->name + 64
1179	–	*/
1180	–	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
1181	–	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
1182	–	}
1183	–	else
1184	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
1185	–
1186	–	/* Old sendto_serv_but_one() call removed because we now
1187	–	** need to send different names to different servers
1188	–	** (domain name matching) Send new server to other servers.
1189	–	*/
1190	–	DLINK_FOREACH(ptr, serv_list.head)
1191	–	{
1192	–	target_p = ptr->data;
1193	–
1194	–	if (target_p == client_p)
1195	–	continue;
1196	–
1197	–	if ((conf = target_p->serv->sconf) &&
1198	–	match(my_name_for_link(conf), client_p->name))
1199	–	continue;
1200	–
1201	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
1202	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
1203	–	me.id, client_p->name, client_p->id,
1204	–	IsHidden(client_p) ? "(H) " : "",
1205	–	client_p->info);
1206	–	else
1207	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
1208	–	me.name, client_p->name,
1209	–	IsHidden(client_p) ? "(H) " : "",
1210	–	client_p->info);
1211	–	}
1212	–
1213	–	/* Pass on my client information to the new server
1214	–	**
1215	–	** First, pass only servers (idea is that if the link gets
1216	–	** cancelled beacause the server was already there,
1217	–	** there are no NICK's to be cancelled...). Of course,
1218	–	** if cancellation occurs, all this info is sent anyway,
1219	–	** and I guess the link dies when a read is attempted...? --msa
1220	–	**
1221	–	** Note: Link cancellation to occur at this point means
1222	–	** that at least two servers from my fragment are building
1223	–	** up connection this other fragment at the same time, it's
1224	–	** a race condition, not the normal way of operation...
1225	–	**
1226	–	** ALSO NOTE: using the get_client_name for server names--
1227	–	**    see previous *WARNING*!!! (Also, original inpath
1228	–	**    is destroyed...)
1229	–	*/
1230	–
1231	–	conf = client_p->serv->sconf;
1232	–
1233	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
1234	–	{
1235	–	target_p = ptr->data;
1236	–
1237	–	/* target_p->from == target_p for target_p == client_p */
1238	–	if (target_p->from == client_p)
1239	–	continue;
1240	–
1241	–	if (match(my_name_for_link(conf), target_p->name))
1242	–	continue;
1243	–
1244	–	if (IsCapable(client_p, CAP_TS6))
1245	–	{
1246	–	if (HasID(target_p))
1247	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
1248	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1249	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
1250	–	target_p->info);
1251	–	else  /* introducing non-ts6 server */
1252	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1253	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1254	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1255	–	}
1256	–	else
1257	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1258	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
1259	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1260	–	}
1261	–
1262	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1263	–	uplink = client_p;
1264	–
1265	–	server_burst(client_p);
1266	–	}
1267	–
1268	–	static void
1269	–	start_io(struct Client *server)
1270	–	{
1271	–	struct LocalUser *lserver = server->localClient;
1272	–	int alloclen = 1;
1273	–	char *buf;
1274	–	dlink_node *ptr;
1275	–	struct dbuf_block *block;
1276	–
1277	–	/* calculate how many bytes to allocate */
1278	–	if (IsCapable(server, CAP_ZIP))
1279	–	alloclen += 6;
1280	–	#ifdef HAVE_LIBCRYPTO
1281	–	if (IsCapable(server, CAP_ENC))
1282	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1283	–	#endif
1284	–	alloclen += dbuf_length(&lserver->buf_recvq);
1285	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1286	–	alloclen += dbuf_length(&lserver->buf_sendq);
1287	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1288	–
1289	–	/* initialize servlink control sendq */
1290	–	lserver->slinkq = buf = MyMalloc(alloclen);
1291	–	lserver->slinkq_ofs = 0;
1292	–	lserver->slinkq_len = alloclen;
1293	–
1294	–	if (IsCapable(server, CAP_ZIP))
1295	–	{
1296	–	/* ziplink */
1297	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1298	–	*buf++ = 0; /* |          */
1299	–	*buf++ = 1; /* \ len is 1 */
1300	–	*buf++ = ConfigFileEntry.compression_level;
1301	–	*buf++ = SLINKCMD_START_ZIP_IN;
1302	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1303	–	}
1304	–	#ifdef HAVE_LIBCRYPTO
1305	–	if (IsCapable(server, CAP_ENC))
1306	–	{
1307	–	/* Decryption settings */
1308	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1309	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1310	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1311	–	*buf++ = lserver->in_cipher->cipherid;
1312	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1313	–	*buf++ = 0; /* keylen < 256 */
1314	–	*buf++ = lserver->in_cipher->keylen;
1315	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1316	–	buf += lserver->in_cipher->keylen;
1317	–	/* Encryption settings */
1318	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1319	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1320	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1321	–	*buf++ = lserver->out_cipher->cipherid;
1322	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1323	–	*buf++ = 0; /* keylen < 256 */
1324	–	*buf++ = lserver->out_cipher->keylen;
1325	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1326	–	buf += lserver->out_cipher->keylen;
1327	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1328	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1329	–	}
1330	–	#endif
1331	–
1332	–	/* pass the whole recvq to servlink */
1333	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1334	–	{
1335	–	block = ptr->data;
1336	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1337	–	*buf++ = (block->size >> 8);
1338	–	*buf++ = (block->size & 0xff);
1339	–	memcpy(buf, &block->data[0], block->size);
1340	–	buf += block->size;
1341	–	}
1342	–	dbuf_clear(&lserver->buf_recvq);
1343	–
1344	–	/* pass the whole sendq to servlink */
1345	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1346	–	{
1347	–	block = ptr->data;
1348	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1349	–	*buf++ = (block->size >> 8);
1350	–	*buf++ = (block->size & 0xff);
1351	–	memcpy(buf, &block->data[0], block->size);
1352	–	buf += block->size;
1353	–	}
1354	–	dbuf_clear(&lserver->buf_sendq);
1355	–
1356	–	/* start io */
1357	–	*buf++ = SLINKCMD_INIT;
1358	–
1359	–	/* schedule a write */
1360	–	send_queued_slink_write(server);
1361	–	}
1362	–
1363	–	/* fork_server()
1364	–	*
1365	–	* inputs       - struct Client *server
1366	–	* output       - success: 0 / failure: -1
1367	–	* side effect  - fork, and exec SERVLINK to handle this connection
1368	–	*/
1369	–	static int
1370	–	fork_server(struct Client *server)
1371	–	{
1372	–	#ifndef HAVE_SOCKETPAIR
1373	–	return -1;
1374	–	#else
1375	–	int i;
1376	–	int slink_fds[2][2];
1377	–	/* 0? - ctrl  | 1? - data
1378	–	* ?0 - child | ?1 - parent */
1379	–
1380	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1381	–	return -1;
1382	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1383	–	goto free_ctrl_fds;
1384	–
1385	–	if ((i = fork()) < 0)
1386	–	{
1387	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1388	–	free_ctrl_fds:
1389	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1390	–	return -1;
1391	–	}
1392	–
1393	–	if (i == 0)
1394	–	{
1395	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1396	–	char *kid_argv[7];
1397	–
1398	–	#ifdef O_ASYNC
1399	–	fcntl(server->localClient->fd.fd, F_SETFL,
1400	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1401	–	#endif
1402	–	close_fds(&server->localClient->fd);
1403	–	close(slink_fds[0][1]);
1404	–	close(slink_fds[1][1]);
1405	–
1406	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1407	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1408	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1409	–
1410	–	kid_argv[0] = "-slink";
1411	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1412	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1413	–	kid_argv[5] = fd_str[2];    /* network */
1414	–	kid_argv[6] = NULL;
1415	–
1416	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1417	–
1418	–	_exit(1);
1419	–	}
1420	–
1421	–	/* close the network fd and the child ends of the pipes */
1422	–	fd_close(&server->localClient->fd);
1423	–	close(slink_fds[0][0]);
1424	–	close(slink_fds[1][0]);
1425	–
1426	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1427	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1428	–
1429	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1430	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1431	–
1432	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1433	–	read_packet(&server->localClient->fd, server);
1434	–
1435	–	return 0;
1436	–	#endif
1437	–	}
1438	–
1439	–	/* server_burst()
1440	–	*
1441	–	* inputs       - struct Client pointer server
1442	–	*              -
1443	–	* output       - none
1444	–	* side effects - send a server burst
1445	–	* bugs         - still too long
1446	–	*/
1447	–	static void
1448	–	server_burst(struct Client *client_p)
1449	–	{
1450	–	/* Send it in the shortened format with the TS, if
1451	–	** it's a TS server; walk the list of channels, sending
1452	–	** all the nicks that haven't been sent yet for each
1453	–	** channel, then send the channel itself -- it's less
1454	–	** obvious than sending all nicks first, but on the
1455	–	** receiving side memory will be allocated more nicely
1456	–	** saving a few seconds in the handling of a split
1457	–	** -orabidoo
1458	–	*/
1459	–
1460	–	/* On a "lazy link" hubs send nothing.
1461	–	* Leafs always have to send nicks plus channels
1462	–	*/
1463	–	if (IsCapable(client_p, CAP_LL))
1464	–	{
1465	–	if (!ServerInfo.hub)
1466	–	{
1467	–	/* burst all our info */
1468	–	burst_all(client_p);
1469	–
1470	–	/* Now, ask for channel info on all our current channels */
1471	–	cjoin_all(client_p);
1472	–	}
1473	–	}
1474	–	else
1475	–	{
1476	–	burst_all(client_p);
1477	–	}
1478	–
1479	–	/* EOB stuff is now in burst_all */
1480	–	/* Always send a PING after connect burst is done */
1481	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
1482	–	}
1483	–
1484	–	/* burst_all()
1485	–	*
1486	–	* inputs       - pointer to server to send burst to
1487	–	* output       - NONE
1488	–	* side effects - complete burst of channels/nicks is sent to client_p
1489	–	*/
1490	–	static void
1491	–	burst_all(struct Client *client_p)
1492	–	{
1493	–	struct Client *target_p;
1494	–	struct Channel *chptr;
1495	–	dlink_node *gptr;
1496	–	dlink_node *ptr;
1497	–
1498	–	DLINK_FOREACH(gptr, global_channel_list.head)
1499	–	{
1500	–	chptr = gptr->data;
1501	–
1502	–	if (dlink_list_length(&chptr->members) != 0)
1503	–	{
1504	–	burst_members(client_p, chptr);
1505	–	send_channel_modes(client_p, chptr);
1506	–	if (IsCapable(client_p, CAP_TB))
1507	–	send_tb(client_p, chptr);
1508	–	}
1509	–	}
1510	–
1511	–	/* also send out those that are not on any channel
1512	–	*/
1513	–	DLINK_FOREACH(ptr, global_client_list.head)
1514	–	{
1515	–	target_p = ptr->data;
1516	–
1517	–	if (!IsBursted(target_p) && target_p->from != client_p)
1518	–	sendnick_TS(client_p, target_p);
1519	–
1520	–	ClearBursted(target_p);
1521	–	}
1522	–
1523	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1524	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1525	–	*/
1526	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1527	–	if (IsCapable(client_p, CAP_EOB))
1528	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1529	–	}
1530	–
1531	–	/*
1532	–	* send_tb
1533	–	*
1534	–	* inputs       - pointer to Client
1535	–	*              - pointer to channel
1536	–	* output       - NONE
1537	–	* side effects - Called on a server burst when
1538	–	*                server is CAP_TB capable
1539	–	*/
1540	–	static void
1541	–	send_tb(struct Client *client_p, struct Channel *chptr)
1542	–	{
1543	–	if (chptr->topic != NULL && IsCapable(client_p, CAP_TB))
1544	–	{
1545	–	if (ConfigChannel.burst_topicwho)
1546	–	{
1547	–	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1548	–	me.name, chptr->chname,
1549	–	(unsigned long)chptr->topic_time,
1550	–	chptr->topic_info, chptr->topic);
1551	–	}
1552	–	else
1553	–	{
1554	–	sendto_one(client_p, ":%s TB %s %lu :%s",
1555	–	me.name, chptr->chname,
1556	–	(unsigned long)chptr->topic_time, chptr->topic);
1557	–	}
1558	–	}
1559	–	}
1560	–
1561	–	/* cjoin_all()
1562	–	*
1563	–	* inputs       - server to ask for channel info from
1564	–	* output       - NONE
1565	–	* side effects - CJOINS for all the leafs known channels is sent
1566	–	*/
1567	–	static void
1568	–	cjoin_all(struct Client *client_p)
1569	–	{
1570	–	const dlink_node *gptr = NULL;
1571	–
1572	–	DLINK_FOREACH(gptr, global_channel_list.head)
1573	–	{
1574	–	const struct Channel *chptr = gptr->data;
1575	–	sendto_one(client_p, ":%s CBURST %s",
1576	–	me.name, chptr->chname);
1577	–	}
1578	–	}
1579	–
1580	–	/* burst_channel()
1581	–	*
1582	–	* inputs       - pointer to server to send sjoins to
1583	–	*              - channel pointer
1584	–	* output       - none
1585	–	* side effects - All sjoins for channel(s) given by chptr are sent
1586	–	*                for all channel members. ONLY called by hub on
1587	–	*                behalf of a lazylink so client_p is always guarunteed
1588	–	*                to be a LL leaf.
1589	–	*/
1590	–	void
1591	–	burst_channel(struct Client *client_p, struct Channel *chptr)
1592	–	{
1593	–	burst_ll_members(client_p, chptr);
1594	–
1595	–	send_channel_modes(client_p, chptr);
1596	–	add_lazylinkchannel(client_p,chptr);
1597	–
1598	–	if (chptr->topic != NULL && chptr->topic_info != NULL)
1599	–	{
1600	–	sendto_one(client_p, ":%s TOPIC %s %s %lu :%s",
1601	–	me.name, chptr->chname, chptr->topic_info,
1602	–	(unsigned long)chptr->topic_time, chptr->topic);
1603	–	}
1604	–	}
1605	–
1606	–	/* add_lazlinkchannel()
1607	–	*
1608	–	* inputs       - pointer to directly connected leaf server
1609	–	*                being introduced to this hub
1610	–	*              - pointer to channel structure being introduced
1611	–	* output       - NONE
1612	–	* side effects - The channel pointed to by chptr is now known
1613	–	*                to be on lazyleaf server given by local_server_p.
1614	–	*                mark that in the bit map and add to the list
1615	–	*                of channels to examine after this newly introduced
1616	–	*                server is squit off.
1617	–	*/
1618	–	static void
1619	–	add_lazylinkchannel(struct Client *local_server_p, struct Channel *chptr)
1620	–	{
1621	–	assert(MyConnect(local_server_p));
1622	–
1623	–	chptr->lazyLinkChannelExists |= local_server_p->localClient->serverMask;
1624	–	dlinkAdd(chptr, make_dlink_node(), &lazylink_channels);
1625	–	}
1626	–
1627	–	/* add_lazylinkclient()
1628	–	*
1629	–	* inputs       - pointer to directly connected leaf server
1630	–	*                being introduced to this hub
1631	–	*              - pointer to client being introduced
1632	–	* output       - NONE
1633	–	* side effects - The client pointed to by client_p is now known
1634	–	*                to be on lazyleaf server given by local_server_p.
1635	–	*                mark that in the bit map and add to the list
1636	–	*                of clients to examine after this newly introduced
1637	–	*                server is squit off.
1638	–	*/
1639	–	void
1640	–	add_lazylinkclient(struct Client *local_server_p, struct Client *client_p)
1641	–	{
1642	–	assert(MyConnect(local_server_p));
1643	–	client_p->lazyLinkClientExists |= local_server_p->localClient->serverMask;
1644	–	}
1645	–
1646	–	/* remove_lazylink_flags()
1647	–	*
1648	–	* inputs       - pointer to server quitting
1649	–	* output       - NONE
1650	–	* side effects - All the channels on the lazylink channel list are examined
1651	–	*                If they hold a bit corresponding to the servermask
1652	–	*                attached to client_p, clear that bit. If this bitmask
1653	–	*                goes to 0, then the channel is no longer known to
1654	–	*                be on any lazylink server, and can be removed from the
1655	–	*                link list.
1656	–	*
1657	–	*                Similar is done for lazylink clients
1658	–	*
1659	–	*                This function must be run by the HUB on any exiting
1660	–	*                lazylink leaf server, while the pointer is still valid.
1661	–	*                Hence must be run from client.c in exit_one_client()
1662	–	*
1663	–	*                The old code scanned all channels, this code only
1664	–	*                scans channels/clients on the lazylink_channels
1665	–	*                lazylink_clients lists.
1666	–	*/
1667	–	void
1668	–	remove_lazylink_flags(unsigned long mask)
1669	–	{
1670	–	dlink_node *ptr;
1671	–	dlink_node *next_ptr;
1672	–	struct Channel *chptr;
1673	–	struct Client *target_p;
1674	–	unsigned long clear_mask;
1675	–
1676	–	if (!mask) /* On 0 mask, don't do anything */
1677	–	return;
1678	–
1679	–	clear_mask = ~mask;
1680	–	freeMask |= mask;
1681	–
1682	–	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
1683	–	{
1684	–	chptr = ptr->data;
1685	–
1686	–	chptr->lazyLinkChannelExists &= clear_mask;
1687	–
1688	–	if (chptr->lazyLinkChannelExists == 0)
1689	–	{
1690	–	dlinkDelete(ptr, &lazylink_channels);
1691	–	free_dlink_node(ptr);
1692	–	}
1693	–	}
1694	–
1695	–	DLINK_FOREACH(ptr, global_client_list.head)
1696	–	{
1697	–	target_p = ptr->data;
1698	–	target_p->lazyLinkClientExists &= clear_mask;
1699	–	}
1700	–	}
1701	–
1702	–	/* burst_members()
1703	–	*
1704	–	* inputs       - pointer to server to send members to
1705	–	*              - dlink_list pointer to membership list to send
1706	–	* output       - NONE
1707	–	* side effects -
1708	–	*/
1709	–	static void
1710	–	burst_members(struct Client *client_p, struct Channel *chptr)
1711	–	{
1712	–	struct Client *target_p;
1713	–	struct Membership *ms;
1714	–	dlink_node *ptr;
1715	–
1716	–	DLINK_FOREACH(ptr, chptr->members.head)
1717	–	{
1718	–	ms       = ptr->data;
1719	–	target_p = ms->client_p;
1720	–
1721	–	if (!IsBursted(target_p))
1722	–	{
1723	–	SetBursted(target_p);
1724	–
1725	–	if (target_p->from != client_p)
1726	–	sendnick_TS(client_p, target_p);
1727	–	}
1728	–	}
1729	–	}
1730	–
1731	–	/* burst_ll_members()
1732	–	*
1733	–	* inputs       - pointer to server to send members to
1734	–	*              - dlink_list pointer to membership list to send
1735	–	* output       - NONE
1736	–	* side effects - This version also has to check the bitmap for lazylink
1737	–	*/
1738	–	static void
1739	–	burst_ll_members(struct Client *client_p, struct Channel *chptr)
1740	–	{
1741	–	struct Client *target_p;
1742	–	struct Membership *ms;
1743	–	dlink_node *ptr;
1744	–
1745	–	DLINK_FOREACH(ptr, chptr->members.head)
1746	–	{
1747	–	ms       = ptr->data;
1748	–	target_p = ms->client_p;
1749	–
1750	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
1751	–	{
1752	–	if (target_p->from != client_p)
1753	–	{
1754	–	add_lazylinkclient(client_p,target_p);
1755	–	sendnick_TS(client_p, target_p);
1756	–	}
1757	–	}
1758	–	}
1759	–	}
1760	–
1761	–	/* set_autoconn()
1762	–	*
1763	–	* inputs       - struct Client pointer to oper requesting change
1764	–	* output       - none
1765	–	* side effects - set autoconnect mode
1766	–	*/
1767	–	void
1768	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1769	–	{
1770	–	struct ConfItem *conf;
1771	–	struct AccessItem *aconf;
1772	–
1773	–	if (name != NULL)
1774	–	{
1775	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1776	–	if (conf != NULL)
1777	–	{
1778	–	aconf = (struct AccessItem *)map_to_conf(conf);
1779	–	if (newval)
1780	–	SetConfAllowAutoConn(aconf);
1781	–	else
1782	–	ClearConfAllowAutoConn(aconf);
1783	–
1784	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1785	–	"%s has changed AUTOCONN for %s to %i",
1786	–	source_p->name, name, newval);
1787	–	sendto_one(source_p,
1788	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1789	–	me.name, source_p->name, name, newval);
1790	–	}
1791	–	else
1792	–	{
1793	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1794	–	me.name, source_p->name, name);
1795	–	}
1796	–	}
1797	–	else
1798	–	{
1799	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1800	–	me.name, source_p->name);
1801	–	}
1802	–	}
1803	–
1804	–	void
1805	–	initServerMask(void)
1806	–	{
1807	–	freeMask = 0xFFFFFFFFUL;
1808	–	}
1809	–
1810	–	/* nextFreeMask()
1811	–	*
1812	–	* inputs       - NONE
1813	–	* output       - unsigned long next unused mask for use in LL
1814	–	* side effects -
1815	–	*/
1816	–	unsigned long
1817	–	nextFreeMask(void)
1818	–	{
1819	–	int i;
1820	–	unsigned long mask = 1;
1821	–
1822	–	for (i = 0; i < 32; i++)
1823	–	{
1824	–	if (mask & freeMask)
1825	–	{
1826	–	freeMask &= ~mask;
1827	–	return(mask);
1828	–	}
1829	–
1830	–	mask <<= 1;
1831	–	}
1832	–
1833	–	return(0L); /* watch this special case ... */
1834	–	}
1835	–
545		/* New server connection code
546		* Based upon the stuff floating about in s_bsd.c
547		*   -- adrian
#	Line 1840 | Line 549 | nextFreeMask(void)
549
550		/* serv_connect() - initiate a server connection
551		*
552	<	* inputs       - pointer to conf
552	>	* inputs       - pointer to conf
553		*              - pointer to client doing the connect
554		* output       -
555		* side effects -
#	Line 1855 | Line 564 | nextFreeMask(void)
564		* it suceeded or not, and 0 if it fails in here somewhere.
565		*/
566		int
567	<	serv_connect(struct AccessItem *aconf, struct Client *by)
567	>	serv_connect(struct MaskItem *conf, struct Client *by)
568		{
569	<	struct ConfItem *conf;
570	<	struct Client *client_p;
1862	<	char buf[HOSTIPLEN];
569	>	struct Client *client_p = NULL;
570	>	char buf[HOSTIPLEN + 1] = "";
571
572		/* conversion structs */
573		struct sockaddr_in *v4;
1866	–	/* Make sure aconf is useful */
1867	–	assert(aconf != NULL);
574
575	<	if(aconf == NULL)
576	<	return (0);
575	>	/* Make sure conf is useful */
576	>	assert(conf);
577
578	<	/* XXX should be passing struct ConfItem in the first place */
579	<	conf = unmap_conf_item(aconf);
580	<
1875	<	/* log */
1876	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1877	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1878	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
578	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
579	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
580	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
581		buf);
582
583		/* Still processing a DNS lookup? -> exit */
584	<	if (aconf->dns_query != NULL)
584	>	if (conf->dns_pending)
585	>	{
586	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
587	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
588	>	conf->name);
589	>	return 0;
590	>	}
591	>
592	>	if (conf->dns_failed)
593		{
594	<	sendto_realops_flags(UMODE_ALL, L_OPER,
595	<	"Error connecting to %s: Error during DNS lookup", conf->name);
596	<	return (0);
594	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
595	>	"Error connecting to %s: DNS lookup for connect{} failed.",
596	>	conf->name);
597	>	return 0;
598		}
599
600		/* Make sure this server isn't already connected
601	<	* Note: aconf should ALWAYS be a valid C: line
601	>	* Note: conf should ALWAYS be a valid C: line
602		*/
603	<	if ((client_p = find_server(conf->name)) != NULL)
604	<	{
605	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
606	<	"Server %s already present from %s",
607	<	conf->name, get_client_name(client_p, SHOW_IP));
608	<	sendto_realops_flags(UMODE_ALL, L_OPER,
609	<	"Server %s already present from %s",
610	<	conf->name, get_client_name(client_p, MASK_IP));
603	>	if ((client_p = hash_find_server(conf->name)))
604	>	{
605	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
606	>	"Server %s already present from %s",
607	>	conf->name, get_client_name(client_p, SHOW_IP));
608	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
609	>	"Server %s already present from %s",
610	>	conf->name, get_client_name(client_p, MASK_IP));
611		if (by && IsClient(by) && !MyClient(by))
612	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
613	<	me.name, by->name, conf->name,
614	<	get_client_name(client_p, MASK_IP));
1904	<	return (0);
612	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
613	>	conf->name, get_client_name(client_p, MASK_IP));
614	>	return 0;
615		}
616	<
616	>
617		/* Create a local client */
618		client_p = make_client(NULL);
619
620		/* Copy in the server, hostname, fd */
621		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
622	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
622	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
623
624		/* We already converted the ip once, so lets use it - stu */
625	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
625	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
626
627	<	/* create a socket for the server connection */
628	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1919	<	SOCK_STREAM, 0, NULL) < 0)
627	>	/* create a socket for the server connection */
628	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
629		{
630		/* Eek, failure to create the socket */
631	<	report_error(L_ALL,
632	<	"opening stream socket to %s: %s", conf->name, errno);
631	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
632	>
633		SetDead(client_p);
634	<	exit_client(client_p, &me, "Connection failed");
635	<	return (0);
634	>	exit_client(client_p, "Connection failed");
635	>	return 0;
636		}
637
638		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1932 | Line 641 | serv_connect(struct AccessItem *aconf, s
641		/* Attach config entries to client here rather than in
642		* serv_connect_callback(). This to avoid null pointer references.
643		*/
644	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
644	>	if (!attach_connect_block(client_p, conf->name, conf->host))
645		{
646	<	sendto_realops_flags(UMODE_ALL, L_ALL,
647	<	"Host %s is not enabled for connecting:no C/N-line",
648	<	conf->name);
649	<	if (by && IsClient(by) && !MyClient(by))
650	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
651	<	me.name, by->name, client_p->name);
646	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
647	>	"Host %s is not enabled for connecting: no connect{} block",
648	>	conf->name);
649	>	if (by && IsClient(by) && !MyClient(by))
650	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
651	>
652		SetDead(client_p);
653	<	exit_client(client_p, client_p, "Connection failed");
654	<	return (0);
653	>	exit_client(client_p, "Connection failed");
654	>	return 0;
655		}
656
657		/* at this point we have a connection in progress and C/N lines
#	Line 1959 | Line 668 | serv_connect(struct AccessItem *aconf, s
668		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
669
670		SetConnecting(client_p);
671	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1963	<	/* from def_fam */
1964	<	client_p->localClient->aftype = aconf->aftype;
671	>	client_p->localClient->aftype = conf->aftype;
672
673		/* Now, initiate the connection */
674	<	/* XXX assume that a non 0 type means a specific bind address
674	>	/* XXX assume that a non 0 type means a specific bind address
675		* for this connect.
676		*/
677	<	switch (aconf->aftype)
677	>	switch (conf->aftype)
678		{
679		case AF_INET:
680	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
681	<	if (v4->sin_addr.s_addr != 0)
680	>	v4 = (struct sockaddr_in*)&conf->bind;
681	>	if (v4->sin_addr.s_addr)
682		{
683		struct irc_ssaddr ipn;
684		memset(&ipn, 0, sizeof(struct irc_ssaddr));
685		ipn.ss.ss_family = AF_INET;
686		ipn.ss_port = 0;
687	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
688	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
689	<	(struct sockaddr *)&ipn, ipn.ss_len,
690	<	serv_connect_callback, client_p, aconf->aftype,
691	<	CONNECTTIMEOUT);
687	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
688	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
689	>	(struct sockaddr *)&ipn, ipn.ss_len,
690	>	serv_connect_callback, client_p, conf->aftype,
691	>	CONNECTTIMEOUT);
692		}
693		else if (ServerInfo.specific_ipv4_vhost)
694		{
#	Line 1990 | Line 697 | serv_connect(struct AccessItem *aconf, s
697		ipn.ss.ss_family = AF_INET;
698		ipn.ss_port = 0;
699		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
700	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
700	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
701		(struct sockaddr *)&ipn, ipn.ss_len,
702	<	serv_connect_callback, client_p, aconf->aftype,
703	<	CONNECTTIMEOUT);
702	>	serv_connect_callback, client_p, conf->aftype,
703	>	CONNECTTIMEOUT);
704		}
705		else
706	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
707	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
706	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
707	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
708		CONNECTTIMEOUT);
709		break;
710		#ifdef IPV6
711		case AF_INET6:
712		{
713	<	struct irc_ssaddr ipn;
714	<	struct sockaddr_in6 *v6;
715	<	struct sockaddr_in6 *v6conf;
716	<
717	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
718	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
719	<	v6 = (struct sockaddr_in6 *)&ipn;
720	<
721	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
2015	<	sizeof(struct in6_addr)) != 0)
2016	<	{
2017	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
2018	<	ipn.ss.ss_family = AF_INET6;
2019	<	ipn.ss_port = 0;
2020	<	comm_connect_tcp(&client_p->localClient->fd,
2021	<	aconf->host, aconf->port,
2022	<	(struct sockaddr *)&ipn, ipn.ss_len,
2023	<	serv_connect_callback, client_p,
2024	<	aconf->aftype, CONNECTTIMEOUT);
2025	<	}
2026	<	else if (ServerInfo.specific_ipv6_vhost)
713	>	struct irc_ssaddr ipn;
714	>	struct sockaddr_in6 *v6;
715	>	struct sockaddr_in6 *v6conf;
716	>
717	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
718	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
719	>	v6 = (struct sockaddr_in6 *)&ipn;
720	>
721	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
722		{
723	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
724	<	ipn.ss.ss_family = AF_INET6;
725	<	ipn.ss_port = 0;
726	<	comm_connect_tcp(&client_p->localClient->fd,
727	<	aconf->host, aconf->port,
728	<	(struct sockaddr *)&ipn, ipn.ss_len,
729	<	serv_connect_callback, client_p,
730	<	aconf->aftype, CONNECTTIMEOUT);
731	<	}
732	<	else
733	<	comm_connect_tcp(&client_p->localClient->fd,
734	<	aconf->host, aconf->port,
735	<	NULL, 0, serv_connect_callback, client_p,
736	<	aconf->aftype, CONNECTTIMEOUT);
723	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
724	>	ipn.ss.ss_family = AF_INET6;
725	>	ipn.ss_port = 0;
726	>	comm_connect_tcp(&client_p->localClient->fd,
727	>	conf->host, conf->port,
728	>	(struct sockaddr *)&ipn, ipn.ss_len,
729	>	serv_connect_callback, client_p,
730	>	conf->aftype, CONNECTTIMEOUT);
731	>	}
732	>	else if (ServerInfo.specific_ipv6_vhost)
733	>	{
734	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
735	>	ipn.ss.ss_family = AF_INET6;
736	>	ipn.ss_port = 0;
737	>	comm_connect_tcp(&client_p->localClient->fd,
738	>	conf->host, conf->port,
739	>	(struct sockaddr *)&ipn, ipn.ss_len,
740	>	serv_connect_callback, client_p,
741	>	conf->aftype, CONNECTTIMEOUT);
742	>	}
743	>	else
744	>	comm_connect_tcp(&client_p->localClient->fd,
745	>	conf->host, conf->port,
746	>	NULL, 0, serv_connect_callback, client_p,
747	>	conf->aftype, CONNECTTIMEOUT);
748		}
749		#endif
750		}
751	<	return (1);
751	>	return 1;
752	>	}
753	>
754	>	#ifdef HAVE_LIBCRYPTO
755	>	static void
756	>	finish_ssl_server_handshake(struct Client *client_p)
757	>	{
758	>	struct MaskItem *conf = NULL;
759	>
760	>	conf = find_conf_name(&client_p->localClient->confs,
761	>	client_p->name, CONF_SERVER);
762	>	if (conf == NULL)
763	>	{
764	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
765	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
766	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
767	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
768	>
769	>	exit_client(client_p, "Lost connect{} block");
770	>	return;
771	>	}
772	>
773	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
774	>
775	>	send_capabilities(client_p, 0);
776	>
777	>	sendto_one(client_p, "SERVER %s 1 :%s%s",
778	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
779	>	me.info);
780	>
781	>	/* If we've been marked dead because a send failed, just exit
782	>	* here now and save everyone the trouble of us ever existing.
783	>	*/
784	>	if (IsDead(client_p))
785	>	{
786	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
787	>	"%s[%s] went dead during handshake",
788	>	client_p->name,
789	>	client_p->host);
790	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
791	>	"%s went dead during handshake", client_p->name);
792	>	return;
793	>	}
794	>
795	>	/* don't move to serv_list yet -- we haven't sent a burst! */
796	>	/* If we get here, we're ok, so lets start reading some data */
797	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
798		}
799
800	+	static void
801	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
802	+	{
803	+	X509 *cert = NULL;
804	+	int ret = 0;
805	+
806	+	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
807	+	{
808	+	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
809	+	{
810	+	case SSL_ERROR_WANT_WRITE:
811	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
812	+	(PF *)ssl_server_handshake, client_p, 0);
813	+	return;
814	+	case SSL_ERROR_WANT_READ:
815	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
816	+	(PF *)ssl_server_handshake, client_p, 0);
817	+	return;
818	+	default:
819	+	{
820	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
821	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
822	+	"Error connecting to %s: %s", client_p->name,
823	+	sslerr ? sslerr : "unknown SSL error");
824	+	exit_client(client_p, "Error during SSL handshake");
825	+	return;
826	+	}
827	+	}
828	+	}
829	+
830	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
831	+	{
832	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
833	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = "";
834	+	unsigned char md[EVP_MAX_MD_SIZE] = "";
835	+
836	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
837	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
838	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
839	+	{
840	+	unsigned int n = 0;
841	+
842	+	if (X509_digest(cert, ServerInfo.message_digest_algorithm, md, &n))
843	+	{
844	+	binary_to_hex(md, buf, n);
845	+	client_p->certfp = xstrdup(buf);
846	+	}
847	+	}
848	+	else
849	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
850	+	client_p->name, client_p->username, client_p->host, res);
851	+	X509_free(cert);
852	+	}
853	+
854	+	finish_ssl_server_handshake(client_p);
855	+	}
856	+
857	+	static void
858	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
859	+	{
860	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
861	+	{
862	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
863	+	ERR_error_string(ERR_get_error(), NULL));
864	+	SetDead(client_p);
865	+	exit_client(client_p, "SSL_new failed");
866	+	return;
867	+	}
868	+
869	+	SSL_set_fd(fd->ssl, fd->fd);
870	+
871	+	if (!EmptyString(conf->cipher_list))
872	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
873	+
874	+	ssl_server_handshake(NULL, client_p);
875	+	}
876	+	#endif
877	+
878		/* serv_connect_callback() - complete a server connection.
879	<	*
879	>	*
880		* This routine is called after the server connection attempt has
881		* completed. If unsucessful, an error is sent to ops and the client
882		* is closed. If sucessful, it goes through the initialisation/check
#	Line 2057 | Line 887 | static void
887		serv_connect_callback(fde_t *fd, int status, void *data)
888		{
889		struct Client *client_p = data;
890	<	struct ConfItem *conf=NULL;
2061	<	struct AccessItem *aconf=NULL;
890	>	struct MaskItem *conf = NULL;
891
892	<	/* First, make sure its a real client! */
893	<	assert(client_p != NULL);
892	>	/* First, make sure it's a real client! */
893	>	assert(client_p);
894		assert(&client_p->localClient->fd == fd);
895
896		/* Next, for backward purposes, record the ip of the server */
897		memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
898		sizeof(struct irc_ssaddr));
899	+
900		/* Check the status */
901		if (status != COMM_OK)
902		{
#	Line 2074 | Line 904 | serv_connect_callback(fde_t *fd, int sta
904		* Admins get to see any IP, mere opers don't *sigh*
905		*/
906		if (ConfigServerHide.hide_server_ips)
907	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
907	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
908		"Error connecting to %s: %s",
909		client_p->name, comm_errstr(status));
910		else
911	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
912	<	"Error connecting to %s[%s]: %s", client_p->name,
913	<	client_p->host, comm_errstr(status));
914	<
915	<	sendto_realops_flags(UMODE_ALL, L_OPER,
916	<	"Error connecting to %s: %s",
917	<	client_p->name, comm_errstr(status));
911	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
912	>	"Error connecting to %s[%s]: %s", client_p->name,
913	>	client_p->host, comm_errstr(status));
914	>
915	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
916	>	"Error connecting to %s: %s",
917	>	client_p->name, comm_errstr(status));
918
919		/* If a fd goes bad, call dead_link() the socket is no
920		* longer valid for reading or writing.
#	Line 2096 | Line 926 | serv_connect_callback(fde_t *fd, int sta
926		/* COMM_OK, so continue the connection procedure */
927		/* Get the C/N lines */
928		conf = find_conf_name(&client_p->localClient->confs,
929	<	client_p->name, SERVER_TYPE);
929	>	client_p->name, CONF_SERVER);
930		if (conf == NULL)
931		{
932	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
933	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
934	<	sendto_realops_flags(UMODE_ALL, L_OPER,
935	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
932	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
933	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
934	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
935	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
936
937	<	exit_client(client_p, &me, "Lost connect{} block");
937	>	exit_client(client_p, "Lost connect{} block");
938		return;
939		}
940
2111	–	aconf = (struct AccessItem *)map_to_conf(conf);
941		/* Next, send the initial handshake */
942		SetHandshake(client_p);
943
944		#ifdef HAVE_LIBCRYPTO
945	<	/* Handle all CRYPTLINK links in cryptlink_init */
2117	<	if (IsConfCryptLink(aconf))
945	>	if (IsConfSSL(conf))
946		{
947	<	cryptlink_init(client_p, conf, fd);
947	>	ssl_connect_init(client_p, conf, fd);
948		return;
949		}
950		#endif
951
952	<	/* jdc -- Check and send spasswd, not passwd. */
2125	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
2126	<	/* Send TS 6 form only if id */
2127	<	sendto_one(client_p, "PASS %s TS %d %s",
2128	<	aconf->spasswd, TS_CURRENT, me.id);
2129	<	else
2130	<	sendto_one(client_p, "PASS %s TS 5",
2131	<	aconf->spasswd);
952	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
953
954	<	/* Pass my info to the new server
2134	<	*
2135	<	* If trying to negotiate LazyLinks, pass on CAP_LL
2136	<	* If this is a HUB, pass on CAP_HUB
2137	<	* Pass on ZIP if supported
2138	<	* Pass on TB if supported.
2139	<	* - Dianora
2140	<	*/
2141	<	send_capabilities(client_p, aconf,
2142	<	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
2143	<	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
2144	<	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
2145	<	, 0);
954	>	send_capabilities(client_p, 0);
955
956	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
957	<	my_name_for_link(conf),
2149	<	ConfigServerHide.hidden ? "(H) " : "",
2150	<	me.info);
956	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
957	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
958
959		/* If we've been marked dead because a send failed, just exit
960		* here now and save everyone the trouble of us ever existing.
961		*/
962	<	if (IsDead(client_p))
962	>	if (IsDead(client_p))
963		{
964	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
965	<	"%s[%s] went dead during handshake",
964	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
965	>	"%s[%s] went dead during handshake",
966		client_p->name,
967	<	client_p->host);
968	<	sendto_realops_flags(UMODE_ALL, L_OPER,
969	<	"%s went dead during handshake", client_p->name);
967	>	client_p->host);
968	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
969	>	"%s went dead during handshake", client_p->name);
970		return;
971		}
972
#	Line 2179 | Line 986 | find_servconn_in_progress(const char *na
986		cptr = ptr->data;
987
988		if (cptr && cptr->name[0])
989	<	if (match(cptr->name, name) || match(name, cptr->name))
989	>	if (!match(name, cptr->name))
990		return cptr;
991		}
2185	–
2186	–	return NULL;
2187	–	}
2188	–
2189	–	#ifdef HAVE_LIBCRYPTO
2190	–	/*
2191	–	* sends a CRYPTLINK SERV command.
2192	–	*/
2193	–	void
2194	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
2195	–	{
2196	–	struct AccessItem *aconf;
2197	–	char *encrypted;
2198	–	unsigned char *key_to_send;
2199	–	char randkey[CIPHERKEYLEN];
2200	–	int enc_len;
2201	–
2202	–	/* get key */
2203	–	if ((!ServerInfo.rsa_private_key) ||
2204	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
2205	–	{
2206	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
2207	–	"Invalid RSA private key");
2208	–	return;
2209	–	}
2210	–
2211	–	aconf = (struct AccessItem *)map_to_conf(conf);
992
993	<	if (aconf->rsa_public_key == NULL)
2214	<	{
2215	<	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
2216	<	"Invalid RSA public key");
2217	<	return;
2218	<	}
2219	<
2220	<	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
2221	<	{
2222	<	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
2223	<	"Couldn't generate keyphrase");
2224	<	return;
2225	<	}
2226	<
2227	<	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
2228	<	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
2229	<	(unsigned char *)randkey,
2230	<	(unsigned char *)encrypted,
2231	<	aconf->rsa_public_key,
2232	<	RSA_PKCS1_PADDING);
2233	<
2234	<	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
2235	<
2236	<	if (enc_len <= 0)
2237	<	{
2238	<	report_crypto_errors();
2239	<	MyFree(encrypted);
2240	<	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
2241	<	"Couldn't encrypt data");
2242	<	return;
2243	<	}
2244	<
2245	<	if (!(base64_block(&key_to_send, encrypted, enc_len)))
2246	<	{
2247	<	MyFree(encrypted);
2248	<	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
2249	<	"Couldn't base64 encode key");
2250	<	return;
2251	<	}
2252	<
2253	<	send_capabilities(client_p, aconf,
2254	<	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
2255	<	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
2256	<	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
2257	<	, CAP_ENC_MASK);
2258	<
2259	<	if (me.id[0])
2260	<	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
2261	<
2262	<	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
2263	<	my_name_for_link(conf), key_to_send,
2264	<	ConfigServerHide.hidden ? "(H) " : "", me.info);
2265	<
2266	<	SetHandshake(client_p);
2267	<	SetWaitAuth(client_p);
2268	<
2269	<	MyFree(encrypted);
2270	<	MyFree(key_to_send);
2271	<
2272	<	if (IsDead(client_p))
2273	<	cryptlink_error(client_p, "SERV", "Went dead during handshake",
2274	<	"Went dead during handshake");
2275	<	else if (fd != NULL)
2276	<	/* If we get here, we're ok, so lets start reading some data */
2277	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
2278	<	}
2279	<
2280	<	void
2281	<	cryptlink_error(struct Client *client_p, const char *type,
2282	<	const char *reason, const char *client_reason)
2283	<	{
2284	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2285	<	get_client_name(client_p, SHOW_IP), type, reason);
2286	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2287	<	get_client_name(client_p, MASK_IP), type, reason);
2288	<	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2289	<	get_client_name(client_p, SHOW_IP), type, reason);
2290	<
2291	<	/* If client_reason isn't NULL, then exit the client with the message
2292	<	* defined in the call.
2293	<	*/
2294	<	if ((client_reason != NULL) && (!IsDead(client_p)))
2295	<	exit_client(client_p, &me, client_reason);
2296	<	}
2297	<
2298	<	static char base64_chars[] =
2299	<	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2300	<
2301	<	static char base64_values[] =
2302	<	{
2303	<	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2304	<	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2305	<	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2306	<	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2307	<	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2308	<	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2309	<	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2310	<	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2311	<	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2312	<	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2313	<	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2314	<	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2315	<	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2316	<	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2317	<	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2318	<	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2319	<	};
2320	<
2321	<	/*
2322	<	* base64_block will allocate and return a new block of memory
2323	<	* using MyMalloc().  It should be freed after use.
2324	<	*/
2325	<	int
2326	<	base64_block(unsigned char **output, char *data, int len)
2327	<	{
2328	<	unsigned char *out;
2329	<	unsigned char *in = (unsigned char*)data;
2330	<	unsigned long int q_in;
2331	<	int i;
2332	<	int count = 0;
2333	<
2334	<	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2335	<
2336	<	/* process 24 bits at a time */
2337	<	for( i = 0; i < len; i += 3)
2338	<	{
2339	<	q_in = 0;
2340	<
2341	<	if ( i + 2 < len )
2342	<	{
2343	<	q_in  = (in[i+2] & 0xc0) << 2;
2344	<	q_in |=  in[i+2];
2345	<	}
2346	<
2347	<	if ( i + 1 < len )
2348	<	{
2349	<	q_in |= (in[i+1] & 0x0f) << 10;
2350	<	q_in |= (in[i+1] & 0xf0) << 12;
2351	<	}
2352	<
2353	<	q_in |= (in[i]   & 0x03) << 20;
2354	<	q_in |=  in[i]           << 22;
2355	<
2356	<	q_in &= 0x3f3f3f3f;
2357	<
2358	<	out[count++] = base64_chars[((q_in >> 24)       )];
2359	<	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2360	<	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2361	<	out[count++] = base64_chars[((q_in      ) & 0xff)];
2362	<	}
2363	<	if ( (i - len) > 0 )
2364	<	{
2365	<	out[count-1] = '=';
2366	<	if ( (i - len) > 1 )
2367	<	out[count-2] = '=';
2368	<	}
2369	<
2370	<	out[count] = '\0';
2371	<	*output = out;
2372	<	return (count);
2373	<	}
2374	<
2375	<	/*
2376	<	* unbase64_block will allocate and return a new block of memory
2377	<	* using MyMalloc().  It should be freed after use.
2378	<	*/
2379	<	int
2380	<	unbase64_block(unsigned char **output, char *data, int len)
2381	<	{
2382	<	unsigned char *out;
2383	<	unsigned char *in = (unsigned char*)data;
2384	<	unsigned long int q_in;
2385	<	int i;
2386	<	int count = 0;
2387	<
2388	<	if ((len % 4) != 0)
2389	<	return (0);
2390	<
2391	<	out = MyMalloc(((len / 4) * 3) + 1);
2392	<
2393	<	/* process 32 bits at a time */
2394	<	for( i = 0; (i + 3) < len; i+=4)
2395	<	{
2396	<	/* compress input (chars a, b, c and d) as follows:
2397	<	* (after converting ascii -> base64 value)
2398	<	*
2399	<	* |00000000aaaaaabbbbbbccccccdddddd|
2400	<	* |  765432  107654  321076  543210|
2401	<	*/
2402	<
2403	<	q_in = 0;
2404	<
2405	<	if (base64_values[in[i+3]] > -1)
2406	<	q_in |= base64_values[in[i+3]]      ;
2407	<	if (base64_values[in[i+2]] > -1)
2408	<	q_in |= base64_values[in[i+2]] <<  6;
2409	<	if (base64_values[in[i+1]] > -1)
2410	<	q_in |= base64_values[in[i+1]] << 12;
2411	<	if (base64_values[in[i  ]] > -1)
2412	<	q_in |= base64_values[in[i  ]] << 18;
2413	<
2414	<	out[count++] = (q_in >> 16) & 0xff;
2415	<	out[count++] = (q_in >>  8) & 0xff;
2416	<	out[count++] = (q_in      ) & 0xff;
2417	<	}
2418	<
2419	<	if (in[i-1] == '=') count--;
2420	<	if (in[i-2] == '=') count--;
2421	<
2422	<	out[count] = '\0';
2423	<	*output = out;
2424	<	return (count);
993	>	return NULL;
994		}
2426	–
2427	–	#endif /* HAVE_LIBCRYPTO */
2428	–

Diff Legend

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