From 8dd5bc49ca67dd3e6197d22d9765a8ea05f60e43 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 20 Jan 2012 02:28:44 +0000 Subject: [PATCH] Fold EACCES and WSAEACCES cases together. Otherwise this causes a duplicate case error on Windows. --- nsock/src/nsock_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nsock/src/nsock_core.c b/nsock/src/nsock_core.c index 0de8c6b48..c023314e3 100644 --- a/nsock/src/nsock_core.c +++ b/nsock/src/nsock_core.c @@ -337,7 +337,9 @@ void handle_connect_result(mspool *ms, msevent *nse, enum nse_status status) { case 0: nse->status = NSE_STATUS_SUCCESS; break; - case EACCES: /* Can be caused by ICMPv6 dest-unreach-admin. */ + /* EACCES can be caused by ICMPv6 dest-unreach-admin, or when a port is + blocked by Windows Firewall (WSAEACCES). */ + case EACCES: case ECONNREFUSED: case EHOSTUNREACH: case ENETDOWN: @@ -349,7 +351,6 @@ void handle_connect_result(mspool *ms, msevent *nse, enum nse_status status) { case ECONNRESET: #ifdef WIN32 case WSAEADDRNOTAVAIL: - case WSAEACCES: /* Can happen when Windows Firewall blocks a port. */ #endif #ifndef WIN32 case EPIPE: /* Has been seen after connect on Linux. */