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/server.c (file contents):
Revision 4298 by michael, Sun Jul 20 13:51:16 2014 UTC vs.
Revision 4340 by michael, Sat Aug 2 16:53:22 2014 UTC

#	Line 690 | Line 690 | serv_connect(struct MaskItem *conf, stru
690		serv_connect_callback, client_p, conf->aftype,
691		CONNECTTIMEOUT);
692		}
693	<	else if (ServerInfo.specific_ipv4_vhost)
693	>	else if (ConfigServerInfo.specific_ipv4_vhost)
694		{
695		struct irc_ssaddr ipn;
696		memset(&ipn, 0, sizeof(struct irc_ssaddr));
697		ipn.ss.ss_family = AF_INET;
698		ipn.ss_port = 0;
699	<	memcpy(&ipn, &ServerInfo.ip, sizeof(struct irc_ssaddr));
699	>	memcpy(&ipn, &ConfigServerInfo.ip, sizeof(struct irc_ssaddr));
700		comm_connect_tcp(&client_p->localClient->fd, conf->host, conf->port,
701		(struct sockaddr *)&ipn, ipn.ss_len,
702		serv_connect_callback, client_p, conf->aftype,
#	Line 729 | Line 729 | serv_connect(struct MaskItem *conf, stru
729		serv_connect_callback, client_p,
730		conf->aftype, CONNECTTIMEOUT);
731		}
732	<	else if (ServerInfo.specific_ipv6_vhost)
732	>	else if (ConfigServerInfo.specific_ipv6_vhost)
733		{
734	<	memcpy(&ipn, &ServerInfo.ip6, sizeof(struct irc_ssaddr));
734	>	memcpy(&ipn, &ConfigServerInfo.ip6, sizeof(struct irc_ssaddr));
735		ipn.ss.ss_family = AF_INET6;
736		ipn.ss_port = 0;
737		comm_connect_tcp(&client_p->localClient->fd,
#	Line 839 | Line 839 | ssl_server_handshake(fde_t *fd, struct C
839		{
840		unsigned int n = 0;
841
842	<	if (X509_digest(cert, ServerInfo.message_digest_algorithm, md, &n))
842	>	if (X509_digest(cert, ConfigServerInfo.message_digest_algorithm, md, &n))
843		{
844		binary_to_hex(md, buf, n);
845		client_p->certfp = xstrdup(buf);
#	Line 857 | Line 857 | ssl_server_handshake(fde_t *fd, struct C
857		static void
858		ssl_connect_init(struct Client *client_p, struct MaskItem *conf, fde_t *fd)
859		{
860	<	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.client_ctx)) == NULL)
860	>	if ((client_p->localClient->fd.ssl = SSL_new(ConfigServerInfo.client_ctx)) == NULL)
861		{
862		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
863		ERR_error_string(ERR_get_error(), NULL));

Diff Legend

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