ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/s_serv.c (file contents):
Revision 1851 by michael, Wed Apr 24 18:31:06 2013 UTC vs.
Revision 2718 by michael, Wed Dec 25 13:43:46 2013 UTC

#	Line 54 | Line 54
54
55		#define MIN_CONN_FREQ 300
56
57	+	dlink_list flatten_links;
58		static dlink_list cap_list = { NULL, NULL, 0 };
59		static void server_burst(struct Client *);
60		static void burst_all(struct Client *);
#	Line 72 | Line 73 | static void burst_members(struct Client
73		*                but in no particular order.
74		*/
75		void
76	<	write_links_file(void* notused)
76	>	write_links_file(void *notused)
77		{
78	<	MessageFileLine *next_mptr = NULL;
79	<	MessageFileLine *mptr = NULL;
80	<	MessageFileLine *currentMessageLine = NULL;
80	<	MessageFileLine *newMessageLine = NULL;
81	<	MessageFile *MessageFileptr = &ConfigFileEntry.linksfile;
82	<	FILE *file;
83	<	char buff[512];
84	<	dlink_node *ptr;
78	>	FILE *file = NULL;
79	>	dlink_node *ptr = NULL, *ptr_next = NULL;
80	>	char buff[IRCD_BUFSIZE] = { '\0' };
81
82	<	if ((file = fopen(MessageFileptr->fileName, "w")) == NULL)
82	>	if ((file = fopen(LIPATH, "w")) == NULL)
83		return;
84
85	<	for (mptr = MessageFileptr->contentsOfFile; mptr; mptr = next_mptr)
85	>	DLINK_FOREACH_SAFE(ptr, ptr_next, flatten_links.head)
86		{
87	<	next_mptr = mptr->next;
88	<	MyFree(mptr);
87	>	dlinkDelete(ptr, &flatten_links);
88	>	MyFree(ptr->data);
89	>	free_dlink_node(ptr);
90		}
91
95	–	MessageFileptr->contentsOfFile = NULL;
96	–
92		DLINK_FOREACH(ptr, global_serv_list.head)
93		{
94		const struct Client *target_p = ptr->data;
95
96	<	/* skip ourselves, we send ourselves in /links */
97	<	if (IsMe(target_p))
98	<	continue;
99	<
100	<	/* skip hidden servers */
106	<	if (IsHidden(target_p))
96	>	/*
97	>	* Skip hidden servers, aswell as ourselves, since we already send
98	>	* ourselves in /links
99	>	*/
100	>	if (IsHidden(target_p) || IsMe(target_p))
101		continue;
102
103		if (HasFlag(target_p, FLAGS_SERVICE) && ConfigServerHide.hide_services)
104		continue;
105
112	–	newMessageLine = MyMalloc(sizeof(MessageFileLine));
113	–
106		/*
107		* Attempt to format the file in such a way it follows the usual links output
108		* ie  "servername uplink :hops info"
109		* Mostly for aesthetic reasons - makes it look pretty in mIRC ;)
110		* - madmax
111		*/
112	<	snprintf(newMessageLine->line, sizeof(newMessageLine->line), "%s %s :1 %s",
113	<	target_p->name, me.name, target_p->info);
114	<
115	<	if (MessageFileptr->contentsOfFile)
116	<	{
125	<	if (currentMessageLine)
126	<	currentMessageLine->next = newMessageLine;
127	<	currentMessageLine = newMessageLine;
128	<	}
129	<	else
130	<	{
131	<	MessageFileptr->contentsOfFile = newMessageLine;
132	<	currentMessageLine = newMessageLine;
133	<	}
112	>	snprintf(buff, sizeof(buff), "%s %s :1 %s",   target_p->name,
113	>	me.name, target_p->info);
114	>	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
115	>	snprintf(buff, sizeof(buff), "%s %s :1 %s\n", target_p->name,
116	>	me.name, target_p->info);
117
135	–	snprintf(buff, sizeof(buff), "%s %s :1 %s\n",
136	–	target_p->name, me.name, target_p->info);
118		fputs(buff, file);
119		}
120
121		fclose(file);
122		}
123
124	+	void
125	+	read_links_file(void)
126	+	{
127	+	FILE *file = NULL;
128	+	char *p = NULL;
129	+	char buff[IRCD_BUFSIZE] = { '\0' };
130	+
131	+	if ((file = fopen(LIPATH, "r")) == NULL)
132	+	return;
133	+
134	+	while (fgets(buff, sizeof(buff), file))
135	+	{
136	+	if ((p = strchr(buff, '\n')) != NULL)
137	+	*p = '\0';
138	+
139	+	dlinkAddTail(xstrdup(buff), make_dlink_node(), &flatten_links);
140	+	}
141	+
142	+	fclose(file);
143	+	}
144	+
145		/* hunt_server()
146		*      Do the basic thing in delivering the message (command)
147		*      across the relays to the specific server (server) for
#	Line 161 | Line 163 | write_links_file(void* notused)
163		*/
164		int
165		hunt_server(struct Client *client_p, struct Client *source_p, const char *command,
166	<	int server, int parc, char *parv[])
166	>	const int server, const int parc, char *parv[])
167		{
168		struct Client *target_p = NULL;
169		struct Client *target_tmp = NULL;
#	Line 192 | Line 194 | hunt_server(struct Client *client_p, str
194		if (target_p->from == source_p->from && !MyConnect(target_p))
195		target_p = NULL;
196
195	–	collapse(parv[server]);
197		wilds = has_wildcards(parv[server]);
198
199		/* Again, if there are no wild cards involved in the server
#	Line 206 | Line 207 | hunt_server(struct Client *client_p, str
207		{
208		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
209		me.name, source_p->name, parv[server]);
210	<	return(HUNTED_NOSUCH);
210	>	return HUNTED_NOSUCH;
211		}
212		}
213		else
#	Line 252 | Line 253 | hunt_server(struct Client *client_p, str
253		sendto_one(target_p, command, parv[0],
254		parv[1], parv[2], parv[3], parv[4],
255		parv[5], parv[6], parv[7], parv[8]);
256	<	return(HUNTED_PASS);
257	<	}
256	>	return HUNTED_PASS;
257	>	}
258
259		sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
260		me.name, source_p->name, parv[server]);
261	<	return(HUNTED_NOSUCH);
261	>	return HUNTED_NOSUCH;
262		}
263
264		/* try_connections()
#	Line 287 | Line 288 | try_connections(void *unused)
288
289		assert(conf->type == CONF_SERVER);
290
291	<	/* Also when already connecting! (update holdtimes) --SRB
291	>	/* Also when already connecting! (update holdtimes) --SRB
292		*/
293		if (!conf->port ||!IsConfAllowAutoConn(conf))
294		continue;
#	Line 308 | Line 309 | try_connections(void *unused)
309		{
310		confrq = conf->class->con_freq;
311		if (confrq < MIN_CONN_FREQ)
312	<	confrq = MIN_CONN_FREQ;
312	>	confrq = MIN_CONN_FREQ;
313		}
314
315		conf->until = CurrentTime + confrq;
#	Line 398 | Line 399 | check_server(const char *name, struct Cl
399
400		/* XXX: Fix me for IPv6                    */
401		/* XXX sockhost is the IPv4 ip as a string */
402	<	if (!match(conf->host, client_p->host) ||
402	>	if (!match(conf->host, client_p->host) ||
403		!match(conf->host, client_p->sockhost))
404		{
405		error = -2;
#	Line 406 | Line 407 | check_server(const char *name, struct Cl
407		if (!match_conf_password(client_p->localClient->passwd, conf))
408		return -2;
409
410	+	if (!EmptyString(conf->certfp))
411	+	if (EmptyString(client_p->certfp) || strcasecmp(client_p->certfp, conf->certfp))
412	+	return -4;
413	+
414		server_conf = conf;
415		}
416		}
417
418		if (server_conf == NULL)
419	<	return(error);
419	>	return error;
420
421		attach_conf(client_p, server_conf);
422
#	Line 425 | Line 430 | check_server(const char *name, struct Cl
430		switch (server_conf->aftype)
431		{
432		#ifdef IPV6
433	<	case AF_INET6:
433	>	case AF_INET6:
434		v6 = (struct sockaddr_in6 *)&server_conf->addr;
435
436		if (IN6_IS_ADDR_UNSPECIFIED(&v6->sin6_addr))
#	Line 436 | Line 441 | check_server(const char *name, struct Cl
441		v4 = (struct sockaddr_in *)&server_conf->addr;
442
443		if (v4->sin_addr.s_addr == INADDR_NONE)
444	<	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
444	>	memcpy(&server_conf->addr, &client_p->localClient->ip, sizeof(struct irc_ssaddr));
445		break;
446		}
447		}
448
449	<	return(0);
449	>	return 0;
450		}
451
452		/* add_capability()
#	Line 487 | Line 492 | delete_capability(const char *capab_name
492		{
493		if (irccmp(cap->name, capab_name) == 0)
494		{
495	<	default_server_capabs &= ~(cap->cap);
496	<	dlinkDelete(ptr, &cap_list);
497	<	MyFree(cap->name);
498	<	cap->name = NULL;
494	<	MyFree(cap);
495	>	default_server_capabs &= ~(cap->cap);
496	>	dlinkDelete(ptr, &cap_list);
497	>	MyFree(cap->name);
498	>	MyFree(cap);
499		}
500		}
501		}
#	Line 506 | Line 510 | delete_capability(const char *capab_name
510		* output       - 0 if not found CAPAB otherwise
511		* side effects - none
512		*/
513	<	int
513	>	unsigned int
514		find_capability(const char *capab)
515		{
516		const dlink_node *ptr = NULL;
#	Line 557 | Line 561 | send_capabilities(struct Client *client_
561		}
562
563		/* sendnick_TS()
564	<	*
564	>	*
565		* inputs       - client (server) to send nick towards
566		*          - client to send nick for
567		* output       - NONE
#	Line 566 | Line 570 | send_capabilities(struct Client *client_
570		void
571		sendnick_TS(struct Client *client_p, struct Client *target_p)
572		{
573	<	static char ubuf[12];
573	>	char ubuf[IRCD_BUFSIZE];
574
575		if (!IsClient(target_p))
576		return;
#	Line 616 | Line 620 | sendnick_TS(struct Client *client_p, str
620		target_p->servptr->name, target_p->info);
621		}
622
623	+	if (!EmptyString(target_p->certfp))
624	+	sendto_one(client_p, ":%s CERTFP %s",
625	+	ID_or_name(target_p, client_p), target_p->certfp);
626	+
627		if (target_p->away[0])
628		sendto_one(client_p, ":%s AWAY :%s", ID_or_name(target_p, client_p),
629		target_p->away);
#	Line 630 | Line 638 | sendnick_TS(struct Client *client_p, str
638		* side effects - build up string representing capabilities of server listed
639		*/
640		const char *
641	<	show_capabilities(struct Client *target_p)
641	>	show_capabilities(const struct Client *target_p)
642		{
643	<	static char msgbuf[IRCD_BUFSIZE];
644	<	char *t = msgbuf;
637	<	dlink_node *ptr;
643	>	static char msgbuf[IRCD_BUFSIZE] = "";
644	>	const dlink_node *ptr = NULL;
645
646	<	t += sprintf(msgbuf, "TS ");
646	>	strlcpy(msgbuf, "TS", sizeof(msgbuf));
647
648		DLINK_FOREACH(ptr, cap_list.head)
649		{
650		const struct Capability *cap = ptr->data;
651
652	<	if (IsCapable(target_p, cap->cap))
653	<	t += sprintf(t, "%s ", cap->name);
652	>	if (!IsCapable(target_p, cap->cap))
653	>	continue;
654	>
655	>	strlcat(msgbuf,       " ", sizeof(msgbuf));
656	>	strlcat(msgbuf, cap->name, sizeof(msgbuf));
657		}
658
649	–	*(t - 1) = '\0';
659		return msgbuf;
660		}
661
#	Line 712 | Line 721 | server_estab(struct Client *client_p)
721		/* If there is something in the serv_list, it might be this
722		* connecting server..
723		*/
724	<	if (!ServerInfo.hub && serv_list.head)
724	>	if (!ServerInfo.hub && serv_list.head)
725		{
726		if (client_p != serv_list.head->data || serv_list.head->next)
727		{
#	Line 725 | Line 734 | server_estab(struct Client *client_p)
734
735		if (IsUnknown(client_p))
736		{
737	<	/* jdc -- 1.  Use EmptyString(), not [0] index reference.
729	<	*        2.  Check conf->spasswd, not conf->passwd.
730	<	*/
731	<	if (!EmptyString(conf->spasswd))
732	<	sendto_one(client_p, "PASS %s TS %d %s",
733	<	conf->spasswd, TS_CURRENT, me.id);
737	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
738
739		send_capabilities(client_p, 0);
740
#	Line 850 | Line 854 | server_estab(struct Client *client_p)
854		IsHidden(client_p) ? "(H) " : "",
855		client_p->info);
856		else
857	<	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
857	>	sendto_one(target_p,":%s SERVER %s 2 :%s%s",
858		me.name, client_p->name,
859		IsHidden(client_p) ? "(H) " : "",
860		client_p->info);
861		}
862
863	<	/* Pass on my client information to the new server
864	<	**
865	<	** First, pass only servers (idea is that if the link gets
866	<	** cancelled beacause the server was already there,
867	<	** there are no NICK's to be cancelled...). Of course,
868	<	** if cancellation occurs, all this info is sent anyway,
869	<	** and I guess the link dies when a read is attempted...? --msa
870	<	**
871	<	** Note: Link cancellation to occur at this point means
872	<	** that at least two servers from my fragment are building
873	<	** up connection this other fragment at the same time, it's
874	<	** a race condition, not the normal way of operation...
875	<	**
876	<	** ALSO NOTE: using the get_client_name for server names--
877	<	**    see previous *WARNING*!!! (Also, original inpath
878	<	**    is destroyed...)
879	<	*/
863	>	/*
864	>	* Pass on my client information to the new server
865	>	*
866	>	* First, pass only servers (idea is that if the link gets
867	>	* cancelled beacause the server was already there,
868	>	* there are no NICK's to be cancelled...). Of course,
869	>	* if cancellation occurs, all this info is sent anyway,
870	>	* and I guess the link dies when a read is attempted...? --msa
871	>	*
872	>	* Note: Link cancellation to occur at this point means
873	>	* that at least two servers from my fragment are building
874	>	* up connection this other fragment at the same time, it's
875	>	* a race condition, not the normal way of operation...
876	>	*
877	>	* ALSO NOTE: using the get_client_name for server names--
878	>	*    see previous *WARNING*!!! (Also, original inpath
879	>	*    is destroyed...)
880	>	*/
881
882		DLINK_FOREACH_PREV(ptr, global_serv_list.tail)
883		{
#	Line 895 | Line 900 | server_estab(struct Client *client_p)
900		IsHidden(target_p) ? "(H) " : "", target_p->info);
901		}
902		else
903	<	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
903	>	sendto_one(client_p, ":%s SERVER %s %d :%s%s",
904		target_p->servptr->name, target_p->name, target_p->hopcount+1,
905		IsHidden(target_p) ? "(H) " : "", target_p->info);
906	+
907	+	if (HasFlag(target_p, FLAGS_EOB))
908	+	sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
909		}
910
911		server_burst(client_p);
#	Line 933 | Line 941 | server_burst(struct Client *client_p)
941
942		/* burst_all()
943		*
944	<	* inputs       - pointer to server to send burst to
944	>	* inputs       - pointer to server to send burst to
945		* output       - NONE
946		* side effects - complete burst of channels/nicks is sent to client_p
947		*/
#	Line 952 | Line 960 | burst_all(struct Client *client_p)
960		send_channel_modes(client_p, chptr);
961
962		if (IsCapable(client_p, CAP_TBURST))
963	<	send_tb(client_p, chptr);
963	>	send_tb(client_p, chptr);
964		}
965		}
966
#	Line 964 | Line 972 | burst_all(struct Client *client_p)
972
973		if (!HasFlag(target_p, FLAGS_BURSTED) && target_p->from != client_p)
974		sendnick_TS(client_p, target_p);
975	<
975	>
976		DelFlag(target_p, FLAGS_BURSTED);
977		}
978
971	–	/* We send the time we started the burst, and let the remote host determine an EOB time,
972	–	** as otherwise we end up sending a EOB of 0   Sending here means it gets sent last -- fl
973	–	*/
974	–	/* Its simpler to just send EOB and use the time its been connected.. --fl_ */
979		if (IsCapable(client_p, CAP_EOB))
980		sendto_one(client_p, ":%s EOB", ID_or_name(&me, client_p));
981		}
#	Line 1046 | Line 1050 | burst_members(struct Client *client_p, s
1050
1051		/* serv_connect() - initiate a server connection
1052		*
1053	<	* inputs       - pointer to conf
1053	>	* inputs       - pointer to conf
1054		*              - pointer to client doing the connect
1055		* output       -
1056		* side effects -
#	Line 1098 | Line 1102 | serv_connect(struct MaskItem *conf, stru
1102		* Note: conf should ALWAYS be a valid C: line
1103		*/
1104		if ((client_p = hash_find_server(conf->name)) != NULL)
1105	<	{
1105	>	{
1106		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1107	<	"Server %s already present from %s",
1108	<	conf->name, get_client_name(client_p, SHOW_IP));
1107	>	"Server %s already present from %s",
1108	>	conf->name, get_client_name(client_p, SHOW_IP));
1109		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1110	<	"Server %s already present from %s",
1111	<	conf->name, get_client_name(client_p, MASK_IP));
1110	>	"Server %s already present from %s",
1111	>	conf->name, get_client_name(client_p, MASK_IP));
1112		if (by && IsClient(by) && !MyClient(by))
1113		sendto_one(by, ":%s NOTICE %s :Server %s already present from %s",
1114	<	me.name, by->name, conf->name,
1115	<	get_client_name(client_p, MASK_IP));
1116	<	return (0);
1114	>	me.name, by->name, conf->name,
1115	>	get_client_name(client_p, MASK_IP));
1116	>	return 0;
1117		}
1118	<
1118	>
1119		/* Create a local client */
1120		client_p = make_client(NULL);
1121
#	Line 1122 | Line 1126 | serv_connect(struct MaskItem *conf, stru
1126		/* We already converted the ip once, so lets use it - stu */
1127		strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost));
1128
1129	<	/* create a socket for the server connection */
1129	>	/* create a socket for the server connection */
1130		if (comm_open(&client_p->localClient->fd, conf->addr.ss.ss_family,
1131		SOCK_STREAM, 0, NULL) < 0)
1132		{
1133		/* Eek, failure to create the socket */
1134	<	report_error(L_ALL,
1135	<	"opening stream socket to %s: %s", conf->name, errno);
1134	>	report_error(L_ALL, "opening stream socket to %s: %s",
1135	>	conf->name, errno);
1136		SetDead(client_p);
1137		exit_client(client_p, &me, "Connection failed");
1138	<	return (0);
1138	>	return 0;
1139		}
1140
1141		/* servernames are always guaranteed under HOSTLEN chars */
#	Line 1143 | Line 1147 | serv_connect(struct MaskItem *conf, stru
1147		if (!attach_connect_block(client_p, conf->name, conf->host))
1148		{
1149		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1150	<	"Host %s is not enabled for connecting: no connect{} block",
1151	<	conf->name);
1152	<	if (by && IsClient(by) && !MyClient(by))
1150	>	"Host %s is not enabled for connecting: no connect{} block",
1151	>	conf->name);
1152	>	if (by && IsClient(by) && !MyClient(by))
1153		sendto_one(by, ":%s NOTICE %s :Connect to host %s failed.",
1154	<	me.name, by->name, client_p->name);
1154	>	me.name, by->name, client_p->name);
1155		SetDead(client_p);
1156		exit_client(client_p, client_p, "Connection failed");
1157	<	return (0);
1157	>	return 0;
1158		}
1159
1160		/* at this point we have a connection in progress and C/N lines
#	Line 1172 | Line 1176 | serv_connect(struct MaskItem *conf, stru
1176		client_p->localClient->aftype = conf->aftype;
1177
1178		/* Now, initiate the connection */
1179	<	/* XXX assume that a non 0 type means a specific bind address
1179	>	/* XXX assume that a non 0 type means a specific bind address
1180		* for this connect.
1181		*/
1182		switch (conf->aftype)
#	Line 1186 | Line 1190 | serv_connect(struct MaskItem *conf, stru
1190		ipn.ss.ss_family = AF_INET;
1191		ipn.ss_port = 0;
1192		memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1193	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1194	<	(struct sockaddr *)&ipn, ipn.ss_len,
1195	<	serv_connect_callback, client_p, conf->aftype,
1196	<	CONNECTTIMEOUT);
1193	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1194	>	(struct sockaddr *)&ipn, ipn.ss_len,
1195	>	serv_connect_callback, client_p, conf->aftype,
1196	>	CONNECTTIMEOUT);
1197		}
1198		else if (ServerInfo.specific_ipv4_vhost)
1199		{
#	Line 1201 | Line 1205 | serv_connect(struct MaskItem *conf, stru
1205		comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1206		(struct sockaddr *)&ipn, ipn.ss_len,
1207		serv_connect_callback, client_p, conf->aftype,
1208	<	CONNECTTIMEOUT);
1208	>	CONNECTTIMEOUT);
1209		}
1210		else
1211	<	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1212	<	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1211	>	comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
1212	>	NULL, 0, serv_connect_callback, client_p, conf->aftype,
1213		CONNECTTIMEOUT);
1214		break;
1215		#ifdef IPV6
1216		case AF_INET6:
1217		{
1218	<	struct irc_ssaddr ipn;
1219	<	struct sockaddr_in6 *v6;
1220	<	struct sockaddr_in6 *v6conf;
1221	<
1222	<	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	<	v6conf = (struct sockaddr_in6 *)&conf->bind;
1224	<	v6 = (struct sockaddr_in6 *)&ipn;
1225	<
1226	<	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr,
1227	<	sizeof(struct in6_addr)) != 0)
1228	<	{
1229	<	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1230	<	ipn.ss.ss_family = AF_INET6;
1231	<	ipn.ss_port = 0;
1232	<	comm_connect_tcp(&client_p->localClient->fd,
1233	<	conf->host, conf->port,
1234	<	(struct sockaddr *)&ipn, ipn.ss_len,
1235	<	serv_connect_callback, client_p,
1236	<	conf->aftype, CONNECTTIMEOUT);
1237	<	}
1234	<	else if (ServerInfo.specific_ipv6_vhost)
1218	>	struct irc_ssaddr ipn;
1219	>	struct sockaddr_in6 *v6;
1220	>	struct sockaddr_in6 *v6conf;
1221	>
1222	>	memset(&ipn, 0, sizeof(struct irc_ssaddr));
1223	>	v6conf = (struct sockaddr_in6 *)&conf->bind;
1224	>	v6 = (struct sockaddr_in6 *)&ipn;
1225	>
1226	>	if (memcmp(&v6conf->sin6_addr, &v6->sin6_addr, sizeof(struct in6_addr)) != 0)
1227	>	{
1228	>	memcpy(&ipn, &conf->bind, sizeof(struct irc_ssaddr));
1229	>	ipn.ss.ss_family = AF_INET6;
1230	>	ipn.ss_port = 0;
1231	>	comm_connect_tcp(&client_p->localClient->fd,
1232	>	conf->host, conf->port,
1233	>	(struct sockaddr *)&ipn, ipn.ss_len,
1234	>	serv_connect_callback, client_p,
1235	>	conf->aftype, CONNECTTIMEOUT);
1236	>	}
1237	>	else if (ServerInfo.specific_ipv6_vhost)
1238		{
1239	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1240	<	ipn.ss.ss_family = AF_INET6;
1241	<	ipn.ss_port = 0;
1242	<	comm_connect_tcp(&client_p->localClient->fd,
1243	<	conf->host, conf->port,
1244	<	(struct sockaddr *)&ipn, ipn.ss_len,
1245	<	serv_connect_callback, client_p,
1246	<	conf->aftype, CONNECTTIMEOUT);
1247	<	}
1248	<	else
1249	<	comm_connect_tcp(&client_p->localClient->fd,
1250	<	conf->host, conf->port,
1251	<	NULL, 0, serv_connect_callback, client_p,
1252	<	conf->aftype, CONNECTTIMEOUT);
1239	>	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
1240	>	ipn.ss.ss_family = AF_INET6;
1241	>	ipn.ss_port = 0;
1242	>	comm_connect_tcp(&client_p->localClient->fd,
1243	>	conf->host, conf->port,
1244	>	(struct sockaddr *)&ipn, ipn.ss_len,
1245	>	serv_connect_callback, client_p,
1246	>	conf->aftype, CONNECTTIMEOUT);
1247	>	}
1248	>	else
1249	>	comm_connect_tcp(&client_p->localClient->fd,
1250	>	conf->host, conf->port,
1251	>	NULL, 0, serv_connect_callback, client_p,
1252	>	conf->aftype, CONNECTTIMEOUT);
1253		}
1254		#endif
1255		}
1256	<	return (1);
1256	>	return 1;
1257		}
1258
1259		#ifdef HAVE_LIBCRYPTO
#	Line 1272 | Line 1275 | finish_ssl_server_handshake(struct Clien
1275		return;
1276		}
1277
1278	<	/* jdc -- Check and send spasswd, not passwd. */
1276	<	if (!EmptyString(conf->spasswd))
1277	<	sendto_one(client_p, "PASS %s TS %d %s",
1278	<	conf->spasswd, TS_CURRENT, me.id);
1278	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1279
1280		send_capabilities(client_p, 0);
1281
#	Line 1305 | Line 1305 | finish_ssl_server_handshake(struct Clien
1305		static void
1306		ssl_server_handshake(fde_t *fd, struct Client *client_p)
1307		{
1308	<	int ret;
1309	<	int err;
1310	<
1311	<	ret = SSL_connect(client_p->localClient->fd.ssl);
1308	>	X509 *cert = NULL;
1309	>	int ret = 0;
1310
1311	<	if (ret <= 0)
1311	>	if ((ret = SSL_connect(client_p->localClient->fd.ssl)) <= 0)
1312		{
1313	<	switch ((err = SSL_get_error(client_p->localClient->fd.ssl, ret)))
1313	>	switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
1314		{
1315		case SSL_ERROR_WANT_WRITE:
1316		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
#	Line 1334 | Line 1332 | ssl_server_handshake(fde_t *fd, struct C
1332		}
1333		}
1334
1335	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
1336	+	{
1337	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
1338	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
1339	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
1340	+
1341	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
1342	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
1343	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
1344	+	{
1345	+	unsigned int i = 0, n = 0;
1346	+
1347	+	if (X509_digest(cert, EVP_sha256(), md, &n))
1348	+	{
1349	+	for (; i < n; ++i)
1350	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
1351	+	client_p->certfp = xstrdup(buf);
1352	+	}
1353	+	}
1354	+	else
1355	+	ilog(LOG_TYPE_IRCD, "Server %s!%s@%s gave bad SSL client certificate: %d",
1356	+	client_p->name, client_p->username, client_p->host, res);
1357	+	X509_free(cert);
1358	+	}
1359	+
1360		finish_ssl_server_handshake(client_p);
1361		}
1362
#	Line 1359 | Line 1382 | ssl_connect_init(struct Client *client_p
1382		#endif
1383
1384		/* serv_connect_callback() - complete a server connection.
1385	<	*
1385	>	*
1386		* This routine is called after the server connection attempt has
1387		* completed. If unsucessful, an error is sent to ops and the client
1388		* is closed. If sucessful, it goes through the initialisation/check
#	Line 1391 | Line 1414 | serv_connect_callback(fde_t *fd, int sta
1414		client_p->name, comm_errstr(status));
1415		else
1416		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1417	<	"Error connecting to %s[%s]: %s", client_p->name,
1418	<	client_p->host, comm_errstr(status));
1417	>	"Error connecting to %s[%s]: %s", client_p->name,
1418	>	client_p->host, comm_errstr(status));
1419
1420		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1421	<	"Error connecting to %s: %s",
1422	<	client_p->name, comm_errstr(status));
1421	>	"Error connecting to %s: %s",
1422	>	client_p->name, comm_errstr(status));
1423
1424		/* If a fd goes bad, call dead_link() the socket is no
1425		* longer valid for reading or writing.
#	Line 1408 | Line 1431 | serv_connect_callback(fde_t *fd, int sta
1431		/* COMM_OK, so continue the connection procedure */
1432		/* Get the C/N lines */
1433		conf = find_conf_name(&client_p->localClient->confs,
1434	<	client_p->name, CONF_SERVER);
1434	>	client_p->name, CONF_SERVER);
1435		if (conf == NULL)
1436		{
1437		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1438	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1438	>	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
1439		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1440	<	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1440	>	"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
1441
1442		exit_client(client_p, &me, "Lost connect{} block");
1443		return;
#	Line 1431 | Line 1454 | serv_connect_callback(fde_t *fd, int sta
1454		}
1455		#endif
1456
1457	<	/* jdc -- Check and send spasswd, not passwd. */
1435	<	if (!EmptyString(conf->spasswd))
1436	<	sendto_one(client_p, "PASS %s TS %d %s",
1437	<	conf->spasswd, TS_CURRENT, me.id);
1457	>	sendto_one(client_p, "PASS %s TS %d %s", conf->spasswd, TS_CURRENT, me.id);
1458
1459		send_capabilities(client_p, 0);
1460
1461	<	sendto_one(client_p, "SERVER %s 1 :%s%s",
1462	<	me.name, ConfigServerHide.hidden ? "(H) " : "",
1443	<	me.info);
1461	>	sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
1462	>	ConfigServerHide.hidden ? "(H) " : "", me.info);
1463
1464		/* If we've been marked dead because a send failed, just exit
1465		* here now and save everyone the trouble of us ever existing.
1466		*/
1467	<	if (IsDead(client_p))
1467	>	if (IsDead(client_p))
1468		{
1469		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1470	<	"%s[%s] went dead during handshake",
1470	>	"%s[%s] went dead during handshake",
1471		client_p->name,
1472	<	client_p->host);
1472	>	client_p->host);
1473		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1474	<	"%s went dead during handshake", client_p->name);
1474	>	"%s went dead during handshake", client_p->name);
1475		return;
1476		}
1477
#	Line 1475 | Line 1494 | find_servconn_in_progress(const char *na
1494		if (!match(name, cptr->name))
1495		return cptr;
1496		}
1497	<
1497	>
1498		return NULL;
1499		}

Diff Legend

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