From b862b720637da0440d8da5852061295ee78556ee Mon Sep 17 00:00:00 2001 From: discomfitor Date: Wed, 29 Sep 2010 14:52:36 +0000 Subject: [PATCH] add more debug output, and even more with -DPRINT_LOTS_OF_DEBUG git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@52891 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_con/ecore_con.c | 13 +++++++++++++ src/lib/ecore_con/ecore_con_ssl.c | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index 48c176e..6fb27dd 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -1820,6 +1820,19 @@ _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler) if (svr->handshaking && ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ | ECORE_FD_WRITE)) { DBG("Continuing ssl handshake"); + if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) + DBG("Preparing to read handshake data..."); + else + DBG("Preparing to write handshake data..."); +#ifdef PRINT_LOTS_OF_DEBUG + if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) + { + char buf[32768]; + ssize_t len; + len = recv(svr->fd, buf, sizeof(buf), MSG_DONTWAIT | MSG_PEEK); + DBG("%zu bytes in buffer", len); + } +#endif if (!svr->ssl_state) { /* we got our server! */ diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c index 7812a29..e35cfda 100644 --- a/src/lib/ecore_con/ecore_con_ssl.c +++ b/src/lib/ecore_con/ecore_con_ssl.c @@ -494,7 +494,7 @@ _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *svr) gnutls_transport_set_ptr(svr->session, (gnutls_transport_ptr_t)svr->fd); svr->ssl_state = ECORE_CON_SSL_STATE_HANDSHAKING; case ECORE_CON_SSL_STATE_HANDSHAKING: - DBG("gnutls handshaking"); + DBG("calling gnutls_handshake()"); ret = gnutls_handshake(svr->session); SSL_ERROR_CHECK_GOTO_ERROR(gnutls_error_is_fatal(ret)); if (!ret) @@ -781,7 +781,7 @@ _ecore_con_ssl_client_init_gnutls(Ecore_Con_Client *cl) gnutls_transport_set_ptr(cl->session, (gnutls_transport_ptr_t)cl->fd); cl->ssl_state = ECORE_CON_SSL_STATE_HANDSHAKING; case ECORE_CON_SSL_STATE_HANDSHAKING: - DBG("gnutls handshaking"); + DBG("calling gnutls_handshake()"); ret = gnutls_handshake(cl->session); SSL_ERROR_CHECK_GOTO_ERROR(gnutls_error_is_fatal(ret)); -- 2.7.4