enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

DBG output 

SVN revision: 52875
This commit is contained in:
Mike Blumenkrantz 2010-09-29 03:52:32 +00:00
parent d93ac79c38
commit f5f8a3c45d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -1475,6 +1475,7 @@ _ecore_con_cb_tcp_connect(void *data, Ecore_Con_Info *net_info)
{
svr->handshaking = EINA_TRUE;
svr->ssl_state = ECORE_CON_SSL_STATE_INIT;
DBG("beginning ssl handshake");
if (ecore_con_ssl_server_init(svr))
goto error;
}
@ -1748,8 +1749,12 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
Eina_Bool lost_server = EINA_TRUE;
unsigned char buf[READBUFSIZ];
if (svr->handshaking && (!ecore_con_ssl_server_init(svr)))
lost_server = EINA_FALSE;
if (svr->handshaking)
{
DBG("Continuing ssl handshake");
if (!ecore_con_ssl_server_init(svr))
lost_server = EINA_FALSE;
}
if (!(svr->type & ECORE_CON_SSL))
{
@ -1814,6 +1819,7 @@ _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
if (svr->handshaking)
{
DBG("Continuing ssl handshake");
if (ecore_con_ssl_server_init(svr))
{
ERR("ssl handshaking failed!");
@ -2221,6 +2227,7 @@ _ecore_con_server_flush(Ecore_Con_Server *svr)
if (svr->handshaking)
{
DBG("Continuing ssl handshake");
if (ecore_con_ssl_server_init(svr))
return _ecore_con_server_kill(svr);
return;

4
legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c
View File

@ -494,6 +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");
ret = gnutls_handshake(svr->session);
SSL_ERROR_CHECK_GOTO_ERROR(gnutls_error_is_fatal(ret));
if (!ret)
@ -669,6 +670,7 @@ _ecore_con_ssl_server_read_gnutls(Ecore_Con_Server *svr, unsigned char *buf,
if (svr->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING)
{
DBG("Continuing gnutls handshake");
if (!_ecore_con_ssl_server_init_gnutls(svr))
return 0;
return -1;
@ -703,6 +705,7 @@ _ecore_con_ssl_server_write_gnutls(Ecore_Con_Server *svr, unsigned char *buf,
if (svr->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING)
{
DBG("Continuing gnutls handshake");
if (!_ecore_con_ssl_server_init_gnutls(svr))
return 0;
return -1;
@ -778,6 +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");
ret = gnutls_handshake(cl->session);
SSL_ERROR_CHECK_GOTO_ERROR(gnutls_error_is_fatal(ret));