ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_serv.c (file contents), Revision 992 by michael, Mon Aug 17 19:19:16 2009 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 7274 by michael, Sat Feb 6 20:55:49 2016 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-2016 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
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"
28	<	#ifdef HAVE_LIBCRYPTO
27	<	#include <openssl/rsa.h>
28	<	#include "rsa.h"
29	<	#endif
30	<	#include "tools.h"
31	<	#include "channel.h"
32	<	#include "channel_mode.h"
28	>	#include "list.h"
29		#include "client.h"
34	–	#include "common.h"
35	–	#include "dbuf.h"
30		#include "event.h"
37	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
40	–	#include "inet_misc.h"
41	–	#include "sprintf_irc.h"
33		#include "ircd.h"
34		#include "ircd_defs.h"
35		#include "s_bsd.h"
45	–	#include "irc_getnameinfo.h"
46	–	#include "list.h"
36		#include "numeric.h"
37		#include "packet.h"
38	<	#include "irc_res.h"
39	<	#include "s_conf.h"
40	<	#include "s_serv.h"
41	<	#include "s_log.h"
53	<	#include "s_user.h"
38	>	#include "conf.h"
39	>	#include "server.h"
40	>	#include "log.h"
41	>	#include "user.h"
42		#include "send.h"
43		#include "memory.h"
44	<	#include "channel.h" /* chcap_usage_counts stuff...*/
45	<
58	<	#define MIN_CONN_FREQ 300
59	<
60	<	static dlink_list cap_list = { NULL, NULL, 0 };
61	<	static void server_burst(struct Client *);
62	<	static int fork_server(struct Client *);
63	<	static void burst_all(struct Client *);
64	<	static void send_tb(struct Client *client_p, struct Channel *chptr);
65	<
66	<	static CNCB serv_connect_callback;
67	<
68	<	static void start_io(struct Client *);
69	<	static void burst_members(struct Client *, struct Channel *);
70	<
71	<	static SlinkRplHnd slink_error;
72	<	static SlinkRplHnd slink_zipstats;
73	<
74	<
75	<	#ifdef HAVE_LIBCRYPTO
76	<	struct EncCapability CipherTable[] =
77	<	{
78	<	#ifdef HAVE_EVP_BF_CFB
79	<	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
80	<	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
81	<	#endif
82	<	#ifdef HAVE_EVP_CAST5_CFB
83	<	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
84	<	#endif
85	<	#ifdef HAVE_EVP_IDEA_CFB
86	<	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
87	<	#endif
88	<	#ifdef HAVE_EVP_RC5_32_12_16_CFB
89	<	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
90	<	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
91	<	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
92	<	#endif
93	<	#ifdef HAVE_EVP_DES_EDE3_CFB
94	<	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
95	<	#endif
96	<	#ifdef HAVE_EVP_DES_CFB
97	<	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
98	<	#endif
99	<	{ 0,            0,                   0, 0             }
100	<	};
101	<	#endif
102	<
103	<	struct SlinkRplDef slinkrpltab[] = {
104	<	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
105	<	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
106	<	{ 0,                 0,              0 },
107	<	};
108	<
109	<
110	<	void
111	<	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
112	<	struct Client *server_p)
113	<	{
114	<	assert(rpl == SLINKRPL_ERROR);
115	<	assert(len < 256);
116	<
117	<	data[len-1] = '\0';
118	<
119	<	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
120	<	server_p->name, data);
121	<	/* XXX should this be exit_client? */
122	<	exit_client(server_p, &me, "servlink error -- terminating link");
123	<	}
124	<
125	<	void
126	<	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
127	<	struct Client *server_p)
128	<	{
129	<	struct ZipStats zipstats;
130	<	uint64_t in = 0, in_wire = 0, out = 0, out_wire = 0;
131	<	int i = 0;
132	<
133	<	assert(rpl == SLINKRPL_ZIPSTATS);
134	<	assert(len == 16);
135	<	assert(IsCapable(server_p, CAP_ZIP));
136	<
137	<	/* Yes, it needs to be done this way, no we cannot let the compiler
138	<	* work with the pointer to the structure.  This works around a GCC
139	<	* bug on SPARC that affects all versions at the time of this writing.
140	<	* I will feed you to the creatures living in RMS's beard if you do
141	<	* not leave this as is, without being sure that you are not causing
142	<	* regression for most of our installed SPARC base.
143	<	* -jmallett, 04/27/2002
144	<	*/
145	<	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
146	<
147	<	in |= (data[i++] << 24);
148	<	in |= (data[i++] << 16);
149	<	in |= (data[i++] <<  8);
150	<	in |= (data[i++]      );
151	<
152	<	in_wire |= (data[i++] << 24);
153	<	in_wire |= (data[i++] << 16);
154	<	in_wire |= (data[i++] <<  8);
155	<	in_wire |= (data[i++]      );
156	<
157	<	out |= (data[i++] << 24);
158	<	out |= (data[i++] << 16);
159	<	out |= (data[i++] <<  8);
160	<	out |= (data[i++]      );
161	<
162	<	out_wire |= (data[i++] << 24);
163	<	out_wire |= (data[i++] << 16);
164	<	out_wire |= (data[i++] <<  8);
165	<	out_wire |= (data[i++]      );
166	<
167	<	/* This macro adds b to a if a plus b is not an overflow, and sets the
168	<	* value of a to b if it is.
169	<	* Add and Set if No Overflow.
170	<	*/
171	<	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
172	<
173	<	ASNO(zipstats.in, in);
174	<	ASNO(zipstats.out, out);
175	<	ASNO(zipstats.in_wire, in_wire);
176	<	ASNO(zipstats.out_wire, out_wire);
177	<
178	<	if (zipstats.in > 0)
179	<	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
180	<	(double)zipstats.in) * 100.00);
181	<	else
182	<	zipstats.in_ratio = 0;
183	<
184	<	if (zipstats.out > 0)
185	<	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
186	<	(double)zipstats.out) * 100.00);
187	<	else
188	<	zipstats.out_ratio = 0;
189	<
190	<	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
191	<	}
192	<
193	<	void
194	<	collect_zipstats(void *unused)
195	<	{
196	<	dlink_node *ptr = NULL;
197	<
198	<	DLINK_FOREACH(ptr, serv_list.head)
199	<	{
200	<	struct Client *target_p = ptr->data;
201	<
202	<	if (IsCapable(target_p, CAP_ZIP))
203	<	{
204	<	/* only bother if we haven't already got something queued... */
205	<	if (!target_p->localClient->slinkq)
206	<	{
207	<	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
208	<	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
209	<	target_p->localClient->slinkq_ofs = 0;
210	<	target_p->localClient->slinkq_len = 1;
211	<	send_queued_slink_write(target_p);
212	<	}
213	<	}
214	<	}
215	<	}
216	<
217	<	#ifdef HAVE_LIBCRYPTO
218	<	struct EncCapability *
219	<	check_cipher(struct Client *client_p, struct AccessItem *aconf)
220	<	{
221	<	struct EncCapability *epref = NULL;
222	<
223	<	/* Use connect{} specific info if available */
224	<	if (aconf->cipher_preference)
225	<	epref = aconf->cipher_preference;
226	<	else if (ConfigFileEntry.default_cipher_preference)
227	<	epref = ConfigFileEntry.default_cipher_preference;
228	<
229	<	/*
230	<	* If the server supports the capability in hand, return the matching
231	<	* conf struct.  Otherwise, return NULL (an error).
232	<	*/
233	<	if (epref && IsCapableEnc(client_p, epref->cap))
234	<	return epref;
44	>	#include "channel.h"
45	>	#include "parse.h"
46
236	–	return NULL;
237	–	}
238	–	#endif /* HAVE_LIBCRYPTO */
47
48	<	/* my_name_for_link()
49	<	* return wildcard name of my server name
50	<	* according to given config entry --Jto
243	<	*/
244	<	const char *
245	<	my_name_for_link(struct ConfItem *conf)
246	<	{
247	<	struct AccessItem *aconf;
48	>	dlink_list flatten_links;
49	>	static dlink_list server_capabilities_list;
50	>	static void serv_connect_callback(fde_t *, int, void *);
51
249	–	aconf = (struct AccessItem *)map_to_conf(conf);
250	–	if (aconf->fakename != NULL)
251	–	return aconf->fakename;
252	–	else
253	–	return me.name;
254	–	}
52
53		/*
54		* write_links_file
#	Line 262 | Line 59 | my_name_for_link(struct ConfItem *conf)
59		*                but in no particular order.
60		*/
61		void
62	<	write_links_file(void* notused)
62	>	write_links_file(void *unused)
63		{
64	<	MessageFileLine *next_mptr = 0;
65	<	MessageFileLine *mptr = 0;
66	<	MessageFileLine *currentMessageLine = 0;
270	<	MessageFileLine *newMessageLine = 0;
271	<	MessageFile *MessageFileptr;
272	<	const char *p;
273	<	FBFILE *file;
274	<	char buff[512];
275	<	dlink_node *ptr;
276	<
277	<	MessageFileptr = &ConfigFileEntry.linksfile;
64	>	FILE *file = NULL;
65	>	dlink_node *node = NULL, *node_next = NULL;
66	>	char buff[IRCD_BUFSIZE] = "";
67
68	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
68	>	if (EmptyString(ConfigServerHide.flatten_links_file))
69		return;
70
71	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
71	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "w")) == NULL)
72		{
73	<	next_mptr = mptr->next;
74	<	MyFree(mptr);
73	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
74	>	strerror(errno));
75	>	return;
76		}
77
78	<	MessageFileptr->contentsOfFile = NULL;
79	<	currentMessageLine             = NULL;
78	>	DLINK_FOREACH_SAFE(node, node_next, flatten_links.head)
79	>	{
80	>	dlinkDelete(node, &flatten_links);
81	>	xfree(node->data);
82	>	free_dlink_node(node);
83	>	}
84
85	<	DLINK_FOREACH(ptr, global_serv_list.head)
85	>	DLINK_FOREACH(node, global_server_list.head)
86		{
87	<	size_t nbytes = 0;
294	<	struct Client *target_p = ptr->data;
87	>	const struct Client *target_p = node->data;
88
89	<	/* skip ourselves, we send ourselves in /links */
90	<	if (IsMe(target_p))
89	>	/*
90	>	* Skip hidden servers, aswell as ourselves, since we already send
91	>	* ourselves in /links
92	>	*/
93	>	if (IsHidden(target_p) || IsMe(target_p))
94		continue;
95
96	<	/* skip hidden servers */
301	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
96	>	if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
97		continue;
98
99	<	if (target_p->info[0])
100	<	p = target_p->info;
306	<	else
307	<	p = "(Unknown Location)";
308	<
309	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
310	<
311	<	/* Attempt to format the file in such a way it follows the usual links output
99	>	/*
100	>	* Attempt to format the file in such a way it follows the usual links output
101		* ie  "servername uplink :hops info"
102		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
103		* - madmax
104		*/
105	+	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
106	+	me.name, target_p->info);
107	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
108	+	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
109	+	me.name, target_p->info);
110
111	<	/*
112	<	* For now, check this ircsprintf wont overflow - it shouldnt on a
319	<	* default config but it is configurable..
320	<	* This should be changed to an snprintf at some point, but I'm wanting to
321	<	* know if this is a cause of a bug - cryogen
322	<	*/
323	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
324	<	MESSAGELINELEN);
325	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
326	<	target_p->name, me.name, p);
327	<	newMessageLine->next = NULL;
111	>	fputs(buff, file);
112	>	}
113
114	<	if (MessageFileptr->contentsOfFile)
115	<	{
116	<	if (currentMessageLine)
117	<	currentMessageLine->next = newMessageLine;
118	<	currentMessageLine = newMessageLine;
119	<	}
120	<	else
121	<	{
122	<	MessageFileptr->contentsOfFile = newMessageLine;
123	<	currentMessageLine = newMessageLine;
124	<	}
114	>	fclose(file);
115	>	}
116	>
117	>	void
118	>	read_links_file(void)
119	>	{
120	>	FILE *file = NULL;
121	>	char *p = NULL;
122	>	char buff[IRCD_BUFSIZE] = "";
123	>
124	>	if (EmptyString(ConfigServerHide.flatten_links_file))
125	>	return;
126	>
127	>	if ((file = fopen(ConfigServerHide.flatten_links_file, "r")) == NULL)
128	>	{
129	>	ilog(LOG_TYPE_IRCD, "Couldn't open \"%s\": %s", ConfigServerHide.flatten_links_file,
130	>	strerror(errno));
131	>	return;
132	>	}
133	>
134	>	while (fgets(buff, sizeof(buff), file))
135	>	{
136	>	if ((p = strchr(buff, '\n')))
137	>	*p = '\0';
138
139	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
342	<	fbputs(buff, file, nbytes);
139	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
140		}
141
142	<	fbclose(file);
142	>	fclose(file);
143		}
144
145		/* hunt_server()
#	Line 365 | Line 162 | write_links_file(void* notused)
162		*      returns: (see #defines)
163		*/
164		int
165	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
166	<	int server, int parc, char *parv[])
165	>	hunt_server(struct Client *source_p, const char *command,
166	>	const int server, const int parc, char *parv[])
167		{
168		struct Client *target_p = NULL;
169	<	struct Client *target_tmp = NULL;
373	<	dlink_node *ptr;
374	<	int wilds;
169	>	dlink_node *node = NULL;
170
171	<	/* Assume it's me, if no server
172	<	*/
173	<	if (parc <= server || EmptyString(parv[server]) ||
379	<	match(me.name, parv[server]) ||
380	<	match(parv[server], me.name) ||
381	<	!strcmp(parv[server], me.id))
382	<	return(HUNTED_ISME);
171	>	/* Assume it's me, if no server */
172	>	if (parc <= server || EmptyString(parv[server]))
173	>	return HUNTED_ISME;
174
175	<	/* These are to pickup matches that would cause the following
175	>	if ((target_p = find_person(source_p, parv[server])) == NULL)
176	>	target_p = hash_find_server(parv[server]);
177	>
178	>	/*
179	>	* These are to pickup matches that would cause the following
180		* message to go in the wrong direction while doing quick fast
181		* non-matching lookups.
182		*/
388	–	if (MyClient(source_p))
389	–	target_p = find_client(parv[server]);
390	–	else
391	–	target_p = find_person(client_p, parv[server]);
392	–
183		if (target_p)
184		if (target_p->from == source_p->from && !MyConnect(target_p))
185		target_p = NULL;
186
187	<	if (target_p == NULL && (target_p = find_server(parv[server])))
398	<	if (target_p->from == source_p->from && !MyConnect(target_p))
399	<	target_p = NULL;
400	<
401	<	collapse(parv[server]);
402	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
403	<
404	<	/* Again, if there are no wild cards involved in the server
405	<	* name, use the hash lookup
406	<	*/
407	<	if (target_p == NULL)
187	>	if (!target_p && has_wildcards(parv[server]))
188		{
189	<	if (!wilds)
189	>	DLINK_FOREACH(node, global_server_list.head)
190		{
191	<	if (!(target_p = find_server(parv[server])))
191	>	struct Client *tmp = node->data;
192	>
193	>	assert(IsMe(tmp) || IsServer(tmp));
194	>	if (!match(parv[server], tmp->name))
195		{
196	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
197	<	me.name, parv[0], parv[server]);
198	<	return(HUNTED_NOSUCH);
196	>	if (tmp->from == source_p->from && !MyConnect(tmp))
197	>	continue;
198	>
199	>	target_p = node->data;
200	>	break;
201		}
202		}
203	<	else
203	>
204	>	if (!target_p)
205		{
206	<	DLINK_FOREACH(ptr, global_client_list.head)
206	>	DLINK_FOREACH(node, global_client_list.head)
207		{
208	<	target_tmp = ptr->data;
208	>	struct Client *tmp = node->data;
209
210	<	if (match(parv[server], target_tmp->name))
210	>	assert(IsMe(tmp) || IsServer(tmp) || IsClient(tmp));
211	>	if (!match(parv[server], tmp->name))
212		{
213	<	if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
213	>	if (tmp->from == source_p->from && !MyConnect(tmp))
214		continue;
428	–	target_p = ptr->data;
215
216	<	if (IsRegistered(target_p) && (target_p != client_p))
217	<	break;
216	>	target_p = node->data;
217	>	break;
218		}
219		}
220		}
221		}
222
223	<	if (target_p != NULL)
223	>	if (target_p)
224		{
225	<	if(!IsRegistered(target_p))
440	<	{
441	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
442	<	me.name, parv[0], parv[server]);
443	<	return HUNTED_NOSUCH;
444	<	}
445	<
225	>	assert(IsMe(target_p) || IsServer(target_p) || IsClient(target_p));
226		if (IsMe(target_p) || MyClient(target_p))
227		return HUNTED_ISME;
228
229	<	if (!match(target_p->name, parv[server]))
230	<	parv[server] = target_p->name;
451	<
452	<	/* This is a little kludgy but should work... */
453	<	if (IsClient(source_p) &&
454	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
455	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
456	<	parv[0] = ID(source_p);
457	<
458	<	sendto_one(target_p, command, parv[0],
229	>	parv[server] = target_p->id;
230	>	sendto_one(target_p, command, source_p->id,
231		parv[1], parv[2], parv[3], parv[4],
232		parv[5], parv[6], parv[7], parv[8]);
233	<	return(HUNTED_PASS);
234	<	}
233	>	return HUNTED_PASS;
234	>	}
235
236	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
237	<	me.name, parv[0], parv[server]);
466	<	return(HUNTED_NOSUCH);
236	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237	>	return HUNTED_NOSUCH;
238		}
239
240		/* try_connections()
#	Line 479 | Line 250 | hunt_server(struct Client *client_p, str
250		void
251		try_connections(void *unused)
252		{
253	<	dlink_node *ptr;
483	<	struct ConfItem *conf;
484	<	struct AccessItem *aconf;
485	<	struct ClassItem *cltmp;
486	<	int confrq;
253	>	dlink_node *node = NULL;
254
488	–	/* TODO: change this to set active flag to 0 when added to event! --Habeeb */
255		if (GlobalSetOptions.autoconn == 0)
256		return;
257
258	<	DLINK_FOREACH(ptr, server_items.head)
258	>	DLINK_FOREACH(node, server_items.head)
259		{
260	<	conf = ptr->data;
495	<	aconf = (struct AccessItem *)map_to_conf(conf);
260	>	struct MaskItem *conf = node->data;
261
262	<	/* Also when already connecting! (update holdtimes) --SRB
498	<	*/
499	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
500	<	!(IsConfAllowAutoConn(aconf)))
501	<	continue;
262	>	assert(conf->type == CONF_SERVER);
263
264	<	cltmp = (struct ClassItem *)map_to_conf(aconf->class_ptr);
264	>	/* Also when already connecting! (update holdtimes) --SRB */
265	>	if (!conf->port || !IsConfAllowAutoConn(conf))
266	>	continue;
267
268	<	/* Skip this entry if the use of it is still on hold until
268	>	/*
269	>	* Skip this entry if the use of it is still on hold until
270		* future. Otherwise handle this entry (and set it on hold
271		* until next time). Will reset only hold times, if already
272		* made one successfull connection... [this algorithm is
273		* a bit fuzzy... -- msa >;) ]
274		*/
275	<	if (aconf->hold > CurrentTime)
275	>	if (conf->until > CurrentTime)
276		continue;
277
278	<	if (cltmp == NULL)
515	<	confrq = DEFAULT_CONNECTFREQUENCY;
516	<	else
517	<	{
518	<	confrq = ConFreq(cltmp);
519	<	if (confrq < MIN_CONN_FREQ )
520	<	confrq = MIN_CONN_FREQ;
521	<	}
278	>	assert(conf->class);
279
280	<	aconf->hold = CurrentTime + confrq;
280	>	conf->until = CurrentTime + conf->class->con_freq;
281
282	<	/* Found a CONNECT config with port specified, scan clients
282	>	/*
283	>	* Found a CONNECT config with port specified, scan clients
284		* and see if this server is already connected?
285		*/
286	<	if (find_server(conf->name) != NULL)
286	>	if (hash_find_server(conf->name))
287		continue;
288
289	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
289	>	if (conf->class->ref_count < conf->class->max_total)
290		{
291	<	/* Go to the end of the list, if not already last */
292	<	if (ptr->next != NULL)
291	>	/* Move this entry to the end of the list, if not already last */
292	>	if (node->next)
293		{
294	<	dlinkDelete(ptr, &server_items);
294	>	dlinkDelete(node, &server_items);
295		dlinkAddTail(conf, &conf->node, &server_items);
296		}
297
298		if (find_servconn_in_progress(conf->name))
299		return;
300
301	<	/* We used to only print this if serv_connect() actually
301	>	/*
302	>	* We used to only print this if serv_connect() actually
303		* succeeded, but since comm_tcp_connect() can call the callback
304		* immediately if there is an error, we were getting error messages
305		* in the wrong order. SO, we just print out the activated line,
#	Line 549 | Line 308 | try_connections(void *unused)
308		*   -- adrian
309		*/
310		if (ConfigServerHide.hide_server_ips)
311	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s activated.",
311	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
312	>	"Connection to %s activated.",
313		conf->name);
314		else
315	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Connection to %s[%s] activated.",
316	<	conf->name, aconf->host);
315	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
316	>	"Connection to %s[%s] activated.",
317	>	conf->name, conf->host);
318
319	<	serv_connect(aconf, NULL);
319	>	serv_connect(conf, NULL);
320		/* We connect only one at time... */
321		return;
322		}
#	Line 563 | Line 324 | try_connections(void *unused)
324		}
325
326		int
327	<	check_server(const char *name, struct Client *client_p, int cryptlink)
327	>	valid_servname(const char *name)
328		{
329	<	dlink_node *ptr;
330	<	struct ConfItem *conf           = NULL;
570	<	struct ConfItem *server_conf    = NULL;
571	<	struct AccessItem *server_aconf = NULL;
572	<	struct AccessItem *aconf        = NULL;
573	<	int error = -1;
329	>	unsigned int dots = 0;
330	>	const char *p = name;
331
332	<	assert(client_p != NULL);
332	>	for (; *p; ++p)
333	>	{
334	>	if (!IsServChar(*p))
335	>	return 0;
336
337	<	if (client_p == NULL)
338	<	return(error);
337	>	if (*p == '.')
338	>	++dots;
339	>	}
340
341	<	if (strlen(name) > HOSTLEN)
342	<	return(-4);
341	>	return dots && (p - name) <= HOSTLEN;
342	>	}
343
344	<	/* loop through looking for all possible connect items that might work */
345	<	DLINK_FOREACH(ptr, server_items.head)
344	>	int
345	>	check_server(const char *name, struct Client *client_p)
346	>	{
347	>	dlink_node *node = NULL;
348	>	struct MaskItem *conf        = NULL;
349	>	struct MaskItem *server_conf = NULL;
350	>	int error = -1;
351	>
352	>	assert(client_p);
353	>
354	>	/* Loop through looking for all possible connect items that might work */
355	>	DLINK_FOREACH(node, server_items.head)
356		{
357	<	conf = ptr->data;
587	<	aconf = (struct AccessItem *)map_to_conf(conf);
357	>	conf = node->data;
358
359	<	if (!match(name, conf->name))
359	>	if (match(name, conf->name))
360		continue;
361
362		error = -3;
363
364	<	/* XXX: Fix me for IPv6                    */
365	<	/* XXX sockhost is the IPv4 ip as a string */
596	<	if (match(aconf->host, client_p->host) ||
597	<	match(aconf->host, client_p->sockhost))
364	>	if (!match(conf->host, client_p->host) ||
365	>	!match(conf->host, client_p->sockhost))
366		{
367		error = -2;
600	–	#ifdef HAVE_LIBCRYPTO
601	–	if (cryptlink && IsConfCryptLink(aconf))
602	–	{
603	–	if (aconf->rsa_public_key)
604	–	server_conf = conf;
605	–	}
606	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
607	–	#endif /* HAVE_LIBCRYPTO */
608	–	{
609	–	/* A NULL password is as good as a bad one */
610	–	if (EmptyString(client_p->localClient->passwd))
611	–	return(-2);
612	–
613	–	/* code in s_conf.c should not have allowed this to be NULL */
614	–	if (aconf->passwd == NULL)
615	–	return(-2);
368
369	<	if (IsConfEncrypted(aconf))
370	<	{
371	<	if (strcmp(aconf->passwd,
372	<	(const char *)crypt(client_p->localClient->passwd,
373	<	aconf->passwd)) == 0)
374	<	server_conf = conf;
375	<	}
376	<	else
625	<	{
626	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
627	<	server_conf = conf;
628	<	}
629	<	}
369	>	if (!match_conf_password(client_p->connection->password, conf))
370	>	return -2;
371	>
372	>	if (!EmptyString(conf->certfp))
373	>	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
374	>	return -4;
375	>
376	>	server_conf = conf;
377		}
378		}
379
380		if (server_conf == NULL)
381	<	return(error);
381	>	return error;
382
383		attach_conf(client_p, server_conf);
384
385	<	/* Now find all leaf or hub config items for this server */
639	<	DLINK_FOREACH(ptr, hub_items.head)
385	>	switch (server_conf->aftype)
386		{
387	<	conf = ptr->data;
642	<
643	<	if (!match(name, conf->name))
644	<	continue;
645	<	attach_conf(client_p, conf);
646	<	}
647	<
648	<	DLINK_FOREACH(ptr, leaf_items.head)
649	<	{
650	<	conf = ptr->data;
651	<
652	<	if (!match(name, conf->name))
653	<	continue;
654	<	attach_conf(client_p, conf);
655	<	}
656	<
657	<	server_aconf = map_to_conf(server_conf);
658	<
659	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
660	<	if (!IsConfCompressed(server_aconf))
661	<	#endif
662	<	ClearCap(client_p, CAP_ZIP);
663	<	if (!IsConfCryptLink(server_aconf))
664	<	ClearCap(client_p, CAP_ENC);
665	<	if (!IsConfTopicBurst(server_aconf))
666	<	{
667	<	ClearCap(client_p, CAP_TB);
668	<	ClearCap(client_p, CAP_TBURST);
669	<	}
670	<
671	<	/* Don't unset CAP_HUB here even if the server isn't a hub,
672	<	* it only indicates if the server thinks it's lazylinks are
673	<	* leafs or not.. if you unset it, bad things will happen
674	<	*/
675	<	if (aconf != NULL)
676	<	{
677	<	struct sockaddr_in *v4;
678	<	#ifdef IPV6
679	<	struct sockaddr_in6 *v6;
680	<	#endif
681	<	switch (aconf->aftype)
387	>	case AF_INET6:
388		{
389	<	#ifdef IPV6
684	<	case AF_INET6:
685	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
389	>	const struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&server_conf->addr;
390
391	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
392	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
393	<	break;
394	<	#endif
395	<	case AF_INET:
396	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
391	>	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
392	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
393	>	break;
394	>	}
395	>	case AF_INET:
396	>	{
397	>	const struct sockaddr_in *v4 = (struct sockaddr_in *)&server_conf->addr;
398
399	<	if (v4->sin_addr.s_addr == INADDR_NONE)
400	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
401	<	break;
399	>	if (v4->sin_addr.s_addr == INADDR_NONE)
400	>	memcpy(&server_conf->addr, &client_p->connection->ip, sizeof(struct irc_ssaddr));
401	>	break;
402		}
403		}
404
405	<	return(0);
405	>	return 0;
406		}
407
408		/* add_capability()
#	Line 710 | Line 415 | check_server(const char *name, struct Cl
415		*                modules to dynamically add or subtract their capability.
416		*/
417		void
418	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
418	>	add_capability(const char *name, unsigned int flag)
419		{
420	<	struct Capability *cap = MyMalloc(sizeof(*cap));
420	>	struct Capability *cap = xcalloc(sizeof(*cap));
421
422	<	DupString(cap->name, capab_name);
423	<	cap->cap = cap_flag;
424	<	dlinkAdd(cap, &cap->node, &cap_list);
720	<
721	<	if (add_to_default)
722	<	default_server_capabs |= cap_flag;
422	>	cap->name = xstrdup(name);
423	>	cap->cap = flag;
424	>	dlinkAdd(cap, &cap->node, &server_capabilities_list);
425		}
426
427		/* delete_capability()
#	Line 728 | Line 430 | add_capability(const char *capab_name, i
430		* output       - NONE
431		* side effects - delete given capability from ones known.
432		*/
433	<	int
434	<	delete_capability(const char *capab_name)
433	>	void
434	>	delete_capability(const char *name)
435		{
436	<	dlink_node *ptr;
735	<	dlink_node *next_ptr;
736	<	struct Capability *cap;
436	>	dlink_node *node = NULL, *node_next = NULL;
437
438	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
438	>	DLINK_FOREACH_SAFE(node, node_next, server_capabilities_list.head)
439		{
440	<	cap = ptr->data;
440	>	struct Capability *cap = node->data;
441
442	<	if (cap->cap != 0)
442	>	if (!irccmp(cap->name, name))
443		{
444	<	if (irccmp(cap->name, capab_name) == 0)
445	<	{
446	<	default_server_capabs &= ~(cap->cap);
747	<	dlinkDelete(ptr, &cap_list);
748	<	MyFree(cap->name);
749	<	cap->name = NULL;
750	<	MyFree(cap);
751	<	}
444	>	dlinkDelete(node, &server_capabilities_list);
445	>	xfree(cap->name);
446	>	xfree(cap);
447		}
448		}
754	–
755	–	return 0;
449		}
450
451		/*
#	Line 762 | Line 455 | delete_capability(const char *capab_name
455		* output       - 0 if not found CAPAB otherwise
456		* side effects - none
457		*/
458	<	int
459	<	find_capability(const char *capab)
458	>	unsigned int
459	>	find_capability(const char *name)
460		{
461	<	const dlink_node *ptr = NULL;
461	>	const dlink_node *node = NULL;
462
463	<	DLINK_FOREACH(ptr, cap_list.head)
463	>	DLINK_FOREACH(node, server_capabilities_list.head)
464		{
465	<	const struct Capability *cap = ptr->data;
465	>	const struct Capability *cap = node->data;
466
467	<	if (cap->cap && !irccmp(cap->name, capab))
467	>	if (!irccmp(cap->name, name))
468		return cap->cap;
469		}
470
#	Line 781 | Line 474 | find_capability(const char *capab)
474		/* send_capabilities()
475		*
476		* inputs       - Client pointer to send to
784	–	*              - Pointer to AccessItem (for crypt)
477		*              - int flag of capabilities that this server can send
786	–	*              - int flag of encryption capabilities
478		* output       - NONE
479		* side effects - send the CAPAB line to a server  -orabidoo
480		*
481		*/
482		void
483	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
793	<	int cap_can_send, int enc_can_send)
483	>	send_capabilities(struct Client *client_p)
484		{
485	<	struct Capability *cap=NULL;
486	<	char msgbuf[IRCD_BUFSIZE];
797	<	char *t;
798	<	int tl;
799	<	dlink_node *ptr;
800	<	#ifdef HAVE_LIBCRYPTO
801	<	const struct EncCapability *epref = NULL;
802	<	char *capend;
803	<	int sent_cipher = 0;
804	<	#endif
485	>	char buf[IRCD_BUFSIZE] = "";
486	>	const dlink_node *node = NULL;
487
488	<	t = msgbuf;
807	<
808	<	DLINK_FOREACH(ptr, cap_list.head)
488	>	DLINK_FOREACH(node, server_capabilities_list.head)
489		{
490	<	cap = ptr->data;
490	>	const struct Capability *cap = node->data;
491
492	<	if (cap->cap & (cap_can_send|default_server_capabs))
813	<	{
814	<	tl = ircsprintf(t, "%s ", cap->name);
815	<	t += tl;
816	<	}
817	<	}
818	<	#ifdef HAVE_LIBCRYPTO
819	<	if (enc_can_send)
820	<	{
821	<	capend = t;
822	<	strcpy(t, "ENC:");
823	<	t += 4;
824	<
825	<	/* use connect{} specific info if available */
826	<	if (aconf->cipher_preference)
827	<	epref = aconf->cipher_preference;
828	<	else if (ConfigFileEntry.default_cipher_preference)
829	<	epref = ConfigFileEntry.default_cipher_preference;
492	>	strlcat(buf, cap->name, sizeof(buf));
493
494	<	if (epref && (epref->cap & enc_can_send))
495	<	{
833	<	/* Leave the space -- it is removed later. */
834	<	tl = ircsprintf(t, "%s ", epref->name);
835	<	t += tl;
836	<	sent_cipher = 1;
837	<	}
838	<
839	<	if (!sent_cipher)
840	<	t = capend; /* truncate string before ENC:, below */
494	>	if (node->next)
495	>	strlcat(buf, " ", sizeof(buf));
496		}
842	–	#endif
843	–	*(t - 1) = '\0';
844	–	sendto_one(client_p, "CAPAB :%s", msgbuf);
845	–	}
846	–
847	–	/* sendnick_TS()
848	–	*
849	–	* inputs       - client (server) to send nick towards
850	–	*          - client to send nick for
851	–	* output       - NONE
852	–	* side effects - NICK message is sent towards given client_p
853	–	*/
854	–	void
855	–	sendnick_TS(struct Client *client_p, struct Client *target_p)
856	–	{
857	–	static char ubuf[12];
858	–
859	–	if (!IsClient(target_p))
860	–	return;
861	–
862	–	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
863	–	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
864	–
865	–	if (ubuf[0] == '\0')
866	–	{
867	–	ubuf[0] = '+';
868	–	ubuf[1] = '\0';
869	–	}
870	–
871	–	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
872	–	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
873	–	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
874	–	target_p->servptr->id,
875	–	target_p->name, target_p->hopcount + 1,
876	–	(unsigned long) target_p->tsinfo,
877	–	ubuf, target_p->username, target_p->host,
878	–	(MyClient(target_p) && IsIPSpoof(target_p)) ?
879	–	"0" : target_p->sockhost, target_p->id, target_p->info);
880	–	else
881	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
882	–	target_p->name, target_p->hopcount + 1,
883	–	(unsigned long) target_p->tsinfo,
884	–	ubuf, target_p->username, target_p->host,
885	–	target_p->servptr->name, target_p->info);
886	–
887	–	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
888	–	if (!EmptyString(target_p->away))
889	–	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
890	–	target_p->away);
497
498	+	sendto_one(client_p, "CAPAB :%s", buf);
499		}
500
501		/*
#	Line 899 | Line 506 | sendnick_TS(struct Client *client_p, str
506		* side effects - build up string representing capabilities of server listed
507		*/
508		const char *
509	<	show_capabilities(struct Client *target_p)
509	>	show_capabilities(const struct Client *target_p)
510		{
511	<	static char msgbuf[IRCD_BUFSIZE];
512	<	char *t = msgbuf;
906	<	dlink_node *ptr;
511	>	static char msgbuf[IRCD_BUFSIZE] = "";
512	>	const dlink_node *node = NULL;
513
514	<	t += ircsprintf(msgbuf, "TS ");
514	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
515
516	<	DLINK_FOREACH(ptr, cap_list.head)
516	>	DLINK_FOREACH(node, server_capabilities_list.head)
517		{
518	<	const struct Capability *cap = ptr->data;
518	>	const struct Capability *cap = node->data;
519	>
520	>	if (!IsCapable(target_p, cap->cap))
521	>	continue;
522
523	<	if (IsCapable(target_p, cap->cap))
524	<	t += ircsprintf(t, "%s ", cap->name);
523	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
524	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
525		}
917	–	#ifdef HAVE_LIBCRYPTO
918	–	if (IsCapable(target_p, CAP_ENC) &&
919	–	target_p->localClient->in_cipher &&
920	–	target_p->localClient->out_cipher)
921	–	t += ircsprintf(t, "ENC:%s ",
922	–	target_p->localClient->in_cipher->name);
923	–	#endif
924	–	*(t - 1) = '\0';
526
527	<	return(msgbuf);
527	>	return msgbuf;
528		}
529
530		/* make_server()
#	Line 937 | Line 538 | struct Server *
538		make_server(struct Client *client_p)
539		{
540		if (client_p->serv == NULL)
541	<	client_p->serv = MyMalloc(sizeof(struct Server));
541	>	client_p->serv = xcalloc(sizeof(struct Server));
542
543		return client_p->serv;
544		}
545
945	–	/* server_estab()
946	–	*
947	–	* inputs       - pointer to a struct Client
948	–	* output       -
949	–	* side effects -
950	–	*/
951	–	void
952	–	server_estab(struct Client *client_p)
953	–	{
954	–	struct Client *target_p;
955	–	struct ConfItem *conf;
956	–	struct AccessItem *aconf=NULL;
957	–	char *host;
958	–	const char *inpath;
959	–	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
960	–	dlink_node *m;
961	–	dlink_node *ptr;
962	–
963	–	assert(client_p != NULL);
964	–
965	–	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
966	–
967	–	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
968	–	host   = client_p->name;
969	–
970	–	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
971	–	== NULL)
972	–	{
973	–	/* This shouldn't happen, better tell the ops... -A1kmm */
974	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
975	–	"for server %s(this shouldn't happen)!", host);
976	–	exit_client(client_p, &me, "Lost connect{} block!");
977	–	return;
978	–	}
979	–
980	–	MyFree(client_p->localClient->passwd);
981	–	client_p->localClient->passwd = NULL;
982	–
983	–	/* Its got identd, since its a server */
984	–	SetGotId(client_p);
985	–
986	–	/* If there is something in the serv_list, it might be this
987	–	* connecting server..
988	–	*/
989	–	if (!ServerInfo.hub && serv_list.head)
990	–	{
991	–	if (client_p != serv_list.head->data || serv_list.head->next)
992	–	{
993	–	++ServerStats.is_ref;
994	–	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
995	–	exit_client(client_p, &me, "I'm a leaf");
996	–	return;
997	–	}
998	–	}
999	–
1000	–	aconf = (struct AccessItem *)map_to_conf(conf);
1001	–
1002	–	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
1003	–	{
1004	–	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1005	–	*        2.  Check aconf->spasswd, not aconf->passwd.
1006	–	*/
1007	–	if (!EmptyString(aconf->spasswd))
1008	–	{
1009	–	/* only send ts6 format PASS if we have ts6 enabled */
1010	–	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1011	–	sendto_one(client_p, "PASS %s TS %d %s",
1012	–	aconf->spasswd, TS_CURRENT, me.id);
1013	–	else
1014	–	sendto_one(client_p, "PASS %s TS 5",
1015	–	aconf->spasswd);
1016	–	}
1017	–
1018	–	/* Pass my info to the new server
1019	–	*
1020	–	* If this is a HUB, pass on CAP_HUB
1021	–	* Pass on ZIP if supported
1022	–	* Pass on TB if supported.
1023	–	* - Dianora
1024	–	*/
1025	–
1026	–	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1027	–	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1028	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1029	–
1030	–	/* SERVER is the last command sent before switching to ziplinks.
1031	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1032	–	* on the wire immediately.  Otherwise, it could be sitting in
1033	–	* a kernel buffer when we start sending zipped data, and the
1034	–	* parser on the receiving side can't hand both unzipped and zipped
1035	–	* data in one packet. --Rodder
1036	–	*
1037	–	* currently we only need to call send_queued_write,
1038	–	* Nagle is already disabled at this point --adx
1039	–	*/
1040	–	sendto_one(client_p, "SERVER %s 1 :%s%s",
1041	–	my_name_for_link(conf),
1042	–	ConfigServerHide.hidden ? "(H) " : "",
1043	–	(me.info[0]) ? (me.info) : "IRCers United");
1044	–	send_queued_write(client_p);
1045	–	}
1046	–
1047	–	/* Hand the server off to servlink now */
1048	–	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1049	–	{
1050	–	if (fork_server(client_p) < 0)
1051	–	{
1052	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1053	–	"Warning: fork failed for server %s -- check servlink_path (%s)",
1054	–	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1055	–	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1056	–	"%s -- check servlink_path (%s)",
1057	–	get_client_name(client_p, MASK_IP),
1058	–	ConfigFileEntry.servlink_path);
1059	–	exit_client(client_p, &me, "fork failed");
1060	–	return;
1061	–	}
1062	–
1063	–	start_io(client_p);
1064	–	SetServlink(client_p);
1065	–	}
1066	–
1067	–	/* only send ts6 format SVINFO if we have ts6 enabled */
1068	–	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1069	–	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
1070	–	(unsigned long)CurrentTime);
1071	–
1072	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
1073	–	if (IsCapable(client_p, CAP_TS6))
1074	–	hash_add_id(client_p);
1075	–
1076	–	/* XXX Does this ever happen? I don't think so -db */
1077	–	detach_conf(client_p, OPER_TYPE);
1078	–
1079	–	/* *WARNING*
1080	–	**    In the following code in place of plain server's
1081	–	**    name we send what is returned by get_client_name
1082	–	**    which may add the "sockhost" after the name. It's
1083	–	**    *very* *important* that there is a SPACE between
1084	–	**    the name and sockhost (if present). The receiving
1085	–	**    server will start the information field from this
1086	–	**    first blank and thus puts the sockhost into info.
1087	–	**    ...a bit tricky, but you have been warned, besides
1088	–	**    code is more neat this way...  --msa
1089	–	*/
1090	–	client_p->servptr = &me;
1091	–
1092	–	if (IsClosing(client_p))
1093	–	return;
1094	–
1095	–	SetServer(client_p);
1096	–
1097	–	/* Update the capability combination usage counts. -A1kmm */
1098	–	set_chcap_usage_counts(client_p);
1099	–
1100	–	/* Some day, all these lists will be consolidated *sigh* */
1101	–	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
1102	–
1103	–	m = dlinkFind(&unknown_list, client_p);
1104	–	assert(NULL != m);
1105	–
1106	–	dlinkDelete(m, &unknown_list);
1107	–	dlinkAdd(client_p, m, &serv_list);
1108	–
1109	–	Count.myserver++;
1110	–
1111	–	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
1112	–	hash_add_client(client_p);
1113	–
1114	–	/* doesnt duplicate client_p->serv if allocated this struct already */
1115	–	make_server(client_p);
1116	–
1117	–	/* fixing eob timings.. -gnp */
1118	–	client_p->firsttime = CurrentTime;
1119	–
1120	–	/* Show the real host/IP to admins */
1121	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1122	–	"Link with %s established: (%s) link",
1123	–	inpath_ip,show_capabilities(client_p));
1124	–	/* Now show the masked hostname/IP to opers */
1125	–	sendto_realops_flags(UMODE_ALL, L_OPER,
1126	–	"Link with %s established: (%s) link",
1127	–	inpath,show_capabilities(client_p));
1128	–	ilog(L_NOTICE, "Link with %s established: (%s) link",
1129	–	inpath_ip, show_capabilities(client_p));
1130	–
1131	–	client_p->serv->sconf = conf;
1132	–
1133	–	if (HasServlink(client_p))
1134	–	{
1135	–	/* we won't overflow FD_DESC_SZ here, as it can hold
1136	–	* client_p->name + 64
1137	–	*/
1138	–	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
1139	–	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
1140	–	}
1141	–	else
1142	–	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
1143	–
1144	–	/* Old sendto_serv_but_one() call removed because we now
1145	–	** need to send different names to different servers
1146	–	** (domain name matching) Send new server to other servers.
1147	–	*/
1148	–	DLINK_FOREACH(ptr, serv_list.head)
1149	–	{
1150	–	target_p = ptr->data;
1151	–
1152	–	if (target_p == client_p)
1153	–	continue;
1154	–
1155	–	if ((conf = target_p->serv->sconf) &&
1156	–	match(my_name_for_link(conf), client_p->name))
1157	–	continue;
1158	–
1159	–	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
1160	–	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
1161	–	me.id, client_p->name, client_p->id,
1162	–	IsHidden(client_p) ? "(H) " : "",
1163	–	client_p->info);
1164	–	else
1165	–	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
1166	–	me.name, client_p->name,
1167	–	IsHidden(client_p) ? "(H) " : "",
1168	–	client_p->info);
1169	–	}
1170	–
1171	–	/* Pass on my client information to the new server
1172	–	**
1173	–	** First, pass only servers (idea is that if the link gets
1174	–	** cancelled beacause the server was already there,
1175	–	** there are no NICK's to be cancelled...). Of course,
1176	–	** if cancellation occurs, all this info is sent anyway,
1177	–	** and I guess the link dies when a read is attempted...? --msa
1178	–	**
1179	–	** Note: Link cancellation to occur at this point means
1180	–	** that at least two servers from my fragment are building
1181	–	** up connection this other fragment at the same time, it's
1182	–	** a race condition, not the normal way of operation...
1183	–	**
1184	–	** ALSO NOTE: using the get_client_name for server names--
1185	–	**    see previous *WARNING*!!! (Also, original inpath
1186	–	**    is destroyed...)
1187	–	*/
1188	–
1189	–	conf = client_p->serv->sconf;
1190	–
1191	–	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
1192	–	{
1193	–	target_p = ptr->data;
1194	–
1195	–	/* target_p->from == target_p for target_p == client_p */
1196	–	if (target_p->from == client_p)
1197	–	continue;
1198	–
1199	–	if (match(my_name_for_link(conf), target_p->name))
1200	–	continue;
1201	–
1202	–	if (IsCapable(client_p, CAP_TS6))
1203	–	{
1204	–	if (HasID(target_p))
1205	–	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
1206	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1207	–	target_p->id, IsHidden(target_p) ? "(H) " : "",
1208	–	target_p->info);
1209	–	else  /* introducing non-ts6 server */
1210	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1211	–	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
1212	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1213	–	}
1214	–	else
1215	–	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
1216	–	target_p->servptr->name, target_p->name, target_p->hopcount+1,
1217	–	IsHidden(target_p) ? "(H) " : "", target_p->info);
1218	–	}
1219	–
1220	–	server_burst(client_p);
1221	–	}
1222	–
1223	–	static void
1224	–	start_io(struct Client *server)
1225	–	{
1226	–	struct LocalUser *lserver = server->localClient;
1227	–	int alloclen = 1;
1228	–	char *buf;
1229	–	dlink_node *ptr;
1230	–	struct dbuf_block *block;
1231	–
1232	–	/* calculate how many bytes to allocate */
1233	–	if (IsCapable(server, CAP_ZIP))
1234	–	alloclen += 6;
1235	–	#ifdef HAVE_LIBCRYPTO
1236	–	if (IsCapable(server, CAP_ENC))
1237	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1238	–	#endif
1239	–	alloclen += dbuf_length(&lserver->buf_recvq);
1240	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1241	–	alloclen += dbuf_length(&lserver->buf_sendq);
1242	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1243	–
1244	–	/* initialize servlink control sendq */
1245	–	lserver->slinkq = buf = MyMalloc(alloclen);
1246	–	lserver->slinkq_ofs = 0;
1247	–	lserver->slinkq_len = alloclen;
1248	–
1249	–	if (IsCapable(server, CAP_ZIP))
1250	–	{
1251	–	/* ziplink */
1252	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1253	–	*buf++ = 0; /* |          */
1254	–	*buf++ = 1; /* \ len is 1 */
1255	–	*buf++ = ConfigFileEntry.compression_level;
1256	–	*buf++ = SLINKCMD_START_ZIP_IN;
1257	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1258	–	}
1259	–	#ifdef HAVE_LIBCRYPTO
1260	–	if (IsCapable(server, CAP_ENC))
1261	–	{
1262	–	/* Decryption settings */
1263	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1264	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1265	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1266	–	*buf++ = lserver->in_cipher->cipherid;
1267	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1268	–	*buf++ = 0; /* keylen < 256 */
1269	–	*buf++ = lserver->in_cipher->keylen;
1270	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1271	–	buf += lserver->in_cipher->keylen;
1272	–	/* Encryption settings */
1273	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1274	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1275	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1276	–	*buf++ = lserver->out_cipher->cipherid;
1277	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1278	–	*buf++ = 0; /* keylen < 256 */
1279	–	*buf++ = lserver->out_cipher->keylen;
1280	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1281	–	buf += lserver->out_cipher->keylen;
1282	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1283	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1284	–	}
1285	–	#endif
1286	–
1287	–	/* pass the whole recvq to servlink */
1288	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1289	–	{
1290	–	block = ptr->data;
1291	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1292	–	*buf++ = (block->size >> 8);
1293	–	*buf++ = (block->size & 0xff);
1294	–	memcpy(buf, &block->data[0], block->size);
1295	–	buf += block->size;
1296	–	}
1297	–
1298	–	dbuf_clear(&lserver->buf_recvq);
1299	–
1300	–	/* pass the whole sendq to servlink */
1301	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1302	–	{
1303	–	block = ptr->data;
1304	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1305	–	*buf++ = (block->size >> 8);
1306	–	*buf++ = (block->size & 0xff);
1307	–	memcpy(buf, &block->data[0], block->size);
1308	–	buf += block->size;
1309	–	}
1310	–
1311	–	dbuf_clear(&lserver->buf_sendq);
1312	–
1313	–	/* start io */
1314	–	*buf++ = SLINKCMD_INIT;
1315	–
1316	–	/* schedule a write */
1317	–	send_queued_slink_write(server);
1318	–	}
1319	–
1320	–	/* fork_server()
1321	–	*
1322	–	* inputs       - struct Client *server
1323	–	* output       - success: 0 / failure: -1
1324	–	* side effect  - fork, and exec SERVLINK to handle this connection
1325	–	*/
1326	–	static int
1327	–	fork_server(struct Client *server)
1328	–	{
1329	–	#ifndef HAVE_SOCKETPAIR
1330	–	return -1;
1331	–	#else
1332	–	int i;
1333	–	int slink_fds[2][2];
1334	–	/* 0? - ctrl  | 1? - data
1335	–	* ?0 - child | ?1 - parent */
1336	–
1337	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1338	–	return -1;
1339	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1340	–	goto free_ctrl_fds;
1341	–
1342	–	if ((i = fork()) < 0)
1343	–	{
1344	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1345	–	free_ctrl_fds:
1346	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1347	–	return -1;
1348	–	}
1349	–
1350	–	if (i == 0)
1351	–	{
1352	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1353	–	char *kid_argv[7];
1354	–
1355	–	#ifdef O_ASYNC
1356	–	fcntl(server->localClient->fd.fd, F_SETFL,
1357	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1358	–	#endif
1359	–	close_fds(&server->localClient->fd);
1360	–	close(slink_fds[0][1]);
1361	–	close(slink_fds[1][1]);
1362	–
1363	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1364	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1365	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1366	–
1367	–	kid_argv[0] = "-slink";
1368	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1369	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1370	–	kid_argv[5] = fd_str[2];    /* network */
1371	–	kid_argv[6] = NULL;
1372	–
1373	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1374	–
1375	–	_exit(1);
1376	–	}
1377	–
1378	–	/* close the network fd and the child ends of the pipes */
1379	–	fd_close(&server->localClient->fd);
1380	–	close(slink_fds[0][0]);
1381	–	close(slink_fds[1][0]);
1382	–
1383	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1384	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1385	–
1386	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1387	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1388	–
1389	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1390	–	read_packet(&server->localClient->fd, server);
1391	–
1392	–	return 0;
1393	–	#endif
1394	–	}
1395	–
1396	–	/* server_burst()
1397	–	*
1398	–	* inputs       - struct Client pointer server
1399	–	*              -
1400	–	* output       - none
1401	–	* side effects - send a server burst
1402	–	* bugs         - still too long
1403	–	*/
1404	–	static void
1405	–	server_burst(struct Client *client_p)
1406	–	{
1407	–	/* Send it in the shortened format with the TS, if
1408	–	** it's a TS server; walk the list of channels, sending
1409	–	** all the nicks that haven't been sent yet for each
1410	–	** channel, then send the channel itself -- it's less
1411	–	** obvious than sending all nicks first, but on the
1412	–	** receiving side memory will be allocated more nicely
1413	–	** saving a few seconds in the handling of a split
1414	–	** -orabidoo
1415	–	*/
1416	–
1417	–	burst_all(client_p);
1418	–
1419	–	/* EOB stuff is now in burst_all */
1420	–	/* Always send a PING after connect burst is done */
1421	–	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
1422	–	}
1423	–
1424	–	/* burst_all()
1425	–	*
1426	–	* inputs       - pointer to server to send burst to
1427	–	* output       - NONE
1428	–	* side effects - complete burst of channels/nicks is sent to client_p
1429	–	*/
1430	–	static void
1431	–	burst_all(struct Client *client_p)
1432	–	{
1433	–	dlink_node *ptr = NULL;
1434	–
1435	–	DLINK_FOREACH(ptr, global_channel_list.head)
1436	–	{
1437	–	struct Channel *chptr = ptr->data;
1438	–
1439	–	if (dlink_list_length(&chptr->members) != 0)
1440	–	{
1441	–	burst_members(client_p, chptr);
1442	–	send_channel_modes(client_p, chptr);
1443	–
1444	–	if (IsCapable(client_p, CAP_TBURST) ||
1445	–	IsCapable(client_p, CAP_TB))
1446	–	send_tb(client_p, chptr);
1447	–	}
1448	–	}
1449	–
1450	–	/* also send out those that are not on any channel
1451	–	*/
1452	–	DLINK_FOREACH(ptr, global_client_list.head)
1453	–	{
1454	–	struct Client *target_p = ptr->data;
1455	–
1456	–	if (!IsBursted(target_p) && target_p->from != client_p)
1457	–	sendnick_TS(client_p, target_p);
1458	–
1459	–	ClearBursted(target_p);
1460	–	}
1461	–
1462	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1463	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1464	–	*/
1465	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1466	–	if (IsCapable(client_p, CAP_EOB))
1467	–	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1468	–	}
1469	–
1470	–	/*
1471	–	* send_tb
1472	–	*
1473	–	* inputs       - pointer to Client
1474	–	*              - pointer to channel
1475	–	* output       - NONE
1476	–	* side effects - Called on a server burst when
1477	–	*                server is CAP_TB|CAP_TBURST capable
1478	–	*/
1479	–	static void
1480	–	send_tb(struct Client *client_p, struct Channel *chptr)
1481	–	{
1482	–	/*
1483	–	* We may also send an empty topic here, but only if topic_time isn't 0,
1484	–	* i.e. if we had a topic that got unset.  This is required for syncing
1485	–	* topics properly.
1486	–	*
1487	–	* Imagine the following scenario: Our downlink introduces a channel
1488	–	* to us with a TS that is equal to ours, but the channel topic on
1489	–	* their side got unset while the servers were in splitmode, which means
1490	–	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1491	–	* deal with it in a more sophisticated fashion instead of just resetting
1492	–	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1493	–	* for further information   -Michael
1494	–	*/
1495	–	if (chptr->topic_time != 0)
1496	–	{
1497	–	if (IsCapable(client_p, CAP_TBURST))
1498	–	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1499	–	me.name, (unsigned long)chptr->channelts, chptr->chname,
1500	–	(unsigned long)chptr->topic_time,
1501	–	chptr->topic_info ? chptr->topic_info : "",
1502	–	chptr->topic ? chptr->topic : "");
1503	–	else if (IsCapable(client_p, CAP_TB))
1504	–	{
1505	–	if (ConfigChannel.burst_topicwho)
1506	–	{
1507	–	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1508	–	me.name, chptr->chname,
1509	–	(unsigned long)chptr->topic_time,
1510	–	chptr->topic_info, chptr->topic ? chptr->topic : "");
1511	–	}
1512	–	else
1513	–	{
1514	–	sendto_one(client_p, ":%s TB %s %lu :%s",
1515	–	me.name, chptr->chname,
1516	–	(unsigned long)chptr->topic_time,
1517	–	chptr->topic ? chptr->topic : "");
1518	–	}
1519	–	}
1520	–	}
1521	–	}
1522	–
1523	–	/* burst_members()
1524	–	*
1525	–	* inputs       - pointer to server to send members to
1526	–	*              - dlink_list pointer to membership list to send
1527	–	* output       - NONE
1528	–	* side effects -
1529	–	*/
1530	–	static void
1531	–	burst_members(struct Client *client_p, struct Channel *chptr)
1532	–	{
1533	–	struct Client *target_p;
1534	–	struct Membership *ms;
1535	–	dlink_node *ptr;
1536	–
1537	–	DLINK_FOREACH(ptr, chptr->members.head)
1538	–	{
1539	–	ms       = ptr->data;
1540	–	target_p = ms->client_p;
1541	–
1542	–	if (!IsBursted(target_p))
1543	–	{
1544	–	SetBursted(target_p);
1545	–
1546	–	if (target_p->from != client_p)
1547	–	sendnick_TS(client_p, target_p);
1548	–	}
1549	–	}
1550	–	}
1551	–
546		/* New server connection code
547		* Based upon the stuff floating about in s_bsd.c
548		*   -- adrian
#	Line 1556 | Line 550 | burst_members(struct Client *client_p, s
550
551		/* serv_connect() - initiate a server connection
552		*
553	<	* inputs       - pointer to conf
553	>	* inputs       - pointer to conf
554		*              - pointer to client doing the connect
555		* output       -
556		* side effects -
#	Line 1571 | Line 565 | burst_members(struct Client *client_p, s
565		* it suceeded or not, and 0 if it fails in here somewhere.
566		*/
567		int
568	<	serv_connect(struct AccessItem *aconf, struct Client *by)
568	>	serv_connect(struct MaskItem *conf, struct Client *by)
569		{
570	<	struct ConfItem *conf;
571	<	struct Client *client_p;
1578	<	char buf[HOSTIPLEN];
570	>	struct Client *client_p = NULL;
571	>	char buf[HOSTIPLEN + 1] = "";
572
573		/* conversion structs */
574		struct sockaddr_in *v4;
1582	–	/* Make sure aconf is useful */
1583	–	assert(aconf != NULL);
575
576	<	if(aconf == NULL)
577	<	return (0);
576	>	/* Make sure conf is useful */
577	>	assert(conf);
578
579	<	/* XXX should be passing struct ConfItem in the first place */
580	<	conf = unmap_conf_item(aconf);
581	<
1591	<	/* log */
1592	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1593	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1594	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
579	>	getnameinfo((const struct sockaddr *)&conf->addr, conf->addr.ss_len,
580	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
581	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
582		buf);
583
584		/* Still processing a DNS lookup? -> exit */
585	<	if (aconf->dns_pending)
585	>	if (conf->dns_pending)
586		{
587	<	sendto_realops_flags(UMODE_ALL, L_ALL,
587	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
588		"Error connecting to %s: DNS lookup for connect{} in progress.",
589		conf->name);
590	<	return (0);
590	>	return 0;
591		}
592
593	<	if (aconf->dns_failed)
593	>	if (conf->dns_failed)
594		{
595	<	sendto_realops_flags(UMODE_ALL, L_ALL,
595	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
596		"Error connecting to %s: DNS lookup for connect{} failed.",
597		conf->name);
598	<	return (0);
598	>	return 0;
599		}
600
601	<	/* Make sure this server isn't already connected
602	<	* Note: aconf should ALWAYS be a valid C: line
601	>	/*
602	>	* Make sure this server isn't already connected.
603	>	* Note: conf should ALWAYS be a valid connect {} block
604		*/
605	<	if ((client_p = find_server(conf->name)) != NULL)
606	<	{
607	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
608	<	"Server %s already present from %s",
609	<	conf->name, get_client_name(client_p, SHOW_IP));
610	<	sendto_realops_flags(UMODE_ALL, L_OPER,
611	<	"Server %s already present from %s",
612	<	conf->name, get_client_name(client_p, MASK_IP));
605	>	if ((client_p = hash_find_server(conf->name)))
606	>	{
607	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
608	>	"Server %s already present from %s",
609	>	conf->name, get_client_name(client_p, SHOW_IP));
610	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
611	>	"Server %s already present from %s",
612	>	conf->name, get_client_name(client_p, MASK_IP));
613		if (by && IsClient(by) && !MyClient(by))
614	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
615	<	me.name, by->name, conf->name,
616	<	get_client_name(client_p, MASK_IP));
1629	<	return (0);
614	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
615	>	conf->name, get_client_name(client_p, MASK_IP));
616	>	return 0;
617		}
618	<
618	>
619		/* Create a local client */
620		client_p = make_client(NULL);
621
622		/* Copy in the server, hostname, fd */
623		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
624	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
624	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
625
626		/* We already converted the ip once, so lets use it - stu */
627	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
627	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
628
629	<	/* create a socket for the server connection */
630	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1644	<	SOCK_STREAM, 0, NULL) < 0)
629	>	/* Create a socket for the server connection */
630	>	if (comm_open(&client_p->connection->fd, conf->addr.ss.ss_family, SOCK_STREAM, 0, NULL) < 0)
631		{
632		/* Eek, failure to create the socket */
633	<	report_error(L_ALL,
634	<	"opening stream socket to %s: %s", conf->name, errno);
633	>	report_error(L_ALL, "opening stream socket to %s: %s", conf->name, errno);
634	>
635		SetDead(client_p);
636	<	exit_client(client_p, &me, "Connection failed");
637	<	return (0);
636	>	exit_client(client_p, "Connection failed");
637	>	return 0;
638		}
639
640	<	/* servernames are always guaranteed under HOSTLEN chars */
641	<	fd_note(&client_p->localClient->fd, "Server: %s", conf->name);
640	>	/* Server names are always guaranteed under HOSTLEN chars */
641	>	fd_note(&client_p->connection->fd, "Server: %s", client_p->name);
642
643	<	/* Attach config entries to client here rather than in
644	<	* serv_connect_callback(). This to avoid null pointer references.
643	>	/*
644	>	* Attach config entries to client here rather than in serv_connect_callback().
645	>	* This to avoid null pointer references.
646		*/
647	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
647	>	if (!attach_connect_block(client_p, conf->name, conf->host))
648		{
649	<	sendto_realops_flags(UMODE_ALL, L_ALL,
650	<	"Host %s is not enabled for connecting:no C/N-line",
651	<	conf->name);
652	<	if (by && IsClient(by) && !MyClient(by))
653	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
654	<	me.name, by->name, client_p->name);
649	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
650	>	"Host %s is not enabled for connecting: no connect {} block",
651	>	conf->name);
652	>	if (by && IsClient(by) && !MyClient(by))
653	>	sendto_one_notice(by, &me, ":Connect to host %s failed: no connect {} block", client_p->name);
654	>
655		SetDead(client_p);
656	<	exit_client(client_p, client_p, "Connection failed");
657	<	return (0);
656	>	exit_client(client_p, "Connection failed");
657	>	return 0;
658		}
659
660	<	/* at this point we have a connection in progress and C/N lines
661	<	* attached to the client, the socket info should be saved in the
662	<	* client and it should either be resolved or have a valid address.
660	>	/*
661	>	* At this point we have a connection in progress and a connect {} block
662	>	* attached to the client, the socket info should be saved in the client
663	>	* and it should either be resolved or have a valid address.
664		*
665		* The socket has been connected or connect is in progress.
666		*/
#	Line 1684 | Line 672 | serv_connect(struct AccessItem *aconf, s
672		strlcpy(client_p->serv->by, "AutoConn.", sizeof(client_p->serv->by));
673
674		SetConnecting(client_p);
675	<	dlinkAdd(client_p, &client_p->node, &global_client_list);
1688	<	/* from def_fam */
1689	<	client_p->localClient->aftype = aconf->aftype;
675	>	client_p->connection->aftype = conf->aftype;
676
677		/* Now, initiate the connection */
678	<	/* XXX assume that a non 0 type means a specific bind address
678	>	/* XXX assume that a non 0 type means a specific bind address
679		* for this connect.
680		*/
681	<	switch (aconf->aftype)
681	>	switch (conf->aftype)
682		{
683		case AF_INET:
684	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
685	<	if (v4->sin_addr.s_addr != 0)
684	>	v4 = (struct sockaddr_in*)&conf->bind;
685	>	if (v4->sin_addr.s_addr)
686		{
687		struct irc_ssaddr ipn;
688		memset(&ipn, 0, sizeof(struct irc_ssaddr));
689		ipn.ss.ss_family = AF_INET;
690		ipn.ss_port = 0;
691	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
692	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
693	<	(struct sockaddr *)&ipn, ipn.ss_len,
694	<	serv_connect_callback, client_p, aconf->aftype,
695	<	CONNECTTIMEOUT);
691	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
692	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
693	>	(struct sockaddr *)&ipn, ipn.ss_len,
694	>	serv_connect_callback, client_p, conf->aftype,
695	>	CONNECTTIMEOUT);
696		}
697	<	else if (ServerInfo.specific_ipv4_vhost)
697	>	else if (ConfigServerInfo.specific_ipv4_vhost)
698		{
699		struct irc_ssaddr ipn;
700		memset(&ipn, 0, sizeof(struct irc_ssaddr));
701		ipn.ss.ss_family = AF_INET;
702		ipn.ss_port = 0;
703	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
704	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
703	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
704	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
705		(struct sockaddr *)&ipn, ipn.ss_len,
706	<	serv_connect_callback, client_p, aconf->aftype,
707	<	CONNECTTIMEOUT);
706	>	serv_connect_callback, client_p, conf->aftype,
707	>	CONNECTTIMEOUT);
708		}
709		else
710	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
711	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
710	>	comm_connect_tcp(&client_p->connection->fd, conf->host, conf->port,
711	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
712		CONNECTTIMEOUT);
713		break;
1728	–	#ifdef IPV6
714		case AF_INET6:
715		{
716	<	struct irc_ssaddr ipn;
717	<	struct sockaddr_in6 *v6;
718	<	struct sockaddr_in6 *v6conf;
719	<
720	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
721	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
722	<	v6 = (struct sockaddr_in6 *)&ipn;
723	<
724	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
725	<	sizeof(struct in6_addr)) != 0)
726	<	{
727	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
728	<	ipn.ss.ss_family = AF_INET6;
729	<	ipn.ss_port = 0;
730	<	comm_connect_tcp(&client_p->localClient->fd,
731	<	aconf->host, aconf->port,
732	<	(struct sockaddr *)&ipn, ipn.ss_len,
733	<	serv_connect_callback, client_p,
734	<	aconf->aftype, CONNECTTIMEOUT);
735	<	}
1751	<	else if (ServerInfo.specific_ipv6_vhost)
716	>	struct irc_ssaddr ipn;
717	>	struct sockaddr_in6 *v6;
718	>	struct sockaddr_in6 *v6conf;
719	>
720	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
721	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
722	>	v6 = (struct sockaddr_in6 *)&ipn;
723	>
724	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)))
725	>	{
726	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
727	>	ipn.ss.ss_family = AF_INET6;
728	>	ipn.ss_port = 0;
729	>	comm_connect_tcp(&client_p->connection->fd,
730	>	conf->host, conf->port,
731	>	(struct sockaddr *)&ipn, ipn.ss_len,
732	>	serv_connect_callback, client_p,
733	>	conf->aftype, CONNECTTIMEOUT);
734	>	}
735	>	else if (ConfigServerInfo.specific_ipv6_vhost)
736		{
737	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
738	<	ipn.ss.ss_family = AF_INET6;
739	<	ipn.ss_port = 0;
740	<	comm_connect_tcp(&client_p->localClient->fd,
741	<	aconf->host, aconf->port,
742	<	(struct sockaddr *)&ipn, ipn.ss_len,
743	<	serv_connect_callback, client_p,
744	<	aconf->aftype, CONNECTTIMEOUT);
745	<	}
746	<	else
747	<	comm_connect_tcp(&client_p->localClient->fd,
748	<	aconf->host, aconf->port,
749	<	NULL, 0, serv_connect_callback, client_p,
750	<	aconf->aftype, CONNECTTIMEOUT);
737	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
738	>	ipn.ss.ss_family = AF_INET6;
739	>	ipn.ss_port = 0;
740	>	comm_connect_tcp(&client_p->connection->fd,
741	>	conf->host, conf->port,
742	>	(struct sockaddr *)&ipn, ipn.ss_len,
743	>	serv_connect_callback, client_p,
744	>	conf->aftype, CONNECTTIMEOUT);
745	>	}
746	>	else
747	>	comm_connect_tcp(&client_p->connection->fd,
748	>	conf->host, conf->port,
749	>	NULL, 0, serv_connect_callback, client_p,
750	>	conf->aftype, CONNECTTIMEOUT);
751		}
1768	–	#endif
752		}
753	<	return (1);
753	>
754	>	return 1;
755		}
756
1773	–	/* serv_connect_callback() - complete a server connection.
1774	–	*
1775	–	* This routine is called after the server connection attempt has
1776	–	* completed. If unsucessful, an error is sent to ops and the client
1777	–	* is closed. If sucessful, it goes through the initialisation/check
1778	–	* procedures, the capabilities are sent, and the socket is then
1779	–	* marked for reading.
1780	–	*/
757		static void
758	<	serv_connect_callback(fde_t *fd, int status, void *data)
758	>	finish_ssl_server_handshake(struct Client *client_p)
759		{
760	<	struct Client *client_p = data;
1785	<	struct ConfItem *conf=NULL;
1786	<	struct AccessItem *aconf=NULL;
1787	<
1788	<	/* First, make sure its a real client! */
1789	<	assert(client_p != NULL);
1790	<	assert(&client_p->localClient->fd == fd);
1791	<
1792	<	/* Next, for backward purposes, record the ip of the server */
1793	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
1794	<	sizeof(struct irc_ssaddr));
1795	<	/* Check the status */
1796	<	if (status != COMM_OK)
1797	<	{
1798	<	/* We have an error, so report it and quit
1799	<	* Admins get to see any IP, mere opers don't *sigh*
1800	<	*/
1801	<	if (ConfigServerHide.hide_server_ips)
1802	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1803	<	"Error connecting to %s: %s",
1804	<	client_p->name, comm_errstr(status));
1805	<	else
1806	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1807	<	"Error connecting to %s[%s]: %s", client_p->name,
1808	<	client_p->host, comm_errstr(status));
1809	<
1810	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1811	<	"Error connecting to %s: %s",
1812	<	client_p->name, comm_errstr(status));
1813	<
1814	<	/* If a fd goes bad, call dead_link() the socket is no
1815	<	* longer valid for reading or writing.
1816	<	*/
1817	<	dead_link_on_write(client_p, 0);
1818	<	return;
1819	<	}
760	>	struct MaskItem *conf = NULL;
761
762	<	/* COMM_OK, so continue the connection procedure */
763	<	/* Get the C/N lines */
1823	<	conf = find_conf_name(&client_p->localClient->confs,
1824	<	client_p->name, SERVER_TYPE);
762	>	conf = find_conf_name(&client_p->connection->confs,
763	>	client_p->name, CONF_SERVER);
764		if (conf == NULL)
765		{
766	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
767	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
768	<	sendto_realops_flags(UMODE_ALL, L_OPER,
769	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
766	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
767	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
768	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
769	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
770
771	<	exit_client(client_p, &me, "Lost connect{} block");
771	>	exit_client(client_p, "Lost connect{} block");
772		return;
773		}
774
775	<	aconf = (struct AccessItem *)map_to_conf(conf);
1837	<	/* Next, send the initial handshake */
1838	<	SetHandshake(client_p);
775	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
776
777	<	#ifdef HAVE_LIBCRYPTO
1841	<	/* Handle all CRYPTLINK links in cryptlink_init */
1842	<	if (IsConfCryptLink(aconf))
1843	<	{
1844	<	cryptlink_init(client_p, conf, fd);
1845	<	return;
1846	<	}
1847	<	#endif
1848	<
1849	<	/* jdc -- Check and send spasswd, not passwd. */
1850	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
1851	<	/* Send TS 6 form only if id */
1852	<	sendto_one(client_p, "PASS %s TS %d %s",
1853	<	aconf->spasswd, TS_CURRENT, me.id);
1854	<	else
1855	<	sendto_one(client_p, "PASS %s TS 5",
1856	<	aconf->spasswd);
1857	<
1858	<	/* Pass my info to the new server
1859	<	*
1860	<	* If this is a HUB, pass on CAP_HUB
1861	<	* Pass on ZIP if supported
1862	<	* Pass on TB if supported.
1863	<	* - Dianora
1864	<	*/
1865	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1866	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1867	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
777	>	send_capabilities(client_p);
778
779		sendto_one(client_p, "SERVER %s 1 :%s%s",
780	<	my_name_for_link(conf),
781	<	ConfigServerHide.hidden ? "(H) " : "",
1872	<	me.info);
780	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
781	>	me.info);
782
783	<	/* If we've been marked dead because a send failed, just exit
783	>	/*
784	>	* If we've been marked dead because a send failed, just exit
785		* here now and save everyone the trouble of us ever existing.
786		*/
787	<	if (IsDead(client_p))
787	>	if (IsDead(client_p))
788		{
789	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
790	<	"%s[%s] went dead during handshake",
791	<	client_p->name,
792	<	client_p->host);
793	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1884	<	"%s went dead during handshake", client_p->name);
1885	<	return;
789	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
790	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
791	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
792	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
793	>	return;
794		}
795
796		/* don't move to serv_list yet -- we haven't sent a burst! */
797		/* If we get here, we're ok, so lets start reading some data */
798	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
798	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ, read_packet, client_p, 0);
799		}
800
801	<	struct Client *
802	<	find_servconn_in_progress(const char *name)
801	>	static void
802	>	ssl_server_handshake(fde_t *fd, void *data)
803		{
804	<	dlink_node *ptr;
805	<	struct Client *cptr;
804	>	struct Client *client_p = data;
805	>	const char *sslerr = NULL;
806
807	<	DLINK_FOREACH(ptr, unknown_list.head)
807	>	tls_handshake_status_t ret = tls_handshake(&client_p->connection->fd.ssl, TLS_ROLE_CLIENT, &sslerr);
808	>	if (ret != TLS_HANDSHAKE_DONE)
809		{
810	<	cptr = ptr->data;
810	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
811	>	{
812	>	exit_client(client_p, "Timeout during TLS handshake");
813	>	return;
814	>	}
815
816	<	if (cptr && cptr->name[0])
817	<	if (match(cptr->name, name) || match(name, cptr->name))
818	<	return cptr;
816	>	switch (ret)
817	>	{
818	>	case TLS_HANDSHAKE_WANT_WRITE:
819	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
820	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
821	>	return;
822	>	case TLS_HANDSHAKE_WANT_READ:
823	>	comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
824	>	ssl_server_handshake, client_p, CONNECTTIMEOUT);
825	>	return;
826	>	default:
827	>	{
828	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
829	>	"Error connecting to %s: %s", client_p->name,
830	>	sslerr ? sslerr : "unknown TLS error");
831	>	exit_client(client_p, "Error during TLS handshake");
832	>	return;
833	>	}
834	>	}
835		}
836	<
837	<	return NULL;
836	>
837	>	comm_settimeout(&client_p->connection->fd, 0, NULL, NULL);
838	>
839	>	if (!tls_verify_cert(&client_p->connection->fd.ssl, ConfigServerInfo.message_digest_algorithm, &client_p->certfp))
840	>	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad TLS client certificate",
841	>	client_p->name, client_p->username, client_p->host);
842	>
843	>	finish_ssl_server_handshake(client_p);
844		}
845
846	<	#ifdef HAVE_LIBCRYPTO
847	<	/*
1913	<	* sends a CRYPTLINK SERV command.
1914	<	*/
1915	<	void
1916	<	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
846	>	static void
847	>	ssl_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *fd)
848		{
849	<	struct AccessItem *aconf;
1919	<	char *encrypted;
1920	<	unsigned char *key_to_send;
1921	<	char randkey[CIPHERKEYLEN];
1922	<	int enc_len;
1923	<
1924	<	/* get key */
1925	<	if ((!ServerInfo.rsa_private_key) ||
1926	<	(!RSA_check_key(ServerInfo.rsa_private_key)) )
849	>	if (!tls_new(&client_p->connection->fd.ssl, fd->fd, TLS_ROLE_CLIENT))
850		{
851	<	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
852	<	"Invalid RSA private key");
851	>	SetDead(client_p);
852	>	exit_client(client_p, "TLS context initialization failed");
853		return;
854		}
855
856	<	aconf = (struct AccessItem *)map_to_conf(conf);
856	>	if (!EmptyString(conf->cipher_list))
857	>	tls_set_ciphers(&client_p->connection->fd.ssl, conf->cipher_list);
858	>
859	>	ssl_server_handshake(NULL, client_p);
860	>	}
861	>
862	>	/* serv_connect_callback() - complete a server connection.
863	>	*
864	>	* This routine is called after the server connection attempt has
865	>	* completed. If unsucessful, an error is sent to ops and the client
866	>	* is closed. If sucessful, it goes through the initialisation/check
867	>	* procedures, the capabilities are sent, and the socket is then
868	>	* marked for reading.
869	>	*/
870	>	static void
871	>	serv_connect_callback(fde_t *fd, int status, void *data)
872	>	{
873	>	struct Client *const client_p = data;
874	>	const struct MaskItem *conf = NULL;
875	>
876	>	/* First, make sure it's a real client! */
877	>	assert(client_p);
878	>	assert(&client_p->connection->fd == fd);
879	>
880	>	/* Next, for backward purposes, record the ip of the server */
881	>	memcpy(&client_p->connection->ip, &fd->connect.hostaddr,
882	>	sizeof(struct irc_ssaddr));
883
884	<	if (aconf->rsa_public_key == NULL)
884	>	/* Check the status */
885	>	if (status != COMM_OK)
886		{
887	<	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
888	<	"Invalid RSA public key");
887	>	/* We have an error, so report it and quit */
888	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
889	>	"Error connecting to %s: %s",
890	>	get_client_name(client_p, SHOW_IP), comm_errstr(status));
891	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
892	>	"Error connecting to %s: %s",
893	>	get_client_name(client_p, MASK_IP), comm_errstr(status));
894	>
895	>	/*
896	>	* If a fd goes bad, call dead_link() the socket is no
897	>	* longer valid for reading or writing.
898	>	*/
899	>	dead_link_on_write(client_p, 0);
900		return;
901		}
902
903	<	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
903	>	/* COMM_OK, so continue the connection procedure */
904	>	/* Get the C/N lines */
905	>	conf = find_conf_name(&client_p->connection->confs,
906	>	client_p->name, CONF_SERVER);
907	>	if (conf == NULL)
908		{
909	<	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
910	<	"Couldn't generate keyphrase");
911	<	return;
912	<	}
909	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
910	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
911	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
912	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
913
914	<	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1950	<	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1951	<	(unsigned char *)randkey,
1952	<	(unsigned char *)encrypted,
1953	<	aconf->rsa_public_key,
1954	<	RSA_PKCS1_PADDING);
1955	<
1956	<	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1957	<
1958	<	if (enc_len <= 0)
1959	<	{
1960	<	report_crypto_errors();
1961	<	MyFree(encrypted);
1962	<	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
1963	<	"Couldn't encrypt data");
914	>	exit_client(client_p, "Lost connect{} block");
915		return;
916		}
917
918	<	if (!(base64_block(&key_to_send, encrypted, enc_len)))
918	>	/* Next, send the initial handshake */
919	>	SetHandshake(client_p);
920	>
921	>	if (IsConfSSL(conf))
922		{
923	<	MyFree(encrypted);
1970	<	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
1971	<	"Couldn't base64 encode key");
923	>	ssl_connect_init(client_p, conf, fd);
924		return;
925		}
926
927	<	send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1976	<	| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1977	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
927	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
928
929	<	if (me.id[0])
1980	<	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
929	>	send_capabilities(client_p);
930
931	<	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
1983	<	my_name_for_link(conf), key_to_send,
931	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
932		ConfigServerHide.hidden ? "(H) " : "", me.info);
933
934	<	SetHandshake(client_p);
935	<	SetWaitAuth(client_p);
936	<
937	<	MyFree(encrypted);
1990	<	MyFree(key_to_send);
1991	<
934	>	/*
935	>	* If we've been marked dead because a send failed, just exit
936	>	* here now and save everyone the trouble of us ever existing.
937	>	*/
938		if (IsDead(client_p))
939	<	cryptlink_error(client_p, "SERV", "Went dead during handshake",
940	<	"Went dead during handshake");
941	<	else if (fd != NULL)
942	<	/* If we get here, we're ok, so lets start reading some data */
943	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
944	<	}
945	<
2000	<	void
2001	<	cryptlink_error(struct Client *client_p, const char *type,
2002	<	const char *reason, const char *client_reason)
2003	<	{
2004	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2005	<	get_client_name(client_p, SHOW_IP), type, reason);
2006	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2007	<	get_client_name(client_p, MASK_IP), type, reason);
2008	<	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2009	<	get_client_name(client_p, SHOW_IP), type, reason);
939	>	{
940	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
941	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
942	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
943	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
944	>	return;
945	>	}
946
947	<	/* If client_reason isn't NULL, then exit the client with the message
948	<	* defined in the call.
949	<	*/
2014	<	if ((client_reason != NULL) && (!IsDead(client_p)))
2015	<	exit_client(client_p, &me, client_reason);
947	>	/* don't move to serv_list yet -- we haven't sent a burst! */
948	>	/* If we get here, we're ok, so lets start reading some data */
949	>	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
950		}
951
952	<	static char base64_chars[] =
953	<	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2020	<
2021	<	static char base64_values[] =
2022	<	{
2023	<	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2024	<	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2025	<	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2026	<	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2027	<	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2028	<	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2029	<	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2030	<	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2031	<	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2032	<	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2033	<	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2034	<	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2035	<	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2036	<	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2037	<	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2038	<	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2039	<	};
2040	<
2041	<	/*
2042	<	* base64_block will allocate and return a new block of memory
2043	<	* using MyMalloc().  It should be freed after use.
2044	<	*/
2045	<	int
2046	<	base64_block(unsigned char **output, char *data, int len)
952	>	struct Client *
953	>	find_servconn_in_progress(const char *name)
954		{
955	<	unsigned char *out;
956	<	unsigned char *in = (unsigned char*)data;
2050	<	unsigned long int q_in;
2051	<	int i;
2052	<	int count = 0;
2053	<
2054	<	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
955	>	dlink_node *ptr;
956	>	struct Client *cptr;
957
958	<	/* process 24 bits at a time */
2057	<	for( i = 0; i < len; i += 3)
958	>	DLINK_FOREACH(ptr, unknown_list.head)
959		{
960	<	q_in = 0;
2060	<
2061	<	if ( i + 2 < len )
2062	<	{
2063	<	q_in  = (in[i+2] & 0xc0) << 2;
2064	<	q_in |=  in[i+2];
2065	<	}
2066	<
2067	<	if ( i + 1 < len )
2068	<	{
2069	<	q_in |= (in[i+1] & 0x0f) << 10;
2070	<	q_in |= (in[i+1] & 0xf0) << 12;
2071	<	}
2072	<
2073	<	q_in |= (in[i]   & 0x03) << 20;
2074	<	q_in |=  in[i]           << 22;
2075	<
2076	<	q_in &= 0x3f3f3f3f;
960	>	cptr = ptr->data;
961
962	<	out[count++] = base64_chars[((q_in >> 24)       )];
963	<	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
964	<	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2081	<	out[count++] = base64_chars[((q_in      ) & 0xff)];
2082	<	}
2083	<	if ( (i - len) > 0 )
2084	<	{
2085	<	out[count-1] = '=';
2086	<	if ( (i - len) > 1 )
2087	<	out[count-2] = '=';
962	>	if (cptr && cptr->name[0])
963	>	if (!match(name, cptr->name))
964	>	return cptr;
965		}
966
967	<	out[count] = '\0';
2091	<	*output = out;
2092	<	return (count);
2093	<	}
2094	<
2095	<	/*
2096	<	* unbase64_block will allocate and return a new block of memory
2097	<	* using MyMalloc().  It should be freed after use.
2098	<	*/
2099	<	int
2100	<	unbase64_block(unsigned char **output, char *data, int len)
2101	<	{
2102	<	unsigned char *out;
2103	<	unsigned char *in = (unsigned char*)data;
2104	<	unsigned long int q_in;
2105	<	int i;
2106	<	int count = 0;
2107	<
2108	<	if ((len % 4) != 0)
2109	<	return (0);
2110	<
2111	<	out = MyMalloc(((len / 4) * 3) + 1);
2112	<
2113	<	/* process 32 bits at a time */
2114	<	for( i = 0; (i + 3) < len; i+=4)
2115	<	{
2116	<	/* compress input (chars a, b, c and d) as follows:
2117	<	* (after converting ascii -> base64 value)
2118	<	*
2119	<	* |00000000aaaaaabbbbbbccccccdddddd|
2120	<	* |  765432  107654  321076  543210|
2121	<	*/
2122	<
2123	<	q_in = 0;
2124	<
2125	<	if (base64_values[in[i+3]] > -1)
2126	<	q_in |= base64_values[in[i+3]]      ;
2127	<	if (base64_values[in[i+2]] > -1)
2128	<	q_in |= base64_values[in[i+2]] <<  6;
2129	<	if (base64_values[in[i+1]] > -1)
2130	<	q_in |= base64_values[in[i+1]] << 12;
2131	<	if (base64_values[in[i  ]] > -1)
2132	<	q_in |= base64_values[in[i  ]] << 18;
2133	<
2134	<	out[count++] = (q_in >> 16) & 0xff;
2135	<	out[count++] = (q_in >>  8) & 0xff;
2136	<	out[count++] = (q_in      ) & 0xff;
2137	<	}
2138	<
2139	<	if (in[i-1] == '=') count--;
2140	<	if (in[i-2] == '=') count--;
2141	<
2142	<	out[count] = '\0';
2143	<	*output = out;
2144	<	return (count);
967	>	return NULL;
968		}
2146	–
2147	–	#endif /* HAVE_LIBCRYPTO */
2148	–

Diff Legend

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