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/trunk/src/s_serv.c (file contents):
Revision 2216 by michael, Thu Jun 6 17:35:45 2013 UTC vs.
Revision 3215 by michael, Tue Mar 25 19:23:15 2014 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-2014 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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_serv.c
23	>	* \brief Server related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 31 | Line 33
33		#include "channel.h"
34		#include "channel_mode.h"
35		#include "client.h"
34	–	#include "dbuf.h"
36		#include "event.h"
37		#include "fdlist.h"
38		#include "hash.h"
#	Line 49 | Line 50
50		#include "s_user.h"
51		#include "send.h"
52		#include "memory.h"
53	<	#include "channel.h" /* chcap_usage_counts stuff...*/
53	>	#include "channel.h"
54		#include "parse.h"
55
56		#define MIN_CONN_FREQ 300
#	Line 77 | Line 78 | write_links_file(void *notused)
78		{
79		FILE *file = NULL;
80		dlink_node *ptr = NULL, *ptr_next = NULL;
81	<	char buff[IRCD_BUFSIZE] = { '\0' };
81	>	char buff[IRCD_BUFSIZE] = "";
82
83		if ((file = fopen(LIPATH, "w")) == NULL)
84		return;
#	Line 126 | Line 127 | read_links_file(void)
127		{
128		FILE *file = NULL;
129		char *p = NULL;
130	<	char buff[IRCD_BUFSIZE] = { '\0' };
130	>	char buff[IRCD_BUFSIZE] = "";
131
132		if ((file = fopen(LIPATH, "r")) == NULL)
133		return;
#	Line 162 | Line 163 | read_links_file(void)
163		*      returns: (see #defines)
164		*/
165		int
166	<	hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
166	>	hunt_server(struct Client *source_p, const char *command,
167		const int server, const int parc, char *parv[])
168		{
169		struct Client *target_p = NULL;
#	Line 184 | Line 185 | hunt_server(struct Client *client_p, str
185		if (MyClient(source_p))
186		target_p = hash_find_client(parv[server]);
187		else
188	<	target_p = find_person(client_p, parv[server]);
188	>	target_p = find_person(source_p, parv[server]);
189
190		if (target_p)
191		if (target_p->from == source_p->from && !MyConnect(target_p))
#	Line 205 | Line 206 | hunt_server(struct Client *client_p, str
206		{
207		if (!(target_p = hash_find_server(parv[server])))
208		{
209	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
209	<	me.name, source_p->name, parv[server]);
209	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
210		return HUNTED_NOSUCH;
211		}
212		}
#	Line 222 | Line 222 | hunt_server(struct Client *client_p, str
222		continue;
223		target_p = ptr->data;
224
225	<	if (IsRegistered(target_p) && (target_p != client_p))
225	>	if (IsRegistered(target_p) && (target_p != source_p->from))
226		break;
227		}
228		}
#	Line 233 | Line 233 | hunt_server(struct Client *client_p, str
233		{
234		if(!IsRegistered(target_p))
235		{
236	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
237	<	me.name, source_p->name, parv[server]);
236	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
237		return HUNTED_NOSUCH;
238		}
239
#	Line 245 | Line 244 | hunt_server(struct Client *client_p, str
244		parv[server] = target_p->name;
245
246		/* This is a little kludgy but should work... */
247	<	if (IsClient(source_p) &&
249	<	((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
250	<	(!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
251	<	parv[0] = ID(source_p);
252	<
253	<	sendto_one(target_p, command, parv[0],
247	>	sendto_one(target_p, command, ID_or_name(source_p, target_p),
248		parv[1], parv[2], parv[3], parv[4],
249		parv[5], parv[6], parv[7], parv[8]);
250		return HUNTED_PASS;
251	<	}
251	>	}
252
253	<	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
260	<	me.name, source_p->name, parv[server]);
253	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHSERVER, parv[server]);
254		return HUNTED_NOSUCH;
255		}
256
#	Line 288 | Line 281 | try_connections(void *unused)
281
282		assert(conf->type == CONF_SERVER);
283
284	<	/* Also when already connecting! (update holdtimes) --SRB
284	>	/* Also when already connecting! (update holdtimes) --SRB
285		*/
286		if (!conf->port ||!IsConfAllowAutoConn(conf))
287		continue;
#	Line 399 | Line 392 | check_server(const char *name, struct Cl
392
393		/* XXX: Fix me for IPv6                    */
394		/* XXX sockhost is the IPv4 ip as a string */
395	<	if (!match(conf->host, client_p->host) ||
395	>	if (!match(conf->host, client_p->host) ||
396		!match(conf->host, client_p->sockhost))
397		{
398		error = -2;
#	Line 407 | Line 400 | check_server(const char *name, struct Cl
400		if (!match_conf_password(client_p->localClient->passwd, conf))
401		return -2;
402
403	+	if (!EmptyString(conf->certfp))
404	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
405	+	return -4;
406	+
407		server_conf = conf;
408		}
409		}
#	Line 426 | Line 423 | check_server(const char *name, struct Cl
423		switch (server_conf->aftype)
424		{
425		#ifdef IPV6
426	<	case AF_INET6:
426	>	case AF_INET6:
427		v6 = (struct sockaddr_in6 *)&server_conf->addr;
428
429		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
#	Line 437 | Line 434 | check_server(const char *name, struct Cl
434		v4 = (struct sockaddr_in *)&server_conf->addr;
435
436		if (v4->sin_addr.s_addr == INADDR_NONE)
437	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
437	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
438		break;
439		}
440		}
#	Line 557 | Line 554 | send_capabilities(struct Client *client_
554		}
555
556		/* sendnick_TS()
557	<	*
557	>	*
558		* inputs       - client (server) to send nick towards
559		*          - client to send nick for
560		* output       - NONE
#	Line 566 | Line 563 | send_capabilities(struct Client *client_
563		void
564		sendnick_TS(struct Client *client_p, struct Client *target_p)
565		{
566	<	static char ubuf[12];
566	>	char ubuf[IRCD_BUFSIZE];
567
568		if (!IsClient(target_p))
569		return;
#	Line 580 | Line 577 | sendnick_TS(struct Client *client_p, str
577		}
578
579		if (IsCapable(client_p, CAP_SVS))
580	<	{
581	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
582	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
583	<	target_p->servptr->id,
584	<	target_p->name, target_p->hopcount + 1,
585	<	(unsigned long) target_p->tsinfo,
586	<	ubuf, target_p->username, target_p->host,
587	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
591	<	"0" : target_p->sockhost, target_p->id,
592	<	target_p->svid, target_p->info);
593	<	else
594	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %s :%s",
595	<	target_p->name, target_p->hopcount + 1,
596	<	(unsigned long) target_p->tsinfo,
597	<	ubuf, target_p->username, target_p->host,
598	<	target_p->servptr->name, target_p->svid,
599	<	target_p->info);
600	<	}
580	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
581	>	target_p->servptr->id,
582	>	target_p->name, target_p->hopcount + 1,
583	>	(unsigned long) target_p->tsinfo,
584	>	ubuf, target_p->username, target_p->host,
585	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
586	>	"0" : target_p->sockhost, target_p->id,
587	>	target_p->svid, target_p->info);
588		else
589	<	{
590	<	if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
591	<	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
592	<	target_p->servptr->id,
593	<	target_p->name, target_p->hopcount + 1,
594	<	(unsigned long) target_p->tsinfo,
595	<	ubuf, target_p->username, target_p->host,
596	<	(MyClient(target_p) && IsIPSpoof(target_p)) ?
597	<	"0" : target_p->sockhost, target_p->id, target_p->info);
598	<	else
612	<	sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
613	<	target_p->name, target_p->hopcount + 1,
614	<	(unsigned long) target_p->tsinfo,
615	<	ubuf, target_p->username, target_p->host,
616	<	target_p->servptr->name, target_p->info);
617	<	}
589	>	sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	>	target_p->servptr->id,
591	>	target_p->name, target_p->hopcount + 1,
592	>	(unsigned long) target_p->tsinfo,
593	>	ubuf, target_p->username, target_p->host,
594	>	(MyClient(target_p) && IsIPSpoof(target_p)) ?
595	>	"0" : target_p->sockhost, target_p->id, target_p->info);
596	>
597	>	if (!EmptyString(target_p->certfp))
598	>	sendto_one(client_p, ":%s CERTFP %s", target_p->id, target_p->certfp);
599
600		if (target_p->away[0])
601	<	sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
621	<	target_p->away);
601	>	sendto_one(client_p, ":%s AWAY :%s", target_p->id, target_p->away);
602
603		}
604
#	Line 630 | Line 610 | sendnick_TS(struct Client *client_p, str
610		* side effects - build up string representing capabilities of server listed
611		*/
612		const char *
613	<	show_capabilities(struct Client *target_p)
613	>	show_capabilities(const struct Client *target_p)
614		{
615	<	static char msgbuf[IRCD_BUFSIZE];
616	<	char *t = msgbuf;
637	<	dlink_node *ptr;
615	>	static char msgbuf[IRCD_BUFSIZE] = "";
616	>	const dlink_node *ptr = NULL;
617
618	<	t += sprintf(msgbuf, "TS ");
618	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
619
620		DLINK_FOREACH(ptr, cap_list.head)
621		{
622		const struct Capability *cap = ptr->data;
623
624	<	if (IsCapable(target_p, cap->cap))
625	<	t += sprintf(t, "%s ", cap->name);
624	>	if (!IsCapable(target_p, cap->cap))
625	>	continue;
626	>
627	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
628	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
629		}
630
649	–	*(t - 1) = '\0';
631		return msgbuf;
632		}
633
#	Line 675 | Line 656 | make_server(struct Client *client_p)
656		void
657		server_estab(struct Client *client_p)
658		{
678	–	struct Client *target_p;
659		struct MaskItem *conf = NULL;
660		char *host;
661		const char *inpath;
#	Line 699 | Line 679 | server_estab(struct Client *client_p)
679		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
680		"Warning: Lost connect{} block "
681		"for server %s(this shouldn't happen)!", host);
682	<	exit_client(client_p, &me, "Lost connect{} block!");
682	>	exit_client(client_p, "Lost connect{} block!");
683		return;
684		}
685
#	Line 712 | Line 692 | server_estab(struct Client *client_p)
692		/* If there is something in the serv_list, it might be this
693		* connecting server..
694		*/
695	<	if (!ServerInfo.hub && serv_list.head)
695	>	if (!ServerInfo.hub && serv_list.head)
696		{
697		if (client_p != serv_list.head->data || serv_list.head->next)
698		{
699		++ServerStats.is_ref;
700		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
701	<	exit_client(client_p, &me, "I'm a leaf");
701	>	exit_client(client_p, "I'm a leaf");
702		return;
703		}
704		}
#	Line 736 | Line 716 | server_estab(struct Client *client_p)
716		sendto_one(client_p, "SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN,
717		(unsigned long)CurrentTime);
718
739	–	/* assumption here is if they passed the correct TS version, they also passed an SID */
740	–	if (IsCapable(client_p, CAP_TS6))
741	–	hash_add_id(client_p);
742	–
719		/* XXX Does this ever happen? I don't think so -db */
720		detach_conf(client_p, CONF_OPER);
721
#	Line 761 | Line 737 | server_estab(struct Client *client_p)
737
738		SetServer(client_p);
739
764	–	/* Update the capability combination usage counts. -A1kmm */
765	–	set_chcap_usage_counts(client_p);
766	–
740		/* Some day, all these lists will be consolidated *sigh* */
741		dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
742
#	Line 776 | Line 749 | server_estab(struct Client *client_p)
749
750		dlinkAdd(client_p, make_dlink_node(), &global_serv_list);
751		hash_add_client(client_p);
752	+	hash_add_id(client_p);
753
754		/* doesnt duplicate client_p->serv if allocated this struct already */
755		make_server(client_p);
#	Line 828 | Line 802 | server_estab(struct Client *client_p)
802
803		fd_note(&client_p->localClient->fd, "Server: %s", client_p->name);
804
805	<	/* Old sendto_serv_but_one() call removed because we now
806	<	** need to send different names to different servers
807	<	** (domain name matching) Send new server to other servers.
834	<	*/
835	<	DLINK_FOREACH(ptr, serv_list.head)
836	<	{
837	<	target_p = ptr->data;
838	<
839	<	if (target_p == client_p)
840	<	continue;
805	>	sendto_server(client_p, NOCAPS, NOCAPS, ":%s SID %s 2 %s :%s%s",
806	>	me.id, client_p->name, client_p->id,
807	>	IsHidden(client_p) ? "(H) " : "", client_p->info);
808
809	<	if (IsCapable(target_p, CAP_TS6) && HasID(client_p))
810	<	sendto_one(target_p, ":%s SID %s 2 %s :%s%s",
811	<	me.id, client_p->name, client_p->id,
812	<	IsHidden(client_p) ? "(H) " : "",
813	<	client_p->info);
814	<	else
815	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
816	<	me.name, client_p->name,
817	<	IsHidden(client_p) ? "(H) " : "",
818	<	client_p->info);
819	<	}
820	<
821	<	/* Pass on my client information to the new server
822	<	**
823	<	** First, pass only servers (idea is that if the link gets
824	<	** cancelled beacause the server was already there,
825	<	** there are no NICK's to be cancelled...). Of course,
826	<	** if cancellation occurs, all this info is sent anyway,
860	<	** and I guess the link dies when a read is attempted...? --msa
861	<	**
862	<	** Note: Link cancellation to occur at this point means
863	<	** that at least two servers from my fragment are building
864	<	** up connection this other fragment at the same time, it's
865	<	** a race condition, not the normal way of operation...
866	<	**
867	<	** ALSO NOTE: using the get_client_name for server names--
868	<	**    see previous *WARNING*!!! (Also, original inpath
869	<	**    is destroyed...)
870	<	*/
809	>	/*
810	>	* Pass on my client information to the new server
811	>	*
812	>	* First, pass only servers (idea is that if the link gets
813	>	* cancelled beacause the server was already there,
814	>	* there are no NICK's to be cancelled...). Of course,
815	>	* if cancellation occurs, all this info is sent anyway,
816	>	* and I guess the link dies when a read is attempted...? --msa
817	>	*
818	>	* Note: Link cancellation to occur at this point means
819	>	* that at least two servers from my fragment are building
820	>	* up connection this other fragment at the same time, it's
821	>	* a race condition, not the normal way of operation...
822	>	*
823	>	* ALSO NOTE: using the get_client_name for server names--
824	>	*    see previous *WARNING*!!! (Also, original inpath
825	>	*    is destroyed...)
826	>	*/
827
828		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
829		{
830	<	target_p = ptr->data;
830	>	struct Client *target_p = ptr->data;
831
832		/* target_p->from == target_p for target_p == client_p */
833		if (IsMe(target_p) || target_p->from == client_p)
834		continue;
835
836	<	if (IsCapable(client_p, CAP_TS6))
837	<	{
838	<	if (HasID(target_p))
839	<	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
884	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
885	<	target_p->id, IsHidden(target_p) ? "(H) " : "",
886	<	target_p->info);
887	<	else  /* introducing non-ts6 server */
888	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
889	<	ID(target_p->servptr), target_p->name, target_p->hopcount+1,
890	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
891	<	}
892	<	else
893	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
894	<	target_p->servptr->name, target_p->name, target_p->hopcount+1,
895	<	IsHidden(target_p) ? "(H) " : "", target_p->info);
836	>	sendto_one(client_p, ":%s SID %s %d %s :%s%s",
837	>	target_p->servptr->id, target_p->name, target_p->hopcount+1,
838	>	target_p->id, IsHidden(target_p) ? "(H) " : "",
839	>	target_p->info);
840
841		if (HasFlag(target_p, FLAGS_EOB))
842	<	sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
842	>	sendto_one(client_p, ":%s EOB", target_p->id, client_p);
843		}
844
845		server_burst(client_p);
#	Line 926 | Line 870 | server_burst(struct Client *client_p)
870
871		/* EOB stuff is now in burst_all */
872		/* Always send a PING after connect burst is done */
873	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
873	>	sendto_one(client_p, "PING :%s", me.id);
874		}
875
876		/* burst_all()
877		*
878	<	* inputs       - pointer to server to send burst to
878	>	* inputs       - pointer to server to send burst to
879		* output       - NONE
880		* side effects - complete burst of channels/nicks is sent to client_p
881		*/
#	Line 962 | Line 906 | burst_all(struct Client *client_p)
906
907		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
908		sendnick_TS(client_p, target_p);
909	<
909	>
910		DelFlag(target_p, FLAGS_BURSTED);
911		}
912
913		if (IsCapable(client_p, CAP_EOB))
914	<	sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
914	>	sendto_one(client_p, ":%s EOB", me.id);
915		}
916
917		/*
#	Line 996 | Line 940 | send_tb(struct Client *client_p, struct
940		* for further information   -Michael
941		*/
942		if (chptr->topic_time != 0)
943	<	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s",
1000	<	ID_or_name(&me, client_p),
943	>	sendto_one(client_p, ":%s TBURST %lu %s %lu %s :%s", me.id,
944		(unsigned long)chptr->channelts, chptr->chname,
945		(unsigned long)chptr->topic_time,
946		chptr->topic_info,
#	Line 1040 | Line 983 | burst_members(struct Client *client_p, s
983
984		/* serv_connect() - initiate a server connection
985		*
986	<	* inputs       - pointer to conf
986	>	* inputs       - pointer to conf
987		*              - pointer to client doing the connect
988		* output       -
989		* side effects -
#	Line 1092 | Line 1035 | serv_connect(struct MaskItem *conf, stru
1035		* Note: conf should ALWAYS be a valid C: line
1036		*/
1037		if ((client_p = hash_find_server(conf->name)) != NULL)
1038	<	{
1038	>	{
1039		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1040		"Server %s already present from %s",
1041		conf->name, get_client_name(client_p, SHOW_IP));
#	Line 1100 | Line 1043 | serv_connect(struct MaskItem *conf, stru
1043		"Server %s already present from %s",
1044		conf->name, get_client_name(client_p, MASK_IP));
1045		if (by && IsClient(by) && !MyClient(by))
1046	<	sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1047	<	me.name, by->name, conf->name,
1105	<	get_client_name(client_p, MASK_IP));
1046	>	sendto_one_notice(by, &me, ":Server %s already present from %s",
1047	>	conf->name, get_client_name(client_p, MASK_IP));
1048		return 0;
1049		}
1050	<
1050	>
1051		/* Create a local client */
1052		client_p = make_client(NULL);
1053
#	Line 1116 | Line 1058 | serv_connect(struct MaskItem *conf, stru
1058		/* We already converted the ip once, so lets use it - stu */
1059		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1060
1061	<	/* create a socket for the server connection */
1061	>	/* create a socket for the server connection */
1062		if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1063		SOCK_STREAM, 0, NULL) < 0)
1064		{
#	Line 1124 | Line 1066 | serv_connect(struct MaskItem *conf, stru
1066		report_error(L_ALL, "opening stream socket to %s: %s",
1067		conf->name, errno);
1068		SetDead(client_p);
1069	<	exit_client(client_p, &me, "Connection failed");
1069	>	exit_client(client_p, "Connection failed");
1070		return 0;
1071		}
1072
#	Line 1139 | Line 1081 | serv_connect(struct MaskItem *conf, stru
1081		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1082		"Host %s is not enabled for connecting: no connect{} block",
1083		conf->name);
1084	<	if (by && IsClient(by) && !MyClient(by))
1085	<	sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1086	<	me.name, by->name, client_p->name);
1084	>	if (by && IsClient(by) && !MyClient(by))
1085	>	sendto_one_notice(by, &me, ":Connect to host %s failed.", client_p->name);
1086	>
1087		SetDead(client_p);
1088	<	exit_client(client_p, client_p, "Connection failed");
1088	>	exit_client(client_p, "Connection failed");
1089		return 0;
1090		}
1091
#	Line 1166 | Line 1108 | serv_connect(struct MaskItem *conf, stru
1108		client_p->localClient->aftype = conf->aftype;
1109
1110		/* Now, initiate the connection */
1111	<	/* XXX assume that a non 0 type means a specific bind address
1111	>	/* XXX assume that a non 0 type means a specific bind address
1112		* for this connect.
1113		*/
1114		switch (conf->aftype)
#	Line 1181 | Line 1123 | serv_connect(struct MaskItem *conf, stru
1123		ipn.ss_port = 0;
1124		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1125		comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1126	<	(struct sockaddr *)&ipn, ipn.ss_len,
1126	>	(struct sockaddr *)&ipn, ipn.ss_len,
1127		serv_connect_callback, client_p, conf->aftype,
1128		CONNECTTIMEOUT);
1129		}
#	Line 1198 | Line 1140 | serv_connect(struct MaskItem *conf, stru
1140		CONNECTTIMEOUT);
1141		}
1142		else
1143	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1144	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1143	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1144	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1145		CONNECTTIMEOUT);
1146		break;
1147		#ifdef IPV6
#	Line 1220 | Line 1162 | serv_connect(struct MaskItem *conf, stru
1162		ipn.ss_port = 0;
1163		comm_connect_tcp(&client_p->localClient->fd,
1164		conf->host, conf->port,
1165	<	(struct sockaddr *)&ipn, ipn.ss_len,
1165	>	(struct sockaddr *)&ipn, ipn.ss_len,
1166		serv_connect_callback, client_p,
1167		conf->aftype, CONNECTTIMEOUT);
1168		}
#	Line 1237 | Line 1179 | serv_connect(struct MaskItem *conf, stru
1179		}
1180		else
1181		comm_connect_tcp(&client_p->localClient->fd,
1182	<	conf->host, conf->port,
1182	>	conf->host, conf->port,
1183		NULL, 0, serv_connect_callback, client_p,
1184		conf->aftype, CONNECTTIMEOUT);
1185		}
#	Line 1261 | Line 1203 | finish_ssl_server_handshake(struct Clien
1203		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1204		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1205
1206	<	exit_client(client_p, &me, "Lost connect{} block");
1206	>	exit_client(client_p, "Lost connect{} block");
1207		return;
1208		}
1209
#	Line 1295 | Line 1237 | finish_ssl_server_handshake(struct Clien
1237		static void
1238		ssl_server_handshake(fde_t *fd, struct Client *client_p)
1239		{
1240	<	int ret;
1241	<	int err;
1240	>	X509 *cert = NULL;
1241	>	int ret = 0;
1242
1243	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1302	<
1303	<	if (ret <= 0)
1243	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1244		{
1245	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1245	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1246		{
1247		case SSL_ERROR_WANT_WRITE:
1248		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1318 | Line 1258 | ssl_server_handshake(fde_t *fd, struct C
1258		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1259		"Error connecting to %s: %s", client_p->name,
1260		sslerr ? sslerr : "unknown SSL error");
1261	<	exit_client(client_p, client_p, "Error during SSL handshake");
1261	>	exit_client(client_p, "Error during SSL handshake");
1262		return;
1263		}
1264		}
1265		}
1266
1267	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1268	+	{
1269	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1270	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1271	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1272	+
1273	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1274	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1275	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1276	+	{
1277	+	unsigned int i = 0, n = 0;
1278	+
1279	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1280	+	{
1281	+	for (; i < n; ++i)
1282	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1283	+	client_p->certfp = xstrdup(buf);
1284	+	}
1285	+	}
1286	+	else
1287	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1288	+	client_p->name, client_p->username, client_p->host, res);
1289	+	X509_free(cert);
1290	+	}
1291	+
1292		finish_ssl_server_handshake(client_p);
1293		}
1294
#	Line 1335 | Line 1300 | ssl_connect_init(struct Client *client_p
1300		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
1301		ERR_error_string(ERR_get_error(), NULL));
1302		SetDead(client_p);
1303	<	exit_client(client_p, client_p, "SSL_new failed");
1303	>	exit_client(client_p, "SSL_new failed");
1304		return;
1305		}
1306
#	Line 1349 | Line 1314 | ssl_connect_init(struct Client *client_p
1314		#endif
1315
1316		/* serv_connect_callback() - complete a server connection.
1317	<	*
1317	>	*
1318		* This routine is called after the server connection attempt has
1319		* completed. If unsucessful, an error is sent to ops and the client
1320		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1406 | Line 1371 | serv_connect_callback(fde_t *fd, int sta
1371		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1372		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1373
1374	<	exit_client(client_p, &me, "Lost connect{} block");
1374	>	exit_client(client_p, "Lost connect{} block");
1375		return;
1376		}
1377
#	Line 1431 | Line 1396 | serv_connect_callback(fde_t *fd, int sta
1396		/* If we've been marked dead because a send failed, just exit
1397		* here now and save everyone the trouble of us ever existing.
1398		*/
1399	<	if (IsDead(client_p))
1399	>	if (IsDead(client_p))
1400		{
1401		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1402		"%s[%s] went dead during handshake",
#	Line 1461 | Line 1426 | find_servconn_in_progress(const char *na
1426		if (!match(name, cptr->name))
1427		return cptr;
1428		}
1429	<
1429	>
1430		return NULL;
1431		}

Diff Legend

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