ViewVC Help

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

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

Comparing:
ircd-hybrid/src/s_serv.c (file contents), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs.
ircd-hybrid/trunk/src/server.c (file contents), Revision 8512 by michael, Fri Apr 6 19:28:05 2018 UTC

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

Comparing:
ircd-hybrid/src/s_serv.c (property svn:keywords), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs.
ircd-hybrid/trunk/src/server.c (property svn:keywords), Revision 8512 by michael, Fri Apr 6 19:28:05 2018 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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