summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con.c75
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c38
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c4
-rw-r--r--src/lib/ecore_con/ecore_con_url.c23
4 files changed, 61 insertions, 79 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index a08a151..8dd9d82 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -109,7 +109,7 @@ static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
109 109
110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \ 110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
111 Eina_Bool finalized; \ 111 Eina_Bool finalized; \
112 if (eo_do_ret(obj, finalized, eo_finalized_get())) \ 112 if (eo_finalized_get(obj)) \
113 { \ 113 { \
114 ERR("This function is only allowed during construction."); \ 114 ERR("This function is only allowed during construction."); \
115 return; \ 115 return; \
@@ -306,10 +306,7 @@ _efl_network_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const ch
306 if (!name || !done_cb) 306 if (!name || !done_cb)
307 return EINA_FALSE; 307 return EINA_FALSE;
308 308
309 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, 309 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, 1025));
310 efl_network_server_connection_type_set(ECORE_CON_REMOTE_TCP),
311 efl_network_server_name_set(name),
312 efl_network_base_port_set(1025));
313 310
314 lk = malloc(sizeof (Ecore_Con_Lookup)); 311 lk = malloc(sizeof (Ecore_Con_Lookup));
315 if (!lk) 312 if (!lk)
@@ -363,10 +360,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
363 360
364 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 361 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
365 /* remote system socket: TCP/IP: [name]:[port] */ 362 /* remote system socket: TCP/IP: [name]:[port] */
366 obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, 363 obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port));
367 efl_network_server_connection_type_set(compl_type),
368 efl_network_server_name_set(name),
369 efl_network_base_port_set(port));
370 364
371 ecore_con_server_data_set(obj, (void *) data); 365 ecore_con_server_data_set(obj, (void *) data);
372 366
@@ -376,7 +370,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
376EOLIAN static Eo * 370EOLIAN static Eo *
377_efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr) 371_efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
378{ 372{
379 obj = eo_do_super_ret(obj, EFL_NETWORK_SERVER_CLASS, obj, eo_constructor()); 373 obj = eo_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
380 374
381 svr->fd = -1; 375 svr->fd = -1;
382 svr->reject_excess_clients = EINA_FALSE; 376 svr->reject_excess_clients = EINA_FALSE;
@@ -392,7 +386,7 @@ _efl_network_server_eo_base_finalize(Ecore_Con_Server *obj, Efl_Network_Server_D
392 Ecore_Con_Type compl_type = svr->type; 386 Ecore_Con_Type compl_type = svr->type;
393 Ecore_Con_Type type; 387 Ecore_Con_Type type;
394 388
395 eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize()); 389 eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
396 390
397 svr->created = EINA_TRUE; 391 svr->created = EINA_TRUE;
398 svr->ppid = getpid(); 392 svr->ppid = getpid();
@@ -462,10 +456,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
462 /* local user socket: FILE: ~/.ecore/[name]/[port] */ 456 /* local user socket: FILE: ~/.ecore/[name]/[port] */
463 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 457 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
464 /* remote system socket: TCP/IP: [name]:[port] */ 458 /* remote system socket: TCP/IP: [name]:[port] */
465 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, 459 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port));
466 efl_network_server_connection_type_set(compl_type),
467 efl_network_server_name_set(name),
468 efl_network_base_port_set(port));
469 460
470 ecore_con_server_data_set(obj, (void *) data); 461 ecore_con_server_data_set(obj, (void *) data);
471 462
@@ -481,7 +472,7 @@ _efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNU
481 472
482 /* XXX: We intentionally put SERVER class here and not connector, as we'd 473 /* XXX: We intentionally put SERVER class here and not connector, as we'd
483 * like to skip that one. */ 474 * like to skip that one. */
484 eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize()); 475 eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
485 476
486 svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; 477 svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
487 svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY; 478 svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@@ -548,7 +539,7 @@ error:
548EAPI void 539EAPI void
549ecore_con_server_timeout_set(Ecore_Con *obj, double timeout) 540ecore_con_server_timeout_set(Ecore_Con *obj, double timeout)
550{ 541{
551 eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout)); 542 efl_network_base_timeout_set((Ecore_Con *)obj, timeout);
552} 543}
553 544
554EOLIAN static void 545EOLIAN static void
@@ -566,7 +557,7 @@ EAPI double
566ecore_con_server_timeout_get(const Ecore_Con *obj) 557ecore_con_server_timeout_get(const Ecore_Con *obj)
567{ 558{
568 double ret; 559 double ret;
569 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get()); 560 return efl_network_base_timeout_get((Ecore_Con *)obj);
570} 561}
571 562
572EOLIAN static double 563EOLIAN static double
@@ -620,7 +611,7 @@ EAPI Eina_Bool
620ecore_con_server_connected_get(const Ecore_Con *obj) 611ecore_con_server_connected_get(const Ecore_Con *obj)
621{ 612{
622 Eina_Bool ret; 613 Eina_Bool ret;
623 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get()); 614 return efl_network_base_connected_get((Ecore_Con *)obj);
624} 615}
625 616
626EOLIAN static Eina_Bool 617EOLIAN static Eina_Bool
@@ -670,7 +661,7 @@ EAPI int
670ecore_con_server_port_get(const Ecore_Con *obj) 661ecore_con_server_port_get(const Ecore_Con *obj)
671{ 662{
672 int ret; 663 int ret;
673 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get()); 664 return efl_network_base_port_get((Ecore_Con *)obj);
674} 665}
675 666
676EOLIAN static void 667EOLIAN static void
@@ -691,7 +682,7 @@ EAPI int
691ecore_con_server_send(Ecore_Con *obj, const void *data, int size) 682ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
692{ 683{
693 int ret; 684 int ret;
694 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size)); 685 return efl_network_base_send((Ecore_Con *)obj, data, size);
695} 686}
696 687
697EOLIAN static int 688EOLIAN static int
@@ -748,7 +739,7 @@ EAPI const char *
748ecore_con_server_ip_get(const Ecore_Con *obj) 739ecore_con_server_ip_get(const Ecore_Con *obj)
749{ 740{
750 const char *ret; 741 const char *ret;
751 return eo_do_ret(obj, ret, efl_network_base_ip_get()); 742 return efl_network_base_ip_get(obj);
752} 743}
753 744
754EOLIAN static const char * 745EOLIAN static const char *
@@ -761,7 +752,7 @@ EAPI double
761ecore_con_server_uptime_get(const Ecore_Con *obj) 752ecore_con_server_uptime_get(const Ecore_Con *obj)
762{ 753{
763 double ret; 754 double ret;
764 return eo_do_ret(obj, ret, efl_network_base_uptime_get()); 755 return efl_network_base_uptime_get(obj);
765} 756}
766 757
767EOLIAN static double 758EOLIAN static double
@@ -773,7 +764,7 @@ _efl_network_server_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network
773EAPI void 764EAPI void
774ecore_con_server_flush(Ecore_Con *obj) 765ecore_con_server_flush(Ecore_Con *obj)
775{ 766{
776 eo_do((Ecore_Con *)obj, efl_network_base_flush()); 767 efl_network_base_flush((Ecore_Con *)obj);
777} 768}
778 769
779EOLIAN static void 770EOLIAN static void
@@ -803,7 +794,7 @@ EAPI int
803ecore_con_client_send(Ecore_Con *obj, const void *data, int size) 794ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
804{ 795{
805 int ret; 796 int ret;
806 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size)); 797 return efl_network_base_send((Ecore_Con *)obj, data, size);
807} 798}
808 799
809EOLIAN static int 800EOLIAN static int
@@ -871,7 +862,7 @@ EAPI Eina_Bool
871ecore_con_client_connected_get(const Ecore_Con *obj) 862ecore_con_client_connected_get(const Ecore_Con *obj)
872{ 863{
873 Eina_Bool ret; 864 Eina_Bool ret;
874 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get()); 865 return efl_network_base_connected_get((Ecore_Con *)obj);
875} 866}
876 867
877EOLIAN static void 868EOLIAN static void
@@ -885,7 +876,7 @@ _efl_network_client_efl_network_base_timeout_set(Eo *obj, Efl_Network_Client_Dat
885EAPI void 876EAPI void
886ecore_con_client_timeout_set(Ecore_Con *obj, double timeout) 877ecore_con_client_timeout_set(Ecore_Con *obj, double timeout)
887{ 878{
888 eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout)); 879 efl_network_base_timeout_set((Ecore_Con *)obj, timeout);
889} 880}
890 881
891EOLIAN static double 882EOLIAN static double
@@ -898,7 +889,7 @@ EAPI double
898ecore_con_client_timeout_get(const Ecore_Con *obj) 889ecore_con_client_timeout_get(const Ecore_Con *obj)
899{ 890{
900 double ret; 891 double ret;
901 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get()); 892 return efl_network_base_timeout_get((Ecore_Con *)obj);
902} 893}
903 894
904EAPI void * 895EAPI void *
@@ -950,7 +941,7 @@ EAPI const char *
950ecore_con_client_ip_get(const Ecore_Con *obj) 941ecore_con_client_ip_get(const Ecore_Con *obj)
951{ 942{
952 const char *ret; 943 const char *ret;
953 return eo_do_ret(obj, ret, efl_network_base_ip_get()); 944 return efl_network_base_ip_get(obj);
954} 945}
955 946
956EOLIAN static int 947EOLIAN static int
@@ -978,7 +969,7 @@ EAPI int
978ecore_con_client_port_get(const Ecore_Con *obj) 969ecore_con_client_port_get(const Ecore_Con *obj)
979{ 970{
980 int ret; 971 int ret;
981 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get()); 972 return efl_network_base_port_get((Ecore_Con *)obj);
982} 973}
983 974
984EOLIAN static double 975EOLIAN static double
@@ -991,7 +982,7 @@ EAPI double
991ecore_con_client_uptime_get(const Ecore_Con *obj) 982ecore_con_client_uptime_get(const Ecore_Con *obj)
992{ 983{
993 double ret; 984 double ret;
994 return eo_do_ret(obj, ret, efl_network_base_uptime_get()); 985 return efl_network_base_uptime_get(obj);
995} 986}
996 987
997EOLIAN static void 988EOLIAN static void
@@ -1003,14 +994,14 @@ _efl_network_client_efl_network_base_flush(Eo *obj, Efl_Network_Client_Data *cl
1003EAPI void 994EAPI void
1004ecore_con_client_flush(Ecore_Con *obj) 995ecore_con_client_flush(Ecore_Con *obj)
1005{ 996{
1006 eo_do((Ecore_Con *)obj, efl_network_base_flush()); 997 efl_network_base_flush((Ecore_Con *)obj);
1007} 998}
1008 999
1009EAPI int 1000EAPI int
1010ecore_con_server_fd_get(const Ecore_Con *obj) 1001ecore_con_server_fd_get(const Ecore_Con *obj)
1011{ 1002{
1012 int ret; 1003 int ret;
1013 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get()); 1004 return efl_network_base_fd_get((Ecore_Con *)obj);
1014} 1005}
1015 1006
1016EOLIAN static int 1007EOLIAN static int
@@ -1031,7 +1022,7 @@ EAPI int
1031ecore_con_client_fd_get(const Ecore_Con *obj) 1022ecore_con_client_fd_get(const Ecore_Con *obj)
1032{ 1023{
1033 int ret; 1024 int ret;
1034 return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get()); 1025 return efl_network_base_fd_get((Ecore_Con *)obj);
1035} 1026}
1036 1027
1037/** 1028/**
@@ -1077,7 +1068,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
1077 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE; 1068 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
1078 ecore_event_add(ev, e, 1069 ecore_event_add(ev, e,
1079 _ecore_con_event_server_add_free, NULL); 1070 _ecore_con_event_server_add_free, NULL);
1080 eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL)); 1071 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL);
1081 _ecore_con_event_count++; 1072 _ecore_con_event_count++;
1082} 1073}
1083 1074
@@ -1156,7 +1147,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
1156 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1147 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1157 event_info.data = e->data; 1148 event_info.data = e->data;
1158 event_info.size = e->size; 1149 event_info.size = e->size;
1159 eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info)); 1150 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info);
1160 } 1151 }
1161 _ecore_con_event_count++; 1152 _ecore_con_event_count++;
1162} 1153}
@@ -1181,7 +1172,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
1181 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE; 1172 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
1182 ecore_event_add(ev, e, 1173 ecore_event_add(ev, e,
1183 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server); 1174 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
1184 eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL)); 1175 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL);
1185 _ecore_con_event_count++; 1176 _ecore_con_event_count++;
1186} 1177}
1187 1178
@@ -1263,7 +1254,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
1263 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1254 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1264 event_info.data = e->data; 1255 event_info.data = e->data;
1265 event_info.size = e->size; 1256 event_info.size = e->size;
1266 eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info)); 1257 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info);
1267 } 1258 }
1268 _ecore_con_event_count++; 1259 _ecore_con_event_count++;
1269} 1260}
@@ -1289,7 +1280,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
1289 DBG("%s", error); 1280 DBG("%s", error);
1290 svr->event_count = eina_list_append(svr->event_count, e); 1281 svr->event_count = eina_list_append(svr->event_count, e);
1291 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL); 1282 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
1292 eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error)); 1283 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error);
1293 _ecore_con_event_count++; 1284 _ecore_con_event_count++;
1294} 1285}
1295 1286
@@ -1310,7 +1301,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
1310 cl->event_count = eina_list_append(cl->event_count, e); 1301 cl->event_count = eina_list_append(cl->event_count, e);
1311 host_server->event_count = eina_list_append(host_server->event_count, e); 1302 host_server->event_count = eina_list_append(host_server->event_count, e);
1312 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server); 1303 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
1313 eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error)); 1304 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error);
1314 _ecore_con_event_count++; 1305 _ecore_con_event_count++;
1315} 1306}
1316 1307
@@ -1397,7 +1388,7 @@ _efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr)
1397 servers = eina_list_remove(servers, obj); 1388 servers = eina_list_remove(servers, obj);
1398 svr->data = NULL; 1389 svr->data = NULL;
1399 1390
1400 eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_destructor()); 1391 eo_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
1401end: 1392end:
1402 return; 1393 return;
1403} 1394}
@@ -1460,7 +1451,7 @@ _efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl)
1460 eina_stringshare_del(cl->ip); 1451 eina_stringshare_del(cl->ip);
1461 cl->data = NULL; 1452 cl->data = NULL;
1462 1453
1463 eo_do_super(obj, EFL_NETWORK_CLIENT_CLASS, eo_destructor()); 1454 eo_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
1464} 1455}
1465 1456
1466static Eina_Bool 1457static Eina_Bool
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 9720b57..800770c 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -580,7 +580,7 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
580EOLIAN static Eo_Base * 580EOLIAN static Eo_Base *
581_ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED) 581_ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
582{ 582{
583 obj = eo_do_super_ret(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, obj, eo_constructor()); 583 obj = eo_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
584 584
585 if (!obj) return NULL; 585 if (!obj) return NULL;
586 586
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D
615 ecore_event_handler_del(pd->handler_del); 615 ecore_event_handler_del(pd->handler_del);
616 ecore_event_handler_del(pd->handler_data); 616 ecore_event_handler_del(pd->handler_data);
617 617
618 eo_do_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, eo_destructor()); 618 eo_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
619} 619}
620 620
621EOLIAN static Eo_Base * 621EOLIAN static Eo_Base *
622_ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED) 622_ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
623{ 623{
624 obj = eo_do_super_ret(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, obj, eo_constructor()); 624 obj = eo_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
625 625
626 if (!obj) return NULL; 626 if (!obj) return NULL;
627 627
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D
654 ecore_event_handler_del(pd->handler_del); 654 ecore_event_handler_del(pd->handler_del);
655 ecore_event_handler_del(pd->handler_data); 655 ecore_event_handler_del(pd->handler_data);
656 656
657 eo_do_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, eo_destructor()); 657 eo_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
658} 658}
659 659
660EOLIAN static Eo_Base * 660EOLIAN static Eo_Base *
661_ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) 661_ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
662{ 662{
663 obj = eo_do_super_ret(obj, ECORE_CON_EET_BASE_CLASS, obj, eo_constructor()); 663 obj = eo_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
664 664
665 if (!obj) return NULL; 665 if (!obj) return NULL;
666 666
@@ -675,7 +675,7 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
675EOLIAN static void 675EOLIAN static void
676_ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) 676_ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
677{ 677{
678 eo_do_super(obj, ECORE_CON_EET_BASE_CLASS, eo_destructor()); 678 eo_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
679 679
680 eet_data_descriptor_free(pd->edd); 680 eet_data_descriptor_free(pd->edd);
681 eet_data_descriptor_free(pd->matching); 681 eet_data_descriptor_free(pd->matching);
@@ -722,8 +722,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server)
722 722
723 if (!server) return NULL; 723 if (!server) return NULL;
724 724
725 ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, 725 ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server));
726 ecore_con_eet_base_server_set(server));
727 726
728 return ece_obj; 727 return ece_obj;
729} 728}
@@ -735,8 +734,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
735 734
736 if (!server) return NULL; 735 if (!server) return NULL;
737 736
738 ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, 737 ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server));
739 ecore_con_eet_base_server_set(server));
740 738
741 return ece_obj; 739 return ece_obj;
742} 740}
@@ -750,31 +748,31 @@ ecore_con_eet_server_free(Ecore_Con_Eet *r)
750EAPI void 748EAPI void
751ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd) 749ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd)
752{ 750{
753 eo_do(ece, ecore_con_eet_base_register(name, edd)); 751 ecore_con_eet_base_register(ece, name, edd);
754} 752}
755 753
756EAPI void 754EAPI void
757ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data) 755ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data)
758{ 756{
759 eo_do(ece, ecore_con_eet_base_data_callback_set(name, func, data)); 757 ecore_con_eet_base_data_callback_set(ece, name, func, data);
760} 758}
761 759
762EAPI void 760EAPI void
763ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name) 761ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name)
764{ 762{
765 eo_do(ece, ecore_con_eet_base_data_callback_del(name)); 763 ecore_con_eet_base_data_callback_del(ece, name);
766} 764}
767 765
768EAPI void 766EAPI void
769ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data) 767ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data)
770{ 768{
771 eo_do(ece, ecore_con_eet_base_raw_data_callback_set(name, func, data)); 769 ecore_con_eet_base_raw_data_callback_set(ece, name, func, data);
772} 770}
773 771
774EAPI void 772EAPI void
775ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name) 773ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
776{ 774{
777 eo_do(ece, ecore_con_eet_base_raw_data_callback_del(name)); 775 ecore_con_eet_base_raw_data_callback_del(ece, name);
778} 776}
779 777
780EAPI void 778EAPI void
@@ -920,7 +918,7 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
920EAPI void 918EAPI void
921ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data) 919ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
922{ 920{
923 eo_do(ece,eo_key_data_set(ECORE_CON_EET_DATA_KEY, data)); 921 eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data);
924} 922}
925 923
926EAPI const void * 924EAPI const void *
@@ -928,7 +926,7 @@ ecore_con_eet_data_get(Ecore_Con_Eet *ece)
928{ 926{
929 const void *temp; 927 const void *temp;
930 928
931 return eo_do_ret(ece, temp, eo_key_data_get(ECORE_CON_EET_DATA_KEY)); 929 return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
932} 930}
933 931
934EAPI Ecore_Con_Eet * 932EAPI Ecore_Con_Eet *
@@ -941,15 +939,13 @@ ecore_con_eet_reply(Ecore_Con_Reply *reply)
941EAPI void 939EAPI void
942ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value) 940ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value)
943{ 941{
944 eo_do(reply->ece, ecore_con_eet_base_send(reply, name, value)); 942 ecore_con_eet_base_send(reply->ece, reply, name, value);
945} 943}
946 944
947EAPI void 945EAPI void
948ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length) 946ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length)
949{ 947{
950 eo_do(reply->ece, 948 ecore_con_eet_base_raw_send(reply->ece, reply, protocol_name, section, value, length);
951 ecore_con_eet_base_raw_send(reply, protocol_name, section, value,
952 length));
953} 949}
954 950
955#include "ecore_con_eet_base.eo.c" 951#include "ecore_con_eet_base.eo.c"
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 0b84b90..fd05522 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -5,7 +5,7 @@ EAPI Eina_Bool
5ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url) 5ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url)
6{ 6{
7 Eina_Bool ret; 7 Eina_Bool ret;
8 eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_set(url)); 8 ret = efl_network_url_set((Ecore_Con_Url *)obj, url);
9 return ret; 9 return ret;
10} 10}
11 11
@@ -13,7 +13,7 @@ EAPI const char *
13ecore_con_url_url_get(const Ecore_Con_Url *obj) 13ecore_con_url_url_get(const Ecore_Con_Url *obj)
14{ 14{
15 const char * ret; 15 const char * ret;
16 eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_get()); 16 ret = efl_network_url_get((Ecore_Con_Url *)obj);
17 return ret; 17 return ret;
18} 18}
19 19
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 049d4f2..000bf4d 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -225,12 +225,9 @@ EAPI Ecore_Con_Url *
225ecore_con_url_new(const char *url) 225ecore_con_url_new(const char *url)
226{ 226{
227 Ecore_Con_Url *url_obj; 227 Ecore_Con_Url *url_obj;
228 url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, 228 url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eoid, url));
229 efl_network_url_set(url));
230 229
231 eo_do(url_obj, 230 eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
232 eo_event_callback_array_add(efl_network_url_event_table_callbacks(),
233 NULL));
234 231
235 return url_obj; 232 return url_obj;
236} 233}
@@ -238,7 +235,7 @@ ecore_con_url_new(const char *url)
238EOLIAN static Eo * 235EOLIAN static Eo *
239_efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED) 236_efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
240{ 237{
241 url_obj = eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_constructor()); 238 url_obj = eo_constructor(eo_super(url_obj, MY_CLASS));
242 239
243 if (!_init_count || !_c_init()) 240 if (!_init_count || !_c_init())
244 { 241 {
@@ -338,7 +335,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data
338 */ 335 */
339 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30); 336 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
340 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1); 337 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
341 return eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_finalize()); 338 return eo_finalize(eo_super(url_obj, MY_CLASS));
342} 339}
343 340
344EAPI Ecore_Con_Url * 341EAPI Ecore_Con_Url *
@@ -375,9 +372,7 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
375 if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS)) 372 if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
376 return; 373 return;
377 374
378 eo_do(url_obj, 375 eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
379 eo_event_callback_array_del(efl_network_url_event_table_callbacks(),
380 NULL));
381 376
382 eo_del(url_obj); 377 eo_del(url_obj);
383} 378}
@@ -400,7 +395,7 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
400EOLIAN static void 395EOLIAN static void
401_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con) 396_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
402{ 397{
403 eo_do_super(url_obj, MY_CLASS, eo_destructor()); 398 eo_destructor(eo_super(url_obj, MY_CLASS));
404 399
405 if (!_c) return; 400 if (!_c) return;
406 if (url_con->curl_easy) 401 if (url_con->curl_easy)
@@ -1145,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
1145 e.status = status; 1140 e.status = status;
1146 e.url_con = url_obj; 1141 e.url_con = url_obj;
1147 url_con->event_count++; 1142 url_con->event_count++;
1148 eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_COMPLETE, &e)); 1143 eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
1149} 1144}
1150 1145
1151static void 1146static void
@@ -1206,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
1206 e.size = real_size; 1201 e.size = real_size;
1207 e.data = buffer; 1202 e.data = buffer;
1208 url_con->event_count++; 1203 url_con->event_count++;
1209 eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_DATA, &e)); 1204 eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
1210 } 1205 }
1211 else 1206 else
1212 { 1207 {
@@ -1265,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
1265 e.up.total = ultotal; 1260 e.up.total = ultotal;
1266 e.up.now = ulnow; 1261 e.up.now = ulnow;
1267 url_con->event_count++; 1262 url_con->event_count++;
1268 eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_PROGRESS, &e)); 1263 eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
1269 1264
1270 return 0; 1265 return 0;
1271} 1266}