vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UNIX socket doesn't exist on Windows. 

thanks to vtorri & Kuri to spot that one.
This commit is contained in:
Gustavo Sverzut Barbieri 2016-10-27 09:01:19 -02:00
parent 9c1b0e346e
commit 48fb9e72df
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ecore_con/ecore_con.c
View File

@ -3026,6 +3026,7 @@ _ecore_con_lookup_done(void *data,
#include "efl_network_server.eo.c"
#include "efl_network_connector.eo.c"
#ifndef _WIN32
Eina_Bool
efl_net_unix_fmt(char *buf, size_t buflen, SOCKET fd, const struct sockaddr_un *addr, socklen_t addrlen)
{
@ -3078,6 +3079,7 @@ efl_net_unix_fmt(char *buf, size_t buflen, SOCKET fd, const struct sockaddr_un *
buf[pathlen] = '\0';
return EINA_TRUE;
}
#endif
Eina_Bool
efl_net_ip_port_fmt(char *buf, size_t buflen, const struct sockaddr *addr)
@ -3373,9 +3375,11 @@ _efl_net_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
if (eina_log_domain_level_check(_ecore_con_log_dom, EINA_LOG_LEVEL_DBG))
{
#ifndef _WIN32
if (d->addr->sa_family == AF_UNIX)
efl_net_unix_fmt(buf, sizeof(buf), d->sockfd, (const struct sockaddr_un *)d->addr, d->addrlen);
else
#endif
efl_net_ip_port_fmt(buf, sizeof(buf), d->addr);
}

2
src/lib/ecore_con/ecore_con_private.h
View File

@ -402,7 +402,9 @@ void _efl_net_server_udp_client_feed(Eo *client, Eina_Rw_Slice slice);
void _efl_net_socket_udp_init(Eo *o, const struct sockaddr *addr, socklen_t addrlen, const char *str);
#ifndef _WIN32
Eina_Bool efl_net_unix_fmt(char *buf, size_t buflen, SOCKET fd, const struct sockaddr_un *addr, socklen_t addrlen);
#endif
Eina_Bool efl_net_ip_port_fmt(char *buf, size_t buflen, const struct sockaddr *addr);
/**