ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/server.c

Comparing:
ircd-hybrid-7.3/src/s_serv.c (file contents), Revision 1123 by michael, Sun Feb 6 21:57:50 2011 UTC vs.
ircd-hybrid-8/src/s_serv.c (file contents), Revision 1514 by michael, Sun Aug 26 09:11:17 2012 UTC

#	Line 31 | Line 31
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
34	–	#include "common.h"
34		#include "dbuf.h"
35		#include "event.h"
36		#include "fdlist.h"
#	Line 44 | Line 43
43		#include "numeric.h"
44		#include "packet.h"
45		#include "irc_res.h"
46	<	#include "s_conf.h"
46	>	#include "conf.h"
47		#include "s_serv.h"
48	<	#include "s_log.h"
48	>	#include "log.h"
49	>	#include "s_misc.h"
50		#include "s_user.h"
51		#include "send.h"
52		#include "memory.h"
53		#include "channel.h" /* chcap_usage_counts stuff...*/
54	+	#include "parse.h"
55
56		#define MIN_CONN_FREQ 300
57
58		static dlink_list cap_list = { NULL, NULL, 0 };
59		static void server_burst(struct Client *);
59	–	static int fork_server(struct Client *);
60		static void burst_all(struct Client *);
61		static void send_tb(struct Client *client_p, struct Channel *chptr);
62
63		static CNCB serv_connect_callback;
64
65	–	static void start_io(struct Client *);
65		static void burst_members(struct Client *, struct Channel *);
66
68	–	static SlinkRplHnd slink_error;
69	–	static SlinkRplHnd slink_zipstats;
70	–
71	–
72	–	#ifdef HAVE_LIBCRYPTO
73	–	struct EncCapability CipherTable[] =
74	–	{
75	–	#ifdef HAVE_EVP_BF_CFB
76	–	{ "BF/168",     CAP_ENC_BF_168,     24, CIPHER_BF     },
77	–	{ "BF/128",     CAP_ENC_BF_128,     16, CIPHER_BF     },
78	–	#endif
79	–	#ifdef HAVE_EVP_CAST5_CFB
80	–	{ "CAST/128",   CAP_ENC_CAST_128,   16, CIPHER_CAST   },
81	–	#endif
82	–	#ifdef HAVE_EVP_IDEA_CFB
83	–	{ "IDEA/128",   CAP_ENC_IDEA_128,   16, CIPHER_IDEA   },
84	–	#endif
85	–	#ifdef HAVE_EVP_RC5_32_12_16_CFB
86	–	{ "RC5.16/128", CAP_ENC_RC5_16_128, 16, CIPHER_RC5_16 },
87	–	{ "RC5.12/128", CAP_ENC_RC5_12_128, 16, CIPHER_RC5_12 },
88	–	{ "RC5.8/128",  CAP_ENC_RC5_8_128,  16, CIPHER_RC5_8  },
89	–	#endif
90	–	#ifdef HAVE_EVP_DES_EDE3_CFB
91	–	{ "3DES/168",   CAP_ENC_3DES_168,   24, CIPHER_3DES   },
92	–	#endif
93	–	#ifdef HAVE_EVP_DES_CFB
94	–	{ "DES/56",     CAP_ENC_DES_56,      8, CIPHER_DES    },
95	–	#endif
96	–	{ 0,            0,                   0, 0             }
97	–	};
98	–	#endif
99	–
100	–	struct SlinkRplDef slinkrpltab[] = {
101	–	{ SLINKRPL_ERROR,    slink_error,    SLINKRPL_FLAG_DATA },
102	–	{ SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA },
103	–	{ 0,                 0,              0 },
104	–	};
105	–
106	–
107	–	void
108	–	slink_error(unsigned int rpl, unsigned int len, unsigned char *data,
109	–	struct Client *server_p)
110	–	{
111	–	assert(rpl == SLINKRPL_ERROR);
112	–	assert(len < 256);
113	–
114	–	data[len-1] = '\0';
115	–
116	–	sendto_realops_flags(UMODE_ALL, L_ALL, "SlinkError for %s: %s",
117	–	server_p->name, data);
118	–	/* XXX should this be exit_client? */
119	–	exit_client(server_p, &me, "servlink error -- terminating link");
120	–	}
121	–
122	–	void
123	–	slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data,
124	–	struct Client *server_p)
125	–	{
126	–	struct ZipStats zipstats;
127	–	uint64_t in = 0, in_wire = 0, out = 0, out_wire = 0;
128	–	int i = 0;
129	–
130	–	assert(rpl == SLINKRPL_ZIPSTATS);
131	–	assert(len == 16);
132	–	assert(IsCapable(server_p, CAP_ZIP));
133	–
134	–	/* Yes, it needs to be done this way, no we cannot let the compiler
135	–	* work with the pointer to the structure.  This works around a GCC
136	–	* bug on SPARC that affects all versions at the time of this writing.
137	–	* I will feed you to the creatures living in RMS's beard if you do
138	–	* not leave this as is, without being sure that you are not causing
139	–	* regression for most of our installed SPARC base.
140	–	* -jmallett, 04/27/2002
141	–	*/
142	–	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
143	–
144	–	in |= (data[i++] << 24);
145	–	in |= (data[i++] << 16);
146	–	in |= (data[i++] <<  8);
147	–	in |= (data[i++]      );
148	–
149	–	in_wire |= (data[i++] << 24);
150	–	in_wire |= (data[i++] << 16);
151	–	in_wire |= (data[i++] <<  8);
152	–	in_wire |= (data[i++]      );
153	–
154	–	out |= (data[i++] << 24);
155	–	out |= (data[i++] << 16);
156	–	out |= (data[i++] <<  8);
157	–	out |= (data[i++]      );
158	–
159	–	out_wire |= (data[i++] << 24);
160	–	out_wire |= (data[i++] << 16);
161	–	out_wire |= (data[i++] <<  8);
162	–	out_wire |= (data[i++]      );
163	–
164	–	/* This macro adds b to a if a plus b is not an overflow, and sets the
165	–	* value of a to b if it is.
166	–	* Add and Set if No Overflow.
167	–	*/
168	–	#define ASNO(a, b) a = (a + b >= a ? a + b : b)
169	–
170	–	ASNO(zipstats.in, in);
171	–	ASNO(zipstats.out, out);
172	–	ASNO(zipstats.in_wire, in_wire);
173	–	ASNO(zipstats.out_wire, out_wire);
174	–
175	–	if (zipstats.in > 0)
176	–	zipstats.in_ratio = (((double)(zipstats.in - zipstats.in_wire) /
177	–	(double)zipstats.in) * 100.00);
178	–	else
179	–	zipstats.in_ratio = 0;
180	–
181	–	if (zipstats.out > 0)
182	–	zipstats.out_ratio = (((double)(zipstats.out - zipstats.out_wire) /
183	–	(double)zipstats.out) * 100.00);
184	–	else
185	–	zipstats.out_ratio = 0;
186	–
187	–	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
188	–	}
189	–
190	–	void
191	–	collect_zipstats(void *unused)
192	–	{
193	–	dlink_node *ptr = NULL;
194	–
195	–	DLINK_FOREACH(ptr, serv_list.head)
196	–	{
197	–	struct Client *target_p = ptr->data;
198	–
199	–	if (IsCapable(target_p, CAP_ZIP))
200	–	{
201	–	/* only bother if we haven't already got something queued... */
202	–	if (!target_p->localClient->slinkq)
203	–	{
204	–	target_p->localClient->slinkq     = MyMalloc(1); /* sigh.. */
205	–	target_p->localClient->slinkq[0]  = SLINKCMD_ZIPSTATS;
206	–	target_p->localClient->slinkq_ofs = 0;
207	–	target_p->localClient->slinkq_len = 1;
208	–	send_queued_slink_write(target_p);
209	–	}
210	–	}
211	–	}
212	–	}
213	–
214	–	#ifdef HAVE_LIBCRYPTO
215	–	struct EncCapability *
216	–	check_cipher(struct Client *client_p, struct AccessItem *aconf)
217	–	{
218	–	struct EncCapability *epref = NULL;
219	–
220	–	/* Use connect{} specific info if available */
221	–	if (aconf->cipher_preference)
222	–	epref = aconf->cipher_preference;
223	–	else if (ConfigFileEntry.default_cipher_preference)
224	–	epref = ConfigFileEntry.default_cipher_preference;
225	–
226	–	/*
227	–	* If the server supports the capability in hand, return the matching
228	–	* conf struct.  Otherwise, return NULL (an error).
229	–	*/
230	–	if (epref && IsCapableEnc(client_p, epref->cap))
231	–	return epref;
232	–
233	–	return NULL;
234	–	}
235	–	#endif /* HAVE_LIBCRYPTO */
236	–
67		/*
68		* write_links_file
69		*
#	Line 251 | Line 81 | write_links_file(void* notused)
81		MessageFileLine *newMessageLine = 0;
82		MessageFile *MessageFileptr;
83		const char *p;
84	<	FBFILE *file;
84	>	FILE *file;
85		char buff[512];
86		dlink_node *ptr;
87
88		MessageFileptr = &ConfigFileEntry.linksfile;
89
90	<	if ((file = fbopen(MessageFileptr->fileName, "w")) == NULL)
90	>	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
91		return;
92
93		for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
#	Line 271 | Line 101 | write_links_file(void* notused)
101
102		DLINK_FOREACH(ptr, global_serv_list.head)
103		{
104	<	size_t nbytes = 0;
275	<	struct Client *target_p = ptr->data;
104	>	const struct Client *target_p = ptr->data;
105
106		/* skip ourselves, we send ourselves in /links */
107		if (IsMe(target_p))
108		continue;
109
110		/* skip hidden servers */
111	<	if (IsHidden(target_p) && !ConfigServerHide.disable_hidden)
111	>	if (IsHidden(target_p))
112		continue;
113
114		if (target_p->info[0])
#	Line 303 | Line 132 | write_links_file(void* notused)
132		*/
133		assert(strlen(target_p->name) + strlen(me.name) + 6 + strlen(p) <=
134		MESSAGELINELEN);
135	<	ircsprintf(newMessageLine->line, "%s %s :1 %s",
136	<	target_p->name, me.name, p);
135	>	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
136	>	target_p->name, me.name, p);
137		newMessageLine->next = NULL;
138
139		if (MessageFileptr->contentsOfFile)
#	Line 319 | Line 148 | write_links_file(void* notused)
148		currentMessageLine = newMessageLine;
149		}
150
151	<	nbytes = ircsprintf(buff, "%s %s :1 %s\n", target_p->name, me.name, p);
152	<	fbputs(buff, file, nbytes);
151	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name, me.name, p);
152	>	fputs(buff, file);
153		}
154
155	<	fbclose(file);
155	>	fclose(file);
156		}
157
158		/* hunt_server()
#	Line 354 | Line 183 | hunt_server(struct Client *client_p, str
183		dlink_node *ptr;
184		int wilds;
185
186	<	/* Assume it's me, if no server
187	<	*/
188	<	if (parc <= server || EmptyString(parv[server]) ||
189	<	match(me.name, parv[server]) ||
190	<	match(parv[server], me.name) ||
191	<	!strcmp(parv[server], me.id))
363	<	return(HUNTED_ISME);
186	>	/* Assume it's me, if no server */
187	>	if (parc <= server || EmptyString(parv[server]))
188	>	return HUNTED_ISME;
189	>
190	>	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
191	>	return HUNTED_ISME;
192
193		/* These are to pickup matches that would cause the following
194		* message to go in the wrong direction while doing quick fast
195		* non-matching lookups.
196		*/
197		if (MyClient(source_p))
198	<	target_p = find_client(parv[server]);
198	>	target_p = hash_find_client(parv[server]);
199		else
200		target_p = find_person(client_p, parv[server]);
201
#	Line 375 | Line 203 | hunt_server(struct Client *client_p, str
203		if (target_p->from == source_p->from && !MyConnect(target_p))
204		target_p = NULL;
205
206	<	if (target_p == NULL && (target_p = find_server(parv[server])))
206	>	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], '*'));
211	>	wilds = has_wildcards(parv[server]);
212
213		/* Again, if there are no wild cards involved in the server
214		* name, use the hash lookup
#	Line 389 | Line 217 | hunt_server(struct Client *client_p, str
217		{
218		if (!wilds)
219		{
220	<	if (!(target_p = find_server(parv[server])))
220	>	if (!(target_p = hash_find_server(parv[server])))
221		{
222		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
223	<	me.name, parv[0], parv[server]);
223	>	me.name, source_p->name, parv[server]);
224		return(HUNTED_NOSUCH);
225		}
226		}
#	Line 420 | Line 248 | hunt_server(struct Client *client_p, str
248		if(!IsRegistered(target_p))
249		{
250		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
251	<	me.name, parv[0], parv[server]);
251	>	me.name, source_p->name, parv[server]);
252		return HUNTED_NOSUCH;
253		}
254
#	Line 443 | Line 271 | hunt_server(struct Client *client_p, str
271		}
272
273		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
274	<	me.name, parv[0], parv[server]);
274	>	me.name, source_p->name, parv[server]);
275		return(HUNTED_NOSUCH);
276		}
277
#	Line 496 | Line 324 | try_connections(void *unused)
324		confrq = DEFAULT_CONNECTFREQUENCY;
325		else
326		{
327	<	confrq = ConFreq(cltmp);
328	<	if (confrq < MIN_CONN_FREQ )
327	>	confrq = cltmp->con_freq;
328	>	if (confrq < MIN_CONN_FREQ)
329		confrq = MIN_CONN_FREQ;
330		}
331
#	Line 506 | Line 334 | try_connections(void *unused)
334		/* Found a CONNECT config with port specified, scan clients
335		* and see if this server is already connected?
336		*/
337	<	if (find_server(conf->name) != NULL)
337	>	if (hash_find_server(conf->name) != NULL)
338		continue;
339
340	<	if (CurrUserCount(cltmp) < MaxTotal(cltmp))
340	>	if (cltmp->curr_user_count < cltmp->max_total)
341		{
342		/* Go to the end of the list, if not already last */
343		if (ptr->next != NULL)
#	Line 565 | Line 393 | valid_servname(const char *name)
393		}
394
395		int
396	<	check_server(const char *name, struct Client *client_p, int cryptlink)
396	>	check_server(const char *name, struct Client *client_p)
397		{
398		dlink_node *ptr;
399		struct ConfItem *conf           = NULL;
#	Line 576 | Line 404 | check_server(const char *name, struct Cl
404
405		assert(client_p != NULL);
406
579	–	if (client_p == NULL)
580	–	return(error);
581	–
582	–	if (strlen(name) > HOSTLEN)
583	–	return(-4);
584	–
407		/* loop through looking for all possible connect items that might work */
408		DLINK_FOREACH(ptr, server_items.head)
409		{
#	Line 599 | Line 421 | check_server(const char *name, struct Cl
421		match(aconf->host, client_p->sockhost))
422		{
423		error = -2;
602	–	#ifdef HAVE_LIBCRYPTO
603	–	if (cryptlink && IsConfCryptLink(aconf))
604	–	{
605	–	if (aconf->rsa_public_key)
606	–	server_conf = conf;
607	–	}
608	–	else if (!(cryptlink || IsConfCryptLink(aconf)))
609	–	#endif /* HAVE_LIBCRYPTO */
610	–	{
611	–	/* A NULL password is as good as a bad one */
612	–	if (EmptyString(client_p->localClient->passwd))
613	–	return(-2);
614	–
615	–	/* code in s_conf.c should not have allowed this to be NULL */
616	–	if (aconf->passwd == NULL)
617	–	return(-2);
424
425	<	if (IsConfEncrypted(aconf))
426	<	{
427	<	if (strcmp(aconf->passwd,
428	<	(const char *)crypt(client_p->localClient->passwd,
623	<	aconf->passwd)) == 0)
624	<	server_conf = conf;
625	<	}
626	<	else
627	<	{
628	<	if (strcmp(aconf->passwd, client_p->localClient->passwd) == 0)
629	<	server_conf = conf;
630	<	}
631	<	}
425	>	if (!match_conf_password(client_p->localClient->passwd, aconf))
426	>	return -2;
427	>
428	>	server_conf = conf;
429		}
430		}
431
#	Line 637 | Line 434 | check_server(const char *name, struct Cl
434
435		attach_conf(client_p, server_conf);
436
640	–	/* Now find all leaf or hub config items for this server */
641	–	DLINK_FOREACH(ptr, hub_items.head)
642	–	{
643	–	conf = ptr->data;
644	–
645	–	if (!match(name, conf->name))
646	–	continue;
647	–	attach_conf(client_p, conf);
648	–	}
649	–
650	–	DLINK_FOREACH(ptr, leaf_items.head)
651	–	{
652	–	conf = ptr->data;
653	–
654	–	if (!match(name, conf->name))
655	–	continue;
656	–	attach_conf(client_p, conf);
657	–	}
658	–
437		server_aconf = map_to_conf(server_conf);
438
661	–	#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
662	–	if (!IsConfCompressed(server_aconf))
663	–	#endif
664	–	ClearCap(client_p, CAP_ZIP);
665	–	if (!IsConfCryptLink(server_aconf))
666	–	ClearCap(client_p, CAP_ENC);
439		if (!IsConfTopicBurst(server_aconf))
668	–	{
669	–	ClearCap(client_p, CAP_TB);
440		ClearCap(client_p, CAP_TBURST);
671	–	}
441
442		if (aconf != NULL)
443		{
#	Line 680 | Line 449 | check_server(const char *name, struct Cl
449		{
450		#ifdef IPV6
451		case AF_INET6:
452	<	v6 = (struct sockaddr_in6 *)&aconf->ipnum;
452	>	v6 = (struct sockaddr_in6 *)&aconf->addr;
453
454		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
455	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
455	>	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
456		break;
457		#endif
458		case AF_INET:
459	<	v4 = (struct sockaddr_in *)&aconf->ipnum;
459	>	v4 = (struct sockaddr_in *)&aconf->addr;
460
461		if (v4->sin_addr.s_addr == INADDR_NONE)
462	<	memcpy(&aconf->ipnum, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
462	>	memcpy(&aconf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
463		break;
464		}
465		}
#	Line 781 | Line 550 | find_capability(const char *capab)
550		* inputs       - Client pointer to send to
551		*              - Pointer to AccessItem (for crypt)
552		*              - int flag of capabilities that this server can send
784	–	*              - int flag of encryption capabilities
553		* output       - NONE
554		* side effects - send the CAPAB line to a server  -orabidoo
555		*
556		*/
557		void
558		send_capabilities(struct Client *client_p, struct AccessItem *aconf,
559	<	int cap_can_send, int enc_can_send)
559	>	int cap_can_send)
560		{
561		struct Capability *cap=NULL;
562		char msgbuf[IRCD_BUFSIZE];
563		char *t;
564		int tl;
565		dlink_node *ptr;
798	–	#ifdef HAVE_LIBCRYPTO
799	–	const struct EncCapability *epref = NULL;
800	–	char *capend;
801	–	int sent_cipher = 0;
802	–	#endif
566
567		t = msgbuf;
568
#	Line 813 | Line 576 | send_capabilities(struct Client *client_
576		t += tl;
577		}
578		}
816	–	#ifdef HAVE_LIBCRYPTO
817	–	if (enc_can_send)
818	–	{
819	–	capend = t;
820	–	strcpy(t, "ENC:");
821	–	t += 4;
822	–
823	–	/* use connect{} specific info if available */
824	–	if (aconf->cipher_preference)
825	–	epref = aconf->cipher_preference;
826	–	else if (ConfigFileEntry.default_cipher_preference)
827	–	epref = ConfigFileEntry.default_cipher_preference;
579
829	–	if (epref && (epref->cap & enc_can_send))
830	–	{
831	–	/* Leave the space -- it is removed later. */
832	–	tl = ircsprintf(t, "%s ", epref->name);
833	–	t += tl;
834	–	sent_cipher = 1;
835	–	}
836	–
837	–	if (!sent_cipher)
838	–	t = capend; /* truncate string before ENC:, below */
839	–	}
840	–	#endif
580		*(t - 1) = '\0';
581		sendto_one(client_p, "CAPAB :%s", msgbuf);
582		}
#	Line 857 | Line 596 | sendnick_TS(struct Client *client_p, str
596		if (!IsClient(target_p))
597		return;
598
599	<	send_umode(NULL, target_p, 0, IsOperHiddenAdmin(target_p) ?
861	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, ubuf);
599	>	send_umode(NULL, target_p, 0, SEND_UMODES, ubuf);
600
601		if (ubuf[0] == '\0')
602		{
#	Line 866 | Line 604 | sendnick_TS(struct Client *client_p, str
604		ubuf[1] = '\0';
605		}
606
607	<	/* XXX Both of these need to have a :me.name or :mySID!?!?! */
608	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
609	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
610	<	target_p->servptr->id,
611	<	target_p->name, target_p->hopcount + 1,
612	<	(unsigned long) target_p->tsinfo,
613	<	ubuf, target_p->username, target_p->host,
614	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
615	<	"0" : target_p->sockhost, target_p->id, target_p->info);
607	>	if (IsCapable(client_p, CAP_SVS))
608	>	{
609	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
610	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
611	>	target_p->servptr->id,
612	>	target_p->name, target_p->hopcount + 1,
613	>	(unsigned long) target_p->tsinfo,
614	>	ubuf, target_p->username, target_p->host,
615	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
616	>	"0" : target_p->sockhost, target_p->id,
617	>	(unsigned long)target_p->servicestamp, target_p->info);
618	>	else
619	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
620	>	target_p->name, target_p->hopcount + 1,
621	>	(unsigned long) target_p->tsinfo,
622	>	ubuf, target_p->username, target_p->host,
623	>	target_p->servptr->name, (unsigned long)target_p->servicestamp,
624	>	target_p->info);
625	>	}
626		else
627	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
628	<	target_p->name, target_p->hopcount + 1,
629	<	(unsigned long) target_p->tsinfo,
630	<	ubuf, target_p->username, target_p->host,
631	<	target_p->servptr->name, target_p->info);
632	<
633	<	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
634	<	if (!EmptyString(target_p->away))
635	<	sendto_one(client_p, ":%s AWAY :%s", target_p->name,
627	>	{
628	>	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
629	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
630	>	target_p->servptr->id,
631	>	target_p->name, target_p->hopcount + 1,
632	>	(unsigned long) target_p->tsinfo,
633	>	ubuf, target_p->username, target_p->host,
634	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
635	>	"0" : target_p->sockhost, target_p->id, target_p->info);
636	>	else
637	>	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
638	>	target_p->name, target_p->hopcount + 1,
639	>	(unsigned long) target_p->tsinfo,
640	>	ubuf, target_p->username, target_p->host,
641	>	target_p->servptr->name, target_p->info);
642	>	}
643	>
644	>	if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->localClient->confs.head->data)))
645	>	if (target_p->away[0])
646	>	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
647		target_p->away);
648
649		}
#	Line 912 | Line 671 | show_capabilities(struct Client *target_
671		if (IsCapable(target_p, cap->cap))
672		t += ircsprintf(t, "%s ", cap->name);
673		}
915	–	#ifdef HAVE_LIBCRYPTO
916	–	if (IsCapable(target_p, CAP_ENC) &&
917	–	target_p->localClient->in_cipher &&
918	–	target_p->localClient->out_cipher)
919	–	t += ircsprintf(t, "ENC:%s ",
920	–	target_p->localClient->in_cipher->name);
921	–	#endif
922	–	*(t - 1) = '\0';
674
675	<	return(msgbuf);
675	>	*(t - 1) = '\0';
676	>	return msgbuf;
677		}
678
679		/* make_server()
#	Line 955 | Line 707 | server_estab(struct Client *client_p)
707		char *host;
708		const char *inpath;
709		static char inpath_ip[HOSTLEN * 2 + USERLEN + 6];
958	–	dlink_node *m;
710		dlink_node *ptr;
711	+	#ifdef HAVE_LIBCRYPTO
712	+	const COMP_METHOD *compression = NULL, *expansion = NULL;
713	+	#endif
714
715		assert(client_p != NULL);
716
#	Line 997 | Line 751 | server_estab(struct Client *client_p)
751
752		aconf = map_to_conf(conf);
753
754	<	if (IsUnknown(client_p) && !IsConfCryptLink(aconf))
754	>	if (IsUnknown(client_p))
755		{
756		/* jdc -- 1.  Use EmptyString(), not [0] index reference.
757		*        2.  Check aconf->spasswd, not aconf->passwd.
#	Line 1014 | Line 768 | server_estab(struct Client *client_p)
768		*/
769
770		send_capabilities(client_p, aconf,
771	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1018	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
771	>	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
772
1020	–	/* SERVER is the last command sent before switching to ziplinks.
1021	–	* We set TCPNODELAY on the socket to make sure it gets sent out
1022	–	* on the wire immediately.  Otherwise, it could be sitting in
1023	–	* a kernel buffer when we start sending zipped data, and the
1024	–	* parser on the receiving side can't hand both unzipped and zipped
1025	–	* data in one packet. --Rodder
1026	–	*
1027	–	* currently we only need to call send_queued_write,
1028	–	* Nagle is already disabled at this point --adx
1029	–	*/
773		sendto_one(client_p, "SERVER %s 1 :%s%s",
774		me.name, ConfigServerHide.hidden ? "(H) " : "", me.info);
1032	–	send_queued_write(client_p);
1033	–	}
1034	–
1035	–	/* Hand the server off to servlink now */
1036	–	if (IsCapable(client_p, CAP_ENC) || IsCapable(client_p, CAP_ZIP))
1037	–	{
1038	–	if (fork_server(client_p) < 0)
1039	–	{
1040	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1041	–	"Warning: fork failed for server %s -- check servlink_path (%s)",
1042	–	get_client_name(client_p, HIDE_IP), ConfigFileEntry.servlink_path);
1043	–	sendto_realops_flags(UMODE_ALL, L_OPER, "Warning: fork failed for server "
1044	–	"%s -- check servlink_path (%s)",
1045	–	get_client_name(client_p, MASK_IP),
1046	–	ConfigFileEntry.servlink_path);
1047	–	exit_client(client_p, &me, "fork failed");
1048	–	return;
1049	–	}
1050	–
1051	–	start_io(client_p);
1052	–	SetServlink(client_p);
775		}
776
777		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
#	Line 1086 | Line 808 | server_estab(struct Client *client_p)
808		/* Some day, all these lists will be consolidated *sigh* */
809		dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
810
811	<	m = dlinkFind(&unknown_list, client_p);
1090	<	assert(NULL != m);
811	>	assert(dlinkFind(&unknown_list, client_p));
812
813	<	dlinkDelete(m, &unknown_list);
814	<	dlinkAdd(client_p, m, &serv_list);
813	>	dlink_move_node(&client_p->localClient->lclient_node,
814	>	&unknown_list, &serv_list);
815
816		Count.myserver++;
817
#	Line 1101 | Line 822 | server_estab(struct Client *client_p)
822		make_server(client_p);
823
824		/* fixing eob timings.. -gnp */
825	<	client_p->firsttime = CurrentTime;
1105	<
1106	<	/* Show the real host/IP to admins */
1107	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1108	<	"Link with %s established: (%s) link",
1109	<	inpath_ip,show_capabilities(client_p));
1110	<	/* Now show the masked hostname/IP to opers */
1111	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1112	<	"Link with %s established: (%s) link",
1113	<	inpath,show_capabilities(client_p));
1114	<	ilog(L_NOTICE, "Link with %s established: (%s) link",
1115	<	inpath_ip, show_capabilities(client_p));
825	>	client_p->localClient->firsttime = CurrentTime;
826
827	<	client_p->serv->sconf = conf;
827	>	if (find_matching_name_conf(SERVICE_TYPE, client_p->name, NULL, NULL, 0))
828	>	AddFlag(client_p, FLAGS_SERVICE);
829
830	<	if (HasServlink(client_p))
830	>	/* Show the real host/IP to admins */
831	>	#ifdef HAVE_LIBCRYPTO
832	>	if (client_p->localClient->fd.ssl)
833		{
834	<	/* we won't overflow FD_DESC_SZ here, as it can hold
835	<	* client_p->name + 64
836	<	*/
837	<	fd_note(&client_p->localClient->fd, "slink data: %s", client_p->name);
838	<	fd_note(&client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
834	>	compression = SSL_get_current_compression(client_p->localClient->fd.ssl);
835	>	expansion   = SSL_get_current_expansion(client_p->localClient->fd.ssl);
836	>
837	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
838	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
839	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
840	>	compression ? SSL_COMP_get_name(compression) : "NONE",
841	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
842	>	show_capabilities(client_p));
843	>	/* Now show the masked hostname/IP to opers */
844	>	sendto_realops_flags(UMODE_ALL, L_OPER,
845	>	"Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
846	>	inpath, ssl_get_cipher(client_p->localClient->fd.ssl),
847	>	compression ? SSL_COMP_get_name(compression) : "NONE",
848	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
849	>	show_capabilities(client_p));
850	>	ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)",
851	>	inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl),
852	>	compression ? SSL_COMP_get_name(compression) : "NONE",
853	>	expansion ? SSL_COMP_get_name(expansion) : "NONE",
854	>	show_capabilities(client_p));
855		}
856		else
857	<	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
857	>	#endif
858	>	{
859	>	sendto_realops_flags(UMODE_ALL, L_ADMIN,
860	>	"Link with %s established: (Capabilities: %s)",
861	>	inpath_ip,show_capabilities(client_p));
862	>	/* Now show the masked hostname/IP to opers */
863	>	sendto_realops_flags(UMODE_ALL, L_OPER,
864	>	"Link with %s established: (Capabilities: %s)",
865	>	inpath,show_capabilities(client_p));
866	>	ilog(LOG_TYPE_IRCD, "Link with %s established: (Capabilities: %s)",
867	>	inpath_ip, show_capabilities(client_p));
868	>	}
869	>
870	>	fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
871
872		/* Old sendto_serv_but_one() call removed because we now
873		** need to send different names to different servers
#	Line 1197 | Line 939 | server_estab(struct Client *client_p)
939		server_burst(client_p);
940		}
941
1200	–	static void
1201	–	start_io(struct Client *server)
1202	–	{
1203	–	struct LocalUser *lserver = server->localClient;
1204	–	int alloclen = 1;
1205	–	char *buf;
1206	–	dlink_node *ptr;
1207	–	struct dbuf_block *block;
1208	–
1209	–	/* calculate how many bytes to allocate */
1210	–	if (IsCapable(server, CAP_ZIP))
1211	–	alloclen += 6;
1212	–	#ifdef HAVE_LIBCRYPTO
1213	–	if (IsCapable(server, CAP_ENC))
1214	–	alloclen += 16 + lserver->in_cipher->keylen + lserver->out_cipher->keylen;
1215	–	#endif
1216	–	alloclen += dbuf_length(&lserver->buf_recvq);
1217	–	alloclen += dlink_list_length(&lserver->buf_recvq.blocks) * 3;
1218	–	alloclen += dbuf_length(&lserver->buf_sendq);
1219	–	alloclen += dlink_list_length(&lserver->buf_sendq.blocks) * 3;
1220	–
1221	–	/* initialize servlink control sendq */
1222	–	lserver->slinkq = buf = MyMalloc(alloclen);
1223	–	lserver->slinkq_ofs = 0;
1224	–	lserver->slinkq_len = alloclen;
1225	–
1226	–	if (IsCapable(server, CAP_ZIP))
1227	–	{
1228	–	/* ziplink */
1229	–	*buf++ = SLINKCMD_SET_ZIP_OUT_LEVEL;
1230	–	*buf++ = 0; /* |          */
1231	–	*buf++ = 1; /* \ len is 1 */
1232	–	*buf++ = ConfigFileEntry.compression_level;
1233	–	*buf++ = SLINKCMD_START_ZIP_IN;
1234	–	*buf++ = SLINKCMD_START_ZIP_OUT;
1235	–	}
1236	–	#ifdef HAVE_LIBCRYPTO
1237	–	if (IsCapable(server, CAP_ENC))
1238	–	{
1239	–	/* Decryption settings */
1240	–	*buf++ = SLINKCMD_SET_CRYPT_IN_CIPHER;
1241	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1242	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1243	–	*buf++ = lserver->in_cipher->cipherid;
1244	–	*buf++ = SLINKCMD_SET_CRYPT_IN_KEY;
1245	–	*buf++ = 0; /* keylen < 256 */
1246	–	*buf++ = lserver->in_cipher->keylen;
1247	–	memcpy(buf, lserver->in_key, lserver->in_cipher->keylen);
1248	–	buf += lserver->in_cipher->keylen;
1249	–	/* Encryption settings */
1250	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_CIPHER;
1251	–	*buf++ = 0; /* /                     (upper 8-bits of len) */
1252	–	*buf++ = 1; /* \ cipher id is 1 byte (lower 8-bits of len) */
1253	–	*buf++ = lserver->out_cipher->cipherid;
1254	–	*buf++ = SLINKCMD_SET_CRYPT_OUT_KEY;
1255	–	*buf++ = 0; /* keylen < 256 */
1256	–	*buf++ = lserver->out_cipher->keylen;
1257	–	memcpy(buf, lserver->out_key, lserver->out_cipher->keylen);
1258	–	buf += lserver->out_cipher->keylen;
1259	–	*buf++ = SLINKCMD_START_CRYPT_IN;
1260	–	*buf++ = SLINKCMD_START_CRYPT_OUT;
1261	–	}
1262	–	#endif
1263	–
1264	–	/* pass the whole recvq to servlink */
1265	–	DLINK_FOREACH (ptr, lserver->buf_recvq.blocks.head)
1266	–	{
1267	–	block = ptr->data;
1268	–	*buf++ = SLINKCMD_INJECT_RECVQ;
1269	–	*buf++ = (block->size >> 8);
1270	–	*buf++ = (block->size & 0xff);
1271	–	memcpy(buf, &block->data[0], block->size);
1272	–	buf += block->size;
1273	–	}
1274	–
1275	–	dbuf_clear(&lserver->buf_recvq);
1276	–
1277	–	/* pass the whole sendq to servlink */
1278	–	DLINK_FOREACH (ptr, lserver->buf_sendq.blocks.head)
1279	–	{
1280	–	block = ptr->data;
1281	–	*buf++ = SLINKCMD_INJECT_SENDQ;
1282	–	*buf++ = (block->size >> 8);
1283	–	*buf++ = (block->size & 0xff);
1284	–	memcpy(buf, &block->data[0], block->size);
1285	–	buf += block->size;
1286	–	}
1287	–
1288	–	dbuf_clear(&lserver->buf_sendq);
1289	–
1290	–	/* start io */
1291	–	*buf++ = SLINKCMD_INIT;
1292	–
1293	–	/* schedule a write */
1294	–	send_queued_slink_write(server);
1295	–	}
1296	–
1297	–	/* fork_server()
1298	–	*
1299	–	* inputs       - struct Client *server
1300	–	* output       - success: 0 / failure: -1
1301	–	* side effect  - fork, and exec SERVLINK to handle this connection
1302	–	*/
1303	–	static int
1304	–	fork_server(struct Client *server)
1305	–	{
1306	–	#ifndef HAVE_SOCKETPAIR
1307	–	return -1;
1308	–	#else
1309	–	int i;
1310	–	int slink_fds[2][2];
1311	–	/* 0? - ctrl  | 1? - data
1312	–	* ?0 - child | ?1 - parent */
1313	–
1314	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[0]) < 0)
1315	–	return -1;
1316	–	if (socketpair(AF_UNIX, SOCK_STREAM, 0, slink_fds[1]) < 0)
1317	–	goto free_ctrl_fds;
1318	–
1319	–	if ((i = fork()) < 0)
1320	–	{
1321	–	close(slink_fds[1][0]);  close(slink_fds[1][1]);
1322	–	free_ctrl_fds:
1323	–	close(slink_fds[0][0]);  close(slink_fds[0][1]);
1324	–	return -1;
1325	–	}
1326	–
1327	–	if (i == 0)
1328	–	{
1329	–	char fd_str[3][6];   /* store 3x sizeof("65535") */
1330	–	char *kid_argv[7];
1331	–
1332	–	#ifdef O_ASYNC
1333	–	fcntl(server->localClient->fd.fd, F_SETFL,
1334	–	fcntl(server->localClient->fd.fd, F_GETFL, 0) & ~O_ASYNC);
1335	–	#endif
1336	–	close_fds(&server->localClient->fd);
1337	–	close(slink_fds[0][1]);
1338	–	close(slink_fds[1][1]);
1339	–
1340	–	sprintf(fd_str[0], "%d", slink_fds[0][0]);
1341	–	sprintf(fd_str[1], "%d", slink_fds[1][0]);
1342	–	sprintf(fd_str[2], "%d", server->localClient->fd.fd);
1343	–
1344	–	kid_argv[0] = "-slink";
1345	–	kid_argv[1] = kid_argv[2] = fd_str[0];  /* ctrl */
1346	–	kid_argv[3] = kid_argv[4] = fd_str[1];  /* data */
1347	–	kid_argv[5] = fd_str[2];    /* network */
1348	–	kid_argv[6] = NULL;
1349	–
1350	–	execv(ConfigFileEntry.servlink_path, kid_argv);
1351	–
1352	–	_exit(1);
1353	–	}
1354	–
1355	–	/* close the network fd and the child ends of the pipes */
1356	–	fd_close(&server->localClient->fd);
1357	–	close(slink_fds[0][0]);
1358	–	close(slink_fds[1][0]);
1359	–
1360	–	execute_callback(setup_socket_cb, slink_fds[0][1]);
1361	–	execute_callback(setup_socket_cb, slink_fds[1][1]);
1362	–
1363	–	fd_open(&server->localClient->ctrlfd, slink_fds[0][1], 1, "slink ctrl");
1364	–	fd_open(&server->localClient->fd, slink_fds[1][1], 1, "slink data");
1365	–
1366	–	read_ctrl_packet(&server->localClient->ctrlfd, server);
1367	–	read_packet(&server->localClient->fd, server);
1368	–
1369	–	return 0;
1370	–	#endif
1371	–	}
1372	–
942		/* server_burst()
943		*
944		* inputs       - struct Client pointer server
#	Line 1418 | Line 987 | burst_all(struct Client *client_p)
987		burst_members(client_p, chptr);
988		send_channel_modes(client_p, chptr);
989
990	<	if (IsCapable(client_p, CAP_TBURST) ||
1422	<	IsCapable(client_p, CAP_TB))
990	>	if (IsCapable(client_p, CAP_TBURST))
991		send_tb(client_p, chptr);
992		}
993		}
#	Line 1430 | Line 998 | burst_all(struct Client *client_p)
998		{
999		struct Client *target_p = ptr->data;
1000
1001	<	if (!IsBursted(target_p) && target_p->from != client_p)
1001	>	if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
1002		sendnick_TS(client_p, target_p);
1003
1004	<	ClearBursted(target_p);
1004	>	DelFlag(target_p, FLAGS_BURSTED);
1005		}
1006
1007		/* We send the time we started the burst, and let the remote host determine an EOB time,
#	Line 1451 | Line 1019 | burst_all(struct Client *client_p)
1019		*              - pointer to channel
1020		* output       - NONE
1021		* side effects - Called on a server burst when
1022	<	*                server is CAP_TB|CAP_TBURST capable
1022	>	*                server is CAP_TBURST capable
1023		*/
1024		static void
1025		send_tb(struct Client *client_p, struct Channel *chptr)
#	Line 1470 | Line 1038 | send_tb(struct Client *client_p, struct
1038		* for further information   -Michael
1039		*/
1040		if (chptr->topic_time != 0)
1041	<	{
1042	<	if (IsCapable(client_p, CAP_TBURST))
1043	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1044	<	me.name, (unsigned long)chptr->channelts, chptr->chname,
1045	<	(unsigned long)chptr->topic_time,
1046	<	chptr->topic_info ? chptr->topic_info : "",
1479	<	chptr->topic ? chptr->topic : "");
1480	<	else if (IsCapable(client_p, CAP_TB))
1481	<	{
1482	<	if (ConfigChannel.burst_topicwho)
1483	<	{
1484	<	sendto_one(client_p, ":%s TB %s %lu %s :%s",
1485	<	me.name, chptr->chname,
1486	<	(unsigned long)chptr->topic_time,
1487	<	chptr->topic_info, chptr->topic ? chptr->topic : "");
1488	<	}
1489	<	else
1490	<	{
1491	<	sendto_one(client_p, ":%s TB %s %lu :%s",
1492	<	me.name, chptr->chname,
1493	<	(unsigned long)chptr->topic_time,
1494	<	chptr->topic ? chptr->topic : "");
1495	<	}
1496	<	}
1497	<	}
1041	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1042	>	ID_or_name(&me, client_p),
1043	>	(unsigned long)chptr->channelts, chptr->chname,
1044	>	(unsigned long)chptr->topic_time,
1045	>	chptr->topic_info,
1046	>	chptr->topic);
1047		}
1048
1049		/* burst_members()
#	Line 1516 | Line 1065 | burst_members(struct Client *client_p, s
1065		ms       = ptr->data;
1066		target_p = ms->client_p;
1067
1068	<	if (!IsBursted(target_p))
1068	>	if (!HasFlag(target_p, FLAGS_BURSTED))
1069		{
1070	<	SetBursted(target_p);
1070	>	AddFlag(target_p, FLAGS_BURSTED);
1071
1072		if (target_p->from != client_p)
1073		sendnick_TS(client_p, target_p);
#	Line 1552 | Line 1101 | serv_connect(struct AccessItem *aconf, s
1101		{
1102		struct ConfItem *conf;
1103		struct Client *client_p;
1104	<	char buf[HOSTIPLEN];
1104	>	char buf[HOSTIPLEN + 1];
1105
1106		/* conversion structs */
1107		struct sockaddr_in *v4;
1108		/* Make sure aconf is useful */
1109		assert(aconf != NULL);
1110
1562	–	if(aconf == NULL)
1563	–	return (0);
1564	–
1111		/* XXX should be passing struct ConfItem in the first place */
1112		conf = unmap_conf_item(aconf);
1113
1114		/* log */
1115	<	getnameinfo((struct sockaddr *)&aconf->ipnum, aconf->ipnum.ss_len,
1115	>	getnameinfo((struct sockaddr *)&aconf->addr, aconf->addr.ss_len,
1116		buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
1117	<	ilog(L_NOTICE, "Connect to %s[%s] @%s", aconf->user, aconf->host,
1117	>	ilog(LOG_TYPE_IRCD, "Connect to %s[%s] @%s", conf->name, aconf->host,
1118		buf);
1119
1120		/* Still processing a DNS lookup? -> exit */
#	Line 1591 | Line 1137 | serv_connect(struct AccessItem *aconf, s
1137		/* Make sure this server isn't already connected
1138		* Note: aconf should ALWAYS be a valid C: line
1139		*/
1140	<	if ((client_p = find_server(conf->name)) != NULL)
1140	>	if ((client_p = hash_find_server(conf->name)) != NULL)
1141		{
1142		sendto_realops_flags(UMODE_ALL, L_ADMIN,
1143		"Server %s already present from %s",
#	Line 1617 | Line 1163 | serv_connect(struct AccessItem *aconf, s
1163		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1164
1165		/* create a socket for the server connection */
1166	<	if (comm_open(&client_p->localClient->fd, aconf->ipnum.ss.ss_family,
1166	>	if (comm_open(&client_p->localClient->fd, aconf->addr.ss.ss_family,
1167		SOCK_STREAM, 0, NULL) < 0)
1168		{
1169		/* Eek, failure to create the socket */
#	Line 1672 | Line 1218 | serv_connect(struct AccessItem *aconf, s
1218		switch (aconf->aftype)
1219		{
1220		case AF_INET:
1221	<	v4 = (struct sockaddr_in*)&aconf->my_ipnum;
1221	>	v4 = (struct sockaddr_in*)&aconf->bind;
1222		if (v4->sin_addr.s_addr != 0)
1223		{
1224		struct irc_ssaddr ipn;
1225		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1226		ipn.ss.ss_family = AF_INET;
1227		ipn.ss_port = 0;
1228	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1228	>	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1229		comm_connect_tcp(&client_p->localClient->fd, aconf->host, aconf->port,
1230		(struct sockaddr *)&ipn, ipn.ss_len,
1231		serv_connect_callback, client_p, aconf->aftype,
#	Line 1710 | Line 1256 | serv_connect(struct AccessItem *aconf, s
1256		struct sockaddr_in6 *v6conf;
1257
1258		memset(&ipn, 0, sizeof(struct irc_ssaddr));
1259	<	v6conf = (struct sockaddr_in6 *)&aconf->my_ipnum;
1259	>	v6conf = (struct sockaddr_in6 *)&aconf->bind;
1260		v6 = (struct sockaddr_in6 *)&ipn;
1261
1262		if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1263		sizeof(struct in6_addr)) != 0)
1264		{
1265	<	memcpy(&ipn, &aconf->my_ipnum, sizeof(struct irc_ssaddr));
1265	>	memcpy(&ipn, &aconf->bind, sizeof(struct irc_ssaddr));
1266		ipn.ss.ss_family = AF_INET6;
1267		ipn.ss_port = 0;
1268		comm_connect_tcp(&client_p->localClient->fd,
#	Line 1747 | Line 1293 | serv_connect(struct AccessItem *aconf, s
1293		return (1);
1294		}
1295
1296	+	#ifdef HAVE_LIBCRYPTO
1297	+	static void
1298	+	finish_ssl_server_handshake(struct Client *client_p)
1299	+	{
1300	+	struct ConfItem *conf=NULL;
1301	+	struct AccessItem *aconf=NULL;
1302	+
1303	+	conf = find_conf_name(&client_p->localClient->confs,
1304	+	client_p->name, SERVER_TYPE);
1305	+	if (conf == NULL)
1306	+	{
1307	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1308	+	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1309	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1310	+	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1311	+
1312	+	exit_client(client_p, &me, "Lost connect{} block");
1313	+	return;
1314	+	}
1315	+
1316	+	aconf = map_to_conf(conf);
1317	+
1318	+	/* jdc -- Check and send spasswd, not passwd. */
1319	+	if (!EmptyString(aconf->spasswd))
1320	+	sendto_one(client_p, "PASS %s TS %d %s",
1321	+	aconf->spasswd, TS_CURRENT, me.id);
1322	+
1323	+	send_capabilities(client_p, aconf,
1324	+	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1325	+
1326	+	sendto_one(client_p, "SERVER %s 1 :%s%s",
1327	+	me.name, ConfigServerHide.hidden ? "(H) " : "",
1328	+	me.info);
1329	+
1330	+	/* If we've been marked dead because a send failed, just exit
1331	+	* here now and save everyone the trouble of us ever existing.
1332	+	*/
1333	+	if (IsDead(client_p))
1334	+	{
1335	+	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1336	+	"%s[%s] went dead during handshake",
1337	+	client_p->name,
1338	+	client_p->host);
1339	+	sendto_realops_flags(UMODE_ALL, L_OPER,
1340	+	"%s went dead during handshake", client_p->name);
1341	+	return;
1342	+	}
1343	+
1344	+	/* don't move to serv_list yet -- we haven't sent a burst! */
1345	+	/* If we get here, we're ok, so lets start reading some data */
1346	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ, read_packet, client_p, 0);
1347	+	}
1348	+
1349	+	static void
1350	+	ssl_server_handshake(fde_t *fd, struct Client *client_p)
1351	+	{
1352	+	int ret;
1353	+	int err;
1354	+
1355	+	ret = SSL_connect(client_p->localClient->fd.ssl);
1356	+
1357	+	if (ret <= 0)
1358	+	{
1359	+	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1360	+	{
1361	+	case SSL_ERROR_WANT_WRITE:
1362	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
1363	+	(PF *)ssl_server_handshake, client_p, 0);
1364	+	return;
1365	+	case SSL_ERROR_WANT_READ:
1366	+	comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
1367	+	(PF *)ssl_server_handshake, client_p, 0);
1368	+	return;
1369	+	default:
1370	+	{
1371	+	const char *sslerr = ERR_error_string(ERR_get_error(), NULL);
1372	+	sendto_realops_flags(UMODE_ALL, L_ALL,
1373	+	"Error connecting to %s: %s", client_p->name,
1374	+	sslerr ? sslerr : "unknown SSL error");
1375	+	exit_client(client_p, client_p, "Error during SSL handshake");
1376	+	return;
1377	+	}
1378	+	}
1379	+	}
1380	+
1381	+	finish_ssl_server_handshake(client_p);
1382	+	}
1383	+
1384	+	static void
1385	+	ssl_connect_init(struct Client *client_p, struct AccessItem *aconf, fde_t *fd)
1386	+	{
1387	+	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
1388	+	{
1389	+	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1390	+	ERR_error_string(ERR_get_error(), NULL));
1391	+	SetDead(client_p);
1392	+	exit_client(client_p, client_p, "SSL_new failed");
1393	+	return;
1394	+	}
1395	+
1396	+	SSL_set_fd(fd->ssl, fd->fd);
1397	+
1398	+	if (!EmptyString(aconf->cipher_list))
1399	+	SSL_set_cipher_list(client_p->localClient->fd.ssl, aconf->cipher_list);
1400	+
1401	+	ssl_server_handshake(NULL, client_p);
1402	+	}
1403	+	#endif
1404	+
1405		/* serv_connect_callback() - complete a server connection.
1406		*
1407		* This routine is called after the server connection attempt has
#	Line 1810 | Line 1465 | serv_connect_callback(fde_t *fd, int sta
1465		return;
1466		}
1467
1468	<	aconf = (struct AccessItem *)map_to_conf(conf);
1468	>	aconf = map_to_conf(conf);
1469		/* Next, send the initial handshake */
1470		SetHandshake(client_p);
1471
1472		#ifdef HAVE_LIBCRYPTO
1473	<	/* Handle all CRYPTLINK links in cryptlink_init */
1819	<	if (IsConfCryptLink(aconf))
1473	>	if (IsConfSSL(aconf))
1474		{
1475	<	cryptlink_init(client_p, conf, fd);
1475	>	ssl_connect_init(client_p, aconf, fd);
1476		return;
1477		}
1478		#endif
1479
1480		/* jdc -- Check and send spasswd, not passwd. */
1481		if (!EmptyString(aconf->spasswd))
1828	–	/* Send TS 6 form only if id */
1482		sendto_one(client_p, "PASS %s TS %d %s",
1483		aconf->spasswd, TS_CURRENT, me.id);
1484
1832	–	/* Pass my info to the new server
1833	–	*
1834	–	* Pass on ZIP if supported
1835	–	* Pass on TB if supported.
1836	–	* - Dianora
1837	–	*/
1485		send_capabilities(client_p, aconf,
1486	<	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1840	<	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1486	>	(IsConfTopicBurst(aconf) ? CAP_TBURST : 0));
1487
1488		sendto_one(client_p, "SERVER %s 1 :%s%s",
1489		me.name, ConfigServerHide.hidden ? "(H) " : "",
#	Line 1879 | Line 1525 | find_servconn_in_progress(const char *na
1525
1526		return NULL;
1527		}
1882	–
1883	–	#ifdef HAVE_LIBCRYPTO
1884	–	/*
1885	–	* sends a CRYPTLINK SERV command.
1886	–	*/
1887	–	void
1888	–	cryptlink_init(struct Client *client_p, struct ConfItem *conf, fde_t *fd)
1889	–	{
1890	–	struct AccessItem *aconf;
1891	–	char *encrypted;
1892	–	unsigned char *key_to_send;
1893	–	char randkey[CIPHERKEYLEN];
1894	–	int enc_len;
1895	–
1896	–	/* get key */
1897	–	if ((!ServerInfo.rsa_private_key) ||
1898	–	(!RSA_check_key(ServerInfo.rsa_private_key)) )
1899	–	{
1900	–	cryptlink_error(client_p, "SERV", "Invalid RSA private key",
1901	–	"Invalid RSA private key");
1902	–	return;
1903	–	}
1904	–
1905	–	aconf = (struct AccessItem *)map_to_conf(conf);
1906	–
1907	–	if (aconf->rsa_public_key == NULL)
1908	–	{
1909	–	cryptlink_error(client_p, "SERV", "Invalid RSA public key",
1910	–	"Invalid RSA public key");
1911	–	return;
1912	–	}
1913	–
1914	–	if (get_randomness((unsigned char *)randkey, CIPHERKEYLEN) != 1)
1915	–	{
1916	–	cryptlink_error(client_p, "SERV", "Couldn't generate keyphrase",
1917	–	"Couldn't generate keyphrase");
1918	–	return;
1919	–	}
1920	–
1921	–	encrypted = MyMalloc(RSA_size(ServerInfo.rsa_private_key));
1922	–	enc_len   = RSA_public_encrypt(CIPHERKEYLEN,
1923	–	(unsigned char *)randkey,
1924	–	(unsigned char *)encrypted,
1925	–	aconf->rsa_public_key,
1926	–	RSA_PKCS1_PADDING);
1927	–
1928	–	memcpy(client_p->localClient->in_key, randkey, CIPHERKEYLEN);
1929	–
1930	–	if (enc_len <= 0)
1931	–	{
1932	–	report_crypto_errors();
1933	–	MyFree(encrypted);
1934	–	cryptlink_error(client_p, "SERV", "Couldn't encrypt data",
1935	–	"Couldn't encrypt data");
1936	–	return;
1937	–	}
1938	–
1939	–	if (!(base64_block(&key_to_send, encrypted, enc_len)))
1940	–	{
1941	–	MyFree(encrypted);
1942	–	cryptlink_error(client_p, "SERV", "Couldn't base64 encode key",
1943	–	"Couldn't base64 encode key");
1944	–	return;
1945	–	}
1946	–
1947	–	send_capabilities(client_p, aconf,
1948	–	(IsConfCompressed(aconf) ? CAP_ZIP : 0)
1949	–	| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
1950	–
1951	–	sendto_one(client_p, "PASS . TS %d %s", TS_CURRENT, me.id);
1952	–	sendto_one(client_p, "CRYPTLINK SERV %s %s :%s%s",
1953	–	me.name, key_to_send,
1954	–	ConfigServerHide.hidden ? "(H) " : "", me.info);
1955	–
1956	–	SetHandshake(client_p);
1957	–	SetWaitAuth(client_p);
1958	–
1959	–	MyFree(encrypted);
1960	–	MyFree(key_to_send);
1961	–
1962	–	if (IsDead(client_p))
1963	–	cryptlink_error(client_p, "SERV", "Went dead during handshake",
1964	–	"Went dead during handshake");
1965	–	else if (fd != NULL)
1966	–	/* If we get here, we're ok, so lets start reading some data */
1967	–	comm_setselect(fd, COMM_SELECT_READ, read_packet, client_p, 0);
1968	–	}
1969	–
1970	–	void
1971	–	cryptlink_error(struct Client *client_p, const char *type,
1972	–	const char *reason, const char *client_reason)
1973	–	{
1974	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s: CRYPTLINK %s error - %s",
1975	–	get_client_name(client_p, SHOW_IP), type, reason);
1976	–	sendto_realops_flags(UMODE_ALL, L_OPER,  "%s: CRYPTLINK %s error - %s",
1977	–	get_client_name(client_p, MASK_IP), type, reason);
1978	–	ilog(L_ERROR, "%s: CRYPTLINK %s error - %s",
1979	–	get_client_name(client_p, SHOW_IP), type, reason);
1980	–
1981	–	/* If client_reason isn't NULL, then exit the client with the message
1982	–	* defined in the call.
1983	–	*/
1984	–	if ((client_reason != NULL) && (!IsDead(client_p)))
1985	–	exit_client(client_p, &me, client_reason);
1986	–	}
1987	–
1988	–	static char base64_chars[] =
1989	–	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
1990	–
1991	–	static char base64_values[] =
1992	–	{
1993	–	/* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1994	–	/* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1995	–	/* 32-47   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
1996	–	/* 48-63   */ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1,  0, -1, -1,
1997	–	/* 64-79   */ -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
1998	–	/* 80-95   */ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
1999	–	/* 96-111  */ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
2000	–	/* 112-127 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
2001	–	/* 128-143 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2002	–	/* 144-159 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2003	–	/* 160-175 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2004	–	/* 186-191 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2005	–	/* 192-207 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2006	–	/* 208-223 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2007	–	/* 224-239 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
2008	–	/* 240-255 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
2009	–	};
2010	–
2011	–	/*
2012	–	* base64_block will allocate and return a new block of memory
2013	–	* using MyMalloc().  It should be freed after use.
2014	–	*/
2015	–	int
2016	–	base64_block(unsigned char **output, char *data, int len)
2017	–	{
2018	–	unsigned char *out;
2019	–	unsigned char *in = (unsigned char*)data;
2020	–	unsigned long int q_in;
2021	–	int i;
2022	–	int count = 0;
2023	–
2024	–	out = MyMalloc(((((len + 2) - ((len + 2) % 3)) / 3) * 4) + 1);
2025	–
2026	–	/* process 24 bits at a time */
2027	–	for( i = 0; i < len; i += 3)
2028	–	{
2029	–	q_in = 0;
2030	–
2031	–	if ( i + 2 < len )
2032	–	{
2033	–	q_in  = (in[i+2] & 0xc0) << 2;
2034	–	q_in |=  in[i+2];
2035	–	}
2036	–
2037	–	if ( i + 1 < len )
2038	–	{
2039	–	q_in |= (in[i+1] & 0x0f) << 10;
2040	–	q_in |= (in[i+1] & 0xf0) << 12;
2041	–	}
2042	–
2043	–	q_in |= (in[i]   & 0x03) << 20;
2044	–	q_in |=  in[i]           << 22;
2045	–
2046	–	q_in &= 0x3f3f3f3f;
2047	–
2048	–	out[count++] = base64_chars[((q_in >> 24)       )];
2049	–	out[count++] = base64_chars[((q_in >> 16) & 0xff)];
2050	–	out[count++] = base64_chars[((q_in >>  8) & 0xff)];
2051	–	out[count++] = base64_chars[((q_in      ) & 0xff)];
2052	–	}
2053	–	if ( (i - len) > 0 )
2054	–	{
2055	–	out[count-1] = '=';
2056	–	if ( (i - len) > 1 )
2057	–	out[count-2] = '=';
2058	–	}
2059	–
2060	–	out[count] = '\0';
2061	–	*output = out;
2062	–	return (count);
2063	–	}
2064	–
2065	–	/*
2066	–	* unbase64_block will allocate and return a new block of memory
2067	–	* using MyMalloc().  It should be freed after use.
2068	–	*/
2069	–	int
2070	–	unbase64_block(unsigned char **output, char *data, int len)
2071	–	{
2072	–	unsigned char *out;
2073	–	unsigned char *in = (unsigned char*)data;
2074	–	unsigned long int q_in;
2075	–	int i;
2076	–	int count = 0;
2077	–
2078	–	if ((len % 4) != 0)
2079	–	return (0);
2080	–
2081	–	out = MyMalloc(((len / 4) * 3) + 1);
2082	–
2083	–	/* process 32 bits at a time */
2084	–	for( i = 0; (i + 3) < len; i+=4)
2085	–	{
2086	–	/* compress input (chars a, b, c and d) as follows:
2087	–	* (after converting ascii -> base64 value)
2088	–	*
2089	–	* |00000000aaaaaabbbbbbccccccdddddd|
2090	–	* |  765432  107654  321076  543210|
2091	–	*/
2092	–
2093	–	q_in = 0;
2094	–
2095	–	if (base64_values[in[i+3]] > -1)
2096	–	q_in |= base64_values[in[i+3]]      ;
2097	–	if (base64_values[in[i+2]] > -1)
2098	–	q_in |= base64_values[in[i+2]] <<  6;
2099	–	if (base64_values[in[i+1]] > -1)
2100	–	q_in |= base64_values[in[i+1]] << 12;
2101	–	if (base64_values[in[i  ]] > -1)
2102	–	q_in |= base64_values[in[i  ]] << 18;
2103	–
2104	–	out[count++] = (q_in >> 16) & 0xff;
2105	–	out[count++] = (q_in >>  8) & 0xff;
2106	–	out[count++] = (q_in      ) & 0xff;
2107	–	}
2108	–
2109	–	if (in[i-1] == '=') count--;
2110	–	if (in[i-2] == '=') count--;
2111	–
2112	–	out[count] = '\0';
2113	–	*output = out;
2114	–	return (count);
2115	–	}
2116	–
2117	–	#endif /* HAVE_LIBCRYPTO */
2118	–

Diff Legend

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