summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-28 08:51:06 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-28 08:51:06 +0000
commit11dfca7e684922df111acdaffdca2a1d2deffff8 (patch)
tree2e76d38112433878fa46a4e9c56eaf43e1796de0 /legacy
parent39c1554d8d86d9d4549f6881dae2bed2a84bb0dc (diff)
add some error messages when server connections fail for debugging
SVN revision: 72984
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index cc4c6038f3..b9b8a68990 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -468,27 +468,23 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
468 svr->ecs_state = ECORE_CON_PROXY_STATE_RESOLVED; 468 svr->ecs_state = ECORE_CON_PROXY_STATE_RESOLVED;
469 } 469 }
470 } 470 }
471 if (ecore_con_ssl_server_prepare(svr, compl_type & ECORE_CON_SSL)) 471 EINA_SAFETY_ON_TRUE_GOTO(ecore_con_ssl_server_prepare(svr, compl_type & ECORE_CON_SSL), error);
472 goto error;
473 472
474 if (((type == ECORE_CON_REMOTE_TCP) || 473 EINA_SAFETY_ON_TRUE_GOTO(((type == ECORE_CON_REMOTE_TCP) ||
475 (type == ECORE_CON_REMOTE_NODELAY) || 474 (type == ECORE_CON_REMOTE_NODELAY) ||
476 (type == ECORE_CON_REMOTE_CORK) || 475 (type == ECORE_CON_REMOTE_CORK) ||
477 (type == ECORE_CON_REMOTE_UDP) || 476 (type == ECORE_CON_REMOTE_UDP) ||
478 (type == ECORE_CON_REMOTE_BROADCAST)) && 477 (type == ECORE_CON_REMOTE_BROADCAST)) &&
479 (port < 0)) 478 (port < 0), error);
480 goto error;
481 479
482 if ((type == ECORE_CON_LOCAL_USER) || 480 if ((type == ECORE_CON_LOCAL_USER) ||
483 (type == ECORE_CON_LOCAL_SYSTEM) || 481 (type == ECORE_CON_LOCAL_SYSTEM) ||
484 (type == ECORE_CON_LOCAL_ABSTRACT)) 482 (type == ECORE_CON_LOCAL_ABSTRACT))
485 /* Local */ 483 /* Local */
486#ifdef _WIN32 484#ifdef _WIN32
487 if (!ecore_con_local_connect(svr, _ecore_con_cl_handler)) 485 EINA_SAFETY_ON_FALSE_GOTO(ecore_con_local_connect(svr, _ecore_con_cl_handler), error);
488 goto error;
489#else 486#else
490 if (!ecore_con_local_connect(svr, _ecore_con_cl_handler, svr)) 487 EINA_SAFETY_ON_FALSE_GOTO(ecore_con_local_connect(svr, _ecore_con_cl_handler, svr), error);
491 goto error;
492#endif 488#endif
493 489
494 if ((type == ECORE_CON_REMOTE_TCP) || 490 if ((type == ECORE_CON_REMOTE_TCP) ||
@@ -496,16 +492,11 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
496 (type == ECORE_CON_REMOTE_CORK)) 492 (type == ECORE_CON_REMOTE_CORK))
497 { 493 {
498 /* TCP */ 494 /* TCP */
499 if (!ecore_con_info_tcp_connect(svr, _ecore_con_cb_tcp_connect, 495 EINA_SAFETY_ON_FALSE_GOTO(ecore_con_info_tcp_connect(svr, _ecore_con_cb_tcp_connect, svr), error);
500 svr))
501 goto error;
502 } 496 }
503 else if ((type == ECORE_CON_REMOTE_UDP) || 497 else if ((type == ECORE_CON_REMOTE_UDP) || (type == ECORE_CON_REMOTE_BROADCAST))
504 (type == ECORE_CON_REMOTE_BROADCAST))
505 /* UDP and MCAST */ 498 /* UDP and MCAST */
506 if (!ecore_con_info_udp_connect(svr, _ecore_con_cb_udp_connect, 499 EINA_SAFETY_ON_FALSE_GOTO(ecore_con_info_udp_connect(svr, _ecore_con_cb_udp_connect, svr), error);
507 svr))
508 goto error;
509 500
510 servers = eina_list_append(servers, svr); 501 servers = eina_list_append(servers, svr);
511 ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER); 502 ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER);