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

Ecore-con: Use inet_ntop instead of getnameinfo. 

getnameinfo is a blocking call would would resolve a sockaddr into
its hostname, not into an IP address, so the ip_get should use the
inet_ntop call instead.

SVN revision: 63682
This commit is contained in:
Youness Alaoui 2011-09-29 21:05:20 +00:00
parent 075744047d
commit 84796ed59b
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -102,9 +102,7 @@ static void _ecore_con_event_client_write_free(Ecore_Con_Server *svr,
static void _ecore_con_lookup_done(void *data, static void _ecore_con_lookup_done(void *data,
Ecore_Con_Info *infos); Ecore_Con_Info *infos);
static const char * static const char * _ecore_con_pretty_ip(struct sockaddr *client_addr);
_ecore_con_pretty_ip(struct sockaddr *client_addr,
socklen_t size);
EAPI int ECORE_CON_EVENT_CLIENT_ADD = 0; EAPI int ECORE_CON_EVENT_CLIENT_ADD = 0;
EAPI int ECORE_CON_EVENT_CLIENT_DEL = 0; EAPI int ECORE_CON_EVENT_CLIENT_DEL = 0;
@ -854,7 +852,7 @@ ecore_con_client_ip_get(Ecore_Con_Client *cl)
return NULL; return NULL;
} }
if (!cl->ip) if (!cl->ip)
cl->ip = _ecore_con_pretty_ip(cl->client_addr, cl->client_addr_len); cl->ip = _ecore_con_pretty_ip(cl->client_addr);
return cl->ip; return cl->ip;
} }
@ -1770,33 +1768,37 @@ svr_try_connect_plain(Ecore_Con_Server *svr)
} }
static const char * static const char *
_ecore_con_pretty_ip(struct sockaddr *client_addr, _ecore_con_pretty_ip(struct sockaddr *client_addr)
socklen_t size)
{ {
#ifndef HAVE_IPV6 #ifndef HAVE_IPV6
char ipbuf[INET_ADDRSTRLEN + 1]; char ipbuf[INET_ADDRSTRLEN + 1];
#else #else
char ipbuf[INET6_ADDRSTRLEN + 1]; char ipbuf[INET6_ADDRSTRLEN + 1];
/* show v4mapped address in pretty form */
if (client_addr->sa_family == AF_INET6)
{
struct sockaddr_in6 *sa6;
sa6 = (struct sockaddr_in6 *)client_addr;
if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr))
{
snprintf(ipbuf, sizeof (ipbuf), "%u.%u.%u.%u",
sa6->sin6_addr.s6_addr[12],
sa6->sin6_addr.s6_addr[13],
sa6->sin6_addr.s6_addr[14],
sa6->sin6_addr.s6_addr[15]);
return eina_stringshare_add(ipbuf);
}
}
#endif #endif
int family = client_addr->sa_family;
void *src;
if (getnameinfo(client_addr, size, ipbuf, sizeof (ipbuf), NULL, 0, NI_NUMERICHOST)) switch(family)
{
case AF_INET:
src = &(((struct sockaddr_in *)client_addr)->sin_addr);
break;
#ifdef HAVE_IPV6
case AF_INET6:
src = &(((struct sockaddr_in6 *)client_addr)->sin6_addr);
if (IN6_IS_ADDR_V4MAPPED(src))
{
family = AF_INET;
src = (char*)src + 12;
}
break;
#endif
default:
return eina_stringshare_add("0.0.0.0");
}
if (!inet_ntop(family, src, ipbuf, sizeof(ipbuf)))
return eina_stringshare_add("0.0.0.0"); return eina_stringshare_add("0.0.0.0");
ipbuf[sizeof(ipbuf) - 1] = 0; ipbuf[sizeof(ipbuf) - 1] = 0;