diff options
-rw-r--r-- | src/Makefile_Ecore_Con.am | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/Ecore_Con_Eo.h | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/Ecore_Con_Legacy.h | 8 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con.c | 174 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_client.eo | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_dns.c | 4 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_eet.c | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_local.c | 4 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_local_win32.c | 28 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_private.h | 4 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_socks.c | 16 | ||||
-rw-r--r-- | src/lib/ecore_con/ecore_con_ssl.c | 68 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_network_connector.eo | 2 | ||||
-rw-r--r-- | src/lib/ecore_con/efl_network_server.eo (renamed from src/lib/ecore_con/ecore_con_server.eo) | 5 |
14 files changed, 164 insertions, 157 deletions
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index 8ed6b08f2f..969180ce18 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -4,7 +4,7 @@ ecore_con_eolian_files = \ lib/ecore_con/ecore_con_base.eo \ lib/ecore_con/ecore_con_client.eo \ - lib/ecore_con/ecore_con_server.eo \ + lib/ecore_con/efl_network_server.eo \ lib/ecore_con/efl_network_connector.eo \ lib/ecore_con/ecore_con_eet_base.eo \ lib/ecore_con/ecore_con_eet_server_obj.eo \ diff --git a/src/lib/ecore_con/Ecore_Con_Eo.h b/src/lib/ecore_con/Ecore_Con_Eo.h index 460e15ed1c..5a2b592665 100644 --- a/src/lib/ecore_con/Ecore_Con_Eo.h +++ b/src/lib/ecore_con/Ecore_Con_Eo.h @@ -1,5 +1,5 @@ #include "ecore_con_base.eo.h" -#include "ecore_con_server.eo.h" +#include "efl_network_server.eo.h" #include "efl_network_connector.eo.h" #include "ecore_con_client.eo.h" #include "efl_network_url.eo.h" diff --git a/src/lib/ecore_con/Ecore_Con_Legacy.h b/src/lib/ecore_con/Ecore_Con_Legacy.h index 6f9b3f3165..9a75ad5f81 100644 --- a/src/lib/ecore_con/Ecore_Con_Legacy.h +++ b/src/lib/ecore_con/Ecore_Con_Legacy.h @@ -4,12 +4,18 @@ #include <Eo.h> #include "ecore_con_base.eo.legacy.h" -#include "ecore_con_server.eo.legacy.h" +#include "efl_network_server.eo.legacy.h" #include "efl_network_connector.eo.legacy.h" #include "ecore_con_client.eo.legacy.h" /******************************************************************** + * ecore_con_server.eo.h + *******************************************************************/ +typedef Eo Ecore_Con_Server; + + +/******************************************************************** * ecore_con_url.eo.h *******************************************************************/ typedef Eo Ecore_Con_Url; diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index 0235d9f4d1..1831d31460 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -142,7 +142,7 @@ _ecore_con_client_kill(Ecore_Con_Client *obj) void _ecore_con_server_kill(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (svr->delete_me) DBG("Multi kill request for svr %p", svr); else @@ -268,7 +268,7 @@ ecore_con_shutdown(void) EINA_LIST_FOREACH_SAFE(servers, l, l2, obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Server_Add *ev; if (!svr) continue; @@ -307,8 +307,8 @@ _ecore_con_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char return EINA_FALSE; obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, - ecore_con_server_obj_connection_type_set(ECORE_CON_REMOTE_TCP), - ecore_con_server_obj_name_set(name), + efl_network_server_connection_type_set(ECORE_CON_REMOTE_TCP), + efl_network_server_name_set(name), ecore_con_obj_port_set(1025)); lk = malloc(sizeof (Ecore_Con_Lookup)); @@ -363,9 +363,9 @@ ecore_con_server_add(Ecore_Con_Type compl_type, /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ /* remote system socket: TCP/IP: [name]:[port] */ - obj = eo_add(ECORE_CON_SERVER_CLASS, NULL, - ecore_con_server_obj_connection_type_set(compl_type), - ecore_con_server_obj_name_set(name), + obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, + efl_network_server_connection_type_set(compl_type), + efl_network_server_name_set(name), ecore_con_obj_port_set(port)); ecore_con_server_data_set(obj, (void *) data); @@ -374,9 +374,9 @@ ecore_con_server_add(Ecore_Con_Type compl_type, } EOLIAN static Eo * -_ecore_con_server_eo_base_constructor(Ecore_Con_Server *obj, Ecore_Con_Server_Data *svr) +_efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr) { - obj = eo_do_super_ret(obj, ECORE_CON_SERVER_CLASS, obj, eo_constructor()); + obj = eo_do_super_ret(obj, EFL_NETWORK_SERVER_CLASS, obj, eo_constructor()); svr->fd = -1; svr->reject_excess_clients = EINA_FALSE; @@ -387,12 +387,12 @@ _ecore_con_server_eo_base_constructor(Ecore_Con_Server *obj, Ecore_Con_Server_Da } EOLIAN static Eo * -_ecore_con_server_eo_base_finalize(Ecore_Con_Server *obj, Ecore_Con_Server_Data *svr) +_efl_network_server_eo_base_finalize(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr) { Ecore_Con_Type compl_type = svr->type; Ecore_Con_Type type; - eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_finalize()); + eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize()); svr->created = EINA_TRUE; svr->ppid = getpid(); @@ -463,8 +463,8 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ /* remote system socket: TCP/IP: [name]:[port] */ obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, - ecore_con_server_obj_connection_type_set(compl_type), - ecore_con_server_obj_name_set(name), + efl_network_server_connection_type_set(compl_type), + efl_network_server_name_set(name), ecore_con_obj_port_set(port)); ecore_con_server_data_set(obj, (void *) data); @@ -475,13 +475,13 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, EOLIAN static Eo * _efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Type compl_type = svr->type; Ecore_Con_Type type; /* XXX: We intentionally put SERVER class here and not connector, as we'd * like to skip that one. */ - eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_finalize()); + eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_finalize()); svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY; @@ -552,7 +552,7 @@ ecore_con_server_timeout_set(Ecore_Con *obj, double timeout) } EOLIAN static void -_ecore_con_server_ecore_con_base_timeout_set(Eo *obj, Ecore_Con_Server_Data *svr, double timeout) +_efl_network_server_ecore_con_base_timeout_set(Eo *obj, Efl_Network_Server_Data *svr, double timeout) { if (svr->created) svr->client_disconnect_time = timeout; @@ -570,7 +570,7 @@ ecore_con_server_timeout_get(const Ecore_Con *obj) } EOLIAN static double -_ecore_con_server_ecore_con_base_timeout_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_ecore_con_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return svr->created ? svr->client_disconnect_time : svr->disconnect_time; } @@ -579,7 +579,7 @@ EAPI void * ecore_con_server_del(Ecore_Con_Server *obj) { if (!obj) return NULL; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr || svr->delete_me) return NULL; @@ -594,7 +594,7 @@ ecore_con_server_del(Ecore_Con_Server *obj) EAPI void * ecore_con_server_data_get(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return NULL; @@ -605,7 +605,7 @@ EAPI void * ecore_con_server_data_set(Ecore_Con_Server *obj, void *data) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); void *ret = NULL; if (!svr) @@ -624,19 +624,19 @@ ecore_con_server_connected_get(const Ecore_Con *obj) } EOLIAN static Eina_Bool -_ecore_con_server_ecore_con_base_connected_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_ecore_con_base_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return !svr->connecting; } EOLIAN static const Eina_List * -_ecore_con_server_clients_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_clients_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return svr->clients; } EOLIAN static void -_ecore_con_server_connection_type_set(Eo *obj, Ecore_Con_Server_Data *svr, Ecore_Con_Type type) +_efl_network_server_connection_type_set(Eo *obj, Efl_Network_Server_Data *svr, Ecore_Con_Type type) { EO_CONSTRUCTOR_CHECK_RETURN(obj); @@ -644,13 +644,13 @@ _ecore_con_server_connection_type_set(Eo *obj, Ecore_Con_Server_Data *svr, Ecore } EOLIAN static Ecore_Con_Type -_ecore_con_server_connection_type_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_connection_type_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return svr->type; } EOLIAN static void -_ecore_con_server_name_set(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr, const char *name) +_efl_network_server_name_set(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, const char *name) { EO_CONSTRUCTOR_CHECK_RETURN(obj); @@ -661,7 +661,7 @@ _ecore_con_server_name_set(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr, cons } EOLIAN static const char * -_ecore_con_server_name_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_name_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return svr->name; } @@ -674,7 +674,7 @@ ecore_con_server_port_get(const Ecore_Con *obj) } EOLIAN static void -_ecore_con_server_ecore_con_base_port_set(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr, int port) +_efl_network_server_ecore_con_base_port_set(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, int port) { EO_CONSTRUCTOR_CHECK_RETURN(obj); @@ -682,7 +682,7 @@ _ecore_con_server_ecore_con_base_port_set(Eo *obj EINA_UNUSED, Ecore_Con_Server_ } EOLIAN static int -_ecore_con_server_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return svr->port; } @@ -695,7 +695,7 @@ ecore_con_server_send(Ecore_Con *obj, const void *data, int size) } EOLIAN static int -_ecore_con_server_ecore_con_base_send(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr, const void *data, int size) +_efl_network_server_ecore_con_base_send(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, const void *data, int size) { EINA_SAFETY_ON_TRUE_RETURN_VAL(svr->delete_me, 0); @@ -727,7 +727,7 @@ _ecore_con_server_ecore_con_base_send(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data } EOLIAN static void -_ecore_con_server_client_limit_set(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr, +_efl_network_server_client_limit_set(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, int client_limit, char reject_excess_clients) { @@ -736,7 +736,7 @@ _ecore_con_server_client_limit_set(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *s } EOLIAN static void -_ecore_con_server_client_limit_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr, +_efl_network_server_client_limit_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, int *client_limit, char *reject_excess_clients) { @@ -752,7 +752,7 @@ ecore_con_server_ip_get(const Ecore_Con *obj) } EOLIAN static const char * -_ecore_con_server_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return svr->ip; } @@ -765,7 +765,7 @@ ecore_con_server_uptime_get(const Ecore_Con *obj) } EOLIAN static double -_ecore_con_server_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { return ecore_time_get() - svr->start_time; } @@ -777,7 +777,7 @@ ecore_con_server_flush(Ecore_Con *obj) } EOLIAN static void -_ecore_con_server_ecore_con_base_flush(Eo *obj, Ecore_Con_Server_Data *svr EINA_UNUSED) +_efl_network_server_ecore_con_base_flush(Eo *obj, Efl_Network_Server_Data *svr EINA_UNUSED) { _ecore_con_server_flush(obj); } @@ -809,7 +809,7 @@ ecore_con_client_send(Ecore_Con *obj, const void *data, int size) EOLIAN static int _ecore_con_client_ecore_con_base_send(Eo *obj EINA_UNUSED, Ecore_Con_Client_Data *cl, const void *data, int size) { - Ecore_Con_Server_Data *host_server = NULL; + Efl_Network_Server_Data *host_server = NULL; EINA_SAFETY_ON_TRUE_RETURN_VAL(cl->delete_me, 0); EINA_SAFETY_ON_NULL_RETURN_VAL(data, 0); @@ -956,7 +956,7 @@ ecore_con_client_ip_get(const Ecore_Con *obj) EOLIAN static int _ecore_con_client_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Ecore_Con_Client_Data *cl) { - Ecore_Con_Server_Data *sd = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *sd = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (sd->type != ECORE_CON_REMOTE_TCP && sd->type != ECORE_CON_REMOTE_MCAST && @@ -1014,7 +1014,7 @@ ecore_con_server_fd_get(const Ecore_Con *obj) } EOLIAN static int -_ecore_con_server_ecore_con_base_fd_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) +_efl_network_server_ecore_con_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) { if (svr->created) return -1; if (svr->delete_me) return -1; @@ -1041,7 +1041,7 @@ ecore_con_client_fd_get(const Ecore_Con *obj) void ecore_con_event_proxy_bind(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Proxy_Bind *e; int ev = ECORE_CON_EVENT_PROXY_BIND; @@ -1061,7 +1061,7 @@ ecore_con_event_proxy_bind(Ecore_Con_Server *obj) void ecore_con_event_server_add(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); /* we got our server! */ Ecore_Con_Event_Server_Add *e; int ev = ECORE_CON_EVENT_SERVER_ADD; @@ -1084,7 +1084,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj) void ecore_con_event_server_del(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Server_Del *e; svr->delete_me = EINA_TRUE; @@ -1109,7 +1109,7 @@ ecore_con_event_server_del(Ecore_Con_Server *obj) void ecore_con_event_server_write(Ecore_Con_Server *obj, int num) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Server_Write *e; e = ecore_con_event_server_write_alloc(); @@ -1127,7 +1127,7 @@ ecore_con_event_server_write(Ecore_Con_Server *obj, int num) void ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num, Eina_Bool duplicate) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Server_Data *e; e = ecore_con_event_server_data_alloc(); @@ -1171,7 +1171,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj) e = ecore_con_event_client_add_alloc(); EINA_SAFETY_ON_NULL_RETURN(e); - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); cl->event_count = eina_list_append(cl->event_count, e); host_server->event_count = eina_list_append(host_server->event_count, e); @@ -1198,7 +1198,7 @@ ecore_con_event_client_del(Ecore_Con_Client *obj) EINA_SAFETY_ON_NULL_RETURN(e); cl->event_count = eina_list_append(cl->event_count, e); - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); host_server->event_count = eina_list_append(host_server->event_count, e); _ecore_con_cl_timer_update(obj); @@ -1217,7 +1217,7 @@ ecore_con_event_client_write(Ecore_Con_Client *obj, int num) e = ecore_con_event_client_write_alloc(); EINA_SAFETY_ON_NULL_RETURN(e); - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); cl->event_count = eina_list_append(cl->event_count, e); host_server->event_count = eina_list_append(host_server->event_count, e); @@ -1237,7 +1237,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num, e = ecore_con_event_client_data_alloc(); EINA_SAFETY_ON_NULL_RETURN(e); - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); cl->event_count = eina_list_append(cl->event_count, e); host_server->event_count = eina_list_append(host_server->event_count, e); @@ -1271,14 +1271,14 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num, void ecore_con_server_infos_del(Ecore_Con_Server *obj, void *info) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); svr->infos = eina_list_remove(svr->infos, info); } void _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool duplicate) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Server_Error *e; e = ecore_con_event_server_error_alloc(); @@ -1302,7 +1302,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error) e = ecore_con_event_client_error_alloc(); EINA_SAFETY_ON_NULL_RETURN(e); - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); e->client = obj; e->error = strdup(error); @@ -1321,7 +1321,7 @@ _ecore_con_server_free(Ecore_Con_Server *obj) } EOLIAN static void -_ecore_con_server_eo_base_destructor(Eo *obj, Ecore_Con_Server_Data *svr) +_efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr) { Ecore_Con_Client *cl_obj; double t_start, t; @@ -1397,7 +1397,7 @@ _ecore_con_server_eo_base_destructor(Eo *obj, Ecore_Con_Server_Data *svr) servers = eina_list_remove(servers, obj); svr->data = NULL; - eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_destructor()); + eo_do_super(obj, EFL_NETWORK_SERVER_CLASS, eo_destructor()); end: return; } @@ -1429,7 +1429,7 @@ _ecore_con_client_eo_base_destructor(Eo *obj, Ecore_Con_Client_Data *cl) break; } } - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); host_server->clients = eina_list_remove(host_server->clients, obj); --host_server->client_count; @@ -1466,7 +1466,7 @@ _ecore_con_client_eo_base_destructor(Eo *obj, Ecore_Con_Client_Data *cl) static Eina_Bool _ecore_con_server_timer(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); ecore_con_server_del(obj); svr->until_deletion = NULL; @@ -1476,7 +1476,7 @@ _ecore_con_server_timer(Ecore_Con_Server *obj) static void _ecore_con_server_timer_update(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (svr->disconnect_time) { if (svr->disconnect_time > 0) @@ -1539,7 +1539,7 @@ _ecore_con_cl_timer_update(Ecore_Con_Client *obj) } else { - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (host_server->client_disconnect_time > 0) { @@ -1564,7 +1564,7 @@ _ecore_con_cb_tcp_listen(void *data, Ecore_Con_Info *net_info) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); struct linger lin; const char *memerr = NULL; #ifdef _WIN32 @@ -1676,7 +1676,7 @@ _ecore_con_cb_udp_listen(void *data, Ecore_Con_Info *net_info) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Type type; struct ip_mreq mreq; #ifdef HAVE_IPV6 @@ -1791,7 +1791,7 @@ _ecore_con_cb_tcp_connect(void *data, Ecore_Con_Info *net_info) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int res; int curstate = 0; const char *memerr = NULL; @@ -1898,7 +1898,7 @@ _ecore_con_cb_udp_connect(void *data, int curstate = 0; int broadcast = 1; const char *memerr = NULL; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); #ifdef _WIN32 u_long mode = 1; #endif @@ -1961,7 +1961,7 @@ error: static Ecore_Con_State svr_try_connect_plain(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int res; int so_err = 0; socklen_t size = sizeof(int); @@ -2066,7 +2066,7 @@ _ecore_con_svr_tcp_handler(void *data, unsigned char client_addr[256]; unsigned int client_addr_len; const char *clerr = NULL; - Ecore_Con_Server_Data *svr = eo_data_scope_get(svr_obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS); #ifdef _WIN32 u_long mode = 1; #endif @@ -2159,7 +2159,7 @@ error: static void _ecore_con_cl_read(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int num = 0; Eina_Bool lost_server = EINA_TRUE; unsigned char buf[READBUFSIZ]; @@ -2219,7 +2219,7 @@ _ecore_con_cl_handler(void *data, { Ecore_Con_Server *obj = data; Eina_Bool want_read, want_write; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (svr->delete_me) return ECORE_CALLBACK_RENEW; @@ -2281,7 +2281,7 @@ _ecore_con_cl_udp_handler(void *data, int num; Ecore_Con_Server *obj = data; Eina_Bool want_read, want_write; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); want_read = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ); want_write = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE); @@ -2323,7 +2323,7 @@ _ecore_con_svr_udp_handler(void *data, u_long mode = 1; #endif - Ecore_Con_Server_Data *svr = eo_data_scope_get(svr_obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS); if (svr->delete_me) return ECORE_CALLBACK_RENEW; @@ -2400,7 +2400,7 @@ _ecore_con_svr_cl_read(Ecore_Con_Client *obj) _ecore_con_cl_timer_update(obj); } - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade)) { num = recv(cl->fd, (char *)buf, sizeof(buf), 0); @@ -2458,7 +2458,7 @@ _ecore_con_svr_cl_handler(void *data, static void _ecore_con_server_flush(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int count; size_t num; size_t buf_len; @@ -2625,7 +2625,7 @@ _ecore_con_client_flush(Ecore_Con_Client *obj) if (!cl->buf) return; num = eina_binbuf_length_get(cl->buf) - cl->buf_offset; if (num <= 0) return; - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade)) count = send(cl->fd, (char *)eina_binbuf_string_get(cl->buf) + cl->buf_offset, num, 0); else @@ -2651,7 +2651,7 @@ _ecore_con_client_flush(Ecore_Con_Client *obj) eina_binbuf_free(cl->buf); cl->buf = NULL; #ifdef TCP_CORK - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_CORK) { int state = 0; @@ -2671,7 +2671,7 @@ static void _ecore_con_event_client_add_free(Ecore_Con_Server *obj, void *ev) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Client_Add *e; e = ev; @@ -2685,7 +2685,7 @@ _ecore_con_event_client_add_free(Ecore_Con_Server *obj, cl->event_count = eina_list_remove(cl->event_count, e); if (cl->host_server) { - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (host_server) host_server->event_count = eina_list_remove(host_server->event_count, ev); if ((!svr->event_count) && (svr->delete_me)) @@ -2712,7 +2712,7 @@ static void _ecore_con_event_client_del_free(Ecore_Con_Server *obj, void *ev) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Client_Del *e; e = ev; @@ -2726,7 +2726,7 @@ _ecore_con_event_client_del_free(Ecore_Con_Server *obj, cl->event_count = eina_list_remove(cl->event_count, e); if (cl->host_server) { - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (host_server) host_server->event_count = eina_list_remove(host_server->event_count, ev); if ((!svr->event_count) && (svr->delete_me)) @@ -2752,7 +2752,7 @@ static void _ecore_con_event_client_write_free(Ecore_Con_Server *obj, Ecore_Con_Event_Client_Write *e) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (e->client) { Ecore_Con_Client_Data *cl = eo_data_scope_get(e->client, ECORE_CON_CLIENT_CLASS); @@ -2763,7 +2763,7 @@ _ecore_con_event_client_write_free(Ecore_Con_Server *obj, cl->event_count = eina_list_remove(cl->event_count, e); if (cl->host_server) { - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (host_server) host_server->event_count = eina_list_remove(host_server->event_count, e); if ((!svr->event_count) && (svr->delete_me)) @@ -2774,7 +2774,7 @@ _ecore_con_event_client_write_free(Ecore_Con_Server *obj, } if (!svrfreed) { - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (((!cl->event_count) && (cl->delete_me)) || ((cl->host_server && ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || @@ -2793,7 +2793,7 @@ static void _ecore_con_event_client_data_free(Ecore_Con_Server *obj, void *ev) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_Event_Client_Data *e; e = ev; @@ -2807,7 +2807,7 @@ _ecore_con_event_client_data_free(Ecore_Con_Server *obj, cl->event_count = eina_list_remove(cl->event_count, e); if (cl->host_server) { - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (host_server) host_server->event_count = eina_list_remove(host_server->event_count, ev); } @@ -2818,7 +2818,7 @@ _ecore_con_event_client_data_free(Ecore_Con_Server *obj, } if (!svrfreed) { - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (((!cl->event_count) && (cl->delete_me)) || ((cl->host_server && ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || @@ -2843,7 +2843,7 @@ _ecore_con_event_server_add_free(void *data EINA_UNUSED, e = ev; if (e->server) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(e->server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); if (svr) { svr->event_count = eina_list_remove(svr->event_count, ev); @@ -2866,7 +2866,7 @@ _ecore_con_event_server_del_free(void *data EINA_UNUSED, e = ev; if (e->server) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(e->server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); if (svr) { svr->event_count = eina_list_remove(svr->event_count, ev); @@ -2886,7 +2886,7 @@ _ecore_con_event_server_write_free(void *data EINA_UNUSED, { if (e->server) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(e->server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); if (svr) { svr->event_count = eina_list_remove(svr->event_count, e); @@ -2909,7 +2909,7 @@ _ecore_con_event_server_data_free(void *data EINA_UNUSED, e = ev; if (e->server) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(e->server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); if (svr) { svr->event_count = eina_list_remove(svr->event_count, ev); @@ -2930,7 +2930,7 @@ _ecore_con_event_server_error_free(void *data EINA_UNUSED, Ecore_Con_Event_Serve { if (e->server) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(e->server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); if (svr) { svr->event_count = eina_list_remove(svr->event_count, e); @@ -2948,7 +2948,7 @@ _ecore_con_event_server_error_free(void *data EINA_UNUSED, Ecore_Con_Event_Serve static void _ecore_con_event_client_error_free(Ecore_Con_Server *obj, Ecore_Con_Event_Client_Error *e) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (e->client) { Ecore_Con_Client_Data *cl = eo_data_scope_get(e->client, ECORE_CON_CLIENT_CLASS); @@ -2987,7 +2987,7 @@ _ecore_con_lookup_done(void *data, Ecore_Con_Server *obj = data; Ecore_Con_Lookup *lk; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return; lk = svr->data; @@ -3003,5 +3003,5 @@ _ecore_con_lookup_done(void *data, #include "ecore_con_base.eo.c" #include "ecore_con_client.eo.c" -#include "ecore_con_server.eo.c" +#include "efl_network_server.eo.c" #include "efl_network_connector.eo.c" diff --git a/src/lib/ecore_con/ecore_con_client.eo b/src/lib/ecore_con/ecore_con_client.eo index db6859c2c8..33bff4d092 100644 --- a/src/lib/ecore_con/ecore_con_client.eo +++ b/src/lib/ecore_con/ecore_con_client.eo @@ -7,7 +7,7 @@ class Ecore.Con.Client (Ecore.Con.Base) { get { } values { - svr: Ecore.Con.Server *; [[The server the client is connected to.]] + svr: Efl.Network.Server *; [[The server the client is connected to.]] } } } diff --git a/src/lib/ecore_con/ecore_con_dns.c b/src/lib/ecore_con/ecore_con_dns.c index 3e4f14a0b2..eb15001a0e 100644 --- a/src/lib/ecore_con/ecore_con_dns.c +++ b/src/lib/ecore_con/ecore_con_dns.c @@ -59,7 +59,7 @@ _ecore_con_dns_del(Ecore_Con_DNS *dns) { if (dns->svr) { - Ecore_Con_Server_Data *svr; + Efl_Network_Server_Data *svr; svr = eo_data_scope_get(dns->svr, ECORE_CON_CLIENT_CLASS); if ((svr) && (svr->infos)) @@ -296,7 +296,7 @@ ecore_con_info_get(Ecore_Con_Server *obj, void *data, struct addrinfo *hints) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Con_DNS *dns; int error = 0; diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c index c85e287fa2..9720b5799f 100644 --- a/src/lib/ecore_con/ecore_con_eet.c +++ b/src/lib/ecore_con/ecore_con_eet.c @@ -699,7 +699,7 @@ _ecore_con_eet_base_eo_base_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd) EOLIAN static void _ecore_con_eet_base_server_set(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Server *data) { - if (!eo_isa(data, ECORE_CON_SERVER_CLASS)) + if (!eo_isa(data, EFL_NETWORK_SERVER_CLASS)) return; pd->server = data; diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c index c493cc5670..b6f682ac9f 100644 --- a/src/lib/ecore_con/ecore_con_local.c +++ b/src/lib/ecore_con/ecore_con_local.c @@ -72,7 +72,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj, #ifndef HAVE_LOCAL_SOCKETS return 0; #else - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); char buf[4096]; struct sockaddr_un socket_unix; int curstate = 0; @@ -213,7 +213,7 @@ ecore_con_local_listen( EINA_UNUSED) { #ifdef HAVE_LOCAL_SOCKETS - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); char buf[4096]; struct sockaddr_un socket_unix; struct linger lin; diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c index 4d0dedbb46..96ad257169 100644 --- a/src/lib/ecore_con/ecore_con_local_win32.c +++ b/src/lib/ecore_con/ecore_con_local_win32.c @@ -40,7 +40,7 @@ _ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handle void *buf; DWORD n; Eina_Bool broken_pipe = EINA_FALSE; - Ecore_Con_Server_Data *host_svr = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (!ResetEvent(host_svr->event_read)) return ECORE_CALLBACK_RENEW; @@ -90,7 +90,7 @@ _ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handle { Ecore_Con_Client *obj = data; Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS); - Ecore_Con_Server_Data *host_svr = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); #if 0 char *msg; #endif @@ -118,7 +118,7 @@ static Eina_Bool _ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handler *wh) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); #if 0 char *msg; #endif @@ -145,7 +145,7 @@ static Eina_Bool _ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handler *wh) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); void *buf; DWORD n; Eina_Bool broken_pipe = EINA_FALSE; @@ -198,7 +198,7 @@ static unsigned int __stdcall _ecore_con_local_win32_client_read_server_thread(void *data) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); DWORD nbr_bytes = 0; svr->read_stopped = EINA_FALSE; @@ -236,7 +236,7 @@ _ecore_con_local_win32_server_read_client_thread(void *data) { Ecore_Con_Client *obj = data; Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS); - Ecore_Con_Server_Data *host_svr = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); DWORD nbr_bytes = 0; host_svr->read_stopped = EINA_FALSE; @@ -272,7 +272,7 @@ static Eina_Bool _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); Ecore_Win32_Handler *handler_read; Ecore_Win32_Handler *handler_peek; @@ -365,7 +365,7 @@ static unsigned int __stdcall _ecore_con_local_win32_listening(void *data) { Ecore_Con_Server *obj = data; - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); BOOL res; while (1) @@ -389,7 +389,7 @@ _ecore_con_local_win32_listening(void *data) Eina_Bool ecore_con_local_listen(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); char buf[256]; HANDLE thread_listening; Ecore_Win32_Handler *handler; @@ -476,7 +476,7 @@ free_path: void ecore_con_local_win32_server_del(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT) return; @@ -507,7 +507,7 @@ void ecore_con_local_win32_client_del(Ecore_Con_Client *obj) { Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS); - Ecore_Con_Server_Data *svr = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT) return; @@ -539,7 +539,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj, Ecore_Fd_Handler *fd_handler)) { #warning "I am pretty sure cb_done should be used." - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); char buf[256]; Ecore_Win32_Handler *handler_read; Ecore_Win32_Handler *handler_peek; @@ -659,7 +659,7 @@ close_pipe: Eina_Bool ecore_con_local_win32_server_flush(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); size_t num; BOOL res; DWORD written; @@ -711,7 +711,7 @@ ecore_con_local_win32_client_flush(Ecore_Con_Client *obj) size_t num; BOOL res; DWORD written; - Ecore_Con_Server_Data *svr = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); type = svr->type & ECORE_CON_TYPE; diff --git a/src/lib/ecore_con/ecore_con_private.h b/src/lib/ecore_con/ecore_con_private.h index 181ca44012..1fa87e966c 100644 --- a/src/lib/ecore_con/ecore_con_private.h +++ b/src/lib/ecore_con/ecore_con_private.h @@ -129,7 +129,7 @@ struct _Ecore_Con_Client_Data typedef struct _Ecore_Con_Client_Data Ecore_Con_Client_Data; -struct _Ecore_Con_Server_Data +struct _Efl_Network_Server_Data { #ifdef _WIN32 SOCKET fd; @@ -205,7 +205,7 @@ struct _Ecore_Con_Server_Data #endif }; -typedef struct _Ecore_Con_Server_Data Ecore_Con_Server_Data; +typedef struct _Efl_Network_Server_Data Efl_Network_Server_Data; struct _Ecore_Con_Info { diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c index a017f2bba9..3bebffeed9 100644 --- a/src/lib/ecore_con/ecore_con_socks.c +++ b/src/lib/ecore_con/ecore_con_socks.c @@ -136,7 +136,7 @@ _ecore_con_socks_free(Ecore_Con_Socks *ecs) static Eina_Bool _ecore_con_socks_svr_init_v4(Ecore_Con_Server *obj, Ecore_Con_Socks_v4 *v4) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); size_t addrlen, buflen, ulen = 1; unsigned char *sbuf; @@ -176,7 +176,7 @@ _ecore_con_socks_svr_init_v4(Ecore_Con_Server *obj, Ecore_Con_Socks_v4 *v4) static Eina_Bool _ecore_con_socks_svr_init_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); size_t buflen; unsigned int x; unsigned char *sbuf; @@ -230,7 +230,7 @@ _ecore_con_socks_svr_init_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5) static void _ecore_con_socks_read_v4(Ecore_Con_Server *obj, Ecore_Con_Socks_v4 *v4 EINA_UNUSED, const unsigned char *buf, unsigned int num) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); const unsigned char *data; DBG("SOCKS: %d bytes", num); ECORE_CON_SOCKS_READ(8); @@ -289,7 +289,7 @@ error: static Eina_Bool _ecore_con_socks_auth_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); size_t size; unsigned char *data; switch (v5->method) @@ -328,7 +328,7 @@ _ecore_con_socks_auth_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5) static void _ecore_con_socks_read_v5(Ecore_Con_Server *obj, Ecore_Con_Socks_v5 *v5, const unsigned char *buf, unsigned int num) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); const unsigned char *data; DBG("SOCKS: %d bytes", num); @@ -545,7 +545,7 @@ ecore_con_socks_shutdown(void) void ecore_con_socks_read(Ecore_Con_Server *obj, unsigned char *buf, int num) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); ECORE_CON_SOCKS_VERSION_CHECK(svr->ecs); ECORE_CON_SOCKS_CAST(svr->ecs); @@ -558,7 +558,7 @@ ecore_con_socks_read(Ecore_Con_Server *obj, unsigned char *buf, int num) Eina_Bool ecore_con_socks_svr_init(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); ECORE_CON_SOCKS_VERSION_CHECK_RETURN(svr->ecs, EINA_FALSE); ECORE_CON_SOCKS_CAST(svr->ecs); @@ -573,7 +573,7 @@ ecore_con_socks_svr_init(Ecore_Con_Server *obj) void ecore_con_socks_dns_cb(const char *canonname EINA_UNUSED, const char *ip, struct sockaddr *addr, int addrlen EINA_UNUSED, Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); svr->ip = eina_stringshare_add(ip); svr->ecs_state++; if (addr->sa_family == AF_INET) diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c index 3c24afba43..62f1dc488e 100644 --- a/src/lib/ecore_con/ecore_con_ssl.c +++ b/src/lib/ecore_con/ecore_con_ssl.c @@ -513,7 +513,7 @@ ecore_con_ssl_server_prepare(Ecore_Con_Server *svr, Ecore_Con_Ssl_Error ecore_con_ssl_server_init(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr || !(svr->type & ECORE_CON_SSL)) return ECORE_CON_SSL_ERROR_NONE; return SSL_SUFFIX(_ecore_con_ssl_server_init) (obj); @@ -522,7 +522,7 @@ ecore_con_ssl_server_init(Ecore_Con_Server *obj) Ecore_Con_Ssl_Error ecore_con_ssl_server_shutdown(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr || !(svr->type & ECORE_CON_SSL)) return ECORE_CON_SSL_ERROR_NONE; return SSL_SUFFIX(_ecore_con_ssl_server_shutdown) (obj); @@ -550,7 +550,7 @@ ecore_con_ssl_client_init(Ecore_Con_Client *obj) Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS); if (!cl) return ECORE_CON_SSL_ERROR_NONE; - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (!host_server || !(host_server->type & ECORE_CON_SSL)) return ECORE_CON_SSL_ERROR_NONE; return SSL_SUFFIX(_ecore_con_ssl_client_init) (obj); @@ -562,7 +562,7 @@ ecore_con_ssl_client_shutdown(Ecore_Con_Client *obj) Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS); if (!cl) return ECORE_CON_SSL_ERROR_NONE; - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (!host_server || !(host_server->type & ECORE_CON_SSL)) return ECORE_CON_SSL_ERROR_NONE; return SSL_SUFFIX(_ecore_con_ssl_client_shutdown) (obj); @@ -593,7 +593,7 @@ ecore_con_ssl_available_get(void) EAPI void ecore_con_ssl_server_verify(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return; svr->verify = EINA_TRUE; @@ -602,7 +602,7 @@ ecore_con_ssl_server_verify(Ecore_Con_Server *obj) EAPI void ecore_con_ssl_server_verify_basic(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return; svr->verify_basic = EINA_TRUE; @@ -611,7 +611,7 @@ ecore_con_ssl_server_verify_basic(Ecore_Con_Server *obj) EAPI void ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *obj, const char *name) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return; eina_stringshare_replace(&svr->verify_name, name); @@ -620,7 +620,7 @@ ecore_con_ssl_server_verify_name_set(Ecore_Con_Server *obj, const char *name) EAPI const char * ecore_con_ssl_server_verify_name_get(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return NULL; return svr->verify_name ? : svr->name; @@ -630,7 +630,7 @@ EAPI Eina_Bool ecore_con_ssl_server_cert_add(Ecore_Con_Server *obj, const char *cert) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return EINA_FALSE; if (!svr->ssl_prepared) @@ -648,7 +648,7 @@ EAPI Eina_Bool ecore_con_ssl_server_cafile_add(Ecore_Con_Server *obj, const char *ca_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return EINA_FALSE; if (!svr->ssl_prepared) @@ -666,7 +666,7 @@ EAPI Eina_Bool ecore_con_ssl_server_privkey_add(Ecore_Con_Server *obj, const char *key_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return EINA_FALSE; if (!svr->ssl_prepared) @@ -684,7 +684,7 @@ EAPI Eina_Bool ecore_con_ssl_server_crl_add(Ecore_Con_Server *obj, const char *crl_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return EINA_FALSE; if (!svr->ssl_prepared) @@ -701,7 +701,7 @@ ecore_con_ssl_server_crl_add(Ecore_Con_Server *obj, EAPI Eina_Bool ecore_con_ssl_server_upgrade(Ecore_Con_Server *obj, Ecore_Con_Type ssl_type) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!svr) return EINA_FALSE; #if _ECORE_CON_SSL_AVAILABLE == 0 return EINA_FALSE; @@ -732,7 +732,7 @@ ecore_con_ssl_client_upgrade(Ecore_Con_Client *obj, Ecore_Con_Type ssl_type) return EINA_FALSE; #endif - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); if (!host_server->ssl_prepared) { if (ecore_con_ssl_server_prepare(cl->host_server, ssl_type)) @@ -761,7 +761,7 @@ static Ecore_Con_Ssl_Error _ecore_con_ssl_server_prepare_gnutls(Ecore_Con_Server *obj, int ssl_type) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int ret; switch (ssl_type) @@ -814,7 +814,7 @@ error: static Ecore_Con_Ssl_Error _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); const gnutls_datum_t *cert_list; unsigned int iter, cert_list_size; gnutls_x509_crt_t cert = NULL; @@ -951,7 +951,7 @@ static Eina_Bool _ecore_con_ssl_server_cafile_add_gnutls(Ecore_Con_Server *obj, const char *ca_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); struct stat st; Eina_Iterator *it; const char *file; @@ -987,7 +987,7 @@ static Eina_Bool _ecore_con_ssl_server_crl_add_gnutls(Ecore_Con_Server *obj, const char *crl_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); SSL_ERROR_CHECK_GOTO_ERROR(gnutls_certificate_set_x509_crl_file(svr->cert, crl_file, GNUTLS_X509_FMT_PEM) < 1); @@ -1001,7 +1001,7 @@ static Eina_Bool _ecore_con_ssl_server_privkey_add_gnutls(Ecore_Con_Server *obj, const char *key_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); SSL_ERROR_CHECK_GOTO_ERROR(gnutls_certificate_set_x509_key_file(svr->cert, svr->cert_file, key_file, GNUTLS_X509_FMT_PEM)); @@ -1015,7 +1015,7 @@ static Eina_Bool _ecore_con_ssl_server_cert_add_gnutls(Ecore_Con_Server *obj, const char *cert_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (!(svr->cert_file = strdup(cert_file))) return EINA_FALSE; @@ -1025,7 +1025,7 @@ _ecore_con_ssl_server_cert_add_gnutls(Ecore_Con_Server *obj, static Ecore_Con_Ssl_Error _ecore_con_ssl_server_shutdown_gnutls(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (svr->session) { gnutls_bye(svr->session, GNUTLS_SHUT_RDWR); @@ -1074,7 +1074,7 @@ _ecore_con_ssl_server_read_gnutls(Ecore_Con_Server *obj, unsigned char *buf, int size) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int num; if (svr->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING) @@ -1110,7 +1110,7 @@ _ecore_con_ssl_server_write_gnutls(Ecore_Con_Server *obj, const unsigned char *buf, int size) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int num; if (svr->ssl_state == ECORE_CON_SSL_STATE_HANDSHAKING) @@ -1145,7 +1145,7 @@ static Ecore_Con_Ssl_Error _ecore_con_ssl_client_init_gnutls(Ecore_Con_Client *obj) { Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS); - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); const gnutls_datum_t *cert_list; unsigned int iter, cert_list_size; const char *priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT"; @@ -1380,7 +1380,7 @@ static Ecore_Con_Ssl_Error _ecore_con_ssl_server_prepare_openssl(Ecore_Con_Server *obj, int ssl_type) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); long options; int dh = 0; @@ -1446,7 +1446,7 @@ error: static Ecore_Con_Ssl_Error _ecore_con_ssl_server_init_openssl(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int ret = -1; switch (svr->ssl_state) @@ -1541,7 +1541,7 @@ static Eina_Bool _ecore_con_ssl_server_cafile_add_openssl(Ecore_Con_Server *obj, const char *ca_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); struct stat st; if (stat(ca_file, &st)) return EINA_FALSE; @@ -1560,7 +1560,7 @@ static Eina_Bool _ecore_con_ssl_server_crl_add_openssl(Ecore_Con_Server *obj, const char *crl_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); X509_STORE *st; X509_LOOKUP *lu; static Eina_Bool flag = EINA_FALSE; @@ -1585,7 +1585,7 @@ static Eina_Bool _ecore_con_ssl_server_privkey_add_openssl(Ecore_Con_Server *obj, const char *key_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); FILE *fp = NULL; EVP_PKEY *privkey = NULL; @@ -1612,7 +1612,7 @@ static Eina_Bool _ecore_con_ssl_server_cert_add_openssl(Ecore_Con_Server *obj, const char *cert_file) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); FILE *fp = NULL; X509 *cert = NULL; @@ -1637,7 +1637,7 @@ error: static Ecore_Con_Ssl_Error _ecore_con_ssl_server_shutdown_openssl(Ecore_Con_Server *obj) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); if (svr->ssl) { if (!SSL_shutdown(svr->ssl)) @@ -1661,7 +1661,7 @@ _ecore_con_ssl_server_read_openssl(Ecore_Con_Server *obj, unsigned char *buf, int size) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int num; if (!svr->ssl) return -1; @@ -1692,7 +1692,7 @@ _ecore_con_ssl_server_write_openssl(Ecore_Con_Server *obj, const unsigned char *buf, int size) { - Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); int num; num = SSL_write(svr->ssl, buf, size); @@ -1721,7 +1721,7 @@ static Ecore_Con_Ssl_Error _ecore_con_ssl_client_init_openssl(Ecore_Con_Client *obj) { Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS); - Ecore_Con_Server_Data *host_server = eo_data_scope_get(cl->host_server, ECORE_CON_SERVER_CLASS); + Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); int ret = -1; switch (cl->ssl_state) { diff --git a/src/lib/ecore_con/efl_network_connector.eo b/src/lib/ecore_con/efl_network_connector.eo index ef92d77c2c..8c106a955b 100644 --- a/src/lib/ecore_con/efl_network_connector.eo +++ b/src/lib/ecore_con/efl_network_connector.eo @@ -1,4 +1,4 @@ -class Efl.Network.Connector (Ecore.Con.Server) { +class Efl.Network.Connector (Efl.Network.Server) { eo_prefix: efl_network_connector_obj; data: null; implements { diff --git a/src/lib/ecore_con/ecore_con_server.eo b/src/lib/ecore_con/efl_network_server.eo index b1f975c5ca..c7b1583328 100644 --- a/src/lib/ecore_con/ecore_con_server.eo +++ b/src/lib/ecore_con/efl_network_server.eo @@ -1,5 +1,6 @@ -class Ecore.Con.Server (Ecore.Con.Base) { - eo_prefix: ecore_con_server_obj; +class Efl.Network.Server (Ecore.Con.Base) { + legacy_prefix: ecore_con_server; + eo_prefix: efl_network_server; methods { @property name { [[Retrieves the name of server. |