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 391 by michael, Fri Feb 3 09:57:22 2006 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2282 by michael, Tue Jun 18 18:02:14 2013 UTC

#	Line 27 | Line 27
27		#include <openssl/rsa.h>
28		#include "rsa.h"
29		#endif
30	<	#include "tools.h"
30	>	#include "list.h"
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 "inet_misc.h"
41	–	#include "sprintf_irc.h"
39		#include "ircd.h"
40		#include "ircd_defs.h"
41		#include "s_bsd.h"
45	–	#include "irc_getnameinfo.h"
46	–	#include "list.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"
48	<	#include "s_stats.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	<	struct Client *uplink  = NULL;
62	<
63	<
57	>	dlink_list flatten_links;
58		static dlink_list cap_list = { NULL, NULL, 0 };
65	–	static unsigned long freeMask;
59		static void server_burst(struct Client *);
67	–	static int fork_server(struct Client *);
60		static void burst_all(struct Client *);
69	–	static void cjoin_all(struct Client *);
61		static void send_tb(struct Client *client_p, struct Channel *chptr);
62
63		static CNCB serv_connect_callback;
64
74	–	static void start_io(struct Client *);
65		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 = NULL;
231	–
232	–	/* Use connect{} specific info if available */
233	–	if (aconf->cipher_preference)
234	–	epref = aconf->cipher_preference;
235	–	else if (ConfigFileEntry.default_cipher_preference)
236	–	epref = ConfigFileEntry.default_cipher_preference;
237	–
238	–	/*
239	–	* If the server supports the capability in hand, return the matching
240	–	* conf struct.  Otherwise, return NULL (an error).
241	–	*/
242	–	if (epref && IsCapableEnc(client_p, epref->cap))
243	–	return epref;
244	–
245	–	return NULL;
246	–	}
247	–	#endif /* HAVE_LIBCRYPTO */
248	–
249	–	/* my_name_for_link()
250	–	* return wildcard name of my server name
251	–	* according to given config entry --Jto
252	–	*/
253	–	const char *
254	–	my_name_for_link(struct ConfItem *conf)
255	–	{
256	–	struct AccessItem *aconf;
257	–
258	–	aconf = (struct AccessItem *)map_to_conf(conf);
259	–	if (aconf->fakename != NULL)
260	–	return(aconf->fakename);
261	–	else
262	–	return(me.name);
263	–	}
66
67		/*
68		* write_links_file
#	Line 271 | Line 73 | my_name_for_link(struct ConfItem *conf)
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;
279	<	MessageFileLine *newMessageLine = 0;
280	<	MessageFile *MessageFileptr;
281	<	const char *p;
282	<	FBFILE *file;
283	<	char buff[512];
284	<	dlink_node *ptr;
78	>	FILE *file = NULL;
79	>	dlink_node *ptr = NULL, *ptr_next = NULL;
80	>	char buff[IRCD_BUFSIZE] = { '\0' };
81
82	<	MessageFileptr = &ConfigFileEntry.linksfile;
287	<
288	<	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
297	–	MessageFileptr->contentsOfFile = NULL;
298	–	currentMessageLine             = NULL;
299	–
92		DLINK_FOREACH(ptr, global_serv_list.head)
93		{
94	<	size_t nbytes = 0;
303	<	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 */
310	<	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;
315	<	else
316	<	p = "(Unknown Location)";
317	<
318	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
319	<
320	<	/* 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
328	<	* default config but it is configurable..
329	<	* This should be changed to an snprintf at some point, but I'm wanting to
330	<	* know if this is a cause of a bug - cryogen
331	<	*/
332	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
333	<	MESSAGELINELEN);
334	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
335	<	target_p->name, me.name, p);
336	<	newMessageLine->next = NULL;
118	>	fputs(buff, file);
119	>	}
120
121	<	if (MessageFileptr->contentsOfFile)
122	<	{
123	<	if (currentMessageLine)
124	<	currentMessageLine->next = newMessageLine;
125	<	currentMessageLine = newMessageLine;
126	<	}
127	<	else
128	<	{
129	<	MessageFileptr->contentsOfFile = newMessageLine;
130	<	currentMessageLine = newMessageLine;
131	<	}
121	>	fclose(file);
122	>	}
123	>
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	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
135	<	fbputs(buff, file, nbytes);
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 375 | 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))
391	<	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
182		* non-matching lookups.
183		*/
184		if (MyClient(source_p))
185	<	target_p = find_client(parv[server]);
185	>	target_p = hash_find_client(parv[server]);
186		else
187		target_p = find_person(client_p, parv[server]);
188
#	Line 403 | Line 190 | hunt_server(struct Client *client_p, str
190		if (target_p->from == source_p->from && !MyConnect(target_p))
191		target_p = NULL;
192
193	<	if (target_p == NULL && (target_p = find_server(parv[server])))
193	>	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
194		if (target_p->from == source_p->from && !MyConnect(target_p))
195		target_p = NULL;
196
197	<	collapse(parv[server]);
411	<	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 417 | Line 203 | hunt_server(struct Client *client_p, str
203		{
204		if (!wilds)
205		{
206	<	if (!(target_p = find_server(parv[server])))
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 430 | 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 448 | 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
461	–	/* Deal with lazylinks */
462	–	client_burst_if_needed(target_p, source_p);
463	–
247		/* This is a little kludgy but should work... */
248		if (IsClient(source_p) &&
249		((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
#	Line 470 | 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);
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 491 | 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;
496	<	struct AccessItem *aconf;
497	<	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 504 | Line 285 | try_connections(void *unused)
285		DLINK_FOREACH(ptr, server_items.head)
286		{
287		conf = ptr->data;
288	<	aconf = (struct AccessItem *)map_to_conf(conf);
288	>
289	>	assert(conf->type == CONF_SERVER);
290
291		/* Also when already connecting! (update holdtimes) --SRB
292		*/
293	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
512	<	!(IsConfAllowAutoConn(aconf)))
293	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
294		continue;
295
515	–	cltmp = (struct ClassItem *)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 520 | 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?
319		*/
320	<	if (find_server(conf->name) != NULL)
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 561 | 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 575 | Line 357 | try_connections(void *unused)
357		}
358
359		int
360	<	check_server(const char *name, struct Client *client_p, int cryptlink)
360	>	valid_servname(const char *name)
361	>	{
362	>	unsigned int length = 0;
363	>	unsigned int dots   = 0;
364	>	const char *p = name;
365	>
366	>	for (; *p; ++p)
367	>	{
368	>	if (!IsServChar(*p))
369	>	return 0;
370	>
371	>	++length;
372	>
373	>	if (*p == '.')
374	>	++dots;
375	>	}
376	>
377	>	return dots != 0 && length <= HOSTLEN;
378	>	}
379	>
380	>	int
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;
583	<	struct AccessItem *server_aconf = NULL;
584	<	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
589	–	if (client_p == NULL)
590	–	return(error);
591	–
592	–	if (strlen(name) > HOSTLEN)
593	–	return(-4);
594	–
390		/* loop through looking for all possible connect items that might work */
391		DLINK_FOREACH(ptr, server_items.head)
392		{
393		conf = ptr->data;
599	–	aconf = (struct AccessItem *)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;
612	–	#ifdef HAVE_LIBCRYPTO
613	–	if (cryptlink && IsConfCryptLink(aconf))
614	–	{
615	–	if (aconf->rsa_public_key)
616	–	server_conf = conf;
617	–	}
618	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
619	–	#endif /* HAVE_LIBCRYPTO */
620	–	{
621	–	/* A NULL password is as good as a bad one */
622	–	if (EmptyString(client_p->localClient->passwd))
623	–	return(-2);
624	–
625	–	/* code in s_conf.c should not have allowed this to be NULL */
626	–	if (aconf->passwd == NULL)
627	–	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
637	<	{
638	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
639	<	server_conf = conf;
640	<	}
641	<	}
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
650	–	/* Now find all leaf or hub config items for this server */
651	–	DLINK_FOREACH(ptr, hub_items.head)
652	–	{
653	–	conf = ptr->data;
423
424	<	if (!match(name, conf->name))
656	<	continue;
657	<	attach_conf(client_p, conf);
658	<	}
659	<
660	<	DLINK_FOREACH(ptr, leaf_items.head)
661	<	{
662	<	conf = ptr->data;
663	<
664	<	if (!match(name, conf->name))
665	<	continue;
666	<	attach_conf(client_p, conf);
667	<	}
668	<
669	<	server_aconf = (struct AccessItem *)map_to_conf(server_conf);
670	<
671	<	if (!IsConfLazyLink(server_aconf))
672	<	ClearCap(client_p, CAP_LL);
673	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
674	<	if (!IsConfCompressed(server_aconf))
675	<	#endif
676	<	ClearCap(client_p, CAP_ZIP);
677	<	if (!IsConfCryptLink(server_aconf))
678	<	ClearCap(client_p, CAP_ENC);
679	<	if (!IsConfTopicBurst(server_aconf))
680	<	{
681	<	ClearCap(client_p, CAP_TB);
682	<	ClearCap(client_p, CAP_TBURST);
683	<	}
684	<
685	<	/* Don't unset CAP_HUB here even if the server isn't a hub,
686	<	* it only indicates if the server thinks it's lazylinks are
687	<	* leafs or not.. if you unset it, bad things will happen
688	<	*/
689	<	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;
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 726 | Line 461 | check_server(const char *name, struct Cl
461		void
462		add_capability(const char *capab_name, int cap_flag, int add_to_default)
463		{
464	<	struct Capability *cap;
464	>	struct Capability *cap = MyMalloc(sizeof(*cap));
465
466	<	cap = (struct Capability *)MyMalloc(sizeof(*cap));
732	<	DupString(cap->name, capab_name);
466	>	cap->name = xstrdup(capab_name);
467		cap->cap = cap_flag;
468		dlinkAdd(cap, &cap->node, &cap_list);
469	+
470		if (add_to_default)
471		default_server_capabs |= cap_flag;
472		}
#	Line 757 | 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;
764	<	MyFree(cap);
495	>	default_server_capabs &= ~(cap->cap);
496	>	dlinkDelete(ptr, &cap_list);
497	>	MyFree(cap->name);
498	>	MyFree(cap);
499		}
500		}
501		}
502
503	<	return(0);
503	>	return 0;
504		}
505
506		/*
#	Line 776 | 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	<	dlink_node *ptr;
783	<	struct Capability *cap;
516	>	const dlink_node *ptr = NULL;
517
518		DLINK_FOREACH(ptr, cap_list.head)
519		{
520	<	cap = ptr->data;
520	>	const struct Capability *cap = ptr->data;
521
522	<	if (cap->cap != 0)
523	<	{
791	<	if (irccmp(cap->name, capab) == 0)
792	<	return(cap->cap);
793	<	}
522	>	if (cap->cap && !irccmp(cap->name, capab))
523	>	return cap->cap;
524		}
525	<	return(0);
525	>
526	>	return 0;
527		}
528
529		/* send_capabilities()
530		*
531		* inputs       - Client pointer to send to
801	–	*              - Pointer to AccessItem (for crypt)
532		*              - int flag of capabilities that this server can send
803	–	*              - 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,
810	<	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;
817	–	#ifdef HAVE_LIBCRYPTO
818	–	const struct EncCapability *epref = NULL;
819	–	char *capend;
820	–	int sent_cipher = 0;
821	–	#endif
545
546		t = msgbuf;
547
#	Line 828 | 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		}
835	–	#ifdef HAVE_LIBCRYPTO
836	–	if (enc_can_send)
837	–	{
838	–	capend = t;
839	–	strcpy(t, "ENC:");
840	–	t += 4;
841	–
842	–	/* use connect{} specific info if available */
843	–	if (aconf->cipher_preference)
844	–	epref = aconf->cipher_preference;
845	–	else if (ConfigFileEntry.default_cipher_preference)
846	–	epref = ConfigFileEntry.default_cipher_preference;
558
848	–	if (epref && (epref->cap & enc_can_send))
849	–	{
850	–	/* Leave the space -- it is removed later. */
851	–	tl = ircsprintf(t, "%s ", epref->name);
852	–	t += tl;
853	–	sent_cipher = 1;
854	–	}
855	–
856	–	if (!sent_cipher)
857	–	t = capend; /* truncate string before ENC:, below */
858	–	}
859	–	#endif
559		*(t - 1) = '\0';
560		sendto_one(client_p, "CAPAB :%s", msgbuf);
561		}
#	Line 876 | Line 575 | sendnick_TS(struct Client *client_p, str
575		if (!IsClient(target_p))
576		return;
577
578	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
880	<	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 885 | Line 583 | sendnick_TS(struct Client *client_p, str
583		ubuf[1] = '\0';
584		}
585
586	<	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
587	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
588	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
589	<	target_p->servptr->id,
590	<	target_p->name, target_p->hopcount + 1,
591	<	(unsigned long) target_p->tsinfo,
592	<	ubuf, target_p->username, target_p->host,
593	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
594	<	"0" : target_p->sockhost, target_p->id, target_p->info);
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 %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	>	target_p->svid, target_p->info);
597	>	else
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, target_p->svid,
603	>	target_p->info);
604	>	}
605		else
898	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
899	–	target_p->name, target_p->hopcount + 1,
900	–	(unsigned long) target_p->tsinfo,
901	–	ubuf, target_p->username, target_p->host,
902	–	target_p->servptr->name, target_p->info);
903	–
904	–	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
905	–	if (!EmptyString(target_p->away))
906	–	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
907	–	target_p->away);
908	–
909	–	}
910	–
911	–	/* client_burst_if_needed()
912	–	*
913	–	* inputs       - pointer to server
914	–	*              - pointer to client to add
915	–	* output       - NONE
916	–	* side effects - If this client is not known by this lazyleaf, send it
917	–	*/
918	–	void
919	–	client_burst_if_needed(struct Client *client_p, struct Client *target_p)
920	–	{
921	–	if (!ServerInfo.hub)
922	–	return;
923	–	if (!MyConnect(client_p))
924	–	return;
925	–	if (!IsCapable(client_p,CAP_LL))
926	–	return;
927	–
928	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
606		{
607	<	sendnick_TS(client_p, target_p);
608	<	add_lazylinkclient(client_p,target_p);
607	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
608	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
609	>	target_p->servptr->id,
610	>	target_p->name, target_p->hopcount + 1,
611	>	(unsigned long) target_p->tsinfo,
612	>	ubuf, target_p->username, target_p->host,
613	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
614	>	"0" : target_p->sockhost, target_p->id, target_p->info);
615	>	else
616	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
617	>	target_p->name, target_p->hopcount + 1,
618	>	(unsigned long) target_p->tsinfo,
619	>	ubuf, target_p->username, target_p->host,
620	>	target_p->servptr->name, target_p->info);
621		}
622	+
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
633		/*
#	Line 940 | Line 638 | client_burst_if_needed(struct Client *cl
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;
947	<	dlink_node *ptr;
948	<
949	<	t += ircsprintf(msgbuf, "TS ");
643	>	static char msgbuf[IRCD_BUFSIZE] = "TS";
644	>	const dlink_node *ptr = NULL;
645
646		DLINK_FOREACH(ptr, cap_list.head)
647		{
648		const struct Capability *cap = ptr->data;
649
650	<	if (IsCapable(target_p, cap->cap))
651	<	t += ircsprintf(t, "%s ", cap->name);
650	>	if (!IsCapable(target_p, cap->cap))
651	>	continue;
652	>
653	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
654	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
655		}
958	–	#ifdef HAVE_LIBCRYPTO
959	–	if (IsCapable(target_p, CAP_ENC) &&
960	–	target_p->localClient->in_cipher &&
961	–	target_p->localClient->out_cipher)
962	–	t += ircsprintf(t, "ENC:%s ",
963	–	target_p->localClient->in_cipher->name);
964	–	#endif
965	–	*(t - 1) = '\0';
656
657	<	return(msgbuf);
657	>	return msgbuf;
658		}
659
660		/* make_server()
#	Line 978 | Line 668 | struct Server *
668		make_server(struct Client *client_p)
669		{
670		if (client_p->serv == NULL)
981	–	{
671		client_p->serv = MyMalloc(sizeof(struct Server));
983	–	client_p->serv->dep_servers = 1;
984	–	}
672
673		return client_p->serv;
674		}
#	Line 996 | Line 683 | void
683		server_estab(struct Client *client_p)
684		{
685		struct Client *target_p;
686	<	struct ConfItem *conf;
1000	<	struct AccessItem *aconf=NULL;
686	>	struct MaskItem *conf = NULL;
687		char *host;
688		const char *inpath;
689		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
1004	–	dlink_node *m;
690		dlink_node *ptr;
691	+	#ifdef HAVE_LIBCRYPTO
692	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
693	+	#endif
694
695		assert(client_p != NULL);
696
#	Line 1011 | Line 699 | server_estab(struct Client *client_p)
699		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
700		host   = client_p->name;
701
702	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
702	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
703		== NULL)
704		{
705		/* This shouldn't happen, better tell the ops... -A1kmm */
706	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
706	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
707	>	"Warning: Lost connect{} block "
708		"for server %s(this shouldn't happen)!", host);
709		exit_client(client_p, &me, "Lost connect{} block!");
710		return;
#	Line 1034 | Line 723 | server_estab(struct Client *client_p)
723		{
724		if (client_p != serv_list.head->data || serv_list.head->next)
725		{
726	<	ServerStats->is_ref++;
726	>	++ServerStats.is_ref;
727		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
728		exit_client(client_p, &me, "I'm a leaf");
729		return;
730		}
731		}
732
733	<	aconf = (struct AccessItem *)map_to_conf(conf);
1045	<
1046	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
733	>	if (IsUnknown(client_p))
734		{
735	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1049	<	*        2.  Check aconf->spasswd, not aconf->passwd.
1050	<	*/
1051	<	if (!EmptyString(aconf->spasswd))
1052	<	{
1053	<	/* only send ts6 format PASS if we have ts6 enabled */
1054	<	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1055	<	sendto_one(client_p, "PASS %s TS %d %s",
1056	<	aconf->spasswd, TS_CURRENT, me.id);
1057	<	else
1058	<	sendto_one(client_p, "PASS %s TS 5",
1059	<	aconf->spasswd);
1060	<	}
735	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
736
737	<	/* Pass my info to the new server
1063	<	*
1064	<	* If trying to negotiate LazyLinks, pass on CAP_LL
1065	<	* If this is a HUB, pass on CAP_HUB
1066	<	* Pass on ZIP if supported
1067	<	* Pass on TB if supported.
1068	<	* - Dianora
1069	<	*/
737	>	send_capabilities(client_p, 0);
738
1071	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1072	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
1073	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1074	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1075	–
1076	–	/* SERVER is the last command sent before switching to ziplinks.
1077	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1078	–	* on the wire immediately.  Otherwise, it could be sitting in
1079	–	* a kernel buffer when we start sending zipped data, and the
1080	–	* parser on the receiving side can't hand both unzipped and zipped
1081	–	* data in one packet. --Rodder
1082	–	*
1083	–	* currently we only need to call send_queued_write,
1084	–	* Nagle is already disabled at this point --adx
1085	–	*/
739		sendto_one(client_p, "SERVER %s 1 :%s%s",
740	<	my_name_for_link(conf),
1088	<	ConfigServerHide.hidden ? "(H) " : "",
1089	<	(me.info[0]) ? (me.info) : "IRCers United");
1090	<	send_queued_write(client_p);
1091	<	}
1092	<
1093	<	/* Hand the server off to servlink now */
1094	<	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1095	<	{
1096	<	if (fork_server(client_p) < 0)
1097	<	{
1098	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1099	<	"Warning: fork failed for server %s -- check servlink_path (%s)",
1100	<	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1101	<	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1102	<	"%s -- check servlink_path (%s)",
1103	<	get_client_name(client_p, MASK_IP),
1104	<	ConfigFileEntry.servlink_path);
1105	<	exit_client(client_p, &me, "fork failed");
1106	<	return;
1107	<	}
1108	<
1109	<	start_io(client_p);
1110	<	SetServlink(client_p);
740	>	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
741		}
742
743	<	/* only send ts6 format SVINFO if we have ts6 enabled */
1114	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1115	<	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
743	>	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
744		(unsigned long)CurrentTime);
745
746		/* assumption here is if they passed the correct TS version, they also passed an SID */
#	Line 1120 | Line 748 | server_estab(struct Client *client_p)
748		hash_add_id(client_p);
749
750		/* XXX Does this ever happen? I don't think so -db */
751	<	detach_conf(client_p, OPER_TYPE);
751	>	detach_conf(client_p, CONF_OPER);
752
753		/* *WARNING*
754		**    In the following code in place of plain server's
#	Line 1144 | Line 772 | server_estab(struct Client *client_p)
772		set_chcap_usage_counts(client_p);
773
774		/* Some day, all these lists will be consolidated *sigh* */
775	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
775	>	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
776
777	<	m = dlinkFind(&unknown_list, client_p);
1150	<	assert(NULL != m);
777	>	assert(dlinkFind(&unknown_list, client_p));
778
779	<	dlinkDelete(m, &unknown_list);
780	<	dlinkAdd(client_p, m, &serv_list);
779	>	dlink_move_node(&client_p->localClient->lclient_node,
780	>	&unknown_list, &serv_list);
781
782		Count.myserver++;
783
#	Line 1161 | Line 788 | server_estab(struct Client *client_p)
788		make_server(client_p);
789
790		/* fixing eob timings.. -gnp */
791	<	client_p->firsttime = CurrentTime;
791	>	client_p->localClient->firsttime = CurrentTime;
792
793	<	/* Show the real host/IP to admins */
794	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1168	<	"Link with %s established: (%s) link",
1169	<	inpath_ip,show_capabilities(client_p));
1170	<	/* Now show the masked hostname/IP to opers */
1171	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1172	<	"Link with %s established: (%s) link",
1173	<	inpath,show_capabilities(client_p));
1174	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1175	<	inpath_ip, show_capabilities(client_p));
1176	<
1177	<	client_p->serv->sconf = conf;
793	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
794	>	AddFlag(client_p, FLAGS_SERVICE);
795
796	<	if (HasServlink(client_p))
796	>	/* Show the real host/IP to admins */
797	>	#ifdef HAVE_LIBCRYPTO
798	>	if (client_p->localClient->fd.ssl)
799		{
800	<	/* we won't overflow FD_DESC_SZ here, as it can hold
801	<	* client_p->name + 64
802	<	*/
803	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
804	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
800	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
801	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
802	>
803	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
804	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
805	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
806	>	compression ? SSL_COMP_get_name(compression) : "NONE",
807	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
808	>	show_capabilities(client_p));
809	>	/* Now show the masked hostname/IP to opers */
810	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
811	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
812	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
813	>	compression ? SSL_COMP_get_name(compression) : "NONE",
814	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
815	>	show_capabilities(client_p));
816	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
817	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
818	>	compression ? SSL_COMP_get_name(compression) : "NONE",
819	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
820	>	show_capabilities(client_p));
821		}
822		else
823	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
823	>	#endif
824	>	{
825	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
826	>	"Link with %s established: (Capabilities: %s)",
827	>	inpath_ip, show_capabilities(client_p));
828	>	/* Now show the masked hostname/IP to opers */
829	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
830	>	"Link with %s established: (Capabilities: %s)",
831	>	inpath, show_capabilities(client_p));
832	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
833	>	inpath_ip, show_capabilities(client_p));
834	>	}
835	>
836	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
837
838		/* Old sendto_serv_but_one() call removed because we now
839		** need to send different names to different servers
#	Line 1198 | Line 846 | server_estab(struct Client *client_p)
846		if (target_p == client_p)
847		continue;
848
1201	–	if ((conf = target_p->serv->sconf) &&
1202	–	match(my_name_for_link(conf), client_p->name))
1203	–	continue;
1204	–
849		if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
850		sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
851		me.id, client_p->name, client_p->id,
#	Line 1232 | Line 876 | server_estab(struct Client *client_p)
876		**    is destroyed...)
877		*/
878
1235	–	conf = client_p->serv->sconf;
1236	–
879		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
880		{
881		target_p = ptr->data;
882
883		/* target_p->from == target_p for target_p == client_p */
884	<	if (target_p->from == client_p)
1243	<	continue;
1244	<
1245	<	if (match(my_name_for_link(conf), target_p->name))
884	>	if (IsMe(target_p) || target_p->from == client_p)
885		continue;
886
887		if (IsCapable(client_p, CAP_TS6))
#	Line 1261 | Line 900 | server_estab(struct Client *client_p)
900		sendto_one(client_p, ":%s SERVER %s %d :%s%s",
901		target_p->servptr->name, target_p->name, target_p->hopcount+1,
902		IsHidden(target_p) ? "(H) " : "", target_p->info);
1264	–	}
1265	–
1266	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1267	–	uplink = client_p;
1268	–
1269	–	server_burst(client_p);
1270	–	}
1271	–
1272	–	static void
1273	–	start_io(struct Client *server)
1274	–	{
1275	–	struct LocalUser *lserver = server->localClient;
1276	–	int alloclen = 1;
1277	–	char *buf;
1278	–	dlink_node *ptr;
1279	–	struct dbuf_block *block;
1280	–
1281	–	/* calculate how many bytes to allocate */
1282	–	if (IsCapable(server, CAP_ZIP))
1283	–	alloclen += 6;
1284	–	#ifdef HAVE_LIBCRYPTO
1285	–	if (IsCapable(server, CAP_ENC))
1286	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1287	–	#endif
1288	–	alloclen += dbuf_length(&lserver->buf_recvq);
1289	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1290	–	alloclen += dbuf_length(&lserver->buf_sendq);
1291	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1292	–
1293	–	/* initialize servlink control sendq */
1294	–	lserver->slinkq = buf = MyMalloc(alloclen);
1295	–	lserver->slinkq_ofs = 0;
1296	–	lserver->slinkq_len = alloclen;
1297	–
1298	–	if (IsCapable(server, CAP_ZIP))
1299	–	{
1300	–	/* ziplink */
1301	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1302	–	*buf++ = 0; /* |          */
1303	–	*buf++ = 1; /* \ len is 1 */
1304	–	*buf++ = ConfigFileEntry.compression_level;
1305	–	*buf++ = SLINKCMD_START_ZIP_IN;
1306	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1307	–	}
1308	–	#ifdef HAVE_LIBCRYPTO
1309	–	if (IsCapable(server, CAP_ENC))
1310	–	{
1311	–	/* Decryption settings */
1312	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1313	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1314	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1315	–	*buf++ = lserver->in_cipher->cipherid;
1316	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1317	–	*buf++ = 0; /* keylen < 256 */
1318	–	*buf++ = lserver->in_cipher->keylen;
1319	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1320	–	buf += lserver->in_cipher->keylen;
1321	–	/* Encryption settings */
1322	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1323	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1324	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1325	–	*buf++ = lserver->out_cipher->cipherid;
1326	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1327	–	*buf++ = 0; /* keylen < 256 */
1328	–	*buf++ = lserver->out_cipher->keylen;
1329	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1330	–	buf += lserver->out_cipher->keylen;
1331	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1332	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1333	–	}
1334	–	#endif
1335	–
1336	–	/* pass the whole recvq to servlink */
1337	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1338	–	{
1339	–	block = ptr->data;
1340	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1341	–	*buf++ = (block->size >> 8);
1342	–	*buf++ = (block->size & 0xff);
1343	–	memcpy(buf, &block->data[0], block->size);
1344	–	buf += block->size;
1345	–	}
1346	–
1347	–	dbuf_clear(&lserver->buf_recvq);
903
904	<	/* pass the whole sendq to servlink */
905	<	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1351	<	{
1352	<	block = ptr->data;
1353	<	*buf++ = SLINKCMD_INJECT_SENDQ;
1354	<	*buf++ = (block->size >> 8);
1355	<	*buf++ = (block->size & 0xff);
1356	<	memcpy(buf, &block->data[0], block->size);
1357	<	buf += block->size;
904	>	if (HasFlag(target_p, FLAGS_EOB))
905	>	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
906		}
907
908	<	dbuf_clear(&lserver->buf_sendq);
1361	<
1362	<	/* start io */
1363	<	*buf++ = SLINKCMD_INIT;
1364	<
1365	<	/* schedule a write */
1366	<	send_queued_slink_write(server);
1367	<	}
1368	<
1369	<	/* fork_server()
1370	<	*
1371	<	* inputs       - struct Client *server
1372	<	* output       - success: 0 / failure: -1
1373	<	* side effect  - fork, and exec SERVLINK to handle this connection
1374	<	*/
1375	<	static int
1376	<	fork_server(struct Client *server)
1377	<	{
1378	<	#ifndef HAVE_SOCKETPAIR
1379	<	return -1;
1380	<	#else
1381	<	int i;
1382	<	int slink_fds[2][2];
1383	<	/* 0? - ctrl  | 1? - data
1384	<	* ?0 - child | ?1 - parent */
1385	<
1386	<	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1387	<	return -1;
1388	<	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1389	<	goto free_ctrl_fds;
1390	<
1391	<	if ((i = fork()) < 0)
1392	<	{
1393	<	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1394	<	free_ctrl_fds:
1395	<	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1396	<	return -1;
1397	<	}
1398	<
1399	<	if (i == 0)
1400	<	{
1401	<	char fd_str[3][6];   /* store 3x sizeof("65535") */
1402	<	char *kid_argv[7];
1403	<
1404	<	#ifdef O_ASYNC
1405	<	fcntl(server->localClient->fd.fd, F_SETFL,
1406	<	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1407	<	#endif
1408	<	close_fds(&server->localClient->fd);
1409	<	close(slink_fds[0][1]);
1410	<	close(slink_fds[1][1]);
1411	<
1412	<	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1413	<	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1414	<	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1415	<
1416	<	kid_argv[0] = "-slink";
1417	<	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1418	<	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1419	<	kid_argv[5] = fd_str[2];    /* network */
1420	<	kid_argv[6] = NULL;
1421	<
1422	<	execv(ConfigFileEntry.servlink_path, kid_argv);
1423	<
1424	<	_exit(1);
1425	<	}
1426	<
1427	<	/* close the network fd and the child ends of the pipes */
1428	<	fd_close(&server->localClient->fd);
1429	<	close(slink_fds[0][0]);
1430	<	close(slink_fds[1][0]);
1431	<
1432	<	execute_callback(setup_socket_cb, slink_fds[0][1]);
1433	<	execute_callback(setup_socket_cb, slink_fds[1][1]);
1434	<
1435	<	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1436	<	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1437	<
1438	<	read_ctrl_packet(&server->localClient->ctrlfd, server);
1439	<	read_packet(&server->localClient->fd, server);
1440	<
1441	<	return 0;
1442	<	#endif
908	>	server_burst(client_p);
909		}
910
911		/* server_burst()
#	Line 1463 | Line 929 | server_burst(struct Client *client_p)
929		** -orabidoo
930		*/
931
932	<	/* On a "lazy link" hubs send nothing.
1467	<	* Leafs always have to send nicks plus channels
1468	<	*/
1469	<	if (IsCapable(client_p, CAP_LL))
1470	<	{
1471	<	if (!ServerInfo.hub)
1472	<	{
1473	<	/* burst all our info */
1474	<	burst_all(client_p);
1475	<
1476	<	/* Now, ask for channel info on all our current channels */
1477	<	cjoin_all(client_p);
1478	<	}
1479	<	}
1480	<	else
1481	<	{
1482	<	burst_all(client_p);
1483	<	}
932	>	burst_all(client_p);
933
934		/* EOB stuff is now in burst_all */
935		/* Always send a PING after connect burst is done */
#	Line 1507 | Line 956 | burst_all(struct Client *client_p)
956		burst_members(client_p, chptr);
957		send_channel_modes(client_p, chptr);
958
959	<	if (IsCapable(client_p, CAP_TBURST) ||
960	<	IsCapable(client_p, CAP_TB))
1512	<	send_tb(client_p, chptr);
959	>	if (IsCapable(client_p, CAP_TBURST))
960	>	send_tb(client_p, chptr);
961		}
962		}
963
#	Line 1519 | Line 967 | burst_all(struct Client *client_p)
967		{
968		struct Client *target_p = ptr->data;
969
970	<	if (!IsBursted(target_p) && target_p->from != client_p)
970	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
971		sendnick_TS(client_p, target_p);
972
973	<	ClearBursted(target_p);
973	>	DelFlag(target_p, FLAGS_BURSTED);
974		}
975
1528	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1529	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1530	–	*/
1531	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
976		if (IsCapable(client_p, CAP_EOB))
977		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
978		}
#	Line 1540 | Line 984 | burst_all(struct Client *client_p)
984		*              - pointer to channel
985		* output       - NONE
986		* side effects - Called on a server burst when
987	<	*                server is CAP_TB|CAP_TBURST capable
987	>	*                server is CAP_TBURST capable
988		*/
989		static void
990		send_tb(struct Client *client_p, struct Channel *chptr)
#	Line 1559 | Line 1003 | send_tb(struct Client *client_p, struct
1003		* for further information   -Michael
1004		*/
1005		if (chptr->topic_time != 0)
1006	<	{
1007	<	if (IsCapable(client_p, CAP_TBURST))
1008	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1009	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
1010	<	(unsigned long)chptr->topic_time,
1011	<	chptr->topic_info ? chptr->topic_info : "",
1568	<	chptr->topic ? chptr->topic : "");
1569	<	else if (IsCapable(client_p, CAP_TB))
1570	<	{
1571	<	if (ConfigChannel.burst_topicwho)
1572	<	{
1573	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1574	<	me.name, chptr->chname,
1575	<	(unsigned long)chptr->topic_time,
1576	<	chptr->topic_info, chptr->topic ? chptr->topic : "");
1577	<	}
1578	<	else
1579	<	{
1580	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1581	<	me.name, chptr->chname,
1582	<	(unsigned long)chptr->topic_time,
1583	<	chptr->topic ? chptr->topic : "");
1584	<	}
1585	<	}
1586	<	}
1587	<	}
1588	<
1589	<	/* cjoin_all()
1590	<	*
1591	<	* inputs       - server to ask for channel info from
1592	<	* output       - NONE
1593	<	* side effects - CJOINS for all the leafs known channels is sent
1594	<	*/
1595	<	static void
1596	<	cjoin_all(struct Client *client_p)
1597	<	{
1598	<	const dlink_node *gptr = NULL;
1599	<
1600	<	DLINK_FOREACH(gptr, global_channel_list.head)
1601	<	{
1602	<	const struct Channel *chptr = gptr->data;
1603	<	sendto_one(client_p, ":%s CBURST %s",
1604	<	me.name, chptr->chname);
1605	<	}
1606	<	}
1607	<
1608	<	/* burst_channel()
1609	<	*
1610	<	* inputs       - pointer to server to send sjoins to
1611	<	*              - channel pointer
1612	<	* output       - none
1613	<	* side effects - All sjoins for channel(s) given by chptr are sent
1614	<	*                for all channel members. ONLY called by hub on
1615	<	*                behalf of a lazylink so client_p is always guarunteed
1616	<	*                to be a LL leaf.
1617	<	*/
1618	<	void
1619	<	burst_channel(struct Client *client_p, struct Channel *chptr)
1620	<	{
1621	<	burst_ll_members(client_p, chptr);
1622	<
1623	<	send_channel_modes(client_p, chptr);
1624	<	add_lazylinkchannel(client_p,chptr);
1625	<
1626	<	if (chptr->topic != NULL && chptr->topic_info != NULL)
1627	<	{
1628	<	sendto_one(client_p, ":%s TOPIC %s %s %lu :%s",
1629	<	me.name, chptr->chname, chptr->topic_info,
1630	<	(unsigned long)chptr->topic_time, chptr->topic);
1631	<	}
1632	<	}
1633	<
1634	<	/* add_lazlinkchannel()
1635	<	*
1636	<	* inputs       - pointer to directly connected leaf server
1637	<	*                being introduced to this hub
1638	<	*              - pointer to channel structure being introduced
1639	<	* output       - NONE
1640	<	* side effects - The channel pointed to by chptr is now known
1641	<	*                to be on lazyleaf server given by local_server_p.
1642	<	*                mark that in the bit map and add to the list
1643	<	*                of channels to examine after this newly introduced
1644	<	*                server is squit off.
1645	<	*/
1646	<	static void
1647	<	add_lazylinkchannel(struct Client *local_server_p, struct Channel *chptr)
1648	<	{
1649	<	assert(MyConnect(local_server_p));
1650	<
1651	<	chptr->lazyLinkChannelExists |= local_server_p->localClient->serverMask;
1652	<	dlinkAdd(chptr, make_dlink_node(), &lazylink_channels);
1653	<	}
1654	<
1655	<	/* add_lazylinkclient()
1656	<	*
1657	<	* inputs       - pointer to directly connected leaf server
1658	<	*                being introduced to this hub
1659	<	*              - pointer to client being introduced
1660	<	* output       - NONE
1661	<	* side effects - The client pointed to by client_p is now known
1662	<	*                to be on lazyleaf server given by local_server_p.
1663	<	*                mark that in the bit map and add to the list
1664	<	*                of clients to examine after this newly introduced
1665	<	*                server is squit off.
1666	<	*/
1667	<	void
1668	<	add_lazylinkclient(struct Client *local_server_p, struct Client *client_p)
1669	<	{
1670	<	assert(MyConnect(local_server_p));
1671	<	client_p->lazyLinkClientExists |= local_server_p->localClient->serverMask;
1672	<	}
1673	<
1674	<	/* remove_lazylink_flags()
1675	<	*
1676	<	* inputs       - pointer to server quitting
1677	<	* output       - NONE
1678	<	* side effects - All the channels on the lazylink channel list are examined
1679	<	*                If they hold a bit corresponding to the servermask
1680	<	*                attached to client_p, clear that bit. If this bitmask
1681	<	*                goes to 0, then the channel is no longer known to
1682	<	*                be on any lazylink server, and can be removed from the
1683	<	*                link list.
1684	<	*
1685	<	*                Similar is done for lazylink clients
1686	<	*
1687	<	*                This function must be run by the HUB on any exiting
1688	<	*                lazylink leaf server, while the pointer is still valid.
1689	<	*                Hence must be run from client.c in exit_one_client()
1690	<	*
1691	<	*                The old code scanned all channels, this code only
1692	<	*                scans channels/clients on the lazylink_channels
1693	<	*                lazylink_clients lists.
1694	<	*/
1695	<	void
1696	<	remove_lazylink_flags(unsigned long mask)
1697	<	{
1698	<	dlink_node *ptr;
1699	<	dlink_node *next_ptr;
1700	<	struct Channel *chptr;
1701	<	struct Client *target_p;
1702	<	unsigned long clear_mask;
1703	<
1704	<	if (!mask) /* On 0 mask, don't do anything */
1705	<	return;
1706	<
1707	<	clear_mask = ~mask;
1708	<	freeMask |= mask;
1709	<
1710	<	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
1711	<	{
1712	<	chptr = ptr->data;
1713	<
1714	<	chptr->lazyLinkChannelExists &= clear_mask;
1715	<
1716	<	if (chptr->lazyLinkChannelExists == 0)
1717	<	{
1718	<	dlinkDelete(ptr, &lazylink_channels);
1719	<	free_dlink_node(ptr);
1720	<	}
1721	<	}
1722	<
1723	<	DLINK_FOREACH(ptr, global_client_list.head)
1724	<	{
1725	<	target_p = ptr->data;
1726	<	target_p->lazyLinkClientExists &= clear_mask;
1727	<	}
1006	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1007	>	ID_or_name(&me, client_p),
1008	>	(unsigned long)chptr->channelts, chptr->chname,
1009	>	(unsigned long)chptr->topic_time,
1010	>	chptr->topic_info,
1011	>	chptr->topic);
1012		}
1013
1014		/* burst_members()
#	Line 1746 | Line 1030 | burst_members(struct Client *client_p, s
1030		ms       = ptr->data;
1031		target_p = ms->client_p;
1032
1033	<	if (!IsBursted(target_p))
1033	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1034		{
1035	<	SetBursted(target_p);
1035	>	AddFlag(target_p, FLAGS_BURSTED);
1036
1037		if (target_p->from != client_p)
1038		sendnick_TS(client_p, target_p);
#	Line 1756 | Line 1040 | burst_members(struct Client *client_p, s
1040		}
1041		}
1042
1759	–	/* burst_ll_members()
1760	–	*
1761	–	* inputs       - pointer to server to send members to
1762	–	*              - dlink_list pointer to membership list to send
1763	–	* output       - NONE
1764	–	* side effects - This version also has to check the bitmap for lazylink
1765	–	*/
1766	–	static void
1767	–	burst_ll_members(struct Client *client_p, struct Channel *chptr)
1768	–	{
1769	–	struct Client *target_p;
1770	–	struct Membership *ms;
1771	–	dlink_node *ptr;
1772	–
1773	–	DLINK_FOREACH(ptr, chptr->members.head)
1774	–	{
1775	–	ms       = ptr->data;
1776	–	target_p = ms->client_p;
1777	–
1778	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
1779	–	{
1780	–	if (target_p->from != client_p)
1781	–	{
1782	–	add_lazylinkclient(client_p,target_p);
1783	–	sendnick_TS(client_p, target_p);
1784	–	}
1785	–	}
1786	–	}
1787	–	}
1788	–
1789	–	/* set_autoconn()
1790	–	*
1791	–	* inputs       - struct Client pointer to oper requesting change
1792	–	* output       - none
1793	–	* side effects - set autoconnect mode
1794	–	*/
1795	–	void
1796	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1797	–	{
1798	–	struct ConfItem *conf;
1799	–	struct AccessItem *aconf;
1800	–
1801	–	if (name != NULL)
1802	–	{
1803	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1804	–	if (conf != NULL)
1805	–	{
1806	–	aconf = (struct AccessItem *)map_to_conf(conf);
1807	–	if (newval)
1808	–	SetConfAllowAutoConn(aconf);
1809	–	else
1810	–	ClearConfAllowAutoConn(aconf);
1811	–
1812	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1813	–	"%s has changed AUTOCONN for %s to %i",
1814	–	source_p->name, name, newval);
1815	–	sendto_one(source_p,
1816	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1817	–	me.name, source_p->name, name, newval);
1818	–	}
1819	–	else
1820	–	{
1821	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1822	–	me.name, source_p->name, name);
1823	–	}
1824	–	}
1825	–	else
1826	–	{
1827	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1828	–	me.name, source_p->name);
1829	–	}
1830	–	}
1831	–
1832	–	void
1833	–	initServerMask(void)
1834	–	{
1835	–	freeMask = 0xFFFFFFFFUL;
1836	–	}
1837	–
1838	–	/* nextFreeMask()
1839	–	*
1840	–	* inputs       - NONE
1841	–	* output       - unsigned long next unused mask for use in LL
1842	–	* side effects -
1843	–	*/
1844	–	unsigned long
1845	–	nextFreeMask(void)
1846	–	{
1847	–	int i;
1848	–	unsigned long mask = 1;
1849	–
1850	–	for (i = 0; i < 32; i++)
1851	–	{
1852	–	if (mask & freeMask)
1853	–	{
1854	–	freeMask &= ~mask;
1855	–	return(mask);
1856	–	}
1857	–
1858	–	mask <<= 1;
1859	–	}
1860	–
1861	–	return(0L); /* watch this special case ... */
1862	–	}
1863	–
1043		/* New server connection code
1044		* Based upon the stuff floating about in s_bsd.c
1045		*   -- adrian
#	Line 1883 | Line 1062 | nextFreeMask(void)
1062		* it suceeded or not, and 0 if it fails in here somewhere.
1063		*/
1064		int
1065	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1065	>	serv_connect(struct MaskItem *conf, struct Client *by)
1066		{
1888	–	struct ConfItem *conf;
1067		struct Client *client_p;
1068	<	char buf[HOSTIPLEN];
1068	>	char buf[HOSTIPLEN + 1];
1069
1070		/* conversion structs */
1071		struct sockaddr_in *v4;
1072	<	/* Make sure aconf is useful */
1073	<	assert(aconf != NULL);
1896	<
1897	<	if(aconf == NULL)
1898	<	return (0);
1072	>	/* Make sure conf is useful */
1073	>	assert(conf != NULL);
1074
1900	–	/* XXX should be passing struct ConfItem in the first place */
1901	–	conf = unmap_conf_item(aconf);
1075
1076	<	/* log */
1077	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1078	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1906	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1076	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1077	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1078	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1079		buf);
1080
1081		/* Still processing a DNS lookup? -> exit */
1082	<	if (aconf->dns_query != NULL)
1082	>	if (conf->dns_pending)
1083		{
1084	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1085	<	"Error connecting to %s: Error during DNS lookup", conf->name);
1084	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1085	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
1086	>	conf->name);
1087	>	return (0);
1088	>	}
1089	>
1090	>	if (conf->dns_failed)
1091	>	{
1092	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1093	>	"Error connecting to %s: DNS lookup for connect{} failed.",
1094	>	conf->name);
1095		return (0);
1096		}
1097
1098		/* Make sure this server isn't already connected
1099	<	* Note: aconf should ALWAYS be a valid C: line
1099	>	* Note: conf should ALWAYS be a valid C: line
1100		*/
1101	<	if ((client_p = find_server(conf->name)) != NULL)
1101	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1102		{
1103	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1104	<	"Server %s already present from %s",
1105	<	conf->name, get_client_name(client_p, SHOW_IP));
1106	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1107	<	"Server %s already present from %s",
1108	<	conf->name, get_client_name(client_p, MASK_IP));
1103	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1104	>	"Server %s already present from %s",
1105	>	conf->name, get_client_name(client_p, SHOW_IP));
1106	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1107	>	"Server %s already present from %s",
1108	>	conf->name, get_client_name(client_p, MASK_IP));
1109		if (by && IsClient(by) && !MyClient(by))
1110		sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1111	<	me.name, by->name, conf->name,
1112	<	get_client_name(client_p, MASK_IP));
1113	<	return (0);
1111	>	me.name, by->name, conf->name,
1112	>	get_client_name(client_p, MASK_IP));
1113	>	return 0;
1114		}
1115
1116		/* Create a local client */
#	Line 1937 | Line 1118 | serv_connect(struct AccessItem *aconf, s
1118
1119		/* Copy in the server, hostname, fd */
1120		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1121	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1121	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1122
1123		/* We already converted the ip once, so lets use it - stu */
1124	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
1124	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1125
1126		/* create a socket for the server connection */
1127	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1127	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1128		SOCK_STREAM, 0, NULL) < 0)
1129		{
1130		/* Eek, failure to create the socket */
1131	<	report_error(L_ALL,
1132	<	"opening stream socket to %s: %s", conf->name, errno);
1131	>	report_error(L_ALL, "opening stream socket to %s: %s",
1132	>	conf->name, errno);
1133		SetDead(client_p);
1134		exit_client(client_p, &me, "Connection failed");
1135	<	return (0);
1135	>	return 0;
1136		}
1137
1138		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1960 | Line 1141 | serv_connect(struct AccessItem *aconf, s
1141		/* Attach config entries to client here rather than in
1142		* serv_connect_callback(). This to avoid null pointer references.
1143		*/
1144	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1144	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1145		{
1146	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1147	<	"Host %s is not enabled for connecting:no C/N-line",
1148	<	conf->name);
1146	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1147	>	"Host %s is not enabled for connecting: no connect{} block",
1148	>	conf->name);
1149		if (by && IsClient(by) && !MyClient(by))
1150		sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1151	<	me.name, by->name, client_p->name);
1151	>	me.name, by->name, client_p->name);
1152		SetDead(client_p);
1153		exit_client(client_p, client_p, "Connection failed");
1154	<	return (0);
1154	>	return 0;
1155		}
1156
1157		/* at this point we have a connection in progress and C/N lines
#	Line 1989 | Line 1170 | serv_connect(struct AccessItem *aconf, s
1170		SetConnecting(client_p);
1171		dlinkAdd(client_p, &client_p->node, &global_client_list);
1172		/* from def_fam */
1173	<	client_p->localClient->aftype = aconf->aftype;
1173	>	client_p->localClient->aftype = conf->aftype;
1174
1175		/* Now, initiate the connection */
1176		/* XXX assume that a non 0 type means a specific bind address
1177		* for this connect.
1178		*/
1179	<	switch (aconf->aftype)
1179	>	switch (conf->aftype)
1180		{
1181		case AF_INET:
1182	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1182	>	v4 = (struct sockaddr_in*)&conf->bind;
1183		if (v4->sin_addr.s_addr != 0)
1184		{
1185		struct irc_ssaddr ipn;
1186		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1187		ipn.ss.ss_family = AF_INET;
1188		ipn.ss_port = 0;
1189	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1190	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1191	<	(struct sockaddr *)&ipn, ipn.ss_len,
1192	<	serv_connect_callback, client_p, aconf->aftype,
1193	<	CONNECTTIMEOUT);
1189	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1190	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1191	>	(struct sockaddr *)&ipn, ipn.ss_len,
1192	>	serv_connect_callback, client_p, conf->aftype,
1193	>	CONNECTTIMEOUT);
1194		}
1195		else if (ServerInfo.specific_ipv4_vhost)
1196		{
#	Line 2018 | Line 1199 | serv_connect(struct AccessItem *aconf, s
1199		ipn.ss.ss_family = AF_INET;
1200		ipn.ss_port = 0;
1201		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1202	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1202	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1203		(struct sockaddr *)&ipn, ipn.ss_len,
1204	<	serv_connect_callback, client_p, aconf->aftype,
1205	<	CONNECTTIMEOUT);
1204	>	serv_connect_callback, client_p, conf->aftype,
1205	>	CONNECTTIMEOUT);
1206		}
1207		else
1208	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1209	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1208	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1209	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1210		CONNECTTIMEOUT);
1211		break;
1212		#ifdef IPV6
1213		case AF_INET6:
1214		{
1215	<	struct irc_ssaddr ipn;
1216	<	struct sockaddr_in6 *v6;
1217	<	struct sockaddr_in6 *v6conf;
1218	<
1219	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1220	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1221	<	v6 = (struct sockaddr_in6 *)&ipn;
1222	<
1223	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1224	<	sizeof(struct in6_addr)) != 0)
1225	<	{
1226	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1227	<	ipn.ss.ss_family = AF_INET6;
1228	<	ipn.ss_port = 0;
1229	<	comm_connect_tcp(&client_p->localClient->fd,
1230	<	aconf->host, aconf->port,
1231	<	(struct sockaddr *)&ipn, ipn.ss_len,
1232	<	serv_connect_callback, client_p,
1233	<	aconf->aftype, CONNECTTIMEOUT);
1234	<	}
2054	<	else if (ServerInfo.specific_ipv6_vhost)
1215	>	struct irc_ssaddr ipn;
1216	>	struct sockaddr_in6 *v6;
1217	>	struct sockaddr_in6 *v6conf;
1218	>
1219	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1220	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1221	>	v6 = (struct sockaddr_in6 *)&ipn;
1222	>
1223	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1224	>	{
1225	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1226	>	ipn.ss.ss_family = AF_INET6;
1227	>	ipn.ss_port = 0;
1228	>	comm_connect_tcp(&client_p->localClient->fd,
1229	>	conf->host, conf->port,
1230	>	(struct sockaddr *)&ipn, ipn.ss_len,
1231	>	serv_connect_callback, client_p,
1232	>	conf->aftype, CONNECTTIMEOUT);
1233	>	}
1234	>	else if (ServerInfo.specific_ipv6_vhost)
1235		{
1236	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1237	<	ipn.ss.ss_family = AF_INET6;
1238	<	ipn.ss_port = 0;
1239	<	comm_connect_tcp(&client_p->localClient->fd,
1240	<	aconf->host, aconf->port,
1241	<	(struct sockaddr *)&ipn, ipn.ss_len,
1242	<	serv_connect_callback, client_p,
1243	<	aconf->aftype, CONNECTTIMEOUT);
1244	<	}
1245	<	else
1246	<	comm_connect_tcp(&client_p->localClient->fd,
1247	<	aconf->host, aconf->port,
1248	<	NULL, 0, serv_connect_callback, client_p,
1249	<	aconf->aftype, CONNECTTIMEOUT);
1236	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1237	>	ipn.ss.ss_family = AF_INET6;
1238	>	ipn.ss_port = 0;
1239	>	comm_connect_tcp(&client_p->localClient->fd,
1240	>	conf->host, conf->port,
1241	>	(struct sockaddr *)&ipn, ipn.ss_len,
1242	>	serv_connect_callback, client_p,
1243	>	conf->aftype, CONNECTTIMEOUT);
1244	>	}
1245	>	else
1246	>	comm_connect_tcp(&client_p->localClient->fd,
1247	>	conf->host, conf->port,
1248	>	NULL, 0, serv_connect_callback, client_p,
1249	>	conf->aftype, CONNECTTIMEOUT);
1250		}
1251		#endif
1252		}
1253	<	return (1);
1253	>	return 1;
1254		}
1255
1256	+	#ifdef HAVE_LIBCRYPTO
1257	+	static void
1258	+	finish_ssl_server_handshake(struct Client *client_p)
1259	+	{
1260	+	struct MaskItem *conf = NULL;
1261	+
1262	+	conf = find_conf_name(&client_p->localClient->confs,
1263	+	client_p->name, CONF_SERVER);
1264	+	if (conf == NULL)
1265	+	{
1266	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1267	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1268	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1269	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1270	+
1271	+	exit_client(client_p, &me, "Lost connect{} block");
1272	+	return;
1273	+	}
1274	+
1275	+	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1276	+
1277	+	send_capabilities(client_p, 0);
1278	+
1279	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1280	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1281	+	me.info);
1282	+
1283	+	/* If we've been marked dead because a send failed, just exit
1284	+	* here now and save everyone the trouble of us ever existing.
1285	+	*/
1286	+	if (IsDead(client_p))
1287	+	{
1288	+	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1289	+	"%s[%s] went dead during handshake",
1290	+	client_p->name,
1291	+	client_p->host);
1292	+	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1293	+	"%s went dead during handshake", client_p->name);
1294	+	return;
1295	+	}
1296	+
1297	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1298	+	/* If we get here, we're ok, so lets start reading some data */
1299	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1300	+	}
1301	+
1302	+	static void
1303	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1304	+	{
1305	+	int ret;
1306	+	int err;
1307	+
1308	+	ret = SSL_connect(client_p->localClient->fd.ssl);
1309	+
1310	+	if (ret <= 0)
1311	+	{
1312	+	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1313	+	{
1314	+	case SSL_ERROR_WANT_WRITE:
1315	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1316	+	(PF *)ssl_server_handshake, client_p, 0);
1317	+	return;
1318	+	case SSL_ERROR_WANT_READ:
1319	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1320	+	(PF *)ssl_server_handshake, client_p, 0);
1321	+	return;
1322	+	default:
1323	+	{
1324	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1325	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1326	+	"Error connecting to %s: %s", client_p->name,
1327	+	sslerr ? sslerr : "unknown SSL error");
1328	+	exit_client(client_p, client_p, "Error during SSL handshake");
1329	+	return;
1330	+	}
1331	+	}
1332	+	}
1333	+
1334	+	finish_ssl_server_handshake(client_p);
1335	+	}
1336	+
1337	+	static void
1338	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1339	+	{
1340	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1341	+	{
1342	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1343	+	ERR_error_string(ERR_get_error(), NULL));
1344	+	SetDead(client_p);
1345	+	exit_client(client_p, client_p, "SSL_new failed");
1346	+	return;
1347	+	}
1348	+
1349	+	SSL_set_fd(fd->ssl, fd->fd);
1350	+
1351	+	if (!EmptyString(conf->cipher_list))
1352	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1353	+
1354	+	ssl_server_handshake(NULL, client_p);
1355	+	}
1356	+	#endif
1357	+
1358		/* serv_connect_callback() - complete a server connection.
1359		*
1360		* This routine is called after the server connection attempt has
#	Line 2085 | Line 1367 | static void
1367		serv_connect_callback(fde_t *fd, int status, void *data)
1368		{
1369		struct Client *client_p = data;
1370	<	struct ConfItem *conf=NULL;
2089	<	struct AccessItem *aconf=NULL;
1370	>	struct MaskItem *conf = NULL;
1371
1372		/* First, make sure its a real client! */
1373		assert(client_p != NULL);
#	Line 2102 | Line 1383 | serv_connect_callback(fde_t *fd, int sta
1383		* Admins get to see any IP, mere opers don't *sigh*
1384		*/
1385		if (ConfigServerHide.hide_server_ips)
1386	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1386	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1387		"Error connecting to %s: %s",
1388		client_p->name, comm_errstr(status));
1389		else
1390	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1391	<	"Error connecting to %s[%s]: %s", client_p->name,
1392	<	client_p->host, comm_errstr(status));
1393	<
1394	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1395	<	"Error connecting to %s: %s",
1396	<	client_p->name, comm_errstr(status));
1390	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1391	>	"Error connecting to %s[%s]: %s", client_p->name,
1392	>	client_p->host, comm_errstr(status));
1393	>
1394	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1395	>	"Error connecting to %s: %s",
1396	>	client_p->name, comm_errstr(status));
1397
1398		/* If a fd goes bad, call dead_link() the socket is no
1399		* longer valid for reading or writing.
#	Line 2124 | Line 1405 | serv_connect_callback(fde_t *fd, int sta
1405		/* COMM_OK, so continue the connection procedure */
1406		/* Get the C/N lines */
1407		conf = find_conf_name(&client_p->localClient->confs,
1408	<	client_p->name, SERVER_TYPE);
1408	>	client_p->name, CONF_SERVER);
1409		if (conf == NULL)
1410		{
1411	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1412	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1413	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1414	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1411	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1412	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1413	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1414	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1415
1416		exit_client(client_p, &me, "Lost connect{} block");
1417		return;
1418		}
1419
2139	–	aconf = (struct AccessItem *)map_to_conf(conf);
1420		/* Next, send the initial handshake */
1421		SetHandshake(client_p);
1422
1423		#ifdef HAVE_LIBCRYPTO
1424	<	/* Handle all CRYPTLINK links in cryptlink_init */
2145	<	if (IsConfCryptLink(aconf))
1424	>	if (IsConfSSL(conf))
1425		{
1426	<	cryptlink_init(client_p, conf, fd);
1426	>	ssl_connect_init(client_p, conf, fd);
1427		return;
1428		}
1429		#endif
1430
1431	<	/* jdc -- Check and send spasswd, not passwd. */
2153	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
2154	<	/* Send TS 6 form only if id */
2155	<	sendto_one(client_p, "PASS %s TS %d %s",
2156	<	aconf->spasswd, TS_CURRENT, me.id);
2157	<	else
2158	<	sendto_one(client_p, "PASS %s TS 5",
2159	<	aconf->spasswd);
1431	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1432
1433	<	/* Pass my info to the new server
2162	<	*
2163	<	* If trying to negotiate LazyLinks, pass on CAP_LL
2164	<	* If this is a HUB, pass on CAP_HUB
2165	<	* Pass on ZIP if supported
2166	<	* Pass on TB if supported.
2167	<	* - Dianora
2168	<	*/
2169	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2170	<	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
2171	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
2172	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1433	>	send_capabilities(client_p, 0);
1434
1435	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1436	<	my_name_for_link(conf),
2176	<	ConfigServerHide.hidden ? "(H) " : "",
2177	<	me.info);
1435	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1436	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1437
1438		/* If we've been marked dead because a send failed, just exit
1439		* here now and save everyone the trouble of us ever existing.
1440		*/
1441		if (IsDead(client_p))
1442		{
1443	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1444	<	"%s[%s] went dead during handshake",
1443	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1444	>	"%s[%s] went dead during handshake",
1445		client_p->name,
1446	<	client_p->host);
1447	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1448	<	"%s went dead during handshake", client_p->name);
1446	>	client_p->host);
1447	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1448	>	"%s went dead during handshake", client_p->name);
1449		return;
1450		}
1451
#	Line 2206 | Line 1465 | find_servconn_in_progress(const char *na
1465		cptr = ptr->data;
1466
1467		if (cptr && cptr->name[0])
1468	<	if (match(cptr->name, name) || match(name, cptr->name))
1468	>	if (!match(name, cptr->name))
1469		return cptr;
1470		}
1471
1472		return NULL;
1473		}
2215	–
2216	–	#ifdef HAVE_LIBCRYPTO
2217	–	/*
2218	–	* sends a CRYPTLINK SERV command.
2219	–	*/
2220	–	void
2221	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
2222	–	{
2223	–	struct AccessItem *aconf;
2224	–	char *encrypted;
2225	–	unsigned char *key_to_send;
2226	–	char randkey[CIPHERKEYLEN];
2227	–	int enc_len;
2228	–
2229	–	/* get key */
2230	–	if ((!ServerInfo.rsa_private_key) ||
2231	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
2232	–	{
2233	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
2234	–	"Invalid RSA private key");
2235	–	return;
2236	–	}
2237	–
2238	–	aconf = (struct AccessItem *)map_to_conf(conf);
2239	–
2240	–	if (aconf->rsa_public_key == NULL)
2241	–	{
2242	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
2243	–	"Invalid RSA public key");
2244	–	return;
2245	–	}
2246	–
2247	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
2248	–	{
2249	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
2250	–	"Couldn't generate keyphrase");
2251	–	return;
2252	–	}
2253	–
2254	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
2255	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
2256	–	(unsigned char *)randkey,
2257	–	(unsigned char *)encrypted,
2258	–	aconf->rsa_public_key,
2259	–	RSA_PKCS1_PADDING);
2260	–
2261	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
2262	–
2263	–	if (enc_len <= 0)
2264	–	{
2265	–	report_crypto_errors();
2266	–	MyFree(encrypted);
2267	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
2268	–	"Couldn't encrypt data");
2269	–	return;
2270	–	}
2271	–
2272	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
2273	–	{
2274	–	MyFree(encrypted);
2275	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
2276	–	"Couldn't base64 encode key");
2277	–	return;
2278	–	}
2279	–
2280	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2281	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
2282	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
2283	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
2284	–
2285	–	if (me.id[0])
2286	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
2287	–
2288	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
2289	–	my_name_for_link(conf), key_to_send,
2290	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
2291	–
2292	–	SetHandshake(client_p);
2293	–	SetWaitAuth(client_p);
2294	–
2295	–	MyFree(encrypted);
2296	–	MyFree(key_to_send);
2297	–
2298	–	if (IsDead(client_p))
2299	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
2300	–	"Went dead during handshake");
2301	–	else if (fd != NULL)
2302	–	/* If we get here, we're ok, so lets start reading some data */
2303	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
2304	–	}
2305	–
2306	–	void
2307	–	cryptlink_error(struct Client *client_p, const char *type,
2308	–	const char *reason, const char *client_reason)
2309	–	{
2310	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2311	–	get_client_name(client_p, SHOW_IP), type, reason);
2312	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2313	–	get_client_name(client_p, MASK_IP), type, reason);
2314	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2315	–	get_client_name(client_p, SHOW_IP), type, reason);
2316	–
2317	–	/* If client_reason isn't NULL, then exit the client with the message
2318	–	* defined in the call.
2319	–	*/
2320	–	if ((client_reason != NULL) && (!IsDead(client_p)))
2321	–	exit_client(client_p, &me, client_reason);
2322	–	}
2323	–
2324	–	static char base64_chars[] =
2325	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2326	–
2327	–	static char base64_values[] =
2328	–	{
2329	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2330	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2331	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2332	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2333	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2334	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2335	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2336	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2337	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2338	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2339	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2340	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2341	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2342	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2343	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2344	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2345	–	};
2346	–
2347	–	/*
2348	–	* base64_block will allocate and return a new block of memory
2349	–	* using MyMalloc().  It should be freed after use.
2350	–	*/
2351	–	int
2352	–	base64_block(unsigned char **output, char *data, int len)
2353	–	{
2354	–	unsigned char *out;
2355	–	unsigned char *in = (unsigned char*)data;
2356	–	unsigned long int q_in;
2357	–	int i;
2358	–	int count = 0;
2359	–
2360	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2361	–
2362	–	/* process 24 bits at a time */
2363	–	for( i = 0; i < len; i += 3)
2364	–	{
2365	–	q_in = 0;
2366	–
2367	–	if ( i + 2 < len )
2368	–	{
2369	–	q_in  = (in[i+2] & 0xc0) << 2;
2370	–	q_in |=  in[i+2];
2371	–	}
2372	–
2373	–	if ( i + 1 < len )
2374	–	{
2375	–	q_in |= (in[i+1] & 0x0f) << 10;
2376	–	q_in |= (in[i+1] & 0xf0) << 12;
2377	–	}
2378	–
2379	–	q_in |= (in[i]   & 0x03) << 20;
2380	–	q_in |=  in[i]           << 22;
2381	–
2382	–	q_in &= 0x3f3f3f3f;
2383	–
2384	–	out[count++] = base64_chars[((q_in >> 24)       )];
2385	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2386	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2387	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2388	–	}
2389	–	if ( (i - len) > 0 )
2390	–	{
2391	–	out[count-1] = '=';
2392	–	if ( (i - len) > 1 )
2393	–	out[count-2] = '=';
2394	–	}
2395	–
2396	–	out[count] = '\0';
2397	–	*output = out;
2398	–	return (count);
2399	–	}
2400	–
2401	–	/*
2402	–	* unbase64_block will allocate and return a new block of memory
2403	–	* using MyMalloc().  It should be freed after use.
2404	–	*/
2405	–	int
2406	–	unbase64_block(unsigned char **output, char *data, int len)
2407	–	{
2408	–	unsigned char *out;
2409	–	unsigned char *in = (unsigned char*)data;
2410	–	unsigned long int q_in;
2411	–	int i;
2412	–	int count = 0;
2413	–
2414	–	if ((len % 4) != 0)
2415	–	return (0);
2416	–
2417	–	out = MyMalloc(((len / 4) * 3) + 1);
2418	–
2419	–	/* process 32 bits at a time */
2420	–	for( i = 0; (i + 3) < len; i+=4)
2421	–	{
2422	–	/* compress input (chars a, b, c and d) as follows:
2423	–	* (after converting ascii -> base64 value)
2424	–	*
2425	–	* |00000000aaaaaabbbbbbccccccdddddd|
2426	–	* |  765432  107654  321076  543210|
2427	–	*/
2428	–
2429	–	q_in = 0;
2430	–
2431	–	if (base64_values[in[i+3]] > -1)
2432	–	q_in |= base64_values[in[i+3]]      ;
2433	–	if (base64_values[in[i+2]] > -1)
2434	–	q_in |= base64_values[in[i+2]] <<  6;
2435	–	if (base64_values[in[i+1]] > -1)
2436	–	q_in |= base64_values[in[i+1]] << 12;
2437	–	if (base64_values[in[i  ]] > -1)
2438	–	q_in |= base64_values[in[i  ]] << 18;
2439	–
2440	–	out[count++] = (q_in >> 16) & 0xff;
2441	–	out[count++] = (q_in >>  8) & 0xff;
2442	–	out[count++] = (q_in      ) & 0xff;
2443	–	}
2444	–
2445	–	if (in[i-1] == '=') count--;
2446	–	if (in[i-2] == '=') count--;
2447	–
2448	–	out[count] = '\0';
2449	–	*output = out;
2450	–	return (count);
2451	–	}
2452	–
2453	–	#endif /* HAVE_LIBCRYPTO */
2454	–

Diff Legend

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