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

* dtable.cc (dtable::dup2): Add some debugging. Use methods from passed in

Browse Source 
class rather than cygheap->fdtab.
* fhandler_socket.cc (fhandler_socket::fixup_before_fork_exec): Add more
debugging output.
(fhandler_socket::dup): Allocate new space for prot_info_ptr for duplicated
entry.
* syscalls.cc (stat_worker): Always delete fh if it has been created.
This commit is contained in:
Christopher Faylor
2001-10-30 07:43:46 +00:00
parent 3d4b75dec2
commit 19ba6f2195
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
winsup/cygwin/fhandler_socket.cc
View File

@@ -169,11 +169,12 @@ fhandler_socket::fixup_before_fork_exec (DWORD win_proc_id)
debug_printf ("Without Winsock 2.0");
}
else if (!WSADuplicateSocketA (get_socket (), win_proc_id, prot_info_ptr))
debug_printf ("WSADuplicateSocket went fine, dwServiceFlags1=%d",
prot_info_ptr->dwServiceFlags1);
debug_printf ("WSADuplicateSocket went fine, sock %p, win_proc_id %d, prot_info_ptr %p",
get_socket (), win_proc_id, prot_info_ptr);
else
{
debug_printf ("WSADuplicateSocket error");
debug_printf ("WSADuplicateSocket error, sock %p, win_proc_id %d, prot_info_ptr %p",
get_socket (), win_proc_id, prot_info_ptr);
set_winsock_errno ();
}
}
@@ -203,7 +204,7 @@ fhandler_socket::fixup_after_fork (HANDLE parent)
}
else
{
debug_printf ("WSASocket went fine %p", new_sock);
debug_printf ("WSASocket went fine new_sock %p, old_sock %p", new_sock, get_io_handle ());
set_io_handle ((HANDLE) new_sock);
}
@@ -230,6 +231,9 @@ fhandler_socket::dup (fhandler_base *child)
fhandler_socket *fhs = (fhandler_socket *) child;
fhs->addr_family = addr_family;
fhs->set_io_handle (get_io_handle ());
fhs->prot_info_ptr = (LPWSAPROTOCOL_INFOA)
cmalloc (HEAP_BUF, sizeof (WSAPROTOCOL_INFOA));
fhs->fixup_before_fork_exec (GetCurrentProcessId ());
if (winsock2_active)
{
@@ -287,11 +291,9 @@ fhandler_socket::close ()
setsockopt (get_socket (), SOL_SOCKET, SO_LINGER,
(const char *)&linger, sizeof linger);
if (closesocket (get_socket ()))
{
set_winsock_errno ();
res = -1;
}
while (closesocket (get_socket ())
&& WSAGetLastError () == WSAEWOULDBLOCK)
continue;
close_secret_event ();