JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: AF_UNIX: define AF_UNIX_CONNECT_TIMEOUT 

Use macro AF_UNIX_CONNECT_TIMEOUT instead of numerical constant
for connect timeout.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2018-03-07 21:55:34 +01:00
parent 2f48ddb1ca
commit 483cbf8954
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -154,6 +154,9 @@ GUID __cygwin_socket_guid = {
_s == STATUS_BUFFER_OVERFLOW \ _s == STATUS_BUFFER_OVERFLOW \
|| _s == STATUS_MORE_PROCESSING_REQUIRED; }) || _s == STATUS_MORE_PROCESSING_REQUIRED; })
/* Default timeout value of connect: 20 secs, as on Linux. */
#define AF_UNIX_CONNECT_TIMEOUT (-20 * NS100PERSEC)
sun_name_t::sun_name_t () sun_name_t::sun_name_t ()
{ {
un_len = sizeof (sa_family_t); un_len = sizeof (sa_family_t);
@ -619,7 +622,7 @@ fhandler_socket_unix::recv_peer_name ()
DWORD ret; DWORD ret;
LARGE_INTEGER timeout; LARGE_INTEGER timeout;
timeout.QuadPart = -20 * NS100PERSEC; /* 20 secs */ timeout.QuadPart = AF_UNIX_CONNECT_TIMEOUT;
ret = cygwait (evt, &timeout, cw_sig_eintr); ret = cygwait (evt, &timeout, cw_sig_eintr);
switch (ret) switch (ret)
{ {
@ -1062,7 +1065,7 @@ fhandler_socket_unix::wait_pipe_thread (PUNICODE_STRING pipe_name)
goto out; goto out;
pwbuf_size = offsetof (FILE_PIPE_WAIT_FOR_BUFFER, Name) + pipe_name->Length; pwbuf_size = offsetof (FILE_PIPE_WAIT_FOR_BUFFER, Name) + pipe_name->Length;
pwbuf = (PFILE_PIPE_WAIT_FOR_BUFFER) alloca (pwbuf_size); pwbuf = (PFILE_PIPE_WAIT_FOR_BUFFER) alloca (pwbuf_size);
pwbuf->Timeout.QuadPart = -20 * NS100PERSEC; /* 20 secs */ pwbuf->Timeout.QuadPart = AF_UNIX_CONNECT_TIMEOUT;
pwbuf->NameLength = pipe_name->Length; pwbuf->NameLength = pipe_name->Length;
pwbuf->TimeoutSpecified = TRUE; pwbuf->TimeoutSpecified = TRUE;
memcpy (pwbuf->Name, pipe_name->Buffer, pipe_name->Length); memcpy (pwbuf->Name, pipe_name->Buffer, pipe_name->Length);