ViewVC Help

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

root/svn/ircd-hybrid/releases/8.2.21/src/s_bsd.c

Comparing ircd-hybrid/branches/8.2.x/src/s_bsd.c (file contents):
Revision 4589 by michael, Tue Aug 26 15:59:21 2014 UTC vs.
Revision 4738 by michael, Sun Oct 12 12:06:42 2014 UTC

#	Line 225 | Line 225 | ssl_handshake(fde_t *fd, void *data)
225
226		if ((ret = SSL_accept(client_p->connection->fd.ssl)) <= 0)
227		{
228	<	if ((CurrentTime - client_p->connection->firsttime) > 30)
228	>	if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
229		{
230		exit_client(client_p, "Timeout during SSL handshake");
231		return;
#	Line 235 | Line 235 | ssl_handshake(fde_t *fd, void *data)
235		{
236		case SSL_ERROR_WANT_WRITE:
237		comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
238	<	ssl_handshake, client_p, 30);
238	>	ssl_handshake, client_p, CONNECTTIMEOUT);
239		return;
240
241		case SSL_ERROR_WANT_READ:
242		comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
243	<	ssl_handshake, client_p, 30);
243	>	ssl_handshake, client_p, CONNECTTIMEOUT);
244		return;
245
246		default:

Diff Legend

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