mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

1882. [port] win32: isc__errno2result() now reports its caller.

Browse Source 
[RT #13753]

1881.   [port]          win32: Handle ERROR_NETNAME_DELETED.  [RT #13753]
This commit is contained in:
Mark Andrews
2005-06-08 01:04:30 +00:00
parent 7d5b32acb1
commit ab9871e71e
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -1,3 +1,8 @@
1882. [port] win32: isc__errno2result() now reports its caller.
[RT #13753]
1881. [port] win32: Handle ERROR_NETNAME_DELETED. [RT #13753]
1880. [placeholder]
1879. [func] Added framework for handling multiple EDNS versions.

11
lib/isc/win32/errno2result.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: errno2result.c,v 1.9 2004/03/05 05:11:56 marka Exp $ */
/* $Id: errno2result.c,v 1.10 2005/06/08 01:04:29 marka Exp $ */
#include <config.h>
@@ -32,7 +32,7 @@
* not already there.
*/
isc_result_t
isc__errno2result(int posixerrno) {
isc__errno2resultx(int posixerrno, const char *file, int line) {
char strbuf[ISC_STRERRORSIZE];
switch (posixerrno) {
@@ -63,10 +63,8 @@ isc__errno2result(int posixerrno) {
return (ISC_R_TOOMANYOPENFILES);
default:
isc__strerror(posixerrno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"unable to convert errno "
"to isc_result: %d: %s",
posixerrno, strbuf);
UNEXPECTED_ERROR(file, line, "unable to convert errno "
"to isc_result: %d: %s", posixerrno, strbuf);
/*
* XXXDCL would be nice if perhaps this function could
* return the system's error string, so the caller
@@ -76,4 +74,3 @@ isc__errno2result(int posixerrno) {
return (ISC_R_UNEXPECTED);
}
}

7
lib/isc/win32/errno2result.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: errno2result.h,v 1.6 2004/03/05 05:11:57 marka Exp $ */
/* $Id: errno2result.h,v 1.7 2005/06/08 01:04:29 marka Exp $ */
#ifndef UNIX_ERRNO2RESULT_H
#define UNIX_ERRNO2RESULT_H 1
@@ -29,8 +29,11 @@
ISC_LANG_BEGINDECLS
#define isc__errno2result(posixerrno) \
isc__errno2resultx(posixerrno, __FILE__, __LINE__)
isc_result_t
isc__errno2result(int posixerrno);
isc__errno2resultx(int posixerrno, const char *file, int line);
ISC_LANG_ENDDECLS

4
lib/isc/win32/socket.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.37 2005/02/24 00:33:35 marka Exp $ */
/* $Id: socket.c,v 1.38 2005/06/08 01:04:30 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
@@ -1385,6 +1385,7 @@ completeio_recv(isc_socket_t *sock, isc_socketevent_t *dev,
SOFT_OR_HARD(WSAEDISCON, ISC_R_CONNECTIONRESET);
SOFT_OR_HARD(WSAENETDOWN, ISC_R_NETDOWN);
ALWAYS_HARD(ERROR_OPERATION_ABORTED, ISC_R_CONNECTIONRESET);
ALWAYS_HARD(ERROR_NETNAME_DELETED, ISC_R_CONNECTIONRESET);
ALWAYS_HARD(ERROR_PORT_UNREACHABLE, ISC_R_HOSTUNREACH);
ALWAYS_HARD(ERROR_HOST_UNREACHABLE, ISC_R_HOSTUNREACH);
ALWAYS_HARD(ERROR_NETWORK_UNREACHABLE, ISC_R_NETUNREACH);
@@ -1572,6 +1573,7 @@ completeio_send(isc_socket_t *sock, isc_socketevent_t *dev,
SOFT_OR_HARD(WSAEDISCON, ISC_R_CONNECTIONRESET);
SOFT_OR_HARD(WSAENETDOWN, ISC_R_NETDOWN);
ALWAYS_HARD(ERROR_OPERATION_ABORTED, ISC_R_CONNECTIONRESET);
ALWAYS_HARD(ERROR_NETNAME_DELETED, ISC_R_CONNECTIONRESET);
ALWAYS_HARD(ERROR_PORT_UNREACHABLE, ISC_R_HOSTUNREACH);
ALWAYS_HARD(ERROR_HOST_UNREACHABLE, ISC_R_HOSTUNREACH);
ALWAYS_HARD(ERROR_NETWORK_UNREACHABLE, ISC_R_NETUNREACH);