summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-08 10:47:32 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:17:51 -0800
commit36661a436edffa53dd1faf5d25df1a8ea8c00261 (patch)
tree9a2f7e511921e5871c96f32bc1d8b02341f7d2cd /src/lib/ecore_con
parent1d1effea906dc4f784625af7dfba2518ef1e90b7 (diff)
efl-net: namespace events to avoid naming conflicts
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8260
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c8
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer.eo6
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c6
-rw-r--r--src/lib/ecore_con/efl_net_dialer_simple.c12
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c6
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c10
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c10
-rw-r--r--src/lib/ecore_con/efl_net_dialer_unix.c8
-rw-r--r--src/lib/ecore_con/efl_net_dialer_websocket.c16
-rw-r--r--src/lib/ecore_con/efl_net_dialer_windows.c4
-rw-r--r--src/lib/ecore_con/efl_net_server.eo2
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_simple.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_udp.c8
-rw-r--r--src/lib/ecore_con/efl_net_server_unix.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_windows.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_ssl.c6
19 files changed, 59 insertions, 59 deletions
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 0e241b7..5cbb39b 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -1420,9 +1420,9 @@ EFL_CALLBACKS_ARRAY_DEFINE(_ecore_con_server_dialer_cbs,
1420 { EFL_IO_BUFFERED_STREAM_EVENT_READ_FINISHED, _ecore_con_server_dialer_read_finished }, 1420 { EFL_IO_BUFFERED_STREAM_EVENT_READ_FINISHED, _ecore_con_server_dialer_read_finished },
1421 { EFL_IO_BUFFERED_STREAM_EVENT_FINISHED, _ecore_con_server_dialer_finished }, 1421 { EFL_IO_BUFFERED_STREAM_EVENT_FINISHED, _ecore_con_server_dialer_finished },
1422 { EFL_IO_BUFFERED_STREAM_EVENT_ERROR, _ecore_con_server_dialer_error }, 1422 { EFL_IO_BUFFERED_STREAM_EVENT_ERROR, _ecore_con_server_dialer_error },
1423 { EFL_NET_DIALER_EVENT_ERROR, _ecore_con_server_dialer_error }, 1423 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _ecore_con_server_dialer_error },
1424 { EFL_NET_DIALER_EVENT_RESOLVED, _ecore_con_server_dialer_resolved }, 1424 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _ecore_con_server_dialer_resolved },
1425 { EFL_NET_DIALER_EVENT_CONNECTED, _ecore_con_server_dialer_connected }); 1425 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _ecore_con_server_dialer_connected });
1426 1426
1427static void 1427static void
1428_ecore_con_server_server_client_add(void *data, const Efl_Event *event) 1428_ecore_con_server_server_client_add(void *data, const Efl_Event *event)
@@ -1495,7 +1495,7 @@ _ecore_con_server_server_error(void *data, const Efl_Event *event)
1495EFL_CALLBACKS_ARRAY_DEFINE(_ecore_con_server_server_cbs, 1495EFL_CALLBACKS_ARRAY_DEFINE(_ecore_con_server_server_cbs,
1496 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _ecore_con_server_server_client_add }, 1496 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _ecore_con_server_server_client_add },
1497 { EFL_NET_SERVER_EVENT_SERVING, _ecore_con_server_server_serving }, 1497 { EFL_NET_SERVER_EVENT_SERVING, _ecore_con_server_server_serving },
1498 { EFL_NET_SERVER_EVENT_ERROR, _ecore_con_server_server_error }); 1498 { EFL_NET_SERVER_EVENT_SERVER_ERROR, _ecore_con_server_server_error });
1499 1499
1500/** 1500/**
1501 * @addtogroup Ecore_Con_Server_Group Ecore Connection Server Functions 1501 * @addtogroup Ecore_Con_Server_Group Ecore Connection Server Functions
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index b78498a..27b391c 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -508,7 +508,7 @@ _ecore_con_url_dialer_headers_done(void *data, const Efl_Event *event EINA_UNUSE
508EFL_CALLBACKS_ARRAY_DEFINE(ecore_con_url_dialer_cbs, 508EFL_CALLBACKS_ARRAY_DEFINE(ecore_con_url_dialer_cbs,
509 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _ecore_con_url_dialer_can_read_changed }, 509 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _ecore_con_url_dialer_can_read_changed },
510 { EFL_IO_READER_EVENT_EOS, _ecore_con_url_dialer_eos }, 510 { EFL_IO_READER_EVENT_EOS, _ecore_con_url_dialer_eos },
511 { EFL_NET_DIALER_EVENT_ERROR, _ecore_con_url_dialer_error }, 511 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _ecore_con_url_dialer_error },
512 { EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _ecore_con_url_dialer_headers_done }); 512 { EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _ecore_con_url_dialer_headers_done });
513 513
514static Eina_Bool 514static Eina_Bool
diff --git a/src/lib/ecore_con/efl_net_dialer.eo b/src/lib/ecore_con/efl_net_dialer.eo
index 7abba99..fb79de1 100644
--- a/src/lib/ecore_con/efl_net_dialer.eo
+++ b/src/lib/ecore_con/efl_net_dialer.eo
@@ -112,7 +112,7 @@ interface @beta Efl.Net.Dialer extends Efl.Net.Socket {
112 112
113 events { 113 events {
114 /* FIXME: Might be NULL, but @nullable does not work on event types */ 114 /* FIXME: Might be NULL, but @nullable does not work on event types */
115 resolved: string; [[Notifies @.address_dial was resolved to 115 dialer,resolved: string; [[Notifies @.address_dial was resolved to
116 @Efl.Net.Socket.address_remote. 116 @Efl.Net.Socket.address_remote.
117 117
118 This is emitted before "connected" and may 118 This is emitted before "connected" and may
@@ -124,9 +124,9 @@ interface @beta Efl.Net.Dialer extends Efl.Net.Socket {
124 may be emitted multiple times, such as 124 may be emitted multiple times, such as
125 HTTP. 125 HTTP.
126 ]] 126 ]]
127 error: Eina.Error; [[Some error happened and the socket 127 dialer,error: Eina.Error; [[Some error happened and the socket
128 stopped working. 128 stopped working.
129 ]] 129 ]]
130 connected: void; [[Notifies the socket is connected to the remote peer.]] 130 dialer,connected: void; [[Notifies the socket is connected to the remote peer.]]
131 } 131 }
132} 132}
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index aa7698a..64947a1 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -318,7 +318,7 @@ _efl_net_dialer_http_curlm_check(Efl_Net_Dialer_Http_Curlm *cm)
318 efl_ref(dialer); 318 efl_ref(dialer);
319 pd = efl_data_scope_get(dialer, MY_CLASS); 319 pd = efl_data_scope_get(dialer, MY_CLASS);
320 if (pd->error) 320 if (pd->error)
321 efl_event_callback_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &pd->error); 321 efl_event_callback_call(dialer, EFL_NET_DIALER_EVENT_DIALER_ERROR, &pd->error);
322 if (pd->recv.used > 0) pd->pending_eos = EINA_TRUE; 322 if (pd->recv.used > 0) pd->pending_eos = EINA_TRUE;
323 else 323 else
324 { 324 {
@@ -1460,7 +1460,7 @@ _efl_net_dialer_http_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Http_Dat
1460 * allow_redirects will trigger more than once 1460 * allow_redirects will trigger more than once
1461 */ 1461 */
1462 pd->connected = connected; 1462 pd->connected = connected;
1463 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 1463 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, NULL);
1464} 1464}
1465 1465
1466EOLIAN static Eina_Bool 1466EOLIAN static Eina_Bool
@@ -1524,7 +1524,7 @@ EOLIAN static void
1524_efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address) 1524_efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address)
1525{ 1525{
1526 if (eina_stringshare_replace(&pd->address_remote, address)) 1526 if (eina_stringshare_replace(&pd->address_remote, address))
1527 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 1527 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
1528} 1528}
1529 1529
1530EOLIAN static const char * 1530EOLIAN static const char *
diff --git a/src/lib/ecore_con/efl_net_dialer_simple.c b/src/lib/ecore_con/efl_net_dialer_simple.c
index 71e99e8..775621a 100644
--- a/src/lib/ecore_con/efl_net_dialer_simple.c
+++ b/src/lib/ecore_con/efl_net_dialer_simple.c
@@ -33,14 +33,14 @@ static void
33_efl_net_dialer_simple_inner_io_resolved(void *data, const Efl_Event *event) 33_efl_net_dialer_simple_inner_io_resolved(void *data, const Efl_Event *event)
34{ 34{
35 Eo *o = data; 35 Eo *o = data;
36 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, event->info); 36 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, event->info);
37} 37}
38 38
39static void 39static void
40_efl_net_dialer_simple_inner_io_error(void *data, const Efl_Event *event) 40_efl_net_dialer_simple_inner_io_error(void *data, const Efl_Event *event)
41{ 41{
42 Eo *o = data; 42 Eo *o = data;
43 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, event->info); 43 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, event->info);
44} 44}
45 45
46static void 46static void
@@ -48,13 +48,13 @@ _efl_net_dialer_simple_inner_io_connected(void *data, const Efl_Event *event)
48{ 48{
49 Eo *o = data; 49 Eo *o = data;
50 50
51 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, event->info); 51 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, event->info);
52} 52}
53 53
54EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_dialer_simple_inner_io_cbs, 54EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_dialer_simple_inner_io_cbs,
55 { EFL_NET_DIALER_EVENT_RESOLVED, _efl_net_dialer_simple_inner_io_resolved }, 55 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _efl_net_dialer_simple_inner_io_resolved },
56 { EFL_NET_DIALER_EVENT_ERROR, _efl_net_dialer_simple_inner_io_error }, 56 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _efl_net_dialer_simple_inner_io_error },
57 { EFL_NET_DIALER_EVENT_CONNECTED, _efl_net_dialer_simple_inner_io_connected }); 57 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _efl_net_dialer_simple_inner_io_connected });
58 58
59EOLIAN static Efl_Object * 59EOLIAN static Efl_Object *
60_efl_net_dialer_simple_efl_object_finalize(Eo *o, Efl_Net_Dialer_Simple_Data *pd) 60_efl_net_dialer_simple_efl_object_finalize(Eo *o, Efl_Net_Dialer_Simple_Data *pd)
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 33d314f..ffc36a6 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -50,7 +50,7 @@ _efl_net_dialer_ssl_error(void *data EINA_UNUSED, const Efl_Event *event)
50{ 50{
51 Eo *o = event->object; 51 Eo *o = event->object;
52 Eina_Error *perr = event->info; 52 Eina_Error *perr = event->info;
53 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, perr); 53 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, perr);
54} 54}
55 55
56EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_dialer_ssl_cbs, 56EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_dialer_ssl_cbs,
@@ -134,7 +134,7 @@ _efl_net_dialer_ssl_connect_timeout(Eo *o, void *data EINA_UNUSED, const Eina_Va
134 134
135 efl_ref(o); 135 efl_ref(o);
136 efl_io_reader_eos_set(o, EINA_TRUE); 136 efl_io_reader_eos_set(o, EINA_TRUE);
137 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 137 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
138 efl_unref(o); 138 efl_unref(o);
139 return v; 139 return v;
140} 140}
@@ -205,7 +205,7 @@ _efl_net_dialer_ssl_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Ssl_Data
205 eina_future_cancel(pd->connect_timeout); 205 eina_future_cancel(pd->connect_timeout);
206 if (pd->connected == connected) return; 206 if (pd->connected == connected) return;
207 pd->connected = connected; 207 pd->connected = connected;
208 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 208 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, NULL);
209} 209}
210 210
211EOLIAN static Eina_Bool 211EOLIAN static Eina_Bool
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index 9a7a795..ba93fc4 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -99,7 +99,7 @@ _efl_net_dialer_tcp_connect_timeout(Eo *o, void *data EINA_UNUSED, const Eina_Va
99 99
100 efl_ref(o); 100 efl_ref(o);
101 efl_io_reader_eos_set(o, EINA_TRUE); 101 efl_io_reader_eos_set(o, EINA_TRUE);
102 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 102 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
103 efl_unref(o); 103 efl_unref(o);
104 return v; 104 return v;
105} 105}
@@ -128,7 +128,7 @@ _efl_net_dialer_tcp_connected(void *data, const struct sockaddr *addr, socklen_t
128 efl_loop_fd_set(o, sockfd); 128 efl_loop_fd_set(o, sockfd);
129 if (efl_net_socket_address_remote_get(o)) 129 if (efl_net_socket_address_remote_get(o))
130 { 130 {
131 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 131 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
132 efl_net_dialer_connected_set(o, EINA_TRUE); 132 efl_net_dialer_connected_set(o, EINA_TRUE);
133 } 133 }
134 else 134 else
@@ -148,11 +148,11 @@ _efl_net_dialer_tcp_connected(void *data, const struct sockaddr *addr, socklen_t
148 if (efl_net_ip_port_fmt(buf, sizeof(buf), addr)) 148 if (efl_net_ip_port_fmt(buf, sizeof(buf), addr))
149 { 149 {
150 efl_net_socket_address_remote_set(o, buf); 150 efl_net_socket_address_remote_set(o, buf);
151 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 151 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
152 } 152 }
153 } 153 }
154 efl_io_reader_eos_set(o, EINA_TRUE); 154 efl_io_reader_eos_set(o, EINA_TRUE);
155 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 155 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
156 } 156 }
157 157
158 efl_unref(o); 158 efl_unref(o);
@@ -245,7 +245,7 @@ _efl_net_dialer_tcp_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Tcp_Data
245 if (!connected) _efl_net_dialer_tcp_async_stop(pd); 245 if (!connected) _efl_net_dialer_tcp_async_stop(pd);
246 if (pd->connected == connected) return; 246 if (pd->connected == connected) return;
247 pd->connected = connected; 247 pd->connected = connected;
248 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 248 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, NULL);
249} 249}
250 250
251EOLIAN static Eina_Bool 251EOLIAN static Eina_Bool
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index b42e9d4..e75ed24 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -95,7 +95,7 @@ _efl_net_dialer_udp_resolver_timeout(Eo *o, void *data EINA_UNUSED, const Eina_V
95 95
96 efl_ref(o); 96 efl_ref(o);
97 efl_io_reader_eos_set(o, EINA_TRUE); 97 efl_io_reader_eos_set(o, EINA_TRUE);
98 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 98 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
99 efl_unref(o); 99 efl_unref(o);
100 return v; 100 return v;
101} 101}
@@ -184,7 +184,7 @@ _efl_net_dialer_udp_resolved_bind(Eo *o, Efl_Net_Dialer_Udp_Data *pd EINA_UNUSED
184 if (remote_address) 184 if (remote_address)
185 { 185 {
186 efl_net_socket_udp_init(o, remote_address); 186 efl_net_socket_udp_init(o, remote_address);
187 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 187 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
188 efl_del(remote_address); 188 efl_del(remote_address);
189 } 189 }
190 efl_net_dialer_connected_set(o, EINA_TRUE); 190 efl_net_dialer_connected_set(o, EINA_TRUE);
@@ -230,12 +230,12 @@ _efl_net_dialer_udp_resolved(void *data, const char *host EINA_UNUSED, const cha
230 if (efl_net_ip_port_fmt(buf, sizeof(buf), result->ai_addr)) 230 if (efl_net_ip_port_fmt(buf, sizeof(buf), result->ai_addr))
231 { 231 {
232 efl_net_socket_address_remote_set(o, buf); 232 efl_net_socket_address_remote_set(o, buf);
233 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 233 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
234 } 234 }
235 } 235 }
236 236
237 efl_io_reader_eos_set(o, EINA_TRUE); 237 efl_io_reader_eos_set(o, EINA_TRUE);
238 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 238 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
239 } 239 }
240 freeaddrinfo(result); 240 freeaddrinfo(result);
241 241
@@ -319,7 +319,7 @@ _efl_net_dialer_udp_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Udp_Data
319 if (pd->resolver.timeout) eina_future_cancel(pd->resolver.timeout); 319 if (pd->resolver.timeout) eina_future_cancel(pd->resolver.timeout);
320 if (pd->connected == connected) return; 320 if (pd->connected == connected) return;
321 pd->connected = connected; 321 pd->connected = connected;
322 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 322 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, NULL);
323} 323}
324 324
325EOLIAN static Eina_Bool 325EOLIAN static Eina_Bool
diff --git a/src/lib/ecore_con/efl_net_dialer_unix.c b/src/lib/ecore_con/efl_net_dialer_unix.c
index 95e2b06..b2d3dfc 100644
--- a/src/lib/ecore_con/efl_net_dialer_unix.c
+++ b/src/lib/ecore_con/efl_net_dialer_unix.c
@@ -84,7 +84,7 @@ _efl_net_dialer_unix_connect_timeout(Eo *o, void *data EINA_UNUSED, const Eina_V
84 84
85 efl_ref(o); 85 efl_ref(o);
86 efl_io_reader_eos_set(o, EINA_TRUE); 86 efl_io_reader_eos_set(o, EINA_TRUE);
87 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 87 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
88 efl_unref(o); 88 efl_unref(o);
89 return v; 89 return v;
90} 90}
@@ -105,7 +105,7 @@ _efl_net_dialer_unix_connected(void *data, const struct sockaddr *addr, socklen_
105 efl_loop_fd_set(o, sockfd); 105 efl_loop_fd_set(o, sockfd);
106 if (efl_net_socket_address_remote_get(o)) 106 if (efl_net_socket_address_remote_get(o))
107 { 107 {
108 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 108 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
109 efl_net_dialer_connected_set(o, EINA_TRUE); 109 efl_net_dialer_connected_set(o, EINA_TRUE);
110 } 110 }
111 else 111 else
@@ -120,7 +120,7 @@ _efl_net_dialer_unix_connected(void *data, const struct sockaddr *addr, socklen_
120 if (err) 120 if (err)
121 { 121 {
122 efl_io_reader_eos_set(o, EINA_TRUE); 122 efl_io_reader_eos_set(o, EINA_TRUE);
123 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 123 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
124 } 124 }
125 125
126 efl_unref(o); 126 efl_unref(o);
@@ -222,7 +222,7 @@ _efl_net_dialer_unix_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Unix_Dat
222 if (pd->connect.timeout) eina_future_cancel(pd->connect.timeout); 222 if (pd->connect.timeout) eina_future_cancel(pd->connect.timeout);
223 if (pd->connected == connected) return; 223 if (pd->connected == connected) return;
224 pd->connected = connected; 224 pd->connected = connected;
225 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 225 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, NULL);
226} 226}
227 227
228EOLIAN static Eina_Bool 228EOLIAN static Eina_Bool
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c
index 8d8719a..78ab750 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.c
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.c
@@ -350,7 +350,7 @@ _efl_net_dialer_websocket_job_send(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
350 if ((err) && (err != EAGAIN)) 350 if ((err) && (err != EAGAIN))
351 { 351 {
352 ERR("could not write to HTTP socket #%d '%s'", err, eina_error_msg_get(err)); 352 ERR("could not write to HTTP socket #%d '%s'", err, eina_error_msg_get(err));
353 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 353 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
354 } 354 }
355} 355}
356 356
@@ -730,7 +730,7 @@ _efl_net_dialer_websocket_job_receive(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
730 eina_error_msg_get(err)); 730 eina_error_msg_get(err));
731 efl_ref(o); 731 efl_ref(o);
732 efl_io_closer_close(pd->http); 732 efl_io_closer_close(pd->http);
733 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 733 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
734 efl_unref(o); 734 efl_unref(o);
735} 735}
736 736
@@ -819,7 +819,7 @@ _efl_net_dialer_websocket_http_error(void *data, const Efl_Event *event)
819 return; 819 return;
820 efl_ref(o); 820 efl_ref(o);
821 if (!efl_io_closer_closed_get(o)) efl_io_closer_close(o); 821 if (!efl_io_closer_closed_get(o)) efl_io_closer_close(o);
822 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, perr); 822 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, perr);
823 efl_unref(o); 823 efl_unref(o);
824} 824}
825 825
@@ -846,7 +846,7 @@ _efl_net_dialer_websocket_http_headers_done(void *data, const Efl_Event *event E
846 status, EFL_NET_HTTP_STATUS_SWITCHING_PROTOCOLS); 846 status, EFL_NET_HTTP_STATUS_SWITCHING_PROTOCOLS);
847 efl_ref(o); 847 efl_ref(o);
848 efl_io_closer_close(pd->http); 848 efl_io_closer_close(pd->http);
849 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 849 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
850 efl_unref(o); 850 efl_unref(o);
851 return; 851 return;
852 } 852 }
@@ -887,7 +887,7 @@ _efl_net_dialer_websocket_http_headers_done(void *data, const Efl_Event *event E
887 upgraded, connection_websocket, accepted); 887 upgraded, connection_websocket, accepted);
888 efl_ref(o); 888 efl_ref(o);
889 efl_io_closer_close(pd->http); 889 efl_io_closer_close(pd->http);
890 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err); 890 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_ERROR, &err);
891 efl_unref(o); 891 efl_unref(o);
892 return; 892 return;
893 } 893 }
@@ -934,7 +934,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_dialer_websocket_http_cbs,
934 {EFL_IO_READER_EVENT_CAN_READ_CHANGED, _efl_net_dialer_websocket_http_can_read_changed}, 934 {EFL_IO_READER_EVENT_CAN_READ_CHANGED, _efl_net_dialer_websocket_http_can_read_changed},
935 {EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _efl_net_dialer_websocket_http_can_write_changed}, 935 {EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _efl_net_dialer_websocket_http_can_write_changed},
936 {EFL_IO_CLOSER_EVENT_CLOSED, _efl_net_dialer_websocket_http_closed}, 936 {EFL_IO_CLOSER_EVENT_CLOSED, _efl_net_dialer_websocket_http_closed},
937 {EFL_NET_DIALER_EVENT_ERROR, _efl_net_dialer_websocket_http_error}, 937 {EFL_NET_DIALER_EVENT_DIALER_ERROR, _efl_net_dialer_websocket_http_error},
938 {EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _efl_net_dialer_websocket_http_headers_done}); 938 {EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _efl_net_dialer_websocket_http_headers_done});
939 939
940EOLIAN static Efl_Object * 940EOLIAN static Efl_Object *
@@ -1182,7 +1182,7 @@ _efl_net_dialer_websocket_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Web
1182 if (pd->connected == connected) return; 1182 if (pd->connected == connected) return;
1183 pd->connected = connected; 1183 pd->connected = connected;
1184 if (connected) 1184 if (connected)
1185 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 1185 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, NULL);
1186} 1186}
1187 1187
1188EOLIAN static Eina_Bool 1188EOLIAN static Eina_Bool
@@ -1225,7 +1225,7 @@ EOLIAN static void
1225_efl_net_dialer_websocket_efl_net_socket_address_remote_set(Eo *o EINA_UNUSED, Efl_Net_Dialer_Websocket_Data *pd, const char *address) 1225_efl_net_dialer_websocket_efl_net_socket_address_remote_set(Eo *o EINA_UNUSED, Efl_Net_Dialer_Websocket_Data *pd, const char *address)
1226{ 1226{
1227 if (eina_stringshare_replace(&pd->address_remote, address)) 1227 if (eina_stringshare_replace(&pd->address_remote, address))
1228 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 1228 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
1229} 1229}
1230 1230
1231EOLIAN static const char * 1231EOLIAN static const char *
diff --git a/src/lib/ecore_con/efl_net_dialer_windows.c b/src/lib/ecore_con/efl_net_dialer_windows.c
index 8e78446..bf6d525 100644
--- a/src/lib/ecore_con/efl_net_dialer_windows.c
+++ b/src/lib/ecore_con/efl_net_dialer_windows.c
@@ -100,7 +100,7 @@ _efl_net_dialer_windows_efl_net_dialer_dial(Eo *o, Efl_Net_Dialer_Windows_Data *
100 100
101 efl_net_socket_address_remote_set(o, sstr); 101 efl_net_socket_address_remote_set(o, sstr);
102 efl_net_socket_address_local_set(o, cstr); 102 efl_net_socket_address_local_set(o, cstr);
103 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 103 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
104 efl_net_dialer_connected_set(o, EINA_TRUE); 104 efl_net_dialer_connected_set(o, EINA_TRUE);
105 105
106 return _efl_net_socket_windows_io_start(o); 106 return _efl_net_socket_windows_io_start(o);
@@ -125,7 +125,7 @@ _efl_net_dialer_windows_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Windo
125{ 125{
126 if (pd->connected == connected) return; 126 if (pd->connected == connected) return;
127 pd->connected = connected; 127 pd->connected = connected;
128 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 128 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, NULL);
129} 129}
130 130
131EOLIAN static Eina_Bool 131EOLIAN static Eina_Bool
diff --git a/src/lib/ecore_con/efl_net_server.eo b/src/lib/ecore_con/efl_net_server.eo
index 141cf9d..0f23e5a 100644
--- a/src/lib/ecore_con/efl_net_server.eo
+++ b/src/lib/ecore_con/efl_net_server.eo
@@ -26,7 +26,7 @@ interface @beta Efl.Net.Server {
26 excess, see @.clients_limit. 26 excess, see @.clients_limit.
27 ]] 27 ]]
28 28
29 error: Eina.Error; [[An error has occurred and the server needs 29 server,error: Eina.Error; [[An error has occurred and the server needs
30 to be stopped. 30 to be stopped.
31 ]] 31 ]]
32 serving: void; [[Notifies the server is ready to accept clients. 32 serving: void; [[Notifies the server is ready to accept clients.
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index 28626b0..e4e6461 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -81,7 +81,7 @@ _efl_net_server_fd_event_error(void *data EINA_UNUSED, const Efl_Event *event)
81 Eina_Error err = EBADF; 81 Eina_Error err = EBADF;
82 82
83 efl_net_server_serving_set(o, EINA_FALSE); 83 efl_net_server_serving_set(o, EINA_FALSE);
84 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 84 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
85} 85}
86 86
87EOLIAN static Efl_Object * 87EOLIAN static Efl_Object *
@@ -474,7 +474,7 @@ _efl_net_server_fd_process_incoming_data(Eo *o, Efl_Net_Server_Fd_Data *pd)
474 { 474 {
475 Eina_Error err = efl_net_socket_error_get(); 475 Eina_Error err = efl_net_socket_error_get();
476 ERR("accept(" SOCKET_FMT "): %s", fd, eina_error_msg_get(err)); 476 ERR("accept(" SOCKET_FMT "): %s", fd, eina_error_msg_get(err));
477 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 477 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
478 return; 478 return;
479 } 479 }
480 480
diff --git a/src/lib/ecore_con/efl_net_server_simple.c b/src/lib/ecore_con/efl_net_server_simple.c
index 8c0c4a6..46924fa 100644
--- a/src/lib/ecore_con/efl_net_server_simple.c
+++ b/src/lib/ecore_con/efl_net_server_simple.c
@@ -109,7 +109,7 @@ static void
109_efl_net_server_simple_inner_server_error(void *data, const Efl_Event *event) 109_efl_net_server_simple_inner_server_error(void *data, const Efl_Event *event)
110{ 110{
111 Eo *o = data; 111 Eo *o = data;
112 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, event->info); 112 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, event->info);
113} 113}
114 114
115static void 115static void
@@ -122,7 +122,7 @@ _efl_net_server_simple_inner_server_serving(void *data, const Efl_Event *event)
122EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_server_simple_inner_server_cbs, 122EFL_CALLBACKS_ARRAY_DEFINE(_efl_net_server_simple_inner_server_cbs,
123 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _efl_net_server_simple_inner_server_client_add }, 123 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _efl_net_server_simple_inner_server_client_add },
124 { EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _efl_net_server_simple_inner_server_client_rejected }, 124 { EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _efl_net_server_simple_inner_server_client_rejected },
125 { EFL_NET_SERVER_EVENT_ERROR, _efl_net_server_simple_inner_server_error }, 125 { EFL_NET_SERVER_EVENT_SERVER_ERROR, _efl_net_server_simple_inner_server_error },
126 { EFL_NET_SERVER_EVENT_SERVING, _efl_net_server_simple_inner_server_serving }); 126 { EFL_NET_SERVER_EVENT_SERVING, _efl_net_server_simple_inner_server_serving });
127 127
128EOLIAN static Efl_Object * 128EOLIAN static Efl_Object *
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index e4e5bcb..b4bda04 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -138,7 +138,7 @@ _efl_net_server_tcp_resolved(void *data, const char *host EINA_UNUSED, const cha
138 freeaddrinfo(result); 138 freeaddrinfo(result);
139 139
140 end: 140 end:
141 if (err) efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 141 if (err) efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
142 142
143 efl_unref(o); 143 efl_unref(o);
144} 144}
diff --git a/src/lib/ecore_con/efl_net_server_udp.c b/src/lib/ecore_con/efl_net_server_udp.c
index 50a0c97..0f0b228 100644
--- a/src/lib/ecore_con/efl_net_server_udp.c
+++ b/src/lib/ecore_con/efl_net_server_udp.c
@@ -142,7 +142,7 @@ _efl_net_server_udp_resolved_bind(Eo *o, Efl_Net_Server_Udp_Data *pd, const stru
142 if (mr) 142 if (mr)
143 { 143 {
144 ERR("could not join pending multicast group '%s': %s", mcast_addr, eina_error_msg_get(mr)); 144 ERR("could not join pending multicast group '%s': %s", mcast_addr, eina_error_msg_get(mr));
145 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &mr); 145 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &mr);
146 } 146 }
147 } 147 }
148 148
@@ -191,7 +191,7 @@ _efl_net_server_udp_resolved(void *data, const char *host EINA_UNUSED, const cha
191 freeaddrinfo(result); 191 freeaddrinfo(result);
192 192
193 end: 193 end:
194 if (err) efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 194 if (err) efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
195 195
196 efl_unref(o); 196 efl_unref(o);
197} 197}
@@ -328,7 +328,7 @@ _efl_net_server_udp_efl_net_server_fd_process_incoming_data(Eo *o, Efl_Net_Serve
328 Eina_Error err = efl_net_socket_error_get(); 328 Eina_Error err = efl_net_socket_error_get();
329 ERR("recvfrom(" SOCKET_FMT ", %p, %zu, 0, %p, %d): %s", fd, buf, buflen, &addr, addrlen, eina_error_msg_get(err)); 329 ERR("recvfrom(" SOCKET_FMT ", %p, %zu, 0, %p, %d): %s", fd, buf, buflen, &addr, addrlen, eina_error_msg_get(err));
330 free(buf); 330 free(buf);
331 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 331 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
332 return; 332 return;
333 } 333 }
334 if ((size_t)r < buflen) 334 if ((size_t)r < buflen)
@@ -341,7 +341,7 @@ _efl_net_server_udp_efl_net_server_fd_process_incoming_data(Eo *o, Efl_Net_Serve
341 341
342 free(buf); 342 free(buf);
343 ERR("Out of memory on efl net udp data incoming"); 343 ERR("Out of memory on efl net udp data incoming");
344 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 344 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
345 return; 345 return;
346 } 346 }
347 } 347 }
diff --git a/src/lib/ecore_con/efl_net_server_unix.c b/src/lib/ecore_con/efl_net_server_unix.c
index 38280c2..ed8735f 100644
--- a/src/lib/ecore_con/efl_net_server_unix.c
+++ b/src/lib/ecore_con/efl_net_server_unix.c
@@ -165,7 +165,7 @@ _efl_net_server_unix_bind(Eo *o, Efl_Net_Server_Unix_Data *pd)
165 error: 165 error:
166 if (err) 166 if (err)
167 { 167 {
168 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 168 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
169 if (fd != INVALID_SOCKET) closesocket(fd); 169 if (fd != INVALID_SOCKET) closesocket(fd);
170 efl_loop_fd_set(o, SOCKET_TO_LOOP_FD(INVALID_SOCKET)); 170 efl_loop_fd_set(o, SOCKET_TO_LOOP_FD(INVALID_SOCKET));
171 } 171 }
diff --git a/src/lib/ecore_con/efl_net_server_windows.c b/src/lib/ecore_con/efl_net_server_windows.c
index 68e7fe9..454e87c 100644
--- a/src/lib/ecore_con/efl_net_server_windows.c
+++ b/src/lib/ecore_con/efl_net_server_windows.c
@@ -151,7 +151,7 @@ _efl_net_server_windows_client_listen_failure(void *data, Eo *client EINA_UNUSED
151 } 151 }
152 152
153 if (err) 153 if (err)
154 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 154 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVER_ERROR, &err);
155 155
156 // TODO: create a new one on failure? 156 // TODO: create a new one on failure?
157 157
diff --git a/src/lib/ecore_con/efl_net_socket_ssl.c b/src/lib/ecore_con/efl_net_socket_ssl.c
index 912a8cb..4d2c0c0 100644
--- a/src/lib/ecore_con/efl_net_socket_ssl.c
+++ b/src/lib/ecore_con/efl_net_socket_ssl.c
@@ -225,7 +225,7 @@ efl_net_socket_ssl_sock_resolved(void *data, const Efl_Event *event EINA_UNUSED)
225 225
226 if (pd->torndown) return; 226 if (pd->torndown) return;
227 227
228 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 228 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_DIALER_RESOLVED, NULL);
229} 229}
230 230
231static void 231static void
@@ -250,8 +250,8 @@ efl_net_socket_ssl_sock_connected(void *data, const Efl_Event *event EINA_UNUSED
250} 250}
251 251
252EFL_CALLBACKS_ARRAY_DEFINE(efl_net_socket_ssl_sock_dialer_cbs, 252EFL_CALLBACKS_ARRAY_DEFINE(efl_net_socket_ssl_sock_dialer_cbs,
253 {EFL_NET_DIALER_EVENT_RESOLVED, efl_net_socket_ssl_sock_resolved}, 253 {EFL_NET_DIALER_EVENT_DIALER_RESOLVED, efl_net_socket_ssl_sock_resolved},
254 {EFL_NET_DIALER_EVENT_CONNECTED, efl_net_socket_ssl_sock_connected}); 254 {EFL_NET_DIALER_EVENT_DIALER_CONNECTED, efl_net_socket_ssl_sock_connected});
255 255
256static void 256static void
257_efl_net_socket_ssl_context_del(void *data, const Efl_Event *event EINA_UNUSED) 257_efl_net_socket_ssl_context_del(void *data, const Efl_Event *event EINA_UNUSED)