mirror of
https://github.com/unrealircd/unrealircd.git
synced 2026-07-04 19:03:13 +02:00
forgotten defines at ssl.c and ircd.c
This commit is contained in:
@@ -1318,3 +1318,4 @@
|
||||
HOOKTYPE_CLEANUP_USER2: called from exit_client when freeing a user.. I know, this
|
||||
might sound redundant, but then again.. some things REQUIRE a certain order (like before
|
||||
freeing membership links).. Or at least I don't want to break the current logic ;).
|
||||
- Added some new defines which didnt noticed for new io engine.
|
||||
|
||||
+3
-1
@@ -511,9 +511,11 @@ static TS try_connections(TS currenttime)
|
||||
if (!match(deny->mask, aconf->servername)
|
||||
&& crule_eval(deny->rule))
|
||||
break;
|
||||
|
||||
#ifndef NEW_IO
|
||||
if (connect_server(aconf, (aClient *)NULL,
|
||||
(struct hostent *)NULL) == 0)
|
||||
#else /* ifndef NEW_IO */
|
||||
#endif /* ifndef NEW_IO */
|
||||
sendto_realops
|
||||
("Connection to %s[%s] activated.",
|
||||
aconf->servername, aconf->hostname);
|
||||
|
||||
@@ -280,7 +280,10 @@ int ssl_handshake(aClient *cptr)
|
||||
cptr->ssl = SSL_new(ctx_server);
|
||||
CHK_NULL(cptr->ssl);
|
||||
SSL_set_fd((SSL *) cptr->ssl, cptr->fd);
|
||||
#ifndef NEW_IO
|
||||
set_non_blocking(cptr->fd, cptr);
|
||||
#else /* ifndef NEW_IO */
|
||||
#endif /* ifndef NEW_IO */
|
||||
/*
|
||||
* if necessary, SSL_write() will negotiate a TLS/SSL session, if not already explicitly
|
||||
* performed by SSL_connect() or SSL_accept(). If the peer requests a
|
||||
@@ -339,7 +342,10 @@ int ssl_client_handshake(aClient *cptr, ConfigItem_link *l)
|
||||
return -2;
|
||||
#endif
|
||||
}
|
||||
#ifndef NEW_IO
|
||||
set_non_blocking(cptr->fd, cptr);
|
||||
#else /* ifndef NEW_IO */
|
||||
#endif /* ifndef NEW_IO */
|
||||
cptr->flags |= FLAGS_SSL;
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user