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 42 by adx, Sun Oct 2 23:25:27 2005 UTC vs.
ircd-hybrid/trunk/src/s_serv.c (file contents), Revision 2718 by michael, Wed Dec 25 13:43:46 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;
231	–
232	–	/* Use connect{} specific info if available */
233	–	if (aconf->cipher_preference)
234	–	epref = aconf->cipher_preference;
235	–	else
236	–	epref = ConfigFileEntry.default_cipher_preference;
237	–
238	–	/* If the server supports the capability in hand, return the matching
239	–	* conf struct.  Otherwise, return NULL (an error).
240	–	*/
241	–	if (IsCapableEnc(client_p, epref->cap))
242	–	return(epref);
243	–
244	–	return(NULL);
245	–	}
246	–	#endif /* HAVE_LIBCRYPTO */
247	–
248	–	/* my_name_for_link()
249	–	* return wildcard name of my server name
250	–	* according to given config entry --Jto
251	–	*/
252	–	const char *
253	–	my_name_for_link(struct ConfItem *conf)
254	–	{
255	–	struct AccessItem *aconf;
256	–
257	–	aconf = (struct AccessItem *)map_to_conf(conf);
258	–	if (aconf->fakename != NULL)
259	–	return(aconf->fakename);
260	–	else
261	–	return(me.name);
262	–	}
66
67		/*
68		* write_links_file
#	Line 270 | 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;
278	<	MessageFileLine *newMessageLine = 0;
279	<	MessageFile *MessageFileptr;
280	<	const char *p;
281	<	FBFILE *file;
282	<	char buff[512];
283	<	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;
286	<
287	<	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
296	–	MessageFileptr->contentsOfFile = NULL;
297	–	currentMessageLine             = NULL;
298	–
92		DLINK_FOREACH(ptr, global_serv_list.head)
93		{
94	<	size_t nbytes = 0;
302	<	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 */
309	<	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;
314	<	else
315	<	p = "(Unknown Location)";
316	<
317	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
318	<
319	<	/* Attempt to format the file in such a way it follows the usual links output
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
327	<	* default config but it is configurable..
328	<	* This should be changed to an snprintf at some point, but I'm wanting to
329	<	* know if this is a cause of a bug - cryogen
330	<	*/
331	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
332	<	MESSAGELINELEN);
333	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
334	<	target_p->name, me.name, p);
335	<	newMessageLine->next = NULL;
118	>	fputs(buff, file);
119	>	}
120
121	<	if (MessageFileptr->contentsOfFile)
122	<	{
339	<	if (currentMessageLine)
340	<	currentMessageLine->next = newMessageLine;
341	<	currentMessageLine = newMessageLine;
342	<	}
343	<	else
344	<	{
345	<	MessageFileptr->contentsOfFile = newMessageLine;
346	<	currentMessageLine = newMessageLine;
347	<	}
121	>	fclose(file);
122	>	}
123
124	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
125	<	fbputs(buff, file, nbytes);
124	>	void
125	>	read_links_file(void)
126	>	{
127	>	FILE *file = NULL;
128	>	char *p = NULL;
129	>	char buff[IRCD_BUFSIZE] = { '\0' };
130	>
131	>	if ((file = fopen(LIPATH, "r")) == NULL)
132	>	return;
133	>
134	>	while (fgets(buff, sizeof(buff), file))
135	>	{
136	>	if ((p = strchr(buff, '\n')) != NULL)
137	>	*p = '\0';
138	>
139	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
140		}
141
142	<	fbclose(file);
142	>	fclose(file);
143		}
144
145		/* hunt_server()
#	Line 374 | 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))
390	<	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 402 | 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]);
410	<	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 416 | 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 429 | 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 447 | 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
460	–	/* Deal with lazylinks */
461	–	client_burst_if_needed(target_p, source_p);
462	–
247		/* This is a little kludgy but should work... */
248		if (IsClient(source_p) &&
249		((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
#	Line 469 | Line 253 | hunt_server(struct Client *client_p, str
253		sendto_one(target_p, command, parv[0],
254		parv[1], parv[2], parv[3], parv[4],
255		parv[5], parv[6], parv[7], parv[8]);
256	<	return(HUNTED_PASS);
257	<	}
256	>	return HUNTED_PASS;
257	>	}
258
259		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
260	<	me.name, parv[0], parv[server]);
261	<	return(HUNTED_NOSUCH);
260	>	me.name, source_p->name, parv[server]);
261	>	return HUNTED_NOSUCH;
262		}
263
264		/* try_connections()
#	Line 490 | 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;
495	<	struct AccessItem *aconf;
496	<	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 503 | Line 285 | try_connections(void *unused)
285		DLINK_FOREACH(ptr, server_items.head)
286		{
287		conf = ptr->data;
506	–	aconf = (struct AccessItem *)map_to_conf(conf);
288
289	<	/* Also when already connecting! (update holdtimes) --SRB
289	>	assert(conf->type == CONF_SERVER);
290	>
291	>	/* Also when already connecting! (update holdtimes) --SRB
292		*/
293	<	if (!(aconf->status & CONF_SERVER) || aconf->port <= 0 ||
511	<	!(IsConfAllowAutoConn(aconf)))
293	>	if (!conf->port ||!IsConfAllowAutoConn(conf))
294		continue;
295
514	–	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 519 | 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 560 | 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 574 | 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;
582	<	struct AccessItem *server_aconf = NULL;
583	<	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
588	–	if (client_p == NULL)
589	–	return(error);
590	–
591	–	if (strlen(name) > HOSTLEN)
592	–	return(-4);
593	–
390		/* loop through looking for all possible connect items that might work */
391		DLINK_FOREACH(ptr, server_items.head)
392		{
393		conf = ptr->data;
598	–	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;
611	–	#ifdef HAVE_LIBCRYPTO
612	–	if (cryptlink && IsConfCryptLink(aconf))
613	–	{
614	–	if (aconf->rsa_public_key)
615	–	server_conf = conf;
616	–	}
617	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
618	–	#endif /* HAVE_LIBCRYPTO */
619	–	{
620	–	/* A NULL password is as good as a bad one */
621	–	if (EmptyString(client_p->localClient->passwd))
622	–	return(-2);
623	–
624	–	/* code in s_conf.c should not have allowed this to be NULL */
625	–	if (aconf->passwd == NULL)
626	–	return(-2);
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
636	<	{
637	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
638	<	server_conf = conf;
639	<	}
640	<	}
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
649	–	/* Now find all leaf or hub config items for this server */
650	–	DLINK_FOREACH(ptr, hub_items.head)
651	–	{
652	–	conf = ptr->data;
423
424	<	if (!match(name, conf->name))
655	<	continue;
656	<	attach_conf(client_p, conf);
657	<	}
658	<
659	<	DLINK_FOREACH(ptr, leaf_items.head)
660	<	{
661	<	conf = ptr->data;
662	<
663	<	if (!match(name, conf->name))
664	<	continue;
665	<	attach_conf(client_p, conf);
666	<	}
667	<
668	<	server_aconf = (struct AccessItem *)map_to_conf(server_conf);
669	<
670	<	if (!IsConfLazyLink(server_aconf))
671	<	ClearCap(client_p, CAP_LL);
672	<	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
673	<	if (!IsConfCompressed(server_aconf))
674	<	#endif
675	<	ClearCap(client_p, CAP_ZIP);
676	<	if (!IsConfCryptLink(server_aconf))
677	<	ClearCap(client_p, CAP_ENC);
678	<	if (!IsConfTopicBurst(server_aconf))
679	<	ClearCap(client_p, CAP_TB);
680	<
681	<	/* Don't unset CAP_HUB here even if the server isn't a hub,
682	<	* it only indicates if the server thinks it's lazylinks are
683	<	* leafs or not.. if you unset it, bad things will happen
684	<	*/
685	<	if (aconf != NULL)
424	>	if (server_conf != NULL)
425		{
426		struct sockaddr_in *v4;
427		#ifdef IPV6
428		struct sockaddr_in6 *v6;
429		#endif
430	<	switch (aconf->aftype)
430	>	switch (server_conf->aftype)
431		{
432		#ifdef IPV6
433	<	case AF_INET6:
434	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
433	>	case AF_INET6:
434	>	v6 = (struct sockaddr_in6 *)&server_conf->addr;
435
436		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
437	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
437	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
438		break;
439		#endif
440		case AF_INET:
441	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
441	>	v4 = (struct sockaddr_in *)&server_conf->addr;
442
443		if (v4->sin_addr.s_addr == INADDR_NONE)
444	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
444	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
445		break;
446		}
447		}
448
449	<	return(0);
449	>	return 0;
450		}
451
452		/* add_capability()
#	Line 722 | 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));
728	<	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 753 | 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;
760	<	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 772 | 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;
779	<	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	<	{
787	<	if (irccmp(cap->name, capab) == 0)
788	<	return(cap->cap);
789	<	}
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
797	–	*              - Pointer to AccessItem (for crypt)
532		*              - int flag of capabilities that this server can send
799	–	*              - 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,
806	<	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;
813	–	#ifdef HAVE_LIBCRYPTO
814	–	struct EncCapability *epref;
815	–	char *capend;
816	–	int sent_cipher = 0;
817	–	#endif
545
546		t = msgbuf;
547
#	Line 824 | 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		}
831	–	#ifdef HAVE_LIBCRYPTO
832	–	if (enc_can_send)
833	–	{
834	–	capend = t;
835	–	strcpy(t, "ENC:");
836	–	t += 4;
837	–
838	–	/* use connect{} specific info if available */
839	–	if (aconf->cipher_preference)
840	–	epref = aconf->cipher_preference;
841	–	else
842	–	epref = ConfigFileEntry.default_cipher_preference;
558
559	<	if ((epref->cap & enc_can_send))
845	<	{
846	<	/* Leave the space -- it is removed later. */
847	<	tl = ircsprintf(t, "%s ", epref->name);
848	<	t += tl;
849	<	sent_cipher = 1;
850	<	}
851	<
852	<	if (!sent_cipher)
853	<	t = capend; /* truncate string before ENC:, below */
854	<	}
855	<	#endif
856	<	*(t-1) = '\0';
559	>	*(t - 1) = '\0';
560		sendto_one(client_p, "CAPAB :%s", msgbuf);
561		}
562
563		/* sendnick_TS()
564	<	*
564	>	*
565		* inputs       - client (server) to send nick towards
566	<	*              - client to send nick for
566	>	*          - client to send nick for
567		* output       - NONE
568		* side effects - NICK message is sent towards given client_p
569		*/
570		void
571		sendnick_TS(struct Client *client_p, struct Client *target_p)
572		{
573	<	static char ubuf[12];
573	>	char ubuf[IRCD_BUFSIZE];
574
575		if (!IsClient(target_p))
576		return;
577
578	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
876	<	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 881 | 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))?target_p->sockhost:"0"),
594	<	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
894	–	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
895	–	target_p->name, target_p->hopcount + 1,
896	–	(unsigned long) target_p->tsinfo,
897	–	ubuf, target_p->username, target_p->host,
898	–	target_p->servptr->name, target_p->info);
899	–	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
900	–	if (!EmptyString(target_p->away))
901	–	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
902	–	target_p->away);
903	–
904	–	}
905	–
906	–	/* client_burst_if_needed()
907	–	*
908	–	* inputs       - pointer to server
909	–	*              - pointer to client to add
910	–	* output       - NONE
911	–	* side effects - If this client is not known by this lazyleaf, send it
912	–	*/
913	–	void
914	–	client_burst_if_needed(struct Client *client_p, struct Client *target_p)
915	–	{
916	–	if (!ServerInfo.hub)
917	–	return;
918	–	if (!MyConnect(client_p))
919	–	return;
920	–	if (!IsCapable(client_p,CAP_LL))
921	–	return;
922	–
923	–	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 935 | 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;
942	<	dlink_node *ptr;
643	>	static char msgbuf[IRCD_BUFSIZE] = "";
644	>	const dlink_node *ptr = NULL;
645
646	<	t += ircsprintf(msgbuf, "TS ");
646	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
647
648		DLINK_FOREACH(ptr, cap_list.head)
649		{
650		const struct Capability *cap = ptr->data;
651
652	<	if (IsCapable(target_p, cap->cap))
653	<	t += ircsprintf(t, "%s ", cap->name);
652	>	if (!IsCapable(target_p, cap->cap))
653	>	continue;
654	>
655	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
656	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
657		}
953	–	#ifdef HAVE_LIBCRYPTO
954	–	if (IsCapable(target_p, CAP_ENC) &&
955	–	target_p->localClient->in_cipher &&
956	–	target_p->localClient->out_cipher)
957	–	t += ircsprintf(t, "ENC:%s ",
958	–	target_p->localClient->in_cipher->name);
959	–	#endif
960	–	*(t - 1) = '\0';
658
659	<	return(msgbuf);
659	>	return msgbuf;
660		}
661
662		/* make_server()
#	Line 973 | Line 670 | struct Server *
670		make_server(struct Client *client_p)
671		{
672		if (client_p->serv == NULL)
976	–	{
673		client_p->serv = MyMalloc(sizeof(struct Server));
978	–	client_p->serv->dep_servers = 1;
979	–	}
674
675		return client_p->serv;
676		}
#	Line 991 | Line 685 | void
685		server_estab(struct Client *client_p)
686		{
687		struct Client *target_p;
688	<	struct ConfItem *conf;
995	<	struct AccessItem *aconf=NULL;
688	>	struct MaskItem *conf = NULL;
689		char *host;
690		const char *inpath;
691		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
999	–	dlink_node *m;
692		dlink_node *ptr;
693	+	#ifdef HAVE_LIBCRYPTO
694	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
695	+	#endif
696
697		assert(client_p != NULL);
698
#	Line 1006 | Line 701 | server_estab(struct Client *client_p)
701		inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
702		host   = client_p->name;
703
704	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
704	>	if ((conf = find_conf_name(&client_p->localClient->confs, host, CONF_SERVER))
705		== NULL)
706		{
707		/* This shouldn't happen, better tell the ops... -A1kmm */
708	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
708	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
709	>	"Warning: Lost connect{} block "
710		"for server %s(this shouldn't happen)!", host);
711		exit_client(client_p, &me, "Lost connect{} block!");
712		return;
#	Line 1025 | Line 721 | server_estab(struct Client *client_p)
721		/* If there is something in the serv_list, it might be this
722		* connecting server..
723		*/
724	<	if (!ServerInfo.hub && serv_list.head)
724	>	if (!ServerInfo.hub && serv_list.head)
725		{
726		if (client_p != serv_list.head->data || serv_list.head->next)
727		{
728	<	ServerStats->is_ref++;
728	>	++ServerStats.is_ref;
729		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
730		exit_client(client_p, &me, "I'm a leaf");
731		return;
732		}
733		}
734
735	<	aconf = (struct AccessItem *)map_to_conf(conf);
1040	<
1041	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
735	>	if (IsUnknown(client_p))
736		{
737	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
1044	<	*        2.  Check aconf->spasswd, not aconf->passwd.
1045	<	*/
1046	<	if (!EmptyString(aconf->spasswd))
1047	<	{
1048	<	/* only send ts6 format PASS if we have ts6 enabled */
1049	<	if (me.id[0] != '\0')               /* Send TS 6 form only if id */
1050	<	sendto_one(client_p, "PASS %s TS %d %s",
1051	<	aconf->spasswd, TS_CURRENT, me.id);
1052	<	else
1053	<	sendto_one(client_p, "PASS %s TS 5",
1054	<	aconf->spasswd);
1055	<	}
737	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
738
739	<	/* Pass my info to the new server
1058	<	*
1059	<	* If trying to negotiate LazyLinks, pass on CAP_LL
1060	<	* If this is a HUB, pass on CAP_HUB
1061	<	* Pass on ZIP if supported
1062	<	* Pass on TB if supported.
1063	<	* - Dianora
1064	<	*/
739	>	send_capabilities(client_p, 0);
740
1066	–	send_capabilities(client_p, aconf,
1067	–	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
1068	–	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
1069	–	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
1070	–	, 0);
1071	–
1072	–	/* SERVER is the last command sent before switching to ziplinks.
1073	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1074	–	* on the wire immediately.  Otherwise, it could be sitting in
1075	–	* a kernel buffer when we start sending zipped data, and the
1076	–	* parser on the receiving side can't hand both unzipped and zipped
1077	–	* data in one packet. --Rodder
1078	–	*
1079	–	* currently we only need to call send_queued_write,
1080	–	* Nagle is already disabled at this point --adx
1081	–	*/
741		sendto_one(client_p, "SERVER %s 1 :%s%s",
742	<	my_name_for_link(conf),
1084	<	ConfigServerHide.hidden ? "(H) " : "",
1085	<	(me.info[0]) ? (me.info) : "IRCers United");
1086	<	send_queued_write(client_p);
742	>	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
743		}
744
745	<	/* Hand the server off to servlink now */
1090	<	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1091	<	{
1092	<	if (fork_server(client_p) < 0)
1093	<	{
1094	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1095	<	"Warning: fork failed for server %s -- check servlink_path (%s)",
1096	<	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1097	<	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1098	<	"%s -- check servlink_path (%s)",
1099	<	get_client_name(client_p, MASK_IP),
1100	<	ConfigFileEntry.servlink_path);
1101	<	exit_client(client_p, &me, "fork failed");
1102	<	return;
1103	<	}
1104	<
1105	<	start_io(client_p);
1106	<	SetServlink(client_p);
1107	<	}
1108	<
1109	<	/* only send ts6 format SVINFO if we have ts6 enabled */
1110	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu",
1111	<	(me.id[0] ? TS_CURRENT : 5), TS_MIN,
745	>	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
746		(unsigned long)CurrentTime);
747
748		/* assumption here is if they passed the correct TS version, they also passed an SID */
#	Line 1116 | Line 750 | server_estab(struct Client *client_p)
750		hash_add_id(client_p);
751
752		/* XXX Does this ever happen? I don't think so -db */
753	<	detach_conf(client_p, OPER_TYPE);
753	>	detach_conf(client_p, CONF_OPER);
754
755		/* *WARNING*
756		**    In the following code in place of plain server's
#	Line 1140 | Line 774 | server_estab(struct Client *client_p)
774		set_chcap_usage_counts(client_p);
775
776		/* Some day, all these lists will be consolidated *sigh* */
777	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
777	>	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
778
779	<	m = dlinkFind(&unknown_list, client_p);
1146	<	assert(NULL != m);
779	>	assert(dlinkFind(&unknown_list, client_p));
780
781	<	dlinkDelete(m, &unknown_list);
782	<	dlinkAdd(client_p, m, &serv_list);
781	>	dlink_move_node(&client_p->localClient->lclient_node,
782	>	&unknown_list, &serv_list);
783
784		Count.myserver++;
785
#	Line 1157 | Line 790 | server_estab(struct Client *client_p)
790		make_server(client_p);
791
792		/* fixing eob timings.. -gnp */
793	<	client_p->firsttime = CurrentTime;
1161	<
1162	<	/* Show the real host/IP to admins */
1163	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1164	<	"Link with %s established: (%s) link",
1165	<	inpath_ip,show_capabilities(client_p));
1166	<	/* Now show the masked hostname/IP to opers */
1167	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1168	<	"Link with %s established: (%s) link",
1169	<	inpath,show_capabilities(client_p));
1170	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1171	<	inpath_ip, show_capabilities(client_p));
793	>	client_p->localClient->firsttime = CurrentTime;
794
795	<	client_p->serv->sconf = conf;
795	>	if (find_matching_name_conf(CONF_SERVICE, client_p->name, NULL, NULL, 0))
796	>	AddFlag(client_p, FLAGS_SERVICE);
797
798	<	if (HasServlink(client_p))
798	>	/* Show the real host/IP to admins */
799	>	#ifdef HAVE_LIBCRYPTO
800	>	if (client_p->localClient->fd.ssl)
801		{
802	<	/* we won't overflow FD_DESC_SZ here, as it can hold
803	<	* client_p->name + 64
804	<	*/
805	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
806	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
802	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
803	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
804	>
805	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
806	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
807	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
808	>	compression ? SSL_COMP_get_name(compression) : "NONE",
809	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
810	>	show_capabilities(client_p));
811	>	/* Now show the masked hostname/IP to opers */
812	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
813	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
814	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
815	>	compression ? SSL_COMP_get_name(compression) : "NONE",
816	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
817	>	show_capabilities(client_p));
818	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
819	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
820	>	compression ? SSL_COMP_get_name(compression) : "NONE",
821	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
822	>	show_capabilities(client_p));
823		}
824		else
825	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
825	>	#endif
826	>	{
827	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
828	>	"Link with %s established: (Capabilities: %s)",
829	>	inpath_ip, show_capabilities(client_p));
830	>	/* Now show the masked hostname/IP to opers */
831	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
832	>	"Link with %s established: (Capabilities: %s)",
833	>	inpath, show_capabilities(client_p));
834	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
835	>	inpath_ip, show_capabilities(client_p));
836	>	}
837	>
838	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
839
840		/* Old sendto_serv_but_one() call removed because we now
841		** need to send different names to different servers
#	Line 1194 | Line 848 | server_estab(struct Client *client_p)
848		if (target_p == client_p)
849		continue;
850
1197	–	if ((conf = target_p->serv->sconf) &&
1198	–	match(my_name_for_link(conf), client_p->name))
1199	–	continue;
1200	–
851		if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
852		sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
853		me.id, client_p->name, client_p->id,
854		IsHidden(client_p) ? "(H) " : "",
855		client_p->info);
856		else
857	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
857	>	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
858		me.name, client_p->name,
859		IsHidden(client_p) ? "(H) " : "",
860		client_p->info);
861		}
862
863	<	/* Pass on my client information to the new server
864	<	**
865	<	** First, pass only servers (idea is that if the link gets
866	<	** cancelled beacause the server was already there,
867	<	** there are no NICK's to be cancelled...). Of course,
868	<	** if cancellation occurs, all this info is sent anyway,
869	<	** and I guess the link dies when a read is attempted...? --msa
870	<	**
871	<	** Note: Link cancellation to occur at this point means
872	<	** that at least two servers from my fragment are building
873	<	** up connection this other fragment at the same time, it's
874	<	** a race condition, not the normal way of operation...
875	<	**
876	<	** ALSO NOTE: using the get_client_name for server names--
877	<	**    see previous *WARNING*!!! (Also, original inpath
878	<	**    is destroyed...)
879	<	*/
880	<
1231	<	conf = client_p->serv->sconf;
863	>	/*
864	>	* Pass on my client information to the new server
865	>	*
866	>	* First, pass only servers (idea is that if the link gets
867	>	* cancelled beacause the server was already there,
868	>	* there are no NICK's to be cancelled...). Of course,
869	>	* if cancellation occurs, all this info is sent anyway,
870	>	* and I guess the link dies when a read is attempted...? --msa
871	>	*
872	>	* Note: Link cancellation to occur at this point means
873	>	* that at least two servers from my fragment are building
874	>	* up connection this other fragment at the same time, it's
875	>	* a race condition, not the normal way of operation...
876	>	*
877	>	* ALSO NOTE: using the get_client_name for server names--
878	>	*    see previous *WARNING*!!! (Also, original inpath
879	>	*    is destroyed...)
880	>	*/
881
882		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
883		{
884		target_p = ptr->data;
885
886		/* target_p->from == target_p for target_p == client_p */
887	<	if (target_p->from == client_p)
1239	<	continue;
1240	<
1241	<	if (match(my_name_for_link(conf), target_p->name))
887	>	if (IsMe(target_p) || target_p->from == client_p)
888		continue;
889
890		if (IsCapable(client_p, CAP_TS6))
#	Line 1254 | Line 900 | server_estab(struct Client *client_p)
900		IsHidden(target_p) ? "(H) " : "", target_p->info);
901		}
902		else
903	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
903	>	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
904		target_p->servptr->name, target_p->name, target_p->hopcount+1,
905		IsHidden(target_p) ? "(H) " : "", target_p->info);
1260	–	}
1261	–
1262	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1263	–	uplink = client_p;
1264	–
1265	–	server_burst(client_p);
1266	–	}
906
907	<	static void
908	<	start_io(struct Client *server)
1270	<	{
1271	<	struct LocalUser *lserver = server->localClient;
1272	<	int alloclen = 1;
1273	<	char *buf;
1274	<	dlink_node *ptr;
1275	<	struct dbuf_block *block;
1276	<
1277	<	/* calculate how many bytes to allocate */
1278	<	if (IsCapable(server, CAP_ZIP))
1279	<	alloclen += 6;
1280	<	#ifdef HAVE_LIBCRYPTO
1281	<	if (IsCapable(server, CAP_ENC))
1282	<	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1283	<	#endif
1284	<	alloclen += dbuf_length(&lserver->buf_recvq);
1285	<	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1286	<	alloclen += dbuf_length(&lserver->buf_sendq);
1287	<	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1288	<
1289	<	/* initialize servlink control sendq */
1290	<	lserver->slinkq = buf = MyMalloc(alloclen);
1291	<	lserver->slinkq_ofs = 0;
1292	<	lserver->slinkq_len = alloclen;
1293	<
1294	<	if (IsCapable(server, CAP_ZIP))
1295	<	{
1296	<	/* ziplink */
1297	<	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1298	<	*buf++ = 0; /* |          */
1299	<	*buf++ = 1; /* \ len is 1 */
1300	<	*buf++ = ConfigFileEntry.compression_level;
1301	<	*buf++ = SLINKCMD_START_ZIP_IN;
1302	<	*buf++ = SLINKCMD_START_ZIP_OUT;
907	>	if (HasFlag(target_p, FLAGS_EOB))
908	>	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
909		}
1304	–	#ifdef HAVE_LIBCRYPTO
1305	–	if (IsCapable(server, CAP_ENC))
1306	–	{
1307	–	/* Decryption settings */
1308	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1309	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1310	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1311	–	*buf++ = lserver->in_cipher->cipherid;
1312	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1313	–	*buf++ = 0; /* keylen < 256 */
1314	–	*buf++ = lserver->in_cipher->keylen;
1315	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1316	–	buf += lserver->in_cipher->keylen;
1317	–	/* Encryption settings */
1318	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1319	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1320	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1321	–	*buf++ = lserver->out_cipher->cipherid;
1322	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1323	–	*buf++ = 0; /* keylen < 256 */
1324	–	*buf++ = lserver->out_cipher->keylen;
1325	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1326	–	buf += lserver->out_cipher->keylen;
1327	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1328	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1329	–	}
1330	–	#endif
1331	–
1332	–	/* pass the whole recvq to servlink */
1333	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1334	–	{
1335	–	block = ptr->data;
1336	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1337	–	*buf++ = (block->size >> 8);
1338	–	*buf++ = (block->size & 0xff);
1339	–	memcpy(buf, &block->data[0], block->size);
1340	–	buf += block->size;
1341	–	}
1342	–	dbuf_clear(&lserver->buf_recvq);
1343	–
1344	–	/* pass the whole sendq to servlink */
1345	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1346	–	{
1347	–	block = ptr->data;
1348	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1349	–	*buf++ = (block->size >> 8);
1350	–	*buf++ = (block->size & 0xff);
1351	–	memcpy(buf, &block->data[0], block->size);
1352	–	buf += block->size;
1353	–	}
1354	–	dbuf_clear(&lserver->buf_sendq);
1355	–
1356	–	/* start io */
1357	–	*buf++ = SLINKCMD_INIT;
1358	–
1359	–	/* schedule a write */
1360	–	send_queued_slink_write(server);
1361	–	}
1362	–
1363	–	/* fork_server()
1364	–	*
1365	–	* inputs       - struct Client *server
1366	–	* output       - success: 0 / failure: -1
1367	–	* side effect  - fork, and exec SERVLINK to handle this connection
1368	–	*/
1369	–	static int
1370	–	fork_server(struct Client *server)
1371	–	{
1372	–	#ifndef HAVE_SOCKETPAIR
1373	–	return -1;
1374	–	#else
1375	–	int i;
1376	–	int slink_fds[2][2];
1377	–	/* 0? - ctrl  | 1? - data
1378	–	* ?0 - child | ?1 - parent */
1379	–
1380	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1381	–	return -1;
1382	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1383	–	goto free_ctrl_fds;
1384	–
1385	–	if ((i = fork()) < 0)
1386	–	{
1387	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1388	–	free_ctrl_fds:
1389	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1390	–	return -1;
1391	–	}
1392	–
1393	–	if (i == 0)
1394	–	{
1395	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1396	–	char *kid_argv[7];
1397	–
1398	–	#ifdef O_ASYNC
1399	–	fcntl(server->localClient->fd.fd, F_SETFL,
1400	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1401	–	#endif
1402	–	close_fds(&server->localClient->fd);
1403	–	close(slink_fds[0][1]);
1404	–	close(slink_fds[1][1]);
1405	–
1406	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1407	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1408	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1409	–
1410	–	kid_argv[0] = "-slink";
1411	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1412	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1413	–	kid_argv[5] = fd_str[2];    /* network */
1414	–	kid_argv[6] = NULL;
1415	–
1416	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1417	–
1418	–	_exit(1);
1419	–	}
1420	–
1421	–	/* close the network fd and the child ends of the pipes */
1422	–	fd_close(&server->localClient->fd);
1423	–	close(slink_fds[0][0]);
1424	–	close(slink_fds[1][0]);
1425	–
1426	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1427	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1428	–
1429	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1430	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
910
911	<	read_ctrl_packet(&server->localClient->ctrlfd, server);
1433	<	read_packet(&server->localClient->fd, server);
1434	<
1435	<	return 0;
1436	<	#endif
911	>	server_burst(client_p);
912		}
913
914		/* server_burst()
#	Line 1457 | Line 932 | server_burst(struct Client *client_p)
932		** -orabidoo
933		*/
934
935	<	/* On a "lazy link" hubs send nothing.
1461	<	* Leafs always have to send nicks plus channels
1462	<	*/
1463	<	if (IsCapable(client_p, CAP_LL))
1464	<	{
1465	<	if (!ServerInfo.hub)
1466	<	{
1467	<	/* burst all our info */
1468	<	burst_all(client_p);
1469	<
1470	<	/* Now, ask for channel info on all our current channels */
1471	<	cjoin_all(client_p);
1472	<	}
1473	<	}
1474	<	else
1475	<	{
1476	<	burst_all(client_p);
1477	<	}
935	>	burst_all(client_p);
936
937		/* EOB stuff is now in burst_all */
938		/* Always send a PING after connect burst is done */
#	Line 1483 | Line 941 | server_burst(struct Client *client_p)
941
942		/* burst_all()
943		*
944	<	* inputs       - pointer to server to send burst to
944	>	* inputs       - pointer to server to send burst to
945		* output       - NONE
946		* side effects - complete burst of channels/nicks is sent to client_p
947		*/
948		static void
949		burst_all(struct Client *client_p)
950		{
951	<	struct Client *target_p;
1494	<	struct Channel *chptr;
1495	<	dlink_node *gptr;
1496	<	dlink_node *ptr;
951	>	dlink_node *ptr = NULL;
952
953	<	DLINK_FOREACH(gptr, global_channel_list.head)
953	>	DLINK_FOREACH(ptr, global_channel_list.head)
954		{
955	<	chptr = gptr->data;
955	>	struct Channel *chptr = ptr->data;
956
957		if (dlink_list_length(&chptr->members) != 0)
958		{
959		burst_members(client_p, chptr);
960		send_channel_modes(client_p, chptr);
961	<	if (IsCapable(client_p, CAP_TB))
962	<	send_tb(client_p, chptr);
961	>
962	>	if (IsCapable(client_p, CAP_TBURST))
963	>	send_tb(client_p, chptr);
964		}
965		}
966
#	Line 1512 | Line 968 | burst_all(struct Client *client_p)
968		*/
969		DLINK_FOREACH(ptr, global_client_list.head)
970		{
971	<	target_p = ptr->data;
971	>	struct Client *target_p = ptr->data;
972
973	<	if (!IsBursted(target_p) && target_p->from != client_p)
973	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
974		sendnick_TS(client_p, target_p);
975	<
976	<	ClearBursted(target_p);
975	>
976	>	DelFlag(target_p, FLAGS_BURSTED);
977		}
978
1523	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
1524	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1525	–	*/
1526	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
979		if (IsCapable(client_p, CAP_EOB))
980		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
981		}
#	Line 1531 | Line 983 | burst_all(struct Client *client_p)
983		/*
984		* send_tb
985		*
986	<	* inputs       - pointer to Client
987	<	*              - pointer to channel
1536	<	* output       - NONE
1537	<	* side effects - Called on a server burst when
1538	<	*                server is CAP_TB capable
1539	<	*/
1540	<	static void
1541	<	send_tb(struct Client *client_p, struct Channel *chptr)
1542	<	{
1543	<	if (chptr->topic != NULL && IsCapable(client_p, CAP_TB))
1544	<	{
1545	<	if (ConfigChannel.burst_topicwho)
1546	<	{
1547	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1548	<	me.name, chptr->chname,
1549	<	(unsigned long)chptr->topic_time,
1550	<	chptr->topic_info, chptr->topic);
1551	<	}
1552	<	else
1553	<	{
1554	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1555	<	me.name, chptr->chname,
1556	<	(unsigned long)chptr->topic_time, chptr->topic);
1557	<	}
1558	<	}
1559	<	}
1560	<
1561	<	/* cjoin_all()
1562	<	*
1563	<	* inputs       - server to ask for channel info from
986	>	* inputs       - pointer to Client
987	>	*              - pointer to channel
988		* output       - NONE
989	<	* side effects - CJOINS for all the leafs known channels is sent
990	<	*/
1567	<	static void
1568	<	cjoin_all(struct Client *client_p)
1569	<	{
1570	<	const dlink_node *gptr = NULL;
1571	<
1572	<	DLINK_FOREACH(gptr, global_channel_list.head)
1573	<	{
1574	<	const struct Channel *chptr = gptr->data;
1575	<	sendto_one(client_p, ":%s CBURST %s",
1576	<	me.name, chptr->chname);
1577	<	}
1578	<	}
1579	<
1580	<	/* burst_channel()
1581	<	*
1582	<	* inputs       - pointer to server to send sjoins to
1583	<	*              - channel pointer
1584	<	* output       - none
1585	<	* side effects - All sjoins for channel(s) given by chptr are sent
1586	<	*                for all channel members. ONLY called by hub on
1587	<	*                behalf of a lazylink so client_p is always guarunteed
1588	<	*                to be a LL leaf.
1589	<	*/
1590	<	void
1591	<	burst_channel(struct Client *client_p, struct Channel *chptr)
1592	<	{
1593	<	burst_ll_members(client_p, chptr);
1594	<
1595	<	send_channel_modes(client_p, chptr);
1596	<	add_lazylinkchannel(client_p,chptr);
1597	<
1598	<	if (chptr->topic != NULL && chptr->topic_info != NULL)
1599	<	{
1600	<	sendto_one(client_p, ":%s TOPIC %s %s %lu :%s",
1601	<	me.name, chptr->chname, chptr->topic_info,
1602	<	(unsigned long)chptr->topic_time, chptr->topic);
1603	<	}
1604	<	}
1605	<
1606	<	/* add_lazlinkchannel()
1607	<	*
1608	<	* inputs       - pointer to directly connected leaf server
1609	<	*                being introduced to this hub
1610	<	*              - pointer to channel structure being introduced
1611	<	* output       - NONE
1612	<	* side effects - The channel pointed to by chptr is now known
1613	<	*                to be on lazyleaf server given by local_server_p.
1614	<	*                mark that in the bit map and add to the list
1615	<	*                of channels to examine after this newly introduced
1616	<	*                server is squit off.
989	>	* side effects - Called on a server burst when
990	>	*                server is CAP_TBURST capable
991		*/
992		static void
993	<	add_lazylinkchannel(struct Client *local_server_p, struct Channel *chptr)
1620	<	{
1621	<	assert(MyConnect(local_server_p));
1622	<
1623	<	chptr->lazyLinkChannelExists |= local_server_p->localClient->serverMask;
1624	<	dlinkAdd(chptr, make_dlink_node(), &lazylink_channels);
1625	<	}
1626	<
1627	<	/* add_lazylinkclient()
1628	<	*
1629	<	* inputs       - pointer to directly connected leaf server
1630	<	*                being introduced to this hub
1631	<	*              - pointer to client being introduced
1632	<	* output       - NONE
1633	<	* side effects - The client pointed to by client_p is now known
1634	<	*                to be on lazyleaf server given by local_server_p.
1635	<	*                mark that in the bit map and add to the list
1636	<	*                of clients to examine after this newly introduced
1637	<	*                server is squit off.
1638	<	*/
1639	<	void
1640	<	add_lazylinkclient(struct Client *local_server_p, struct Client *client_p)
1641	<	{
1642	<	assert(MyConnect(local_server_p));
1643	<	client_p->lazyLinkClientExists |= local_server_p->localClient->serverMask;
1644	<	}
1645	<
1646	<	/* remove_lazylink_flags()
1647	<	*
1648	<	* inputs       - pointer to server quitting
1649	<	* output       - NONE
1650	<	* side effects - All the channels on the lazylink channel list are examined
1651	<	*                If they hold a bit corresponding to the servermask
1652	<	*                attached to client_p, clear that bit. If this bitmask
1653	<	*                goes to 0, then the channel is no longer known to
1654	<	*                be on any lazylink server, and can be removed from the
1655	<	*                link list.
1656	<	*
1657	<	*                Similar is done for lazylink clients
1658	<	*
1659	<	*                This function must be run by the HUB on any exiting
1660	<	*                lazylink leaf server, while the pointer is still valid.
1661	<	*                Hence must be run from client.c in exit_one_client()
1662	<	*
1663	<	*                The old code scanned all channels, this code only
1664	<	*                scans channels/clients on the lazylink_channels
1665	<	*                lazylink_clients lists.
1666	<	*/
1667	<	void
1668	<	remove_lazylink_flags(unsigned long mask)
993	>	send_tb(struct Client *client_p, struct Channel *chptr)
994		{
995	<	dlink_node *ptr;
996	<	dlink_node *next_ptr;
997	<	struct Channel *chptr;
998	<	struct Client *target_p;
999	<	unsigned long clear_mask;
1000	<
1001	<	if (!mask) /* On 0 mask, don't do anything */
1002	<	return;
1003	<
1004	<	clear_mask = ~mask;
1005	<	freeMask |= mask;
1006	<
1007	<	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
1008	<	{
1009	<	chptr = ptr->data;
1010	<
1011	<	chptr->lazyLinkChannelExists &= clear_mask;
1012	<
1013	<	if (chptr->lazyLinkChannelExists == 0)
1014	<	{
1690	<	dlinkDelete(ptr, &lazylink_channels);
1691	<	free_dlink_node(ptr);
1692	<	}
1693	<	}
1694	<
1695	<	DLINK_FOREACH(ptr, global_client_list.head)
1696	<	{
1697	<	target_p = ptr->data;
1698	<	target_p->lazyLinkClientExists &= clear_mask;
1699	<	}
995	>	/*
996	>	* We may also send an empty topic here, but only if topic_time isn't 0,
997	>	* i.e. if we had a topic that got unset.  This is required for syncing
998	>	* topics properly.
999	>	*
1000	>	* Imagine the following scenario: Our downlink introduces a channel
1001	>	* to us with a TS that is equal to ours, but the channel topic on
1002	>	* their side got unset while the servers were in splitmode, which means
1003	>	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1004	>	* deal with it in a more sophisticated fashion instead of just resetting
1005	>	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1006	>	* for further information   -Michael
1007	>	*/
1008	>	if (chptr->topic_time != 0)
1009	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1010	>	ID_or_name(&me, client_p),
1011	>	(unsigned long)chptr->channelts, chptr->chname,
1012	>	(unsigned long)chptr->topic_time,
1013	>	chptr->topic_info,
1014	>	chptr->topic);
1015		}
1016
1017		/* burst_members()
#	Line 1718 | Line 1033 | burst_members(struct Client *client_p, s
1033		ms       = ptr->data;
1034		target_p = ms->client_p;
1035
1036	<	if (!IsBursted(target_p))
1036	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1037		{
1038	<	SetBursted(target_p);
1038	>	AddFlag(target_p, FLAGS_BURSTED);
1039
1040		if (target_p->from != client_p)
1041		sendnick_TS(client_p, target_p);
#	Line 1728 | Line 1043 | burst_members(struct Client *client_p, s
1043		}
1044		}
1045
1731	–	/* burst_ll_members()
1732	–	*
1733	–	* inputs       - pointer to server to send members to
1734	–	*              - dlink_list pointer to membership list to send
1735	–	* output       - NONE
1736	–	* side effects - This version also has to check the bitmap for lazylink
1737	–	*/
1738	–	static void
1739	–	burst_ll_members(struct Client *client_p, struct Channel *chptr)
1740	–	{
1741	–	struct Client *target_p;
1742	–	struct Membership *ms;
1743	–	dlink_node *ptr;
1744	–
1745	–	DLINK_FOREACH(ptr, chptr->members.head)
1746	–	{
1747	–	ms       = ptr->data;
1748	–	target_p = ms->client_p;
1749	–
1750	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
1751	–	{
1752	–	if (target_p->from != client_p)
1753	–	{
1754	–	add_lazylinkclient(client_p,target_p);
1755	–	sendnick_TS(client_p, target_p);
1756	–	}
1757	–	}
1758	–	}
1759	–	}
1760	–
1761	–	/* set_autoconn()
1762	–	*
1763	–	* inputs       - struct Client pointer to oper requesting change
1764	–	* output       - none
1765	–	* side effects - set autoconnect mode
1766	–	*/
1767	–	void
1768	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1769	–	{
1770	–	struct ConfItem *conf;
1771	–	struct AccessItem *aconf;
1772	–
1773	–	if (name != NULL)
1774	–	{
1775	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1776	–	if (conf != NULL)
1777	–	{
1778	–	aconf = (struct AccessItem *)map_to_conf(conf);
1779	–	if (newval)
1780	–	SetConfAllowAutoConn(aconf);
1781	–	else
1782	–	ClearConfAllowAutoConn(aconf);
1783	–
1784	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1785	–	"%s has changed AUTOCONN for %s to %i",
1786	–	source_p->name, name, newval);
1787	–	sendto_one(source_p,
1788	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1789	–	me.name, source_p->name, name, newval);
1790	–	}
1791	–	else
1792	–	{
1793	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1794	–	me.name, source_p->name, name);
1795	–	}
1796	–	}
1797	–	else
1798	–	{
1799	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1800	–	me.name, source_p->name);
1801	–	}
1802	–	}
1803	–
1804	–	void
1805	–	initServerMask(void)
1806	–	{
1807	–	freeMask = 0xFFFFFFFFUL;
1808	–	}
1809	–
1810	–	/* nextFreeMask()
1811	–	*
1812	–	* inputs       - NONE
1813	–	* output       - unsigned long next unused mask for use in LL
1814	–	* side effects -
1815	–	*/
1816	–	unsigned long
1817	–	nextFreeMask(void)
1818	–	{
1819	–	int i;
1820	–	unsigned long mask = 1;
1821	–
1822	–	for (i = 0; i < 32; i++)
1823	–	{
1824	–	if (mask & freeMask)
1825	–	{
1826	–	freeMask &= ~mask;
1827	–	return(mask);
1828	–	}
1829	–
1830	–	mask <<= 1;
1831	–	}
1832	–
1833	–	return(0L); /* watch this special case ... */
1834	–	}
1835	–
1046		/* New server connection code
1047		* Based upon the stuff floating about in s_bsd.c
1048		*   -- adrian
#	Line 1840 | Line 1050 | nextFreeMask(void)
1050
1051		/* serv_connect() - initiate a server connection
1052		*
1053	<	* inputs       - pointer to conf
1053	>	* inputs       - pointer to conf
1054		*              - pointer to client doing the connect
1055		* output       -
1056		* side effects -
#	Line 1855 | Line 1065 | nextFreeMask(void)
1065		* it suceeded or not, and 0 if it fails in here somewhere.
1066		*/
1067		int
1068	<	serv_connect(struct AccessItem *aconf, struct Client *by)
1068	>	serv_connect(struct MaskItem *conf, struct Client *by)
1069		{
1860	–	struct ConfItem *conf;
1070		struct Client *client_p;
1071	<	char buf[HOSTIPLEN];
1071	>	char buf[HOSTIPLEN + 1];
1072
1073		/* conversion structs */
1074		struct sockaddr_in *v4;
1075	<	/* Make sure aconf is useful */
1076	<	assert(aconf != NULL);
1868	<
1869	<	if(aconf == NULL)
1870	<	return (0);
1075	>	/* Make sure conf is useful */
1076	>	assert(conf != NULL);
1077
1872	–	/* XXX should be passing struct ConfItem in the first place */
1873	–	conf = unmap_conf_item(aconf);
1078
1079	<	/* log */
1080	<	irc_getnameinfo((struct sockaddr*)&aconf->ipnum, aconf->ipnum.ss_len,
1081	<	buf, HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
1878	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1079	>	getnameinfo((struct sockaddr *)&conf->addr, conf->addr.ss_len,
1080	>	buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1081	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, conf->host,
1082		buf);
1083
1084		/* Still processing a DNS lookup? -> exit */
1085	<	if (aconf->dns_query != NULL)
1085	>	if (conf->dns_pending)
1086		{
1087	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1088	<	"Error connecting to %s: Error during DNS lookup", conf->name);
1087	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1088	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
1089	>	conf->name);
1090	>	return (0);
1091	>	}
1092	>
1093	>	if (conf->dns_failed)
1094	>	{
1095	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1096	>	"Error connecting to %s: DNS lookup for connect{} failed.",
1097	>	conf->name);
1098		return (0);
1099		}
1100
1101		/* Make sure this server isn't already connected
1102	<	* Note: aconf should ALWAYS be a valid C: line
1102	>	* Note: conf should ALWAYS be a valid C: line
1103		*/
1104	<	if ((client_p = find_server(conf->name)) != NULL)
1105	<	{
1106	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1107	<	"Server %s already present from %s",
1108	<	conf->name, get_client_name(client_p, SHOW_IP));
1109	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1110	<	"Server %s already present from %s",
1111	<	conf->name, get_client_name(client_p, MASK_IP));
1104	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1105	>	{
1106	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1107	>	"Server %s already present from %s",
1108	>	conf->name, get_client_name(client_p, SHOW_IP));
1109	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1110	>	"Server %s already present from %s",
1111	>	conf->name, get_client_name(client_p, MASK_IP));
1112		if (by && IsClient(by) && !MyClient(by))
1113		sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1114	<	me.name, by->name, conf->name,
1115	<	get_client_name(client_p, MASK_IP));
1116	<	return (0);
1114	>	me.name, by->name, conf->name,
1115	>	get_client_name(client_p, MASK_IP));
1116	>	return 0;
1117		}
1118	<
1118	>
1119		/* Create a local client */
1120		client_p = make_client(NULL);
1121
1122		/* Copy in the server, hostname, fd */
1123		strlcpy(client_p->name, conf->name, sizeof(client_p->name));
1124	<	strlcpy(client_p->host, aconf->host, sizeof(client_p->host));
1124	>	strlcpy(client_p->host, conf->host, sizeof(client_p->host));
1125
1126		/* We already converted the ip once, so lets use it - stu */
1127	<	strlcpy(client_p->sockhost, buf, HOSTIPLEN);
1127	>	strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1128
1129	<	/* create a socket for the server connection */
1130	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1129	>	/* create a socket for the server connection */
1130	>	if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1131		SOCK_STREAM, 0, NULL) < 0)
1132		{
1133		/* Eek, failure to create the socket */
1134	<	report_error(L_ALL,
1135	<	"opening stream socket to %s: %s", conf->name, errno);
1134	>	report_error(L_ALL, "opening stream socket to %s: %s",
1135	>	conf->name, errno);
1136		SetDead(client_p);
1137		exit_client(client_p, &me, "Connection failed");
1138	<	return (0);
1138	>	return 0;
1139		}
1140
1141		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1932 | Line 1144 | serv_connect(struct AccessItem *aconf, s
1144		/* Attach config entries to client here rather than in
1145		* serv_connect_callback(). This to avoid null pointer references.
1146		*/
1147	<	if (!attach_connect_block(client_p, conf->name, aconf->host))
1147	>	if (!attach_connect_block(client_p, conf->name, conf->host))
1148		{
1149	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1150	<	"Host %s is not enabled for connecting:no C/N-line",
1151	<	conf->name);
1152	<	if (by && IsClient(by) && !MyClient(by))
1149	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1150	>	"Host %s is not enabled for connecting: no connect{} block",
1151	>	conf->name);
1152	>	if (by && IsClient(by) && !MyClient(by))
1153		sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1154	<	me.name, by->name, client_p->name);
1154	>	me.name, by->name, client_p->name);
1155		SetDead(client_p);
1156		exit_client(client_p, client_p, "Connection failed");
1157	<	return (0);
1157	>	return 0;
1158		}
1159
1160		/* at this point we have a connection in progress and C/N lines
#	Line 1961 | Line 1173 | serv_connect(struct AccessItem *aconf, s
1173		SetConnecting(client_p);
1174		dlinkAdd(client_p, &client_p->node, &global_client_list);
1175		/* from def_fam */
1176	<	client_p->localClient->aftype = aconf->aftype;
1176	>	client_p->localClient->aftype = conf->aftype;
1177
1178		/* Now, initiate the connection */
1179	<	/* XXX assume that a non 0 type means a specific bind address
1179	>	/* XXX assume that a non 0 type means a specific bind address
1180		* for this connect.
1181		*/
1182	<	switch (aconf->aftype)
1182	>	switch (conf->aftype)
1183		{
1184		case AF_INET:
1185	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1185	>	v4 = (struct sockaddr_in*)&conf->bind;
1186		if (v4->sin_addr.s_addr != 0)
1187		{
1188		struct irc_ssaddr ipn;
1189		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1190		ipn.ss.ss_family = AF_INET;
1191		ipn.ss_port = 0;
1192	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1193	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1194	<	(struct sockaddr *)&ipn, ipn.ss_len,
1195	<	serv_connect_callback, client_p, aconf->aftype,
1196	<	CONNECTTIMEOUT);
1192	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1193	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1194	>	(struct sockaddr *)&ipn, ipn.ss_len,
1195	>	serv_connect_callback, client_p, conf->aftype,
1196	>	CONNECTTIMEOUT);
1197		}
1198		else if (ServerInfo.specific_ipv4_vhost)
1199		{
#	Line 1990 | Line 1202 | serv_connect(struct AccessItem *aconf, s
1202		ipn.ss.ss_family = AF_INET;
1203		ipn.ss_port = 0;
1204		memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
1205	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1205	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1206		(struct sockaddr *)&ipn, ipn.ss_len,
1207	<	serv_connect_callback, client_p, aconf->aftype,
1208	<	CONNECTTIMEOUT);
1207	>	serv_connect_callback, client_p, conf->aftype,
1208	>	CONNECTTIMEOUT);
1209		}
1210		else
1211	<	comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1212	<	NULL, 0, serv_connect_callback, client_p, aconf->aftype,
1211	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1212	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1213		CONNECTTIMEOUT);
1214		break;
1215		#ifdef IPV6
1216		case AF_INET6:
1217		{
1218	<	struct irc_ssaddr ipn;
1219	<	struct sockaddr_in6 *v6;
1220	<	struct sockaddr_in6 *v6conf;
1221	<
1222	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1224	<	v6 = (struct sockaddr_in6 *)&ipn;
1225	<
1226	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1227	<	sizeof(struct in6_addr)) != 0)
1228	<	{
1229	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1230	<	ipn.ss.ss_family = AF_INET6;
1231	<	ipn.ss_port = 0;
1232	<	comm_connect_tcp(&client_p->localClient->fd,
1233	<	aconf->host, aconf->port,
1234	<	(struct sockaddr *)&ipn, ipn.ss_len,
1235	<	serv_connect_callback, client_p,
1236	<	aconf->aftype, CONNECTTIMEOUT);
1237	<	}
2026	<	else if (ServerInfo.specific_ipv6_vhost)
1218	>	struct irc_ssaddr ipn;
1219	>	struct sockaddr_in6 *v6;
1220	>	struct sockaddr_in6 *v6conf;
1221	>
1222	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1224	>	v6 = (struct sockaddr_in6 *)&ipn;
1225	>
1226	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1227	>	{
1228	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1229	>	ipn.ss.ss_family = AF_INET6;
1230	>	ipn.ss_port = 0;
1231	>	comm_connect_tcp(&client_p->localClient->fd,
1232	>	conf->host, conf->port,
1233	>	(struct sockaddr *)&ipn, ipn.ss_len,
1234	>	serv_connect_callback, client_p,
1235	>	conf->aftype, CONNECTTIMEOUT);
1236	>	}
1237	>	else if (ServerInfo.specific_ipv6_vhost)
1238		{
1239	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1240	<	ipn.ss.ss_family = AF_INET6;
1241	<	ipn.ss_port = 0;
1242	<	comm_connect_tcp(&client_p->localClient->fd,
1243	<	aconf->host, aconf->port,
1244	<	(struct sockaddr *)&ipn, ipn.ss_len,
1245	<	serv_connect_callback, client_p,
1246	<	aconf->aftype, CONNECTTIMEOUT);
1247	<	}
1248	<	else
1249	<	comm_connect_tcp(&client_p->localClient->fd,
1250	<	aconf->host, aconf->port,
1251	<	NULL, 0, serv_connect_callback, client_p,
1252	<	aconf->aftype, CONNECTTIMEOUT);
1239	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1240	>	ipn.ss.ss_family = AF_INET6;
1241	>	ipn.ss_port = 0;
1242	>	comm_connect_tcp(&client_p->localClient->fd,
1243	>	conf->host, conf->port,
1244	>	(struct sockaddr *)&ipn, ipn.ss_len,
1245	>	serv_connect_callback, client_p,
1246	>	conf->aftype, CONNECTTIMEOUT);
1247	>	}
1248	>	else
1249	>	comm_connect_tcp(&client_p->localClient->fd,
1250	>	conf->host, conf->port,
1251	>	NULL, 0, serv_connect_callback, client_p,
1252	>	conf->aftype, CONNECTTIMEOUT);
1253		}
1254		#endif
1255		}
1256	<	return (1);
1256	>	return 1;
1257	>	}
1258	>
1259	>	#ifdef HAVE_LIBCRYPTO
1260	>	static void
1261	>	finish_ssl_server_handshake(struct Client *client_p)
1262	>	{
1263	>	struct MaskItem *conf = NULL;
1264	>
1265	>	conf = find_conf_name(&client_p->localClient->confs,
1266	>	client_p->name, CONF_SERVER);
1267	>	if (conf == NULL)
1268	>	{
1269	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1270	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1271	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1272	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1273	>
1274	>	exit_client(client_p, &me, "Lost connect{} block");
1275	>	return;
1276	>	}
1277	>
1278	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1279	>
1280	>	send_capabilities(client_p, 0);
1281	>
1282	>	sendto_one(client_p, "SERVER %s 1 :%s%s",
1283	>	me.name, ConfigServerHide.hidden ? "(H) " : "",
1284	>	me.info);
1285	>
1286	>	/* If we've been marked dead because a send failed, just exit
1287	>	* here now and save everyone the trouble of us ever existing.
1288	>	*/
1289	>	if (IsDead(client_p))
1290	>	{
1291	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1292	>	"%s[%s] went dead during handshake",
1293	>	client_p->name,
1294	>	client_p->host);
1295	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1296	>	"%s went dead during handshake", client_p->name);
1297	>	return;
1298	>	}
1299	>
1300	>	/* don't move to serv_list yet -- we haven't sent a burst! */
1301	>	/* If we get here, we're ok, so lets start reading some data */
1302	>	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1303		}
1304
1305	+	static void
1306	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1307	+	{
1308	+	X509 *cert = NULL;
1309	+	int ret = 0;
1310	+
1311	+	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1312	+	{
1313	+	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1314	+	{
1315	+	case SSL_ERROR_WANT_WRITE:
1316	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1317	+	(PF *)ssl_server_handshake, client_p, 0);
1318	+	return;
1319	+	case SSL_ERROR_WANT_READ:
1320	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1321	+	(PF *)ssl_server_handshake, client_p, 0);
1322	+	return;
1323	+	default:
1324	+	{
1325	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1326	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1327	+	"Error connecting to %s: %s", client_p->name,
1328	+	sslerr ? sslerr : "unknown SSL error");
1329	+	exit_client(client_p, client_p, "Error during SSL handshake");
1330	+	return;
1331	+	}
1332	+	}
1333	+	}
1334	+
1335	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1336	+	{
1337	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1338	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1339	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1340	+
1341	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1342	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1343	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1344	+	{
1345	+	unsigned int i = 0, n = 0;
1346	+
1347	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1348	+	{
1349	+	for (; i < n; ++i)
1350	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1351	+	client_p->certfp = xstrdup(buf);
1352	+	}
1353	+	}
1354	+	else
1355	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1356	+	client_p->name, client_p->username, client_p->host, res);
1357	+	X509_free(cert);
1358	+	}
1359	+
1360	+	finish_ssl_server_handshake(client_p);
1361	+	}
1362	+
1363	+	static void
1364	+	ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
1365	+	{
1366	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1367	+	{
1368	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1369	+	ERR_error_string(ERR_get_error(), NULL));
1370	+	SetDead(client_p);
1371	+	exit_client(client_p, client_p, "SSL_new failed");
1372	+	return;
1373	+	}
1374	+
1375	+	SSL_set_fd(fd->ssl, fd->fd);
1376	+
1377	+	if (!EmptyString(conf->cipher_list))
1378	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, conf->cipher_list);
1379	+
1380	+	ssl_server_handshake(NULL, client_p);
1381	+	}
1382	+	#endif
1383	+
1384		/* serv_connect_callback() - complete a server connection.
1385	<	*
1385	>	*
1386		* This routine is called after the server connection attempt has
1387		* completed. If unsucessful, an error is sent to ops and the client
1388		* is closed. If sucessful, it goes through the initialisation/check
#	Line 2057 | Line 1393 | static void
1393		serv_connect_callback(fde_t *fd, int status, void *data)
1394		{
1395		struct Client *client_p = data;
1396	<	struct ConfItem *conf=NULL;
2061	<	struct AccessItem *aconf=NULL;
1396	>	struct MaskItem *conf = NULL;
1397
1398		/* First, make sure its a real client! */
1399		assert(client_p != NULL);
#	Line 2074 | Line 1409 | serv_connect_callback(fde_t *fd, int sta
1409		* Admins get to see any IP, mere opers don't *sigh*
1410		*/
1411		if (ConfigServerHide.hide_server_ips)
1412	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1412	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1413		"Error connecting to %s: %s",
1414		client_p->name, comm_errstr(status));
1415		else
1416	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1417	<	"Error connecting to %s[%s]: %s", client_p->name,
1418	<	client_p->host, comm_errstr(status));
1419	<
1420	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1421	<	"Error connecting to %s: %s",
1422	<	client_p->name, comm_errstr(status));
1416	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1417	>	"Error connecting to %s[%s]: %s", client_p->name,
1418	>	client_p->host, comm_errstr(status));
1419	>
1420	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1421	>	"Error connecting to %s: %s",
1422	>	client_p->name, comm_errstr(status));
1423
1424		/* If a fd goes bad, call dead_link() the socket is no
1425		* longer valid for reading or writing.
#	Line 2096 | Line 1431 | serv_connect_callback(fde_t *fd, int sta
1431		/* COMM_OK, so continue the connection procedure */
1432		/* Get the C/N lines */
1433		conf = find_conf_name(&client_p->localClient->confs,
1434	<	client_p->name, SERVER_TYPE);
1434	>	client_p->name, CONF_SERVER);
1435		if (conf == NULL)
1436		{
1437	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1438	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1439	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1440	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1437	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1438	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1439	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1440	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1441
1442		exit_client(client_p, &me, "Lost connect{} block");
1443		return;
1444		}
1445
2111	–	aconf = (struct AccessItem *)map_to_conf(conf);
1446		/* Next, send the initial handshake */
1447		SetHandshake(client_p);
1448
1449		#ifdef HAVE_LIBCRYPTO
1450	<	/* Handle all CRYPTLINK links in cryptlink_init */
2117	<	if (IsConfCryptLink(aconf))
1450	>	if (IsConfSSL(conf))
1451		{
1452	<	cryptlink_init(client_p, conf, fd);
1452	>	ssl_connect_init(client_p, conf, fd);
1453		return;
1454		}
1455		#endif
1456
1457	<	/* jdc -- Check and send spasswd, not passwd. */
2125	<	if (!EmptyString(aconf->spasswd) && (me.id[0] != '\0'))
2126	<	/* Send TS 6 form only if id */
2127	<	sendto_one(client_p, "PASS %s TS %d %s",
2128	<	aconf->spasswd, TS_CURRENT, me.id);
2129	<	else
2130	<	sendto_one(client_p, "PASS %s TS 5",
2131	<	aconf->spasswd);
1457	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1458
1459	<	/* Pass my info to the new server
2134	<	*
2135	<	* If trying to negotiate LazyLinks, pass on CAP_LL
2136	<	* If this is a HUB, pass on CAP_HUB
2137	<	* Pass on ZIP if supported
2138	<	* Pass on TB if supported.
2139	<	* - Dianora
2140	<	*/
2141	<	send_capabilities(client_p, aconf,
2142	<	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
2143	<	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
2144	<	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
2145	<	, 0);
1459	>	send_capabilities(client_p, 0);
1460
1461	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1462	<	my_name_for_link(conf),
2149	<	ConfigServerHide.hidden ? "(H) " : "",
2150	<	me.info);
1461	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1462	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1463
1464		/* If we've been marked dead because a send failed, just exit
1465		* here now and save everyone the trouble of us ever existing.
1466		*/
1467	<	if (IsDead(client_p))
1467	>	if (IsDead(client_p))
1468		{
1469	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1470	<	"%s[%s] went dead during handshake",
1469	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1470	>	"%s[%s] went dead during handshake",
1471		client_p->name,
1472	<	client_p->host);
1473	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1474	<	"%s went dead during handshake", client_p->name);
1472	>	client_p->host);
1473	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1474	>	"%s went dead during handshake", client_p->name);
1475		return;
1476		}
1477
#	Line 2179 | Line 1491 | find_servconn_in_progress(const char *na
1491		cptr = ptr->data;
1492
1493		if (cptr && cptr->name[0])
1494	<	if (match(cptr->name, name) || match(name, cptr->name))
1494	>	if (!match(name, cptr->name))
1495		return cptr;
1496		}
2185	–
2186	–	return NULL;
2187	–	}
2188	–
2189	–	#ifdef HAVE_LIBCRYPTO
2190	–	/*
2191	–	* sends a CRYPTLINK SERV command.
2192	–	*/
2193	–	void
2194	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
2195	–	{
2196	–	struct AccessItem *aconf;
2197	–	char *encrypted;
2198	–	unsigned char *key_to_send;
2199	–	char randkey[CIPHERKEYLEN];
2200	–	int enc_len;
2201	–
2202	–	/* get key */
2203	–	if ((!ServerInfo.rsa_private_key) ||
2204	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
2205	–	{
2206	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
2207	–	"Invalid RSA private key");
2208	–	return;
2209	–	}
1497
1498	<	aconf = (struct AccessItem *)map_to_conf(conf);
2212	<
2213	<	if (aconf->rsa_public_key == NULL)
2214	<	{
2215	<	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
2216	<	"Invalid RSA public key");
2217	<	return;
2218	<	}
2219	<
2220	<	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
2221	<	{
2222	<	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
2223	<	"Couldn't generate keyphrase");
2224	<	return;
2225	<	}
2226	<
2227	<	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
2228	<	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
2229	<	(unsigned char *)randkey,
2230	<	(unsigned char *)encrypted,
2231	<	aconf->rsa_public_key,
2232	<	RSA_PKCS1_PADDING);
2233	<
2234	<	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
2235	<
2236	<	if (enc_len <= 0)
2237	<	{
2238	<	report_crypto_errors();
2239	<	MyFree(encrypted);
2240	<	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
2241	<	"Couldn't encrypt data");
2242	<	return;
2243	<	}
2244	<
2245	<	if (!(base64_block(&key_to_send, encrypted, enc_len)))
2246	<	{
2247	<	MyFree(encrypted);
2248	<	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
2249	<	"Couldn't base64 encode key");
2250	<	return;
2251	<	}
2252	<
2253	<	send_capabilities(client_p, aconf,
2254	<	(IsConfLazyLink(aconf) ? find_capability("LL") : 0)
2255	<	| (IsConfCompressed(aconf) ? find_capability("ZIP") : 0)
2256	<	| (IsConfTopicBurst(aconf) ? find_capability("TB") : 0)
2257	<	, CAP_ENC_MASK);
2258	<
2259	<	if (me.id[0])
2260	<	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
2261	<
2262	<	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
2263	<	my_name_for_link(conf), key_to_send,
2264	<	ConfigServerHide.hidden ? "(H) " : "", me.info);
2265	<
2266	<	SetHandshake(client_p);
2267	<	SetWaitAuth(client_p);
2268	<
2269	<	MyFree(encrypted);
2270	<	MyFree(key_to_send);
2271	<
2272	<	if (IsDead(client_p))
2273	<	cryptlink_error(client_p, "SERV", "Went dead during handshake",
2274	<	"Went dead during handshake");
2275	<	else if (fd != NULL)
2276	<	/* If we get here, we're ok, so lets start reading some data */
2277	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
2278	<	}
2279	<
2280	<	void
2281	<	cryptlink_error(struct Client *client_p, const char *type,
2282	<	const char *reason, const char *client_reason)
2283	<	{
2284	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
2285	<	get_client_name(client_p, SHOW_IP), type, reason);
2286	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
2287	<	get_client_name(client_p, MASK_IP), type, reason);
2288	<	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
2289	<	get_client_name(client_p, SHOW_IP), type, reason);
2290	<
2291	<	/* If client_reason isn't NULL, then exit the client with the message
2292	<	* defined in the call.
2293	<	*/
2294	<	if ((client_reason != NULL) && (!IsDead(client_p)))
2295	<	exit_client(client_p, &me, client_reason);
2296	<	}
2297	<
2298	<	static char base64_chars[] =
2299	<	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
2300	<
2301	<	static char base64_values[] =
2302	<	{
2303	<	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2304	<	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2305	<	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
2306	<	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
2307	<	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
2308	<	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
2309	<	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2310	<	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2311	<	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2312	<	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2313	<	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2314	<	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2315	<	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2316	<	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2317	<	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2318	<	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2319	<	};
2320	<
2321	<	/*
2322	<	* base64_block will allocate and return a new block of memory
2323	<	* using MyMalloc().  It should be freed after use.
2324	<	*/
2325	<	int
2326	<	base64_block(unsigned char **output, char *data, int len)
2327	<	{
2328	<	unsigned char *out;
2329	<	unsigned char *in = (unsigned char*)data;
2330	<	unsigned long int q_in;
2331	<	int i;
2332	<	int count = 0;
2333	<
2334	<	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2335	<
2336	<	/* process 24 bits at a time */
2337	<	for( i = 0; i < len; i += 3)
2338	<	{
2339	<	q_in = 0;
2340	<
2341	<	if ( i + 2 < len )
2342	<	{
2343	<	q_in  = (in[i+2] & 0xc0) << 2;
2344	<	q_in |=  in[i+2];
2345	<	}
2346	<
2347	<	if ( i + 1 < len )
2348	<	{
2349	<	q_in |= (in[i+1] & 0x0f) << 10;
2350	<	q_in |= (in[i+1] & 0xf0) << 12;
2351	<	}
2352	<
2353	<	q_in |= (in[i]   & 0x03) << 20;
2354	<	q_in |=  in[i]           << 22;
2355	<
2356	<	q_in &= 0x3f3f3f3f;
2357	<
2358	<	out[count++] = base64_chars[((q_in >> 24)       )];
2359	<	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2360	<	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2361	<	out[count++] = base64_chars[((q_in      ) & 0xff)];
2362	<	}
2363	<	if ( (i - len) > 0 )
2364	<	{
2365	<	out[count-1] = '=';
2366	<	if ( (i - len) > 1 )
2367	<	out[count-2] = '=';
2368	<	}
2369	<
2370	<	out[count] = '\0';
2371	<	*output = out;
2372	<	return (count);
2373	<	}
2374	<
2375	<	/*
2376	<	* unbase64_block will allocate and return a new block of memory
2377	<	* using MyMalloc().  It should be freed after use.
2378	<	*/
2379	<	int
2380	<	unbase64_block(unsigned char **output, char *data, int len)
2381	<	{
2382	<	unsigned char *out;
2383	<	unsigned char *in = (unsigned char*)data;
2384	<	unsigned long int q_in;
2385	<	int i;
2386	<	int count = 0;
2387	<
2388	<	if ((len % 4) != 0)
2389	<	return (0);
2390	<
2391	<	out = MyMalloc(((len / 4) * 3) + 1);
2392	<
2393	<	/* process 32 bits at a time */
2394	<	for( i = 0; (i + 3) < len; i+=4)
2395	<	{
2396	<	/* compress input (chars a, b, c and d) as follows:
2397	<	* (after converting ascii -> base64 value)
2398	<	*
2399	<	* |00000000aaaaaabbbbbbccccccdddddd|
2400	<	* |  765432  107654  321076  543210|
2401	<	*/
2402	<
2403	<	q_in = 0;
2404	<
2405	<	if (base64_values[in[i+3]] > -1)
2406	<	q_in |= base64_values[in[i+3]]      ;
2407	<	if (base64_values[in[i+2]] > -1)
2408	<	q_in |= base64_values[in[i+2]] <<  6;
2409	<	if (base64_values[in[i+1]] > -1)
2410	<	q_in |= base64_values[in[i+1]] << 12;
2411	<	if (base64_values[in[i  ]] > -1)
2412	<	q_in |= base64_values[in[i  ]] << 18;
2413	<
2414	<	out[count++] = (q_in >> 16) & 0xff;
2415	<	out[count++] = (q_in >>  8) & 0xff;
2416	<	out[count++] = (q_in      ) & 0xff;
2417	<	}
2418	<
2419	<	if (in[i-1] == '=') count--;
2420	<	if (in[i-2] == '=') count--;
2421	<
2422	<	out[count] = '\0';
2423	<	*output = out;
2424	<	return (count);
1498	>	return NULL;
1499		}
2426	–
2427	–	#endif /* HAVE_LIBCRYPTO */
2428	–

Diff Legend

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