aboutsummaryrefslogtreecommitdiff
path: root/src/openvpn/error.h
diff options
context:
space:
mode:
authorHeiko Hund2012-07-17 18:25:16 +0200
committerDavid Sommerseth2012-07-19 21:20:39 +0200
commit910675de28956cf8d028aed727486b64747362fb (patch)
treec42b15a45e8056baea13ea6d5bb3d3b08a63292e /src/openvpn/error.h
parent9081e0ad4c496a0334a21fc4e8e4f1f73a470b5a (diff)
downloadopenvpn-910675de28956cf8d028aed727486b64747362fb.zip
openvpn-910675de28956cf8d028aed727486b64747362fb.tar.gz
don't treat socket related errors special anymore
WSAGetLastError() is just a wrapper for GetLastError(). So, there's no need to differentiate between socket related and other errors. This patch removes all special handling of socket errors in favor of simplifying the codebase somewhat. Signed-off-by: Heiko Hund <heiko.hund@sophos.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: 1342542316-32563-1-git-send-email-heiko.hund@sophos.com URL: http://article.gmane.org/gmane.network.openvpn.devel/6876 Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'src/openvpn/error.h')
-rw-r--r--src/openvpn/error.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/openvpn/error.h b/src/openvpn/error.h
index ed8f903..aedb7c3 100644
--- a/src/openvpn/error.h
+++ b/src/openvpn/error.h
@@ -68,12 +68,10 @@ struct gc_arena;
#ifdef WIN32
# define openvpn_errno() GetLastError()
-# define openvpn_errno_socket() WSAGetLastError()
# define openvpn_strerror(e, gc) strerror_win32(e, gc)
const char *strerror_win32 (DWORD errnum, struct gc_arena *gc);
#else
# define openvpn_errno() errno
-# define openvpn_errno_socket() errno
# define openvpn_strerror(x, gc) strerror(x)
#endif
@@ -94,7 +92,6 @@ extern int x_msg_line_num;
#define M_DEBUG (1<<7)
#define M_ERRNO (1<<8) /* show errno description */
-#define M_ERRNO_SOCK (1<<9) /* show socket errno description */
#ifdef ENABLE_CRYPTO_OPENSSL
# define M_SSL (1<<10) /* show SSL error */
@@ -110,7 +107,6 @@ extern int x_msg_line_num;
/* flag combinations which are frequently used */
#define M_ERR (M_FATAL | M_ERRNO)
-#define M_SOCKERR (M_FATAL | M_ERRNO_SOCK)
#define M_SSLERR (M_FATAL | M_SSL)
#define M_USAGE (M_USAGE_SMALL | M_NOPREFIX | M_OPTERR)
#define M_CLIENT (M_MSG_VIRT_OUT | M_NOMUTE | M_NOIPREFIX)