diff options
| author | Heiko Hund <heiko.hund@sophos.com> | 2012-07-17 18:25:16 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2012-07-19 21:20:39 +0200 |
| commit | 910675de28956cf8d028aed727486b64747362fb (patch) | |
| tree | c42b15a45e8056baea13ea6d5bb3d3b08a63292e /src/openvpn/ps.c | |
| parent | 9081e0ad4c496a0334a21fc4e8e4f1f73a470b5a (diff) | |
| download | openvpn-910675de28956cf8d028aed727486b64747362fb.tar.gz openvpn-910675de28956cf8d028aed727486b64747362fb.tar.xz openvpn-910675de28956cf8d028aed727486b64747362fb.zip | |
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/ps.c')
| -rw-r--r-- | src/openvpn/ps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c index 5d056ee..6495dc7 100644 --- a/src/openvpn/ps.c +++ b/src/openvpn/ps.c @@ -233,7 +233,7 @@ port_share_sendmsg (const socket_descriptor_t sd, status = sendmsg (sd, &mesg, MSG_NOSIGNAL); if (status == -1) - msg (M_WARN|M_ERRNO_SOCK, "PORT SHARE: sendmsg failed -- unable to communicate with background process (%d,%d,%d,%d)", + msg (M_WARN|M_ERRNO, "PORT SHARE: sendmsg failed -- unable to communicate with background process (%d,%d,%d,%d)", sd, sd_send, sd_null[0], sd_null[1] ); @@ -419,7 +419,7 @@ proxy_entry_new (struct proxy_connection **list, sock_addr_set (&osaddr, server_addr, server_port); if ((sd_server = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - msg (M_WARN|M_ERRNO_SOCK, "PORT SHARE PROXY: cannot create socket"); + msg (M_WARN|M_ERRNO, "PORT SHARE PROXY: cannot create socket"); return false; } status = openvpn_connect (sd_server, &osaddr, 5, NULL); @@ -851,7 +851,7 @@ port_share_open (const char *host, } else { - msg (M_SOCKERR, "PORT SHARE: unexpected init recv_control status=%d", status); + msg (M_ERR, "PORT SHARE: unexpected init recv_control status=%d", status); } } else |