Ecore con base: Fix Eolian warnings.

This includes either migrating types to eolian, fixing namespace or
importing extra types.
This commit is contained in:
Tom Hacohen 2016-02-16 10:02:10 +00:00
parent 9c44e1c2dd
commit de2d282309
3 changed files with 30 additions and 53 deletions

View File

@ -263,58 +263,6 @@ typedef void (*Ecore_Con_Dns_Cb)(const char *canonname,
int addrlen,
void *data);
/**
* @typedef Ecore_Con_Type
* @enum _Ecore_Con_Type
* Types for an ecore_con client/server object. A correct way to set this type is
* with an ECORE_CON_$TYPE, optionally OR'ed with an ECORE_CON_$USE if encryption is desired,
* and LOAD_CERT if the previously loaded certificate should be used.
* @code
* ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT
* @endcode
* @ingroup Ecore_Con_Server_Group
*/
typedef enum _Ecore_Con_Type
{
/** Socket in ~/.ecore */
ECORE_CON_LOCAL_USER = 0,
/** Socket in /tmp */
ECORE_CON_LOCAL_SYSTEM = 1,
/** Abstract socket */
ECORE_CON_LOCAL_ABSTRACT = 2,
/** Remote server using TCP */
ECORE_CON_REMOTE_TCP = 3,
/** Remote multicast server */
ECORE_CON_REMOTE_MCAST = 4,
/** Remote server using UDP */
ECORE_CON_REMOTE_UDP = 5,
/** Remote broadcast using UDP */
ECORE_CON_REMOTE_BROADCAST = 6,
/** Remote connection sending packets immediately */
ECORE_CON_REMOTE_NODELAY = 7,
/** Remote connection sending data in large chunks
* @note Only available on Linux
* @since 1.2
*/
ECORE_CON_REMOTE_CORK = 8,
/** Use SSL2: UNSUPPORTED. **/
ECORE_CON_USE_SSL2 = (1 << 4),
/** Use SSL3: UNSUPPORTED. **/
ECORE_CON_USE_SSL3 = (1 << 5),
/** Use TLS */
ECORE_CON_USE_TLS = (1 << 6),
/** Use both TLS and SSL3 */
ECORE_CON_USE_MIXED = ECORE_CON_USE_SSL3 | ECORE_CON_USE_TLS,
/** Attempt to use the loaded certificate */
ECORE_CON_LOAD_CERT = (1 << 7),
/** Disable all types of proxy on the server
* @note Only functional for clients
* @since 1.2
*/
ECORE_CON_NO_PROXY = (1 << 8),
ECORE_CON_SOCKET_ACTIVATE = (1 << 9)
} Ecore_Con_Type;
/** @} */
#ifndef EFL_NOLEGACY_API_SUPPORT

View File

@ -1,5 +1,34 @@
type Ecore_Con_Dns_Cb: __undefined_type;
enum Ecore.Con.Type
{
[[Types for an ecore_con client/server object. A correct way to set this type is
with an ECORE_CON_$TYPE, optionally OR'ed with an ECORE_CON_$USE if encryption is desired,
and LOAD_CERT if the previously loaded certificate should be used.]]
legacy: ecore_con;
local_user = 0, [[Socket in "~/.ecore"]]
local_system = 1, [[Socket in /tmp]]
local_abstract = 2, [[Abstract socket]]
remote_tcp = 3, [[Remote server using TCP]]
remote_mcast = 4, [[Remote multicast server]]
remote_udp = 5, [[Remote server using UDP]]
remote_broadcasT = 6, [[Remote broadcast using UDP]]
remote_nodelay = 7, [[Remote connection sending packets immediately]]
remote_cork = 8, [[Remote connection sending data in large chunks
Note: Only available on Linux
@since 1.2]]
use_ssl2 = (1 << 4), [[Use SSL2: UNSUPPORTED.]]
use_ssl3 = (1 << 5), [[Use SSL3: UNSUPPORTED.]]
use_tls = (1 << 6), [[Use TLS]]
use_mixed = Ecore.Con.Type.use_tls | Ecore.Con.Type.use_ssl3, [[Use both TLS and SSL3]]
load_cert = (1 << 7), [[Attempt to use the loaded certificate]]
no_proxy = (1 << 8), [[Disable all types of proxy on the server
Note: Only functional for clients
@since 1.2]]
socket_activate = (1 << 9)
}
abstract Ecore.Con.Base (Eo.Base) {
legacy_prefix: ecore_con;
eo_prefix: ecore_con_obj;

View File

@ -69,7 +69,7 @@ class Efl.Network.Server (Ecore.Con.Base) {
legacy: null;
}
values {
conn_type: Ecore_Con_Type;
conn_type: Ecore.Con.Type;
}
}
}