enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

efl_net_dialer_tcp: make code bit more robust. 

Also avoids the double-set of remote address, since socket.tcp will
alredy do that for us when we efl_loop_fd_set().
This commit is contained in:
Gustavo Sverzut Barbieri 2016-10-26 17:51:58 -02:00
parent c759ec6362
commit 7a842e0612
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/ecore_con/efl_net_dialer_tcp.c
View File

@ -96,28 +96,34 @@ _efl_net_dialer_tcp_connected(void *data, const struct sockaddr *addr, socklen_t
{
Eo *o = data;
Efl_Net_Dialer_Tcp_Data *pd = efl_data_scope_get(o, MY_CLASS);
char buf[INET6_ADDRSTRLEN + sizeof("[]:65536")];
pd->connect.thread = NULL;
efl_ref(o); /* we're emitting callbacks then continuing the workflow */
if (err) goto error;
efl_net_socket_fd_family_set(o, addr->sa_family);
efl_loop_fd_set(o, sockfd);
if (efl_net_socket_address_remote_get(o))
{
efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
efl_net_dialer_connected_set(o, EINA_TRUE);
}
else
{
err = EFL_NET_DIALER_ERROR_COULDNT_CONNECT;
efl_loop_fd_set(o, INVALID_SOCKET);
closesocket(sockfd);
goto error;
}
error:
if (err)
{
efl_io_reader_eos_set(o, EINA_TRUE);
efl_event_callback_call(o, EFL_NET_DIALER_EVENT_ERROR, &err);
}
else
{
efl_net_socket_fd_family_set(o, addr->sa_family);
efl_loop_fd_set(o, sockfd);
if (efl_net_ip_port_fmt(buf, sizeof(buf), addr))
{
efl_net_socket_address_remote_set(o, buf);
efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
}
efl_net_dialer_connected_set(o, EINA_TRUE);
}
efl_unref(o);
}