orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add some error messages when server connections fail for debugging 

SVN revision: 72984
This commit is contained in:
Mike Blumenkrantz 2012-06-28 08:51:06 +00:00
parent 39c1554d8d
commit 11dfca7e68
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,27 +468,23 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
svr->ecs_state = ECORE_CON_PROXY_STATE_RESOLVED; svr->ecs_state = ECORE_CON_PROXY_STATE_RESOLVED;
} }
} }
if (ecore_con_ssl_server_prepare(svr, compl_type & ECORE_CON_SSL)) EINA_SAFETY_ON_TRUE_GOTO(ecore_con_ssl_server_prepare(svr, compl_type & ECORE_CON_SSL), error);
goto error;
if (((type == ECORE_CON_REMOTE_TCP) || EINA_SAFETY_ON_TRUE_GOTO(((type == ECORE_CON_REMOTE_TCP) ||
(type == ECORE_CON_REMOTE_NODELAY) || (type == ECORE_CON_REMOTE_NODELAY) ||
(type == ECORE_CON_REMOTE_CORK) || (type == ECORE_CON_REMOTE_CORK) ||
(type == ECORE_CON_REMOTE_UDP) || (type == ECORE_CON_REMOTE_UDP) ||
(type == ECORE_CON_REMOTE_BROADCAST)) && (type == ECORE_CON_REMOTE_BROADCAST)) &&
(port < 0)) (port < 0), error);
goto error;
if ((type == ECORE_CON_LOCAL_USER) || if ((type == ECORE_CON_LOCAL_USER) ||
(type == ECORE_CON_LOCAL_SYSTEM) || (type == ECORE_CON_LOCAL_SYSTEM) ||
(type == ECORE_CON_LOCAL_ABSTRACT)) (type == ECORE_CON_LOCAL_ABSTRACT))
/* Local */ /* Local */
#ifdef _WIN32 #ifdef _WIN32
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler)) EINA_SAFETY_ON_FALSE_GOTO(ecore_con_local_connect(svr, _ecore_con_cl_handler), error);
goto error;
#else #else
if (!ecore_con_local_connect(svr, _ecore_con_cl_handler, svr)) EINA_SAFETY_ON_FALSE_GOTO(ecore_con_local_connect(svr, _ecore_con_cl_handler, svr), error);
goto error;
#endif #endif
if ((type == ECORE_CON_REMOTE_TCP) || if ((type == ECORE_CON_REMOTE_TCP) ||
@ -496,16 +492,11 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
(type == ECORE_CON_REMOTE_CORK)) (type == ECORE_CON_REMOTE_CORK))
{ {
/* TCP */ /* TCP */
if (!ecore_con_info_tcp_connect(svr, _ecore_con_cb_tcp_connect, EINA_SAFETY_ON_FALSE_GOTO(ecore_con_info_tcp_connect(svr, _ecore_con_cb_tcp_connect, svr), error);
svr))
goto error;
} }
else if ((type == ECORE_CON_REMOTE_UDP) || else if ((type == ECORE_CON_REMOTE_UDP) || (type == ECORE_CON_REMOTE_BROADCAST))
(type == ECORE_CON_REMOTE_BROADCAST))
/* UDP and MCAST */ /* UDP and MCAST */
if (!ecore_con_info_udp_connect(svr, _ecore_con_cb_udp_connect, EINA_SAFETY_ON_FALSE_GOTO(ecore_con_info_udp_connect(svr, _ecore_con_cb_udp_connect, svr), error);
svr))
goto error;
servers = eina_list_append(servers, svr); servers = eina_list_append(servers, svr);
ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER); ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER);