summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-11 13:00:57 +0100
committerTom Hacohen <tom@stosb.com>2016-05-11 13:00:57 +0100
commit70b5f3875e54446e21dcef56e80fc7046a2dbdec (patch)
tree882bc7a7637b62c1e34f6aefc62d160c54ddce03
parent28a2d34ae20885d229accd1c2e482e284be79afc (diff)
Efl network: Remove the no longer needed .Base hack.
-rw-r--r--src/Makefile_Ecore_Con.am2
-rw-r--r--src/lib/ecore_con/Ecore_Con_Eo.h2
-rw-r--r--src/lib/ecore_con/Ecore_Con_Legacy.h2
-rw-r--r--src/lib/ecore_con/ecore_con.c96
-rw-r--r--src/lib/ecore_con/efl_network.eo (renamed from src/lib/ecore_con/efl_network_base.eo)4
-rw-r--r--src/lib/ecore_con/efl_network_client.eo20
-rw-r--r--src/lib/ecore_con/efl_network_server.eo24
7 files changed, 75 insertions, 75 deletions
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 154d25b59d..266e7b4f74 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -2,7 +2,7 @@
2### Library 2### Library
3 3
4ecore_con_eolian_files = \ 4ecore_con_eolian_files = \
5 lib/ecore_con/efl_network_base.eo \ 5 lib/ecore_con/efl_network.eo \
6 lib/ecore_con/efl_network_client.eo \ 6 lib/ecore_con/efl_network_client.eo \
7 lib/ecore_con/efl_network_server.eo \ 7 lib/ecore_con/efl_network_server.eo \
8 lib/ecore_con/efl_network_connector.eo \ 8 lib/ecore_con/efl_network_connector.eo \
diff --git a/src/lib/ecore_con/Ecore_Con_Eo.h b/src/lib/ecore_con/Ecore_Con_Eo.h
index 92f055ed1f..cb2903b5f1 100644
--- a/src/lib/ecore_con/Ecore_Con_Eo.h
+++ b/src/lib/ecore_con/Ecore_Con_Eo.h
@@ -1,4 +1,4 @@
1#include "efl_network_base.eo.h" 1#include "efl_network.eo.h"
2#include "efl_network_server.eo.h" 2#include "efl_network_server.eo.h"
3#include "efl_network_connector.eo.h" 3#include "efl_network_connector.eo.h"
4#include "efl_network_client.eo.h" 4#include "efl_network_client.eo.h"
diff --git a/src/lib/ecore_con/Ecore_Con_Legacy.h b/src/lib/ecore_con/Ecore_Con_Legacy.h
index 396c89a881..a4041addca 100644
--- a/src/lib/ecore_con/Ecore_Con_Legacy.h
+++ b/src/lib/ecore_con/Ecore_Con_Legacy.h
@@ -3,7 +3,7 @@
3#include <Eina.h> 3#include <Eina.h>
4#include <Eo.h> 4#include <Eo.h>
5 5
6#include "efl_network_base.eo.legacy.h" 6#include "efl_network.eo.legacy.h"
7#include "efl_network_server.eo.legacy.h" 7#include "efl_network_server.eo.legacy.h"
8#include "efl_network_connector.eo.legacy.h" 8#include "efl_network_connector.eo.legacy.h"
9#include "efl_network_client.eo.legacy.h" 9#include "efl_network_client.eo.legacy.h"
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 39edeb154c..7faf36dd9f 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -296,7 +296,7 @@ ecore_con_shutdown(void)
296} 296}
297 297
298EOLIAN static Eina_Bool 298EOLIAN static Eina_Bool
299_efl_network_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *name, Ecore_Con_Dns_Cb done_cb, const void *data) 299_efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *name, Ecore_Con_Dns_Cb done_cb, const void *data)
300{ 300{
301 Ecore_Con_Server *obj; 301 Ecore_Con_Server *obj;
302 Ecore_Con_Lookup *lk; 302 Ecore_Con_Lookup *lk;
@@ -305,7 +305,7 @@ _efl_network_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const ch
305 if (!name || !done_cb) 305 if (!name || !done_cb)
306 return EINA_FALSE; 306 return EINA_FALSE;
307 307
308 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eo_self, name), efl_network_base_port_set(eo_self, 1025)); 308 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, 1025));
309 309
310 lk = malloc(sizeof (Ecore_Con_Lookup)); 310 lk = malloc(sizeof (Ecore_Con_Lookup));
311 if (!lk) 311 if (!lk)
@@ -359,7 +359,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
359 359
360 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 360 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
361 /* remote system socket: TCP/IP: [name]:[port] */ 361 /* remote system socket: TCP/IP: [name]:[port] */
362 obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_base_port_set(eo_self, port)); 362 obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, port));
363 363
364 ecore_con_server_data_set(obj, (void *) data); 364 ecore_con_server_data_set(obj, (void *) data);
365 365
@@ -455,7 +455,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
455 /* local user socket: FILE: ~/.ecore/[name]/[port] */ 455 /* local user socket: FILE: ~/.ecore/[name]/[port] */
456 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 456 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
457 /* remote system socket: TCP/IP: [name]:[port] */ 457 /* remote system socket: TCP/IP: [name]:[port] */
458 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_base_port_set(eo_self, port)); 458 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, port));
459 459
460 ecore_con_server_data_set(obj, (void *) data); 460 ecore_con_server_data_set(obj, (void *) data);
461 461
@@ -538,11 +538,11 @@ error:
538EAPI void 538EAPI void
539ecore_con_server_timeout_set(Ecore_Con *obj, double timeout) 539ecore_con_server_timeout_set(Ecore_Con *obj, double timeout)
540{ 540{
541 efl_network_base_timeout_set((Ecore_Con *)obj, timeout); 541 efl_network_timeout_set((Ecore_Con *)obj, timeout);
542} 542}
543 543
544EOLIAN static void 544EOLIAN static void
545_efl_network_server_efl_network_base_timeout_set(Eo *obj, Efl_Network_Server_Data *svr, double timeout) 545_efl_network_server_efl_network_timeout_set(Eo *obj, Efl_Network_Server_Data *svr, double timeout)
546{ 546{
547 if (svr->created) 547 if (svr->created)
548 svr->client_disconnect_time = timeout; 548 svr->client_disconnect_time = timeout;
@@ -555,11 +555,11 @@ _efl_network_server_efl_network_base_timeout_set(Eo *obj, Efl_Network_Server_Dat
555EAPI double 555EAPI double
556ecore_con_server_timeout_get(const Ecore_Con *obj) 556ecore_con_server_timeout_get(const Ecore_Con *obj)
557{ 557{
558 return efl_network_base_timeout_get((Ecore_Con *)obj); 558 return efl_network_timeout_get((Ecore_Con *)obj);
559} 559}
560 560
561EOLIAN static double 561EOLIAN static double
562_efl_network_server_efl_network_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) 562_efl_network_server_efl_network_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
563{ 563{
564 return svr->created ? svr->client_disconnect_time : svr->disconnect_time; 564 return svr->created ? svr->client_disconnect_time : svr->disconnect_time;
565} 565}
@@ -608,11 +608,11 @@ ecore_con_server_data_set(Ecore_Con_Server *obj,
608EAPI Eina_Bool 608EAPI Eina_Bool
609ecore_con_server_connected_get(const Ecore_Con *obj) 609ecore_con_server_connected_get(const Ecore_Con *obj)
610{ 610{
611 return efl_network_base_connected_get((Ecore_Con *)obj); 611 return efl_network_connected_get((Ecore_Con *)obj);
612} 612}
613 613
614EOLIAN static Eina_Bool 614EOLIAN static Eina_Bool
615_efl_network_server_efl_network_base_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) 615_efl_network_server_efl_network_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
616{ 616{
617 return !svr->connecting; 617 return !svr->connecting;
618} 618}
@@ -657,11 +657,11 @@ _efl_network_server_name_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
657EAPI int 657EAPI int
658ecore_con_server_port_get(const Ecore_Con *obj) 658ecore_con_server_port_get(const Ecore_Con *obj)
659{ 659{
660 return efl_network_base_port_get((Ecore_Con *)obj); 660 return efl_network_port_get((Ecore_Con *)obj);
661} 661}
662 662
663EOLIAN static void 663EOLIAN static void
664_efl_network_server_efl_network_base_port_set(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, int port) 664_efl_network_server_efl_network_port_set(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, int port)
665{ 665{
666 EO_CONSTRUCTOR_CHECK_RETURN(obj); 666 EO_CONSTRUCTOR_CHECK_RETURN(obj);
667 667
@@ -669,7 +669,7 @@ _efl_network_server_efl_network_base_port_set(Eo *obj EINA_UNUSED, Efl_Network_S
669} 669}
670 670
671EOLIAN static int 671EOLIAN static int
672_efl_network_server_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) 672_efl_network_server_efl_network_port_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
673{ 673{
674 return svr->port; 674 return svr->port;
675} 675}
@@ -677,11 +677,11 @@ _efl_network_server_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_S
677EAPI int 677EAPI int
678ecore_con_server_send(Ecore_Con *obj, const void *data, int size) 678ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
679{ 679{
680 return efl_network_base_send((Ecore_Con *)obj, data, size); 680 return efl_network_send((Ecore_Con *)obj, data, size);
681} 681}
682 682
683EOLIAN static int 683EOLIAN static int
684_efl_network_server_efl_network_base_send(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, const void *data, int size) 684_efl_network_server_efl_network_send(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, const void *data, int size)
685{ 685{
686 EINA_SAFETY_ON_TRUE_RETURN_VAL(svr->delete_me, 0); 686 EINA_SAFETY_ON_TRUE_RETURN_VAL(svr->delete_me, 0);
687 687
@@ -733,11 +733,11 @@ _efl_network_server_client_limit_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Dat
733EAPI const char * 733EAPI const char *
734ecore_con_server_ip_get(const Ecore_Con *obj) 734ecore_con_server_ip_get(const Ecore_Con *obj)
735{ 735{
736 return efl_network_base_ip_get(obj); 736 return efl_network_ip_get(obj);
737} 737}
738 738
739EOLIAN static const char * 739EOLIAN static const char *
740_efl_network_server_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) 740_efl_network_server_efl_network_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
741{ 741{
742 return svr->ip; 742 return svr->ip;
743} 743}
@@ -745,11 +745,11 @@ _efl_network_server_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Ser
745EAPI double 745EAPI double
746ecore_con_server_uptime_get(const Ecore_Con *obj) 746ecore_con_server_uptime_get(const Ecore_Con *obj)
747{ 747{
748 return efl_network_base_uptime_get(obj); 748 return efl_network_uptime_get(obj);
749} 749}
750 750
751EOLIAN static double 751EOLIAN static double
752_efl_network_server_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) 752_efl_network_server_efl_network_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
753{ 753{
754 return ecore_time_get() - svr->start_time; 754 return ecore_time_get() - svr->start_time;
755} 755}
@@ -757,11 +757,11 @@ _efl_network_server_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network
757EAPI void 757EAPI void
758ecore_con_server_flush(Ecore_Con *obj) 758ecore_con_server_flush(Ecore_Con *obj)
759{ 759{
760 efl_network_base_flush((Ecore_Con *)obj); 760 efl_network_flush((Ecore_Con *)obj);
761} 761}
762 762
763EOLIAN static void 763EOLIAN static void
764_efl_network_server_efl_network_base_flush(Eo *obj, Efl_Network_Server_Data *svr EINA_UNUSED) 764_efl_network_server_efl_network_flush(Eo *obj, Efl_Network_Server_Data *svr EINA_UNUSED)
765{ 765{
766 _ecore_con_server_flush(obj); 766 _ecore_con_server_flush(obj);
767} 767}
@@ -786,11 +786,11 @@ _efl_network_server_efl_network_base_flush(Eo *obj, Efl_Network_Server_Data *svr
786EAPI int 786EAPI int
787ecore_con_client_send(Ecore_Con *obj, const void *data, int size) 787ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
788{ 788{
789 return efl_network_base_send((Ecore_Con *)obj, data, size); 789 return efl_network_send((Ecore_Con *)obj, data, size);
790} 790}
791 791
792EOLIAN static int 792EOLIAN static int
793_efl_network_client_efl_network_base_send(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl, const void *data, int size) 793_efl_network_client_efl_network_send(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl, const void *data, int size)
794{ 794{
795 Efl_Network_Server_Data *host_server = NULL; 795 Efl_Network_Server_Data *host_server = NULL;
796 EINA_SAFETY_ON_TRUE_RETURN_VAL(cl->delete_me, 0); 796 EINA_SAFETY_ON_TRUE_RETURN_VAL(cl->delete_me, 0);
@@ -845,7 +845,7 @@ _efl_network_client_server_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
845} 845}
846 846
847EOLIAN static Eina_Bool 847EOLIAN static Eina_Bool
848_efl_network_client_efl_network_base_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl) 848_efl_network_client_efl_network_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
849{ 849{
850 return !cl->delete_me; 850 return !cl->delete_me;
851} 851}
@@ -853,11 +853,11 @@ _efl_network_client_efl_network_base_connected_get(Eo *obj EINA_UNUSED, Efl_Netw
853EAPI Eina_Bool 853EAPI Eina_Bool
854ecore_con_client_connected_get(const Ecore_Con *obj) 854ecore_con_client_connected_get(const Ecore_Con *obj)
855{ 855{
856 return efl_network_base_connected_get((Ecore_Con *)obj); 856 return efl_network_connected_get((Ecore_Con *)obj);
857} 857}
858 858
859EOLIAN static void 859EOLIAN static void
860_efl_network_client_efl_network_base_timeout_set(Eo *obj, Efl_Network_Client_Data *cl, double timeout) 860_efl_network_client_efl_network_timeout_set(Eo *obj, Efl_Network_Client_Data *cl, double timeout)
861{ 861{
862 cl->disconnect_time = timeout; 862 cl->disconnect_time = timeout;
863 863
@@ -867,11 +867,11 @@ _efl_network_client_efl_network_base_timeout_set(Eo *obj, Efl_Network_Client_Dat
867EAPI void 867EAPI void
868ecore_con_client_timeout_set(Ecore_Con *obj, double timeout) 868ecore_con_client_timeout_set(Ecore_Con *obj, double timeout)
869{ 869{
870 efl_network_base_timeout_set((Ecore_Con *)obj, timeout); 870 efl_network_timeout_set((Ecore_Con *)obj, timeout);
871} 871}
872 872
873EOLIAN static double 873EOLIAN static double
874_efl_network_client_efl_network_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl) 874_efl_network_client_efl_network_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
875{ 875{
876 return cl->disconnect_time; 876 return cl->disconnect_time;
877} 877}
@@ -879,7 +879,7 @@ _efl_network_client_efl_network_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Networ
879EAPI double 879EAPI double
880ecore_con_client_timeout_get(const Ecore_Con *obj) 880ecore_con_client_timeout_get(const Ecore_Con *obj)
881{ 881{
882 return efl_network_base_timeout_get((Ecore_Con *)obj); 882 return efl_network_timeout_get((Ecore_Con *)obj);
883} 883}
884 884
885EAPI void * 885EAPI void *
@@ -919,7 +919,7 @@ ecore_con_client_data_get(Ecore_Con_Client *obj)
919} 919}
920 920
921EOLIAN static const char * 921EOLIAN static const char *
922_efl_network_client_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl) 922_efl_network_client_efl_network_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
923{ 923{
924 if (!cl->ip) 924 if (!cl->ip)
925 cl->ip = _ecore_con_pretty_ip(cl->client_addr); 925 cl->ip = _ecore_con_pretty_ip(cl->client_addr);
@@ -930,11 +930,11 @@ _efl_network_client_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Cli
930EAPI const char * 930EAPI const char *
931ecore_con_client_ip_get(const Ecore_Con *obj) 931ecore_con_client_ip_get(const Ecore_Con *obj)
932{ 932{
933 return efl_network_base_ip_get(obj); 933 return efl_network_ip_get(obj);
934} 934}
935 935
936EOLIAN static int 936EOLIAN static int
937_efl_network_client_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl) 937_efl_network_client_efl_network_port_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
938{ 938{
939 Efl_Network_Server_Data *sd = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 939 Efl_Network_Server_Data *sd = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
940 940
@@ -957,11 +957,11 @@ _efl_network_client_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_C
957EAPI int 957EAPI int
958ecore_con_client_port_get(const Ecore_Con *obj) 958ecore_con_client_port_get(const Ecore_Con *obj)
959{ 959{
960 return efl_network_base_port_get((Ecore_Con *)obj); 960 return efl_network_port_get((Ecore_Con *)obj);
961} 961}
962 962
963EOLIAN static double 963EOLIAN static double
964_efl_network_client_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl) 964_efl_network_client_efl_network_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
965{ 965{
966 return ecore_time_get() - cl->start_time; 966 return ecore_time_get() - cl->start_time;
967} 967}
@@ -969,11 +969,11 @@ _efl_network_client_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network
969EAPI double 969EAPI double
970ecore_con_client_uptime_get(const Ecore_Con *obj) 970ecore_con_client_uptime_get(const Ecore_Con *obj)
971{ 971{
972 return efl_network_base_uptime_get(obj); 972 return efl_network_uptime_get(obj);
973} 973}
974 974
975EOLIAN static void 975EOLIAN static void
976_efl_network_client_efl_network_base_flush(Eo *obj, Efl_Network_Client_Data *cl EINA_UNUSED) 976_efl_network_client_efl_network_flush(Eo *obj, Efl_Network_Client_Data *cl EINA_UNUSED)
977{ 977{
978 _ecore_con_client_flush(obj); 978 _ecore_con_client_flush(obj);
979} 979}
@@ -981,17 +981,17 @@ _efl_network_client_efl_network_base_flush(Eo *obj, Efl_Network_Client_Data *cl
981EAPI void 981EAPI void
982ecore_con_client_flush(Ecore_Con *obj) 982ecore_con_client_flush(Ecore_Con *obj)
983{ 983{
984 efl_network_base_flush((Ecore_Con *)obj); 984 efl_network_flush((Ecore_Con *)obj);
985} 985}
986 986
987EAPI int 987EAPI int
988ecore_con_server_fd_get(const Ecore_Con *obj) 988ecore_con_server_fd_get(const Ecore_Con *obj)
989{ 989{
990 return efl_network_base_fd_get((Ecore_Con *)obj); 990 return efl_network_fd_get((Ecore_Con *)obj);
991} 991}
992 992
993EOLIAN static int 993EOLIAN static int
994_efl_network_server_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr) 994_efl_network_server_efl_network_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
995{ 995{
996 if (svr->created) return -1; 996 if (svr->created) return -1;
997 if (svr->delete_me) return -1; 997 if (svr->delete_me) return -1;
@@ -999,7 +999,7 @@ _efl_network_server_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Ser
999} 999}
1000 1000
1001EOLIAN static int 1001EOLIAN static int
1002_efl_network_client_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl) 1002_efl_network_client_efl_network_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
1003{ 1003{
1004 return ecore_main_fd_handler_fd_get(cl->fd_handler); 1004 return ecore_main_fd_handler_fd_get(cl->fd_handler);
1005} 1005}
@@ -1007,7 +1007,7 @@ _efl_network_client_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Cli
1007EAPI int 1007EAPI int
1008ecore_con_client_fd_get(const Ecore_Con *obj) 1008ecore_con_client_fd_get(const Ecore_Con *obj)
1009{ 1009{
1010 return efl_network_base_fd_get((Ecore_Con *)obj); 1010 return efl_network_fd_get((Ecore_Con *)obj);
1011} 1011}
1012 1012
1013/** 1013/**
@@ -1053,7 +1053,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
1053 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE; 1053 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
1054 ecore_event_add(ev, e, 1054 ecore_event_add(ev, e,
1055 _ecore_con_event_server_add_free, NULL); 1055 _ecore_con_event_server_add_free, NULL);
1056 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL); 1056 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
1057 _ecore_con_event_count++; 1057 _ecore_con_event_count++;
1058} 1058}
1059 1059
@@ -1132,7 +1132,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
1132 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1132 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1133 event_info.data = e->data; 1133 event_info.data = e->data;
1134 event_info.size = e->size; 1134 event_info.size = e->size;
1135 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info); 1135 eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
1136 } 1136 }
1137 _ecore_con_event_count++; 1137 _ecore_con_event_count++;
1138} 1138}
@@ -1157,7 +1157,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
1157 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE; 1157 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
1158 ecore_event_add(ev, e, 1158 ecore_event_add(ev, e,
1159 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server); 1159 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
1160 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL); 1160 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
1161 _ecore_con_event_count++; 1161 _ecore_con_event_count++;
1162} 1162}
1163 1163
@@ -1239,7 +1239,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
1239 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1239 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1240 event_info.data = e->data; 1240 event_info.data = e->data;
1241 event_info.size = e->size; 1241 event_info.size = e->size;
1242 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info); 1242 eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
1243 } 1243 }
1244 _ecore_con_event_count++; 1244 _ecore_con_event_count++;
1245} 1245}
@@ -1265,7 +1265,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
1265 DBG("%s", error); 1265 DBG("%s", error);
1266 svr->event_count = eina_list_append(svr->event_count, e); 1266 svr->event_count = eina_list_append(svr->event_count, e);
1267 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL); 1267 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
1268 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error); 1268 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
1269 _ecore_con_event_count++; 1269 _ecore_con_event_count++;
1270} 1270}
1271 1271
@@ -1286,7 +1286,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
1286 cl->event_count = eina_list_append(cl->event_count, e); 1286 cl->event_count = eina_list_append(cl->event_count, e);
1287 host_server->event_count = eina_list_append(host_server->event_count, e); 1287 host_server->event_count = eina_list_append(host_server->event_count, e);
1288 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server); 1288 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
1289 eo_event_callback_call(obj, EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error); 1289 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
1290 _ecore_con_event_count++; 1290 _ecore_con_event_count++;
1291} 1291}
1292 1292
@@ -2980,7 +2980,7 @@ _ecore_con_lookup_done(void *data,
2980 free(lk); 2980 free(lk);
2981} 2981}
2982 2982
2983#include "efl_network_base.eo.c" 2983#include "efl_network.eo.c"
2984#include "efl_network_client.eo.c" 2984#include "efl_network_client.eo.c"
2985#include "efl_network_server.eo.c" 2985#include "efl_network_server.eo.c"
2986#include "efl_network_connector.eo.c" 2986#include "efl_network_connector.eo.c"
diff --git a/src/lib/ecore_con/efl_network_base.eo b/src/lib/ecore_con/efl_network.eo
index 98dbd0804a..8e10801a37 100644
--- a/src/lib/ecore_con/efl_network_base.eo
+++ b/src/lib/ecore_con/efl_network.eo
@@ -29,11 +29,11 @@ enum Ecore.Con.Type
29 socket_activate = (1 << 9) 29 socket_activate = (1 << 9)
30} 30}
31 31
32abstract Efl.Network.Base (Eo.Base) { 32abstract Efl.Network (Eo.Base) {
33 [[Abstract base class for all EFL.Network classes]] 33 [[Abstract base class for all EFL.Network classes]]
34 34
35 legacy_prefix: ecore_con; 35 legacy_prefix: ecore_con;
36 eo_prefix: efl_network_base; 36 eo_prefix: efl_network;
37 data: null; 37 data: null;
38 methods { 38 methods {
39 @property ip { 39 @property ip {
diff --git a/src/lib/ecore_con/efl_network_client.eo b/src/lib/ecore_con/efl_network_client.eo
index e742b3a450..26c25ceb0c 100644
--- a/src/lib/ecore_con/efl_network_client.eo
+++ b/src/lib/ecore_con/efl_network_client.eo
@@ -1,4 +1,4 @@
1class Efl.Network.Client (Efl.Network.Base) { 1class Efl.Network.Client (Efl.Network) {
2 [[Efl network client]] 2 [[Efl network client]]
3 legacy_prefix: ecore_con_client; 3 legacy_prefix: ecore_con_client;
4 eo_prefix: efl_network_client_obj; 4 eo_prefix: efl_network_client_obj;
@@ -14,15 +14,15 @@ class Efl.Network.Client (Efl.Network.Base) {
14 } 14 }
15 implements { 15 implements {
16 Eo.Base.destructor; 16 Eo.Base.destructor;
17 Efl.Network.Base.ip.get; 17 Efl.Network.ip.get;
18 Efl.Network.Base.uptime.get; 18 Efl.Network.uptime.get;
19 Efl.Network.Base.port.get; 19 Efl.Network.port.get;
20 Efl.Network.Base.fd.get; 20 Efl.Network.fd.get;
21 Efl.Network.Base.connected.get; 21 Efl.Network.connected.get;
22 Efl.Network.Base.timeout.set; 22 Efl.Network.timeout.set;
23 Efl.Network.Base.timeout.get; 23 Efl.Network.timeout.get;
24 Efl.Network.Base.flush; 24 Efl.Network.flush;
25 Efl.Network.Base.send; 25 Efl.Network.send;
26 } 26 }
27} 27}
28 28
diff --git a/src/lib/ecore_con/efl_network_server.eo b/src/lib/ecore_con/efl_network_server.eo
index b75190eabf..2ac399b116 100644
--- a/src/lib/ecore_con/efl_network_server.eo
+++ b/src/lib/ecore_con/efl_network_server.eo
@@ -1,4 +1,4 @@
1class Efl.Network.Server (Efl.Network.Base) { 1class Efl.Network.Server (Efl.Network) {
2 [[Efl network server]] 2 [[Efl network server]]
3 legacy_prefix: ecore_con_server; 3 legacy_prefix: ecore_con_server;
4 eo_prefix: efl_network_server; 4 eo_prefix: efl_network_server;
@@ -59,7 +59,7 @@ class Efl.Network.Server (Efl.Network.Base) {
59 } 59 }
60 values { 60 values {
61 // FIXME: Efl.Network.Client is needed, but that introduces a cycle 61 // FIXME: Efl.Network.Client is needed, but that introduces a cycle
62 clients: const(list<const(Efl.Network.Base) *>) *; [[The list of clients on this server.]] 62 clients: const(list<const(Efl.Network) *>) *; [[The list of clients on this server.]]
63 } 63 }
64 } 64 }
65 @property connection_type { 65 @property connection_type {
@@ -79,15 +79,15 @@ class Efl.Network.Server (Efl.Network.Base) {
79 Eo.Base.constructor; 79 Eo.Base.constructor;
80 Eo.Base.destructor; 80 Eo.Base.destructor;
81 Eo.Base.finalize; 81 Eo.Base.finalize;
82 Efl.Network.Base.ip.get; 82 Efl.Network.ip.get;
83 Efl.Network.Base.uptime.get; 83 Efl.Network.uptime.get;
84 Efl.Network.Base.port.set; 84 Efl.Network.port.set;
85 Efl.Network.Base.port.get; 85 Efl.Network.port.get;
86 Efl.Network.Base.fd.get; 86 Efl.Network.fd.get;
87 Efl.Network.Base.connected.get; 87 Efl.Network.connected.get;
88 Efl.Network.Base.timeout.set; 88 Efl.Network.timeout.set;
89 Efl.Network.Base.timeout.get; 89 Efl.Network.timeout.get;
90 Efl.Network.Base.flush; 90 Efl.Network.flush;
91 Efl.Network.Base.send; 91 Efl.Network.send;
92 } 92 }
93} 93}