ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1386 by michael, Tue May 1 11:35:46 2012 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 "dbuf.h"
30		#include "event.h"
36	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
33		#include "ircd.h"
34		#include "ircd_defs.h"
35		#include "s_bsd.h"
43	–	#include "numeric.h"
36		#include "packet.h"
45	–	#include "irc_res.h"
37		#include "conf.h"
38	<	#include "s_serv.h"
38	>	#include "server.h"
39	>	#include "server_capab.h"
40		#include "log.h"
49	–	#include "s_misc.h"
50	–	#include "s_user.h"
41		#include "send.h"
42		#include "memory.h"
53	–	#include "channel.h" /* chcap_usage_counts stuff...*/
43		#include "parse.h"
44
56	–	#define MIN_CONN_FREQ 300
45
46	<	static dlink_list cap_list = { NULL, NULL, 0 };
47	<	static void server_burst(struct Client *);
60	<	static void burst_all(struct Client *);
61	<	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
63	–	static CNCB serv_connect_callback;
64	–
65	–	static void burst_members(struct Client *, struct Channel *);
49
50		/*
51		* write_links_file
#	Line 73 | Line 56 | static void burst_members(struct Client
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;
81	<	MessageFileLine *newMessageLine = 0;
82	<	MessageFile *MessageFileptr;
83	<	const char *p;
84	<	FILE *file;
85	<	char buff[512];
86	<	dlink_node *ptr;
87	<
88	<	MessageFileptr = &ConfigFileEntry.linksfile;
61	>	FILE *file = NULL;
62	>	dlink_node *node, *node_next;
63	>	char buff[IRCD_BUFSIZE] = "";
64
65	<	if ((file = fopen(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	<	const 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 */
111	<	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;
116	<	else
117	<	p = "(Unknown Location)";
118	<
119	<	newMessageLine = MyMalloc(sizeof(MessageFileLine));
120	<
121	<	/* 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
129	<	* default config but it is configurable..
130	<	* This should be changed to an snprintf at some point, but I'm wanting to
131	<	* know if this is a cause of a bug - cryogen
132	<	*/
133	<	assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
134	<	MESSAGELINELEN);
135	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
136	<	target_p->name, me.name, p);
137	<	newMessageLine->next = NULL;
108	>	fputs(buff, file);
109	>	}
110
111	<	if (MessageFileptr->contentsOfFile)
112	<	{
141	<	if (currentMessageLine)
142	<	currentMessageLine->next = newMessageLine;
143	<	currentMessageLine = newMessageLine;
144	<	}
145	<	else
146	<	{
147	<	MessageFileptr->contentsOfFile = newMessageLine;
148	<	currentMessageLine = newMessageLine;
149	<	}
111	>	fclose(file);
112	>	}
113
114	<	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
115	<	fputs(buff, file);
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	>	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 174 | 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[])
164	<	{
165	<	struct Client *target_p = NULL;
166	<	struct Client *target_tmp = NULL;
167	<	dlink_node *ptr;
184	<	int wilds;
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	>	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		if (parc <= server || EmptyString(parv[server]))
171	<	return HUNTED_ISME;
171	>	{
172	>	h->target_p = &me;
173	>	h->ret = HUNTED_ISME;
174	>	return h;
175	>	}
176
177	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
178	<	return HUNTED_ISME;
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 = hash_find_client(parv[server]);
187	<	else
200	<	target_p = find_person(client_p, parv[server]);
201	<
202	<	if (target_p)
203	<	if (target_p->from == source_p->from && !MyConnect(target_p))
204	<	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	<	if (target_p == NULL && (target_p = hash_find_server(parv[server])))
207	<	if (target_p->from == source_p->from && !MyConnect(target_p))
208	<	target_p = NULL;
209	<
210	<	collapse(parv[server]);
211	<	wilds = (strchr(parv[server], '?') || strchr(parv[server], '*'));
212	<
213	<	/* Again, if there are no wild cards involved in the server
214	<	* name, use the hash lookup
215	<	*/
216	<	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 = hash_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, source_p->name, 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;
237	–	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, source_p->name, parv[server]);
252	<	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;
257	<
258	<	if (!match(target_p->name, parv[server]))
259	<	parv[server] = target_p->name;
260	<
261	<	/* This is a little kludgy but should work... */
262	<	if (IsClient(source_p) &&
263	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
264	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
265	<	parv[0] = ID(source_p);
266	<
267	<	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, source_p->name, 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 288 | Line 257 | hunt_server(struct Client *client_p, str
257		void
258		try_connections(void *unused)
259		{
260	<	dlink_node *ptr;
292	<	struct ConfItem *conf;
293	<	struct AccessItem *aconf;
294	<	struct ClassItem *cltmp;
295	<	int confrq;
260	>	dlink_node *node;
261
297	–	/* 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;
304	<	aconf = map_to_conf(conf);
267	>	struct MaskItem *conf = node->data;
268
269	<	/* Also when already connecting! (update holdtimes) --SRB
270	<	*/
308	<	if (!(aconf->status & CONF_SERVER) || !aconf->port ||
309	<	!(IsConfAllowAutoConn(aconf)))
310	<	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)
324	<	confrq = DEFAULT_CONNECTFREQUENCY;
325	<	else
326	<	{
327	<	confrq = cltmp->con_freq;
328	<	if (confrq < MIN_CONN_FREQ)
329	<	confrq = MIN_CONN_FREQ;
330	<	}
286	>	conf->until = CurrentTime + conf->class->con_freq;
287
288	<	aconf->hold = CurrentTime + confrq;
289	<
334	<	/* 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 (hash_find_server(conf->name) != NULL)
292	>	if (hash_find_server(conf->name))
293		continue;
294
295	<	if (cltmp->curr_user_count < cltmp->max_total)
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 372 | 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;
378	<	unsigned int dots   = 0;
335	>	unsigned int dots = 0;
336		const char *p = name;
337
338		for (; *p; ++p)
#	Line 383 | Line 340 | valid_servname(const char *name)
340		if (!IsServChar(*p))
341		return 0;
342
386	–	++length;
387	–
343		if (*p == '.')
344		++dots;
345		}
346
347	<	return dots != 0 && length <= HOSTLEN;
393	<	}
394	<
395	<	int
396	<	check_server(const char *name, struct Client *client_p)
397	<	{
398	<	dlink_node *ptr;
399	<	struct ConfItem *conf           = NULL;
400	<	struct ConfItem *server_conf    = NULL;
401	<	struct AccessItem *server_aconf = NULL;
402	<	struct AccessItem *aconf        = NULL;
403	<	int error = -1;
404	<
405	<	assert(client_p != NULL);
406	<
407	<	if (client_p == NULL)
408	<	return(error);
409	<
410	<	if (strlen(name) > HOSTLEN)
411	<	return(-4);
412	<
413	<	/* loop through looking for all possible connect items that might work */
414	<	DLINK_FOREACH(ptr, server_items.head)
415	<	{
416	<	conf = ptr->data;
417	<	aconf = map_to_conf(conf);
418	<
419	<	if (!match(name, conf->name))
420	<	continue;
421	<
422	<	error = -3;
423	<
424	<	/* XXX: Fix me for IPv6                    */
425	<	/* XXX sockhost is the IPv4 ip as a string */
426	<	if (match(aconf->host, client_p->host) ||
427	<	match(aconf->host, client_p->sockhost))
428	<	{
429	<	error = -2;
430	<	{
431	<	/* A NULL password is as good as a bad one */
432	<	if (EmptyString(client_p->localClient->passwd))
433	<	return(-2);
434	<
435	<	/* code in s_conf.c should not have allowed this to be NULL */
436	<	if (aconf->passwd == NULL)
437	<	return(-2);
438	<
439	<	if (IsConfEncrypted(aconf))
440	<	{
441	<	if (strcmp(aconf->passwd,
442	<	(const char *)crypt(client_p->localClient->passwd,
443	<	aconf->passwd)) == 0)
444	<	server_conf = conf;
445	<	}
446	<	else
447	<	{
448	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
449	<	server_conf = conf;
450	<	}
451	<	}
452	<	}
453	<	}
454	<
455	<	if (server_conf == NULL)
456	<	return(error);
457	<
458	<	attach_conf(client_p, server_conf);
459	<
460	<	server_aconf = map_to_conf(server_conf);
461	<
462	<	if (!IsConfTopicBurst(server_aconf))
463	<	{
464	<	ClearCap(client_p, CAP_TB);
465	<	ClearCap(client_p, CAP_TBURST);
466	<	}
467	<
468	<	if (aconf != NULL)
469	<	{
470	<	struct sockaddr_in *v4;
471	<	#ifdef IPV6
472	<	struct sockaddr_in6 *v6;
473	<	#endif
474	<	switch (aconf->aftype)
475	<	{
476	<	#ifdef IPV6
477	<	case AF_INET6:
478	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
479	<
480	<	if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
481	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
482	<	break;
483	<	#endif
484	<	case AF_INET:
485	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
486	<
487	<	if (v4->sin_addr.s_addr == INADDR_NONE)
488	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
489	<	break;
490	<	}
491	<	}
492	<
493	<	return(0);
494	<	}
495	<
496	<	/* add_capability()
497	<	*
498	<	* inputs       - string name of CAPAB
499	<	*              - int flag of capability
500	<	* output       - NONE
501	<	* side effects - Adds given capability name and bit mask to
502	<	*                current supported capabilities. This allows
503	<	*                modules to dynamically add or subtract their capability.
504	<	*/
505	<	void
506	<	add_capability(const char *capab_name, int cap_flag, int add_to_default)
507	<	{
508	<	struct Capability *cap = MyMalloc(sizeof(*cap));
509	<
510	<	DupString(cap->name, capab_name);
511	<	cap->cap = cap_flag;
512	<	dlinkAdd(cap, &cap->node, &cap_list);
513	<
514	<	if (add_to_default)
515	<	default_server_capabs |= cap_flag;
516	<	}
517	<
518	<	/* delete_capability()
519	<	*
520	<	* inputs       - string name of CAPAB
521	<	* output       - NONE
522	<	* side effects - delete given capability from ones known.
523	<	*/
524	<	int
525	<	delete_capability(const char *capab_name)
526	<	{
527	<	dlink_node *ptr;
528	<	dlink_node *next_ptr;
529	<	struct Capability *cap;
530	<
531	<	DLINK_FOREACH_SAFE(ptr, next_ptr, cap_list.head)
532	<	{
533	<	cap = ptr->data;
534	<
535	<	if (cap->cap != 0)
536	<	{
537	<	if (irccmp(cap->name, capab_name) == 0)
538	<	{
539	<	default_server_capabs &= ~(cap->cap);
540	<	dlinkDelete(ptr, &cap_list);
541	<	MyFree(cap->name);
542	<	cap->name = NULL;
543	<	MyFree(cap);
544	<	}
545	<	}
546	<	}
547	<
548	<	return 0;
549	<	}
550	<
551	<	/*
552	<	* find_capability()
553	<	*
554	<	* inputs       - string name of capab to find
555	<	* output       - 0 if not found CAPAB otherwise
556	<	* side effects - none
557	<	*/
558	<	int
559	<	find_capability(const char *capab)
560	<	{
561	<	const dlink_node *ptr = NULL;
562	<
563	<	DLINK_FOREACH(ptr, cap_list.head)
564	<	{
565	<	const struct Capability *cap = ptr->data;
566	<
567	<	if (cap->cap && !irccmp(cap->name, capab))
568	<	return cap->cap;
569	<	}
570	<
571	<	return 0;
572	<	}
573	<
574	<	/* send_capabilities()
575	<	*
576	<	* inputs       - Client pointer to send to
577	<	*              - Pointer to AccessItem (for crypt)
578	<	*              - int flag of capabilities that this server can send
579	<	* output       - NONE
580	<	* side effects - send the CAPAB line to a server  -orabidoo
581	<	*
582	<	*/
583	<	void
584	<	send_capabilities(struct Client *client_p, struct AccessItem *aconf,
585	<	int cap_can_send)
586	<	{
587	<	struct Capability *cap=NULL;
588	<	char msgbuf[IRCD_BUFSIZE];
589	<	char *t;
590	<	int tl;
591	<	dlink_node *ptr;
592	<
593	<	t = msgbuf;
594	<
595	<	DLINK_FOREACH(ptr, cap_list.head)
596	<	{
597	<	cap = ptr->data;
598	<
599	<	if (cap->cap & (cap_can_send|default_server_capabs))
600	<	{
601	<	tl = ircsprintf(t, "%s ", cap->name);
602	<	t += tl;
603	<	}
604	<	}
605	<
606	<	*(t - 1) = '\0';
607	<	sendto_one(client_p, "CAPAB :%s", msgbuf);
608	<	}
609	<
610	<	/* sendnick_TS()
611	<	*
612	<	* inputs       - client (server) to send nick towards
613	<	*          - client to send nick for
614	<	* output       - NONE
615	<	* side effects - NICK message is sent towards given client_p
616	<	*/
617	<	void
618	<	sendnick_TS(struct Client *client_p, struct Client *target_p)
619	<	{
620	<	static char ubuf[12];
621	<
622	<	if (!IsClient(target_p))
623	<	return;
624	<
625	<	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
626	<
627	<	if (ubuf[0] == '\0')
628	<	{
629	<	ubuf[0] = '+';
630	<	ubuf[1] = '\0';
631	<	}
632	<
633	<	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
634	<	if (IsCapable(client_p, CAP_SVS))
635	<	{
636	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
637	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
638	<	target_p->servptr->id,
639	<	target_p->name, target_p->hopcount + 1,
640	<	(unsigned long) target_p->tsinfo,
641	<	ubuf, target_p->username, target_p->host,
642	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
643	<	"0" : target_p->sockhost, target_p->id,
644	<	(unsigned long)target_p->servicestamp, target_p->info);
645	<	else
646	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
647	<	target_p->name, target_p->hopcount + 1,
648	<	(unsigned long) target_p->tsinfo,
649	<	ubuf, target_p->username, target_p->host,
650	<	target_p->servptr->name, (unsigned long)target_p->servicestamp,
651	<	target_p->info);
652	<	}
653	<	else
654	<	{
655	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
656	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
657	<	target_p->servptr->id,
658	<	target_p->name, target_p->hopcount + 1,
659	<	(unsigned long) target_p->tsinfo,
660	<	ubuf, target_p->username, target_p->host,
661	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
662	<	"0" : target_p->sockhost, target_p->id, target_p->info);
663	<	else
664	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
665	<	target_p->name, target_p->hopcount + 1,
666	<	(unsigned long) target_p->tsinfo,
667	<	ubuf, target_p->username, target_p->host,
668	<	target_p->servptr->name, target_p->info);
669	<	}
670	<
671	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->localClient->confs.head->data)))
672	<	if (!EmptyString(target_p->away))
673	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
674	<	target_p->away);
675	<
676	<	}
677	<
678	<	/*
679	<	* show_capabilities - show current server capabilities
680	<	*
681	<	* inputs       - pointer to a struct Client
682	<	* output       - pointer to static string
683	<	* side effects - build up string representing capabilities of server listed
684	<	*/
685	<	const char *
686	<	show_capabilities(struct Client *target_p)
687	<	{
688	<	static char msgbuf[IRCD_BUFSIZE];
689	<	char *t = msgbuf;
690	<	dlink_node *ptr;
691	<
692	<	t += ircsprintf(msgbuf, "TS ");
693	<
694	<	DLINK_FOREACH(ptr, cap_list.head)
695	<	{
696	<	const struct Capability *cap = ptr->data;
697	<
698	<	if (IsCapable(target_p, cap->cap))
699	<	t += ircsprintf(t, "%s ", cap->name);
700	<	}
701	<
702	<	*(t - 1) = '\0';
703	<	return msgbuf;
347	>	return dots && (p - name) <= HOSTLEN;
348		}
349
350	<	/* make_server()
350	>	/* server_make()
351		*
352		* inputs       - pointer to client struct
353		* output       - pointer to struct Server
#	Line 711 | 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()
723	<	*
724	<	* inputs       - pointer to a struct Client
725	<	* output       -
726	<	* side effects -
727	<	*/
728	<	void
729	<	server_estab(struct Client *client_p)
730	<	{
731	<	struct Client *target_p;
732	<	struct ConfItem *conf;
733	<	struct AccessItem *aconf=NULL;
734	<	char *host;
735	<	const char *inpath;
736	<	static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
737	<	dlink_node *ptr;
738	<	#ifdef HAVE_LIBCRYPTO
739	<	const COMP_METHOD *compression = NULL, *expansion = NULL;
740	<	#endif
741	<
742	<	assert(client_p != NULL);
743	<
744	<	strlcpy(inpath_ip, get_client_name(client_p, SHOW_IP), sizeof(inpath_ip));
745	<
746	<	inpath = get_client_name(client_p, MASK_IP); /* "refresh" inpath with host */
747	<	host   = client_p->name;
748	<
749	<	if ((conf = find_conf_name(&client_p->localClient->confs, host, SERVER_TYPE))
750	<	== NULL)
751	<	{
752	<	/* This shouldn't happen, better tell the ops... -A1kmm */
753	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Warning: Lost connect{} block "
754	<	"for server %s(this shouldn't happen)!", host);
755	<	exit_client(client_p, &me, "Lost connect{} block!");
756	<	return;
757	<	}
758	<
759	<	MyFree(client_p->localClient->passwd);
760	<	client_p->localClient->passwd = NULL;
761	<
762	<	/* Its got identd, since its a server */
763	<	SetGotId(client_p);
764	<
765	<	/* If there is something in the serv_list, it might be this
766	<	* connecting server..
767	<	*/
768	<	if (!ServerInfo.hub && serv_list.head)
769	<	{
770	<	if (client_p != serv_list.head->data || serv_list.head->next)
771	<	{
772	<	++ServerStats.is_ref;
773	<	sendto_one(client_p, "ERROR :I'm a leaf not a hub");
774	<	exit_client(client_p, &me, "I'm a leaf");
775	<	return;
776	<	}
777	<	}
778	<
779	<	aconf = map_to_conf(conf);
780	<
781	<	if (IsUnknown(client_p))
782	<	{
783	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
784	<	*        2.  Check aconf->spasswd, not aconf->passwd.
785	<	*/
786	<	if (!EmptyString(aconf->spasswd))
787	<	sendto_one(client_p, "PASS %s TS %d %s",
788	<	aconf->spasswd, TS_CURRENT, me.id);
789	<
790	<	/* Pass my info to the new server
791	<	*
792	<	* Pass on ZIP if supported
793	<	* Pass on TB if supported.
794	<	* - Dianora
795	<	*/
796	<
797	<	send_capabilities(client_p, aconf,
798	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
799	<
800	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
801	<	me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
802	<	}
803	<
804	<	sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
805	<	(unsigned long)CurrentTime);
806	<
807	<	/* assumption here is if they passed the correct TS version, they also passed an SID */
808	<	if (IsCapable(client_p, CAP_TS6))
809	<	hash_add_id(client_p);
810	<
811	<	/* XXX Does this ever happen? I don't think so -db */
812	<	detach_conf(client_p, OPER_TYPE);
813	<
814	<	/* *WARNING*
815	<	**    In the following code in place of plain server's
816	<	**    name we send what is returned by get_client_name
817	<	**    which may add the "sockhost" after the name. It's
818	<	**    *very* *important* that there is a SPACE between
819	<	**    the name and sockhost (if present). The receiving
820	<	**    server will start the information field from this
821	<	**    first blank and thus puts the sockhost into info.
822	<	**    ...a bit tricky, but you have been warned, besides
823	<	**    code is more neat this way...  --msa
824	<	*/
825	<	client_p->servptr = &me;
826	<
827	<	if (IsClosing(client_p))
828	<	return;
829	<
830	<	SetServer(client_p);
831	<
832	<	/* Update the capability combination usage counts. -A1kmm */
833	<	set_chcap_usage_counts(client_p);
834	<
835	<	/* Some day, all these lists will be consolidated *sigh* */
836	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
837	<
838	<	assert(dlinkFind(&unknown_list, client_p));
839	<
840	<	dlink_move_node(&client_p->localClient->lclient_node,
841	<	&unknown_list, &serv_list);
842	<
843	<	Count.myserver++;
844	<
845	<	dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
846	<	hash_add_client(client_p);
847	<
848	<	/* doesnt duplicate client_p->serv if allocated this struct already */
849	<	make_server(client_p);
850	<
851	<	/* fixing eob timings.. -gnp */
852	<	client_p->localClient->firsttime = CurrentTime;
853	<
854	<	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
855	<	AddFlag(client_p, FLAGS_SERVICE);
856	<
857	<	/* Show the real host/IP to admins */
858	<	#ifdef HAVE_LIBCRYPTO
859	<	if (client_p->localClient->fd.ssl)
860	<	{
861	<	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
862	<	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
863	<
864	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
865	<	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
866	<	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
867	<	compression ? SSL_COMP_get_name(compression) : "NONE",
868	<	expansion ? SSL_COMP_get_name(expansion) : "NONE",
869	<	show_capabilities(client_p));
870	<	/* Now show the masked hostname/IP to opers */
871	<	sendto_realops_flags(UMODE_ALL, L_OPER,
872	<	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
873	<	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
874	<	compression ? SSL_COMP_get_name(compression) : "NONE",
875	<	expansion ? SSL_COMP_get_name(expansion) : "NONE",
876	<	show_capabilities(client_p));
877	<	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
878	<	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
879	<	compression ? SSL_COMP_get_name(compression) : "NONE",
880	<	expansion ? SSL_COMP_get_name(expansion) : "NONE",
881	<	show_capabilities(client_p));
882	<	}
883	<	else
884	<	#endif
885	<	{
886	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
887	<	"Link with %s established: (Capabilities: %s)",
888	<	inpath_ip,show_capabilities(client_p));
889	<	/* Now show the masked hostname/IP to opers */
890	<	sendto_realops_flags(UMODE_ALL, L_OPER,
891	<	"Link with %s established: (Capabilities: %s)",
892	<	inpath,show_capabilities(client_p));
893	<	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
894	<	inpath_ip, show_capabilities(client_p));
895	<	}
896	<
897	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
898	<
899	<	/* Old sendto_serv_but_one() call removed because we now
900	<	** need to send different names to different servers
901	<	** (domain name matching) Send new server to other servers.
902	<	*/
903	<	DLINK_FOREACH(ptr, serv_list.head)
904	<	{
905	<	target_p = ptr->data;
906	<
907	<	if (target_p == client_p)
908	<	continue;
909	<
910	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
911	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
912	<	me.id, client_p->name, client_p->id,
913	<	IsHidden(client_p) ? "(H) " : "",
914	<	client_p->info);
915	<	else
916	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
917	<	me.name, client_p->name,
918	<	IsHidden(client_p) ? "(H) " : "",
919	<	client_p->info);
920	<	}
921	<
922	<	/* Pass on my client information to the new server
923	<	**
924	<	** First, pass only servers (idea is that if the link gets
925	<	** cancelled beacause the server was already there,
926	<	** there are no NICK's to be cancelled...). Of course,
927	<	** if cancellation occurs, all this info is sent anyway,
928	<	** and I guess the link dies when a read is attempted...? --msa
929	<	**
930	<	** Note: Link cancellation to occur at this point means
931	<	** that at least two servers from my fragment are building
932	<	** up connection this other fragment at the same time, it's
933	<	** a race condition, not the normal way of operation...
934	<	**
935	<	** ALSO NOTE: using the get_client_name for server names--
936	<	**    see previous *WARNING*!!! (Also, original inpath
937	<	**    is destroyed...)
938	<	*/
939	<
940	<	DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
941	<	{
942	<	target_p = ptr->data;
943	<
944	<	/* target_p->from == target_p for target_p == client_p */
945	<	if (IsMe(target_p) || target_p->from == client_p)
946	<	continue;
947	<
948	<	if (IsCapable(client_p, CAP_TS6))
949	<	{
950	<	if (HasID(target_p))
951	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
952	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
953	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
954	<	target_p->info);
955	<	else  /* introducing non-ts6 server */
956	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
957	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
958	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
959	<	}
960	<	else
961	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
962	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
963	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
964	<	}
965	<
966	<	server_burst(client_p);
967	<	}
968	<
969	<	/* server_burst()
970	<	*
971	<	* inputs       - struct Client pointer server
972	<	*              -
973	<	* output       - none
974	<	* side effects - send a server burst
975	<	* bugs         - still too long
976	<	*/
977	<	static void
978	<	server_burst(struct Client *client_p)
979	<	{
980	<	/* Send it in the shortened format with the TS, if
981	<	** it's a TS server; walk the list of channels, sending
982	<	** all the nicks that haven't been sent yet for each
983	<	** channel, then send the channel itself -- it's less
984	<	** obvious than sending all nicks first, but on the
985	<	** receiving side memory will be allocated more nicely
986	<	** saving a few seconds in the handling of a split
987	<	** -orabidoo
988	<	*/
989	<
990	<	burst_all(client_p);
991	<
992	<	/* EOB stuff is now in burst_all */
993	<	/* Always send a PING after connect burst is done */
994	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
995	<	}
996	<
997	<	/* burst_all()
998	<	*
999	<	* inputs       - pointer to server to send burst to
1000	<	* output       - NONE
1001	<	* side effects - complete burst of channels/nicks is sent to client_p
1002	<	*/
1003	<	static void
1004	<	burst_all(struct Client *client_p)
1005	<	{
1006	<	dlink_node *ptr = NULL;
1007	<
1008	<	DLINK_FOREACH(ptr, global_channel_list.head)
1009	<	{
1010	<	struct Channel *chptr = ptr->data;
1011	<
1012	<	if (dlink_list_length(&chptr->members) != 0)
1013	<	{
1014	<	burst_members(client_p, chptr);
1015	<	send_channel_modes(client_p, chptr);
1016	<
1017	<	if (IsCapable(client_p, CAP_TBURST) ||
1018	<	IsCapable(client_p, CAP_TB))
1019	<	send_tb(client_p, chptr);
1020	<	}
1021	<	}
1022	<
1023	<	/* also send out those that are not on any channel
1024	<	*/
1025	<	DLINK_FOREACH(ptr, global_client_list.head)
1026	<	{
1027	<	struct Client *target_p = ptr->data;
1028	<
1029	<	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
1030	<	sendnick_TS(client_p, target_p);
1031	<
1032	<	DelFlag(target_p, FLAGS_BURSTED);
1033	<	}
1034	<
1035	<	/* We send the time we started the burst, and let the remote host determine an EOB time,
1036	<	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
1037	<	*/
1038	<	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
1039	<	if (IsCapable(client_p, CAP_EOB))
1040	<	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
1041	<	}
1042	<
1043	<	/*
1044	<	* send_tb
1045	<	*
1046	<	* inputs       - pointer to Client
1047	<	*              - pointer to channel
1048	<	* output       - NONE
1049	<	* side effects - Called on a server burst when
1050	<	*                server is CAP_TB|CAP_TBURST capable
1051	<	*/
1052	<	static void
1053	<	send_tb(struct Client *client_p, struct Channel *chptr)
1054	<	{
1055	<	/*
1056	<	* We may also send an empty topic here, but only if topic_time isn't 0,
1057	<	* i.e. if we had a topic that got unset.  This is required for syncing
1058	<	* topics properly.
1059	<	*
1060	<	* Imagine the following scenario: Our downlink introduces a channel
1061	<	* to us with a TS that is equal to ours, but the channel topic on
1062	<	* their side got unset while the servers were in splitmode, which means
1063	<	* their 'topic' is newer.  They simply wanted to unset it, so we have to
1064	<	* deal with it in a more sophisticated fashion instead of just resetting
1065	<	* it to their old topic they had before.  Read m_tburst.c:ms_tburst
1066	<	* for further information   -Michael
1067	<	*/
1068	<	if (chptr->topic_time != 0)
1069	<	{
1070	<	if (IsCapable(client_p, CAP_TBURST))
1071	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1072	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
1073	<	(unsigned long)chptr->topic_time,
1074	<	chptr->topic_info,
1075	<	chptr->topic);
1076	<	else if (IsCapable(client_p, CAP_TB))
1077	<	{
1078	<	if (ConfigChannel.burst_topicwho)
1079	<	{
1080	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1081	<	me.name, chptr->chname,
1082	<	(unsigned long)chptr->topic_time,
1083	<	chptr->topic_info, chptr->topic);
1084	<	}
1085	<	else
1086	<	{
1087	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1088	<	me.name, chptr->chname,
1089	<	(unsigned long)chptr->topic_time,
1090	<	chptr->topic);
1091	<	}
1092	<	}
1093	<	}
1094	<	}
1095	<
1096	<	/* burst_members()
1097	<	*
1098	<	* inputs       - pointer to server to send members to
1099	<	*              - dlink_list pointer to membership list to send
1100	<	* output       - NONE
1101	<	* side effects -
1102	<	*/
1103	<	static void
1104	<	burst_members(struct Client *client_p, struct Channel *chptr)
1105	<	{
1106	<	struct Client *target_p;
1107	<	struct Membership *ms;
1108	<	dlink_node *ptr;
1109	<
1110	<	DLINK_FOREACH(ptr, chptr->members.head)
1111	<	{
1112	<	ms       = ptr->data;
1113	<	target_p = ms->client_p;
1114	<
1115	<	if (!HasFlag(target_p, FLAGS_BURSTED))
1116	<	{
1117	<	AddFlag(target_p, FLAGS_BURSTED);
1118	<
1119	<	if (target_p->from != client_p)
1120	<	sendnick_TS(client_p, target_p);
1121	<	}
1122	<	}
1123	<	}
1124	<
1125	<	/* New server connection code
1126	<	* Based upon the stuff floating about in s_bsd.c
1127	<	*   -- adrian
1128	<	*/
1129	<
1130	<	/* serv_connect() - initiate a server connection
366	>	/* server_connect() - initiate a server connection
367		*
368	<	* inputs       - pointer to conf
368	>	* inputs       - pointer to conf
369		*              - pointer to client doing the connect
370		* output       -
371		* side effects -
#	Line 1144 | 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;
1150	<	struct Client *client_p;
1151	<	char buf[HOSTIPLEN];
385	>	char buf[HOSTIPLEN + 1] = "";
386
387		/* conversion structs */
388		struct sockaddr_in *v4;
1155	–	/* Make sure aconf is useful */
1156	–	assert(aconf != NULL);
1157	–
1158	–	if(aconf == NULL)
1159	–	return (0);
389
390	<	/* XXX should be passing struct ConfItem in the first place */
391	<	conf = unmap_conf_item(aconf);
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	<	/* log */
1165	<	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(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1168	<	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 = hash_find_server(conf->name)) != NULL)
420	<	{
421	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
422	<	"Server %s already present from %s",
1194	<	conf->name, get_client_name(client_p, SHOW_IP));
1195	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1196	<	"Server %s already present from %s",
1197	<	conf->name, get_client_name(client_p, MASK_IP));
1198	<	if (by && IsClient(by) && !MyClient(by))
1199	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1200	<	me.name, by->name, conf->name,
1201	<	get_client_name(client_p, MASK_IP));
1202	<	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 */
1216	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1217	<	SOCK_STREAM, 0, NULL) < 0)
1218	<	{
1219	<	/* Eek, failure to create the socket */
1220	<	report_error(L_ALL,
1221	<	"opening stream socket to %s: %s", conf->name, errno);
1222	<	SetDead(client_p);
1223	<	exit_client(client_p, &me, "Connection failed");
1224	<	return (0);
1225	<	}
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))
1234	<	{
1235	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1236	<	"Host %s is not enabled for connecting:no C/N-line",
1237	<	conf->name);
1238	<	if (by && IsClient(by) && !MyClient(by))
1239	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1240	<	me.name, by->name, client_p->name);
1241	<	SetDead(client_p);
1242	<	exit_client(client_p, client_p, "Connection failed");
1243	<	return (0);
1244	<	}
444	>	conf_attach(client_p, conf);
445
446	<	/* at this point we have a connection in progress and C/N lines
1247	<	* attached to the client, the socket info should be saved in the
1248	<	* client and it should either be resolved or have a valid address.
1249	<	*
1250	<	* The socket has been connected or connect is in progress.
1251	<	*/
1252	<	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 1257 | 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);
1261	<	/* from def_fam */
1262	<	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;
1301	–	#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,
1313	<	sizeof(struct in6_addr)) != 0)
1314	<	{
1315	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1316	<	ipn.ss.ss_family = AF_INET6;
1317	<	ipn.ss_port = 0;
1318	<	comm_connect_tcp(&client_p->localClient->fd,
1319	<	aconf->host, aconf->port,
1320	<	(struct sockaddr *)&ipn, ipn.ss_len,
1321	<	serv_connect_callback, client_p,
1322	<	aconf->aftype, CONNECTTIMEOUT);
1323	<	}
1324	<	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		}
1341	–	#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
1346	–	#ifdef HAVE_LIBCRYPTO
550		static void
551	<	finish_ssl_server_handshake(struct Client *client_p)
551	>	server_finish_tls_handshake(struct Client *client_p)
552		{
553	<	struct ConfItem *conf=NULL;
554	<	struct AccessItem *aconf=NULL;
553	>	const struct MaskItem *conf = find_conf_name(&client_p->connection->confs,
554	>	client_p->name, CONF_SERVER);
555	>	if (!conf)
556	>	{
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	<	conf = find_conf_name(&client_p->localClient->confs,
1354	<	client_p->name, SERVER_TYPE);
1355	<	if (conf == NULL)
1356	<	{
1357	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1358	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1359	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1360	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1361	<
1362	<	exit_client(client_p, &me, "Lost connect{} block");
562	>	exit_client(client_p, "Lost connect{} block");
563		return;
564		}
565
566	<	aconf = map_to_conf(conf);
1367	<
1368	<	/* jdc -- Check and send spasswd, not passwd. */
1369	<	if (!EmptyString(aconf->spasswd))
1370	<	sendto_one(client_p, "PASS %s TS %d %s",
1371	<	aconf->spasswd, TS_CURRENT, me.id);
566	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
567
568	<	send_capabilities(client_p, aconf,
1374	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
568	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
569
570		sendto_one(client_p, "SERVER %s 1 :%s%s",
571		me.name, ConfigServerHide.hidden ? "(H) " : "",
572		me.info);
573
1380	–	/* If we've been marked dead because a send failed, just exit
1381	–	* here now and save everyone the trouble of us ever existing.
1382	–	*/
1383	–	if (IsDead(client_p))
1384	–	{
1385	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1386	–	"%s[%s] went dead during handshake",
1387	–	client_p->name,
1388	–	client_p->host);
1389	–	sendto_realops_flags(UMODE_ALL, L_OPER,
1390	–	"%s went dead during handshake", client_p->name);
1391	–	return;
1392	–	}
1393	–
1394	–	/* don't move to serv_list yet -- we haven't sent a burst! */
574		/* If we get here, we're ok, so lets start reading some data */
575	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
575	>	read_packet(client_p->connection->fd, client_p);
576		}
577
578		static void
579	<	ssl_server_handshake(fde_t *fd, struct Client *client_p)
579	>	server_tls_handshake(fde_t *F, void *data)
580		{
581	<	int ret;
582	<	int err;
581	>	struct Client *client_p = data;
582	>	const char *sslerr = NULL;
583
584	<	ret = SSL_connect(client_p->localClient->fd.ssl);
584	>	assert(client_p);
585	>	assert(client_p->connection);
586	>	assert(client_p->connection->fd);
587	>	assert(client_p->connection->fd == F);
588
589	<	if (ret <= 0)
589	>	tls_handshake_status_t ret = tls_handshake(&F->ssl, TLS_ROLE_CLIENT, &sslerr);
590	>	if (ret != TLS_HANDSHAKE_DONE)
591		{
592	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
592	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
593		{
594	<	case SSL_ERROR_WANT_WRITE:
595	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
596	<	(PF *)ssl_server_handshake, client_p, 0);
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 SSL_ERROR_WANT_READ:
605	<	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
606	<	(PF *)ssl_server_handshake, client_p, 0);
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	<	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1422	<	sendto_realops_flags(UMODE_ALL, L_ALL,
610	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
611		"Error connecting to %s: %s", client_p->name,
612	<	sslerr ? sslerr : "unknown SSL error");
613	<	exit_client(client_p, client_p, "Error during SSL handshake");
612	>	sslerr ? sslerr : "unknown TLS error");
613	>	exit_client(client_p, "Error during TLS handshake");
614		return;
615		}
616		}
617		}
618
619	<	finish_ssl_server_handshake(client_p);
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		static void
629	<	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
629	>	server_tls_connect_init(struct Client *client_p, const struct MaskItem *conf, fde_t *F)
630		{
631	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
631	>	assert(client_p);
632	>	assert(client_p->connection);
633	>	assert(client_p->connection->fd);
634	>	assert(client_p->connection->fd == F);
635	>
636	>	if (!tls_new(&F->ssl, F->fd, TLS_ROLE_CLIENT))
637		{
1439	–	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1440	–	ERR_error_string(ERR_get_error(), NULL));
638		SetDead(client_p);
639	<	exit_client(client_p, client_p, "SSL_new failed");
639	>	exit_client(client_p, "TLS context initialization failed");
640		return;
641		}
642
643	<	SSL_set_fd(fd->ssl, fd->fd);
644	<
1448	<	if (!EmptyString(aconf->cipher_list))
1449	<	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
643	>	if (!EmptyString(conf->cipher_list))
644	>	tls_set_ciphers(&F->ssl, conf->cipher_list);
645
646	<	ssl_server_handshake(NULL, client_p);
646	>	server_tls_handshake(F, client_p);
647		}
1453	–	#endif
648
649	<	/* serv_connect_callback() - complete a server connection.
650	<	*
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
#	Line 1461 | Line 655 | ssl_connect_init(struct Client *client_p
655		* marked for reading.
656		*/
657		static void
658	<	serv_connect_callback(fde_t *fd, int status, void *data)
658	>	server_connect_callback(fde_t *F, int status, void *data)
659		{
660	<	struct Client *client_p = data;
1467	<	struct ConfItem *conf=NULL;
1468	<	struct AccessItem *aconf=NULL;
660	>	struct Client *const client_p = data;
661
662	<	/* First, make sure its a real client! */
663	<	assert(client_p != NULL);
664	<	assert(&client_p->localClient->fd == fd);
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		/* Next, for backward purposes, record the ip of the server */
669	<	memcpy(&client_p->localClient->ip, &fd->connect.hostaddr,
670	<	sizeof(struct irc_ssaddr));
669	>	memcpy(&client_p->ip, &F->connect.hostaddr, sizeof(client_p->ip));
670	>
671		/* Check the status */
672		if (status != COMM_OK)
673		{
674	<	/* We have an error, so report it and quit
675	<	* Admins get to see any IP, mere opers don't *sigh*
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	<	if (ConfigServerHide.hide_server_ips)
687	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1485	<	"Error connecting to %s: %s",
1486	<	client_p->name, comm_errstr(status));
1487	<	else
1488	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1489	<	"Error connecting to %s[%s]: %s", client_p->name,
1490	<	client_p->host, comm_errstr(status));
1491	<
1492	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1493	<	"Error connecting to %s: %s",
1494	<	client_p->name, comm_errstr(status));
1495	<
1496	<	/* If a fd goes bad, call dead_link() the socket is no
1497	<	* longer valid for reading or writing.
1498	<	*/
1499	<	dead_link_on_write(client_p, 0);
1500	<	return;
686	>	dead_link_on_write(client_p, 0);
687	>	return;
688		}
689
690		/* COMM_OK, so continue the connection procedure */
691	<	/* Get the C/N lines */
692	<	conf = find_conf_name(&client_p->localClient->confs,
693	<	client_p->name, SERVER_TYPE);
694	<	if (conf == NULL)
695	<	{
696	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
697	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
698	<	sendto_realops_flags(UMODE_ALL, L_OPER,
699	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
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, &me, "Lost connect{} block");
701	>	exit_client(client_p, "Lost connect{} block");
702		return;
703		}
704
1518	–	aconf = map_to_conf(conf);
705		/* Next, send the initial handshake */
706		SetHandshake(client_p);
707
708	<	#ifdef HAVE_LIBCRYPTO
1523	<	if (IsConfSSL(aconf))
708	>	if (IsConfSSL(conf))
709		{
710	<	ssl_connect_init(client_p, aconf, fd);
710	>	server_tls_connect_init(client_p, conf, F);
711		return;
712		}
1528	–	#endif
713
714	<	/* jdc -- Check and send spasswd, not passwd. */
1531	<	if (!EmptyString(aconf->spasswd))
1532	<	sendto_one(client_p, "PASS %s TS %d %s",
1533	<	aconf->spasswd, TS_CURRENT, me.id);
714	>	sendto_one(client_p, "PASS %s TS %u %s", conf->spasswd, TS_CURRENT, me.id);
715
716	<	send_capabilities(client_p, aconf,
1536	<	(IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0));
716	>	sendto_one(client_p, "CAPAB :%s", capab_get(NULL));
717
718	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
719	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1540	<	me.info);
718	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
719	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
720
1542	–	/* If we've been marked dead because a send failed, just exit
1543	–	* here now and save everyone the trouble of us ever existing.
1544	–	*/
1545	–	if (IsDead(client_p))
1546	–	{
1547	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1548	–	"%s[%s] went dead during handshake",
1549	–	client_p->name,
1550	–	client_p->host);
1551	–	sendto_realops_flags(UMODE_ALL, L_OPER,
1552	–	"%s went dead during handshake", client_p->name);
1553	–	return;
1554	–	}
1555	–
1556	–	/* don't move to serv_list yet -- we haven't sent a burst! */
721		/* If we get here, we're ok, so lets start reading some data */
722	<	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
722	>	read_packet(client_p->connection->fd, client_p);
723		}
724
725		struct Client *
726		find_servconn_in_progress(const char *name)
727		{
728		dlink_node *ptr;
1565	–	struct Client *cptr;
729
730		DLINK_FOREACH(ptr, unknown_list.head)
731		{
732	<	cptr = ptr->data;
732	>	struct Client *cptr = ptr->data;
733
734	<	if (cptr && cptr->name[0])
735	<	if (match(name, cptr->name))
734	>	if (cptr->name[0])
735	>	if (!irccmp(name, cptr->name))
736		return cptr;
737		}
738	<
738	>
739		return NULL;
740		}

Comparing:
ircd-hybrid-8/src/s_serv.c (property svn:keywords), Revision 1386 by michael, Tue May 1 11:35:46 2012 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)