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

handle stale sockets gracefully 

SVN revision: 7824
This commit is contained in:
Carsten Haitzler 2003-11-08 10:45:46 +00:00
parent 2bcf6301f8
commit 1fdd7a0c0f
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,6 +139,7 @@ ecore_con_server_add(Ecore_Con_Type type,
snprintf(buf, sizeof(buf), "/tmp/.ecore_service|%s|%i", name, port);
}
pmode = umask(mask);
start:
svr->fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (svr->fd < 0)
{
@ -166,8 +167,31 @@ ecore_con_server_add(Ecore_Con_Type type,
strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
if (bind(svr->fd, (struct sockaddr *)&socket_unix, LENGTH_OF_SOCKADDR_UN(&socket_unix)) < 0)
{
umask(pmode);
goto error;
if (connect(svr->fd, (struct sockaddr *)&socket_unix,
LENGTH_OF_SOCKADDR_UN(&socket_unix)) < 0)
{
if ((type == ECORE_CON_LOCAL_USER) ||
(type == ECORE_CON_LOCAL_SYSTEM))
{
if (unlink(buf) < 0)
{
umask(pmode);
goto error;
}
else
goto start;
}
else
{
umask(pmode);
goto error;
}
}
else
{
umask(pmode);
goto error;
}
}
if (listen(svr->fd, 4096) < 0)
{