jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix outgoing connections on Mac OSX

Browse Source 
connect() on an already established connection returns error with errno
set to EISCONN. Treat it as success.
This commit is contained in:
Pavel Roskin 2016-09-04 09:26:37 -07:00
parent 5465b8c85e
commit 7d03d1a3e9
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/os_calls.c
View File

@ -763,6 +763,13 @@ g_tcp_connect(int sck, const char *address, const char *port)
} }
} }
} }
/* Mac OSX connect() returns -1 for already established connections */
if (res == -1 && errno == EISCONN)
{
res = 0;
}
return res; return res;
} }
#else #else
@ -771,6 +778,7 @@ g_tcp_connect(int sck, const char* address, const char* port)
{ {
struct sockaddr_in s; struct sockaddr_in s;
struct hostent* h; struct hostent* h;
int res;
g_memset(&s, 0, sizeof(struct sockaddr_in)); g_memset(&s, 0, sizeof(struct sockaddr_in));
s.sin_family = AF_INET; s.sin_family = AF_INET;
@ -793,7 +801,15 @@ g_tcp_connect(int sck, const char* address, const char* port)
} }
} }
} }
return connect(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in)); res = connect(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));
/* Mac OSX connect() returns -1 for already established connections */
if (res == -1 && errno == EISCONN)
{
res = 0;
}
return res;
} }
#endif #endif