projects
/
ircu2.10.12-pk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
49a3e40
)
added some debug information to ssl.c
author
pk910
<philipp@zoelle1.de>
Sun, 24 Feb 2013 12:17:08 +0000
(13:17 +0100)
committer
pk910
<philipp@zoelle1.de>
Sun, 24 Feb 2013 12:30:45 +0000
(13:30 +0100)
ircd/ssl.c
patch
|
blob
|
history
diff --git
a/ircd/ssl.c
b/ircd/ssl.c
index 49e861f75cc20178c5403d4bc9f39c281e7454b6..2af08520bb953b1f70ba36a1d4447ead3d08abeb 100644
(file)
--- a/
ircd/ssl.c
+++ b/
ircd/ssl.c
@@
-866,7
+866,8
@@
const char *ssl_cipherstr(ssl_session_t *ssl) {
-#ifdef HAVE_GNUTLS
+#if defined(HAVE_GNUTLS)
+
unsigned int ssl_be_init() {
signed int ret;
if((ret = gnutls_global_init()) != GNUTLS_E_SUCCESS) {
unsigned int ssl_be_init() {
signed int ret;
if((ret = gnutls_global_init()) != GNUTLS_E_SUCCESS) {
@@
-1023,13
+1024,22
@@
const char *ssl_cipherstr(ssl_session_t *ssl) {
signed int res;
res = gnutls_record_send(*ssl, buf, *count_out);
*count_out = 0;
signed int res;
res = gnutls_record_send(*ssl, buf, *count_out);
*count_out = 0;
- if(res == 0) return IO_FAILURE;
+ if(res == 0) {
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_send(): failed (IO_FAILURE)");
+ return IO_FAILURE;
+ }
else if(res < 0) {
else if(res < 0) {
- if(res != GNUTLS_E_AGAIN && res != GNUTLS_E_INTERRUPTED) return IO_FAILURE;
- else return IO_BLOCKED;
+ if(res != GNUTLS_E_AGAIN && res != GNUTLS_E_INTERRUPTED) {
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_send(): failed (IO_FAILURE)");
+ return IO_FAILURE;
+ } else {
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_send(): failed (IO_BLOCKED)");
+ return IO_BLOCKED;
+ }
}
else {
*count_out = res;
}
else {
*count_out = res;
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_send(): successful (IO_SUCCESS)");
return IO_SUCCESS;
}
}
return IO_SUCCESS;
}
}
@@
-1037,13
+1047,22
@@
const char *ssl_cipherstr(ssl_session_t *ssl) {
signed int res;
res = gnutls_record_recv(*ssl, buf, *count_out);
*count_out = 0;
signed int res;
res = gnutls_record_recv(*ssl, buf, *count_out);
*count_out = 0;
- if(res == 0) return IO_FAILURE;
+ if(res == 0) {
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_recv(): failed (IO_FAILURE)");
+ return IO_FAILURE;
+ }
else if(res < 0) {
else if(res < 0) {
- if(res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) return IO_BLOCKED;
- else return IO_FAILURE;
+ if(res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED) {
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_recv(): failed (IO_BLOCKED)");
+ return IO_BLOCKED;
+ } else {
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_recv(): failed (IO_FAILURE)");
+ return IO_FAILURE;
+ }
}
else {
*count_out = res;
}
else {
*count_out = res;
+ ssl_msg(SSL_DEBUG, "SSL: gnutls ssl_be_recv(): successful (IO_SUCCESS)");
return IO_SUCCESS;
}
}
return IO_SUCCESS;
}
}