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

Comparing:
ircd-hybrid-7.2/src/s_serv.c (property svn:keywords), Revision 948 by michael, Tue Jul 21 17:34:06 2009 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)