1660. [bug] win32: connection_reset_fix() was being called

unconditionally.  [RT #11595]
This commit is contained in:
Mark Andrews
2004-06-18 01:15:21 +00:00
parent b615bec612
commit 44800f9368
2 changed files with 11 additions and 6 deletions

View File

@@ -3,6 +3,9 @@
1662. [bug] Change #1658 failed to change one use of 'type'
to 'keytype'.
1660. [bug] win32: connection_reset_fix() was being called
unconditionally. [RT #11595]
1659. [cleanup] Cleanup some messages that were referring to KEY vs
DNSKEY, NXT vs NSEC and SIG vs RRSIG.

View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.30.18.2 2004/05/17 03:21:08 marka Exp $ */
/* $Id: socket.c,v 1.30.18.3 2004/06/18 01:15:21 marka Exp $ */
/* This code has been rewritten to take advantage of Windows Sockets
* I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -1846,11 +1846,13 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
switch (type) {
case isc_sockettype_udp:
sock->fd = socket(pf, SOCK_DGRAM, IPPROTO_UDP);
result = connection_reset_fix(sock->fd);
if (result != ISC_R_SUCCESS) {
closesocket(sock->fd);
free_socket(&sock);
return (result);
if (sock->fd != INVALID_SOCKET) {
result = connection_reset_fix(sock->fd);
if (result != ISC_R_SUCCESS) {
closesocket(sock->fd);
free_socket(&sock);
return (result);
}
}
break;
case isc_sockettype_tcp: