summaryrefslogtreecommitdiff
path: root/src/make_ssl_handshake.c
diff options
context:
space:
mode:
authorJakub Sławiński2005-08-05 21:45:31 +0200
committerJoshua Judson Rosen2014-07-17 21:14:59 +0200
commit43e8714797d40bcf63efab428dcd25f9caf1d52b (patch)
tree796974a873a97f2a44f872f3dd3587508e35aa64 /src/make_ssl_handshake.c
parentv0.7.1 (diff)
downloadapf-43e8714797d40bcf63efab428dcd25f9caf1d52b.tar.gz
v0.7.2
- Added: http proxy basic authorization - Fixed: logging initialization after some value checking - Fixed: auto-reconnect failure when --nossl option is set - Added: auto-reconnect when afserver is not reachable on start - Added: auto-reconnect after normal afserver quit - Added: per user statistics: idle time, amount of downloaded/uploaded bytes and current download/upload rate - Added: support for https proxies - Added: possibility to bind sockets on different interfaces - Fixed: receiving incomplete headers from afclient - Fixed: close user connections by afclient
Diffstat (limited to 'src/make_ssl_handshake.c')
-rw-r--r--src/make_ssl_handshake.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/make_ssl_handshake.c b/src/make_ssl_handshake.c
index ffb4ebd..a7bf9bd 100644
--- a/src/make_ssl_handshake.c
+++ b/src/make_ssl_handshake.c
@@ -28,9 +28,9 @@
#include <openssl/err.h>
void
-make_ssl_initialize(clifd *cliconn)
+make_ssl_initialize(SslFd* sf)
{
- if (SSL_set_fd(cliconn->ssl, cliconn->commfd) != 1) {
+ if (SSL_set_fd(SslFd_get_ssl(sf), SslFd_get_fd(sf)) != 1) {
aflog(LOG_T_INIT, LOG_I_CRIT,
"Problem with initializing ssl... exiting");
exit(1);
@@ -38,23 +38,23 @@ make_ssl_initialize(clifd *cliconn)
}
int
-make_ssl_accept(clifd *cliconn)
+make_ssl_accept(SslFd* sf)
{
int result;
- if ((result = SSL_accept(cliconn->ssl)) != 1) {
- return get_ssl_error(cliconn, "SSL_accept has failed", result);
+ if ((result = SSL_accept(SslFd_get_ssl(sf))) != 1) {
+ return get_ssl_error(sf, "SSL_accept has failed", result);
}
return 0;
}
int
-get_ssl_error(clifd *cliconn, char* info, int result)
+get_ssl_error(SslFd* sf, char* info, int result)
{
int merror;
#ifdef HAVE_ERR_ERROR_STRING
char err_buff[200];
#endif
- merror = SSL_get_error(cliconn->ssl, result);
+ merror = SSL_get_error(SslFd_get_ssl(sf), result);
switch (merror) {
case SSL_ERROR_NONE : {
aflog(LOG_T_MAIN, LOG_I_WARNING,