summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-10-27 18:48:16 -0700
committerCedric Bail <cedric@osg.samsung.com>2017-10-27 18:51:38 -0700
commit6d8ceab4be416f2d1f5e002af05a0377832a6923 (patch)
tree4fb758aab305c7825b4b27a183321bb636f24755
parent270ba9860640249e05ff5bf684762f8ea17ad7eb (diff)
ecore_con: add an Efl_Net.h
-rw-r--r--src/Makefile_Ecore_Con.am2
-rw-r--r--src/lib/ecore_con/Ecore_Con.h10
-rw-r--r--src/lib/ecore_con/Ecore_Con_Eo.h52
-rw-r--r--src/lib/ecore_con/Efl_Net.h141
4 files changed, 147 insertions, 58 deletions
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index b1047c8e85..f8d35d2636 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -74,7 +74,7 @@ lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
74installed_ecoreconmainheadersdir = $(includedir)/ecore-con-@VMAJ@ 74installed_ecoreconmainheadersdir = $(includedir)/ecore-con-@VMAJ@
75dist_installed_ecoreconmainheaders_DATA = \ 75dist_installed_ecoreconmainheaders_DATA = \
76lib/ecore_con/Ecore_Con.h \ 76lib/ecore_con/Ecore_Con.h \
77lib/ecore_con/Ecore_Con_Eo.h \ 77lib/ecore_con/Efl_Net.h \
78lib/ecore_con/Ecore_Con_Eet.h \ 78lib/ecore_con/Ecore_Con_Eet.h \
79lib/ecore_con/Ecore_Con_Eet_Legacy.h \ 79lib/ecore_con/Ecore_Con_Eet_Legacy.h \
80lib/ecore_con/Ecore_Con_Eet_Eo.h 80lib/ecore_con/Ecore_Con_Eet_Eo.h
diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h
index 7ae1427622..5f04e4c39e 100644
--- a/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@@ -11,6 +11,10 @@
11#include <Eina.h> 11#include <Eina.h>
12#include <Eo.h> 12#include <Eo.h>
13 13
14#ifdef EFL_BETA_API_SUPPORT
15#include "Efl_Net.h"
16#endif
17
14#ifdef EAPI 18#ifdef EAPI
15# undef EAPI 19# undef EAPI
16#endif 20#endif
@@ -299,10 +303,6 @@ typedef void (*Ecore_Con_Dns_Cb)(const char *canonname,
299 303
300/** @} */ 304/** @} */
301 305
302#ifdef EFL_BETA_API_SUPPORT
303#include "Ecore_Con_Eo.h"
304#endif
305
306/** 306/**
307 * @struct _Ecore_Con_Server 307 * @struct _Ecore_Con_Server
308 * Used to provide legacy ABI/ABI compatibility with non-Eo applications. 308 * Used to provide legacy ABI/ABI compatibility with non-Eo applications.
@@ -1778,7 +1778,7 @@ typedef enum _Ecore_Con_Url_Http_Version
1778 * @see ecore_con_url_pipeline_get() 1778 * @see ecore_con_url_pipeline_get()
1779 */ 1779 */
1780EAPI Eina_Bool ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ecore_Con_Url_Http_Version version); 1780EAPI Eina_Bool ecore_con_url_http_version_set(Ecore_Con_Url *url_con, Ecore_Con_Url_Http_Version version);
1781 1781
1782/** 1782/**
1783 * @brief Initializes the Ecore_Con_Url library. 1783 * @brief Initializes the Ecore_Con_Url library.
1784 * @return Number of times the library has been initialised without being 1784 * @return Number of times the library has been initialised without being
diff --git a/src/lib/ecore_con/Ecore_Con_Eo.h b/src/lib/ecore_con/Ecore_Con_Eo.h
deleted file mode 100644
index 5958430cbd..0000000000
--- a/src/lib/ecore_con/Ecore_Con_Eo.h
+++ /dev/null
@@ -1,52 +0,0 @@
1#include "efl_net_types.eot.h"
2
3#include "efl_net_ip_address.eo.h"
4
5#include "efl_net_socket.eo.h"
6#include "efl_net_dialer.eo.h"
7#include "efl_net_server.eo.h"
8
9#include "efl_net_socket_simple.eo.h"
10#include "efl_net_dialer_simple.eo.h"
11#include "efl_net_server_simple.eo.h"
12
13#include "efl_net_socket_fd.eo.h"
14#include "efl_net_server_fd.eo.h"
15
16#include "efl_net_server_ip.eo.h"
17
18#include "efl_net_socket_tcp.eo.h"
19#include "efl_net_dialer_tcp.eo.h"
20#include "efl_net_server_tcp.eo.h"
21
22#ifdef _WIN32
23#include "efl_net_socket_windows.eo.h"
24#include "efl_net_dialer_windows.eo.h"
25#include "efl_net_server_windows.eo.h"
26#else
27#include "efl_net_socket_unix.eo.h"
28#include "efl_net_dialer_unix.eo.h"
29#include "efl_net_server_unix.eo.h"
30#endif
31
32#include "efl_net_socket_udp.eo.h"
33#include "efl_net_dialer_udp.eo.h"
34#include "efl_net_server_udp.eo.h"
35#include "efl_net_server_udp_client.eo.h"
36
37#include "efl_net_http_types.eot.h"
38
39#include "efl_net_dialer_http.eo.h"
40#include "efl_net_dialer_websocket.eo.h"
41
42#include "efl_net_ssl_types.eot.h"
43
44#include "efl_net_ssl_context.eo.h"
45#include "efl_net_socket_ssl.eo.h"
46#include "efl_net_dialer_ssl.eo.h"
47#include "efl_net_server_ssl.eo.h"
48
49#include "efl_net_control_technology.eo.h"
50#include "efl_net_control_access_point.eo.h"
51#include "efl_net_control.eo.h"
52#include "efl_net_session.eo.h"
diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h
new file mode 100644
index 0000000000..f98ff29ed4
--- /dev/null
+++ b/src/lib/ecore_con/Efl_Net.h
@@ -0,0 +1,141 @@
1#ifndef _EFL_NET_H
2#define _EFL_NET_H
3
4#include <time.h>
5#include <libgen.h>
6#ifdef _WIN32
7# include <ws2tcpip.h>
8#else
9# include <netdb.h>
10#endif
11#include <Efl_Core.h>
12
13#ifdef EAPI
14# undef EAPI
15#endif
16
17#ifdef _WIN32
18# ifdef EFL_ECORE_CON_BUILD
19# ifdef DLL_EXPORT
20# define EAPI __declspec(dllexport)
21# else
22# define EAPI
23# endif
24# else
25# define EAPI __declspec(dllimport)
26# endif
27#else
28# ifdef __GNUC__
29# if __GNUC__ >= 4
30# define EAPI __attribute__ ((visibility("default")))
31# else
32# define EAPI
33# endif
34# else
35# define EAPI
36# endif
37#endif
38
39#ifdef __cplusplus
40extern "C" {
41#endif
42
43/**
44 * @brief Initializes the Ecore_Con library.
45 * @return Number of times the library has been initialised without being
46 * shut down.
47 *
48 * @note This function already calls ecore_init() internally, so you don't need
49 * to call it explicitly.
50 */
51EAPI int ecore_con_init(void);
52
53/**
54 * @brief Shuts down the Ecore_Con library.
55 * @return Number of times the library has been initialised without being
56 * shut down.
57 * @note This function already calls ecore_shutdown() internally, so you don't
58 * need to call it explicitly unless you called ecore_init() explicitly too.
59 */
60EAPI int ecore_con_shutdown(void);
61
62/**
63 * @brief Initializes the Ecore_Con_Url library.
64 * @return Number of times the library has been initialised without being
65 * shut down.
66 *
67 * @note This function doesn't call ecore_con_init(). You still need to call it
68 * explicitly before calling this one.
69 */
70EAPI int ecore_con_url_init(void);
71
72/**
73 * @brief Shuts down the Ecore_Con_Url library.
74 * @return Number of calls that still uses Ecore_Con_Url
75 *
76 * @note This function doesn't call ecore_con_shutdown(). You still need to call
77 * it explicitly after calling this one.
78 */
79EAPI int ecore_con_url_shutdown(void);
80
81#include "efl_net_types.eot.h"
82
83#include "efl_net_ip_address.eo.h"
84
85#include "efl_net_socket.eo.h"
86#include "efl_net_dialer.eo.h"
87#include "efl_net_server.eo.h"
88
89#include "efl_net_socket_simple.eo.h"
90#include "efl_net_dialer_simple.eo.h"
91#include "efl_net_server_simple.eo.h"
92
93#include "efl_net_socket_fd.eo.h"
94#include "efl_net_server_fd.eo.h"
95
96#include "efl_net_server_ip.eo.h"
97
98#include "efl_net_socket_tcp.eo.h"
99#include "efl_net_dialer_tcp.eo.h"
100#include "efl_net_server_tcp.eo.h"
101
102#ifdef _WIN32
103#include "efl_net_socket_windows.eo.h"
104#include "efl_net_dialer_windows.eo.h"
105#include "efl_net_server_windows.eo.h"
106#else
107#include "efl_net_socket_unix.eo.h"
108#include "efl_net_dialer_unix.eo.h"
109#include "efl_net_server_unix.eo.h"
110#endif
111
112#include "efl_net_socket_udp.eo.h"
113#include "efl_net_dialer_udp.eo.h"
114#include "efl_net_server_udp.eo.h"
115#include "efl_net_server_udp_client.eo.h"
116
117#include "efl_net_http_types.eot.h"
118
119#include "efl_net_dialer_http.eo.h"
120#include "efl_net_dialer_websocket.eo.h"
121
122#include "efl_net_ssl_types.eot.h"
123
124#include "efl_net_ssl_context.eo.h"
125#include "efl_net_socket_ssl.eo.h"
126#include "efl_net_dialer_ssl.eo.h"
127#include "efl_net_server_ssl.eo.h"
128
129#include "efl_net_control_technology.eo.h"
130#include "efl_net_control_access_point.eo.h"
131#include "efl_net_control.eo.h"
132#include "efl_net_session.eo.h"
133
134#ifdef __cplusplus
135}
136#endif
137
138#undef EAPI
139#define EAPI
140
141#endif