ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/s_bsd.c (file contents):
Revision 7270 by michael, Sat Feb 6 17:29:57 2016 UTC vs.
Revision 7271 by michael, Sat Feb 6 20:47:15 2016 UTC

#	Line 193 | Line 193 | close_connection(struct Client *client_p
193		else
194		++ServerStats.is_ni;
195
196	–	#ifdef HAVE_TLS
196		if (tls_isusing(&client_p->connection->fd.ssl))
197		tls_shutdown(&client_p->connection->fd.ssl);
199	–	#endif
198
199		if (client_p->connection->fd.flags.open)
200		fd_close(&client_p->connection->fd);
#	Line 210 | Line 208 | close_connection(struct Client *client_p
208		detach_conf(client_p, CONF_CLIENT | CONF_OPER | CONF_SERVER);
209		}
210
213	–	#ifdef HAVE_TLS
211		/*
212		* ssl_handshake - let OpenSSL initialize the protocol. Register for
213		* read/write events if necessary.
#	Line 253 | Line 250 | ssl_handshake(fde_t *fd, void *data)
250
251		start_auth(client_p);
252		}
256	–	#endif
253
254		/*
255		* add_connection - creates a client which has just connected to us on
#	Line 310 | Line 306 | add_connection(struct Listener *listener
306		client_p->connection->listener = listener;
307		++listener->ref_count;
308
309	<	#ifdef HAVE_TLS
314	<	if (listener->flags & LISTENER_SSL)
309	>	if (tls_is_initialized() && (listener->flags & LISTENER_SSL))
310		{
311		if (!tls_new(&client_p->connection->fd.ssl, fd, TLS_ROLE_SERVER))
312		{
#	Line 324 | Line 319 | add_connection(struct Listener *listener
319		ssl_handshake(NULL, client_p);
320		}
321		else
327	–	#endif
322		start_auth(client_p);
323		}
324

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines