Changeset 51581 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Jun 9, 2014 10:32:05 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94286

Message:

NAT/Net: Start untangling errno vs. winsock mess. Don't refer errno
directly, while here convert some perror() calls to DPRINTFs.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• proxy.c (modified) (8 diffs)
• pxdns.c (modified) (2 diffs)
• pxping.c (modified) (3 diffs)
• pxtcp.c (modified) (13 diffs)
• pxudp.c (modified) (1 diff)
• winutils.h (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/proxy.c

@@ -35 +35 @@
 #endif
 
+static FNRTSTRFORMATTYPE proxy_sockerr_rtstrfmt;
+
 static SOCKET proxy_create_socket(int, int);
 
@@ -42 +44 @@
 /* XXX: for mapping loopbacks to addresses in our network (ip4) */
 struct netif *g_proxy_netif;
+
+
 /*
  * Called on the lwip thread (aka tcpip thread) from tcpip_init() via
@@ -55 +59 @@
     LWIP_UNUSED_ARG(proxy_netif);
 
+    status = RTStrFormatTypeRegister("sockerr", proxy_sockerr_rtstrfmt, NULL);
+    AssertRC(status);
+
     g_proxy_options = opts;
     g_proxy_netif = proxy_netif;
@@ -99 +106 @@
     }
 }
+
+
+#if !defined(RT_OS_WINDOWS)
+/**
+ * Formatter for %R[sockerr] - unix strerror_r() version.
+ */
+static DECLCALLBACK(size_t)
+proxy_sockerr_rtstrfmt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                       const char *pszType, const void *pvValue,
+                       int cchWidth, int cchPrecision, unsigned int fFlags,
+                       void *pvUser)
+{
+    const int error = (int)(intptr_t)pvValue;
+    size_t cb = 0;
+
+    const char *msg = NULL;
+    char buf[128];
+
+    NOREF(cchWidth);
+    NOREF(cchPrecision);
+    NOREF(fFlags);
+    NOREF(pvUser);
+
+    AssertReturn(strcmp(pszType, "sockerr") == 0, 0);
+
+    /* make sure return type mismatch is caught */
+#if defined(RT_OS_LINUX) && defined(_GNU_SOURCE)
+    msg = strerror_r(error, buf, sizeof(buf));
+#else
+    {
+        int status = strerror_r(error, buf, sizeof(buf));
+        msg = buf;
+    }
+#endif
+    return RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL, "%s", msg);
+}
+
+#else /* RT_OS_WINDOWS */
+
+/**
+ * Formatter for %R[sockerr] - windows FormatMessage() version.
+ */
+static DECLCALLBACK(size_t)
+proxy_sockerr_rtstrfmt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                       const char *pszType, const void *pvValue,
+                       int cchWidth, int cchPrecision, unsigned int fFlags,
+                       void *pvUser)
+{
+    const int error = (int)(intptr_t)pvValue;
+    size_t cb = 0;
+
+    NOREF(cchWidth);
+    NOREF(cchPrecision);
+    NOREF(fFlags);
+    NOREF(pvUser);
+
+    AssertReturn(strcmp(pszType, "sockerr") == 0, 0);
+
+    /*
+     * XXX: Windows strerror() doesn't handle posix error codes, but
+     * since winsock uses its own, it shouldn't be much of a problem.
+     * If you see a strange error message, it's probably from
+     * FormatMessage() for an error from <WinError.h> that has the
+     * same numeric value.
+     */
+    if (error < _sys_nerr) {
+        char buf[128] = "";
+        int status;
+
+        status = strerror_s(buf, sizeof(buf), error);
+        if (status == 0) {
+            if (strcmp(buf, "Unknown error") == 0) {
+                /* windows strerror() doesn't add the numeric value */
+                cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                                  "Unknown error: %d", error);
+            }
+            else {
+                cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                                  "%s", buf);
+            }
+        }
+        else {
+            cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                              "Unknown error: %d", error);
+        }
+    }
+    else {
+        DWORD nchars;
+        char *msg = NULL;
+
+        nchars = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM
+                                | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+                                NULL, error, LANG_NEUTRAL,
+                                (LPSTR)&msg, 0,
+                                NULL);
+        if (nchars <= 0 || msg == NULL) {
+            cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                              "Unknown error: %d", error);
+        }
+        else {
+            /* FormatMessage() "helpfully" adds newline; get rid of it */
+            char *crpos = strchr(msg, '\r');
+            if (crpos != NULL) {
+                *crpos = '\0';
+            }
+
+            cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                              "%s", msg);
+        }
+
+        if (msg != NULL) {
+            LocalFree(msg);
+        }
+    }
+
+    return cb;
+}
+#endif /* RT_OS_WINDOWS */
 
 
@@ -300 +425 @@
         status = bind(s, psrc_sa, src_sa_len);
         if (status == SOCKET_ERROR) {
-            DPRINTF(("socket %d: bind: %s\n", s, strerror(errno)));
+            DPRINTF(("socket %d: bind: %R[sockerr]\n", s, SOCKERRNO()));
             closesocket(s);
             return INVALID_SOCKET;
@@ -307 +432 @@
 
     status = connect(s, pdst_sa, dst_sa_len);
-    if (status == SOCKET_ERROR && errno != EINPROGRESS) {
-        DPRINTF(("socket %d: connect: %s\n", s, strerror(errno)));
+    if (status == SOCKET_ERROR && SOCKERRNO() != EINPROGRESS) {
+        DPRINTF(("socket %d: connect: %R[sockerr]\n", s, SOCKERRNO()));
         closesocket(s);
         return INVALID_SOCKET;
@@ -421 +546 @@
         dyniov = (IOVEC *)malloc(clen * sizeof(*dyniov));
         if (dyniov == NULL) {
-            error = -errno;
+            error = -errno;     /* sic: not a socket error */
             goto out;
         }
@@ -447 +572 @@
 
     nsent = sendmsg(sock, &mh, 0);
-    if (nsent < 0) {
-        error = -errno;
-        DPRINTF(("%s: fd %d: sendmsg errno %d\n",
-                 __func__, sock, errno));
-    }
 #else
     rc = WSASendTo(sock, iov, (DWORD)clen, &nsent, 0,
                    name, (int)namelen, NULL, NULL);
     if (rc == SOCKET_ERROR) {
-         DPRINTF(("%s: fd %d: sendmsg errno %d\n",
-                  __func__, sock, WSAGetLastError()));
-         error = -WSAGetLastError();
-    }
-#endif
+        nsent = -1;
+    }
+#endif
+    if (nsent < 0) {
+        error = SOCKERRNO();
+        DPRINTF(("%s: socket %d: sendmsg: %R[sockerr]\n",
+                 __func__, sock, error));
+        error = -error;
+    }
 
   out:

trunk/src/VBox/NetworkServices/NAT/pxdns.c

@@ -716 +716 @@
 
     if (nsent < 0) {
-        DPRINTF2(("%s: send: errno %d\n", __func__, errno));
+        DPRINTF2(("%s: send: %R[sockerr]\n", __func__, SOCKERRNO()));
     }
     else {
@@ -782 +782 @@
                             SO_ERROR, (char *)&sockerr, &optlen);
         if (status < 0) {
-            DPRINTF(("%s: sock %d: SO_ERROR failed with errno %d\n",
-                     __func__, fd, errno));
+            DPRINTF(("%s: sock %d: SO_ERROR failed: %R[sockerr]\n",
+                     __func__, fd, SOCKERRNO()));
         }
         else {
-            DPRINTF(("%s: sock %d: errno %d\n",
+            DPRINTF(("%s: sock %d: %R[sockerr]\n",
                      __func__, fd, sockerr));
         }

trunk/src/VBox/NetworkServices/NAT/pxping.c

@@ -594 +594 @@
     if (status != 0) {
         int error = -status;
-        DPRINTF(("%s: sendto errno %d\n", __func__, error));
+        DPRINTF(("%s: sendto: %R[sockerr]\n", __func__, error));
 
 #ifdef DF_WITH_IP_HDRINCL
@@ -719 +719 @@
     if (status != 0) {
         int error = -status;
-        DPRINTF(("%s: sendto errno %d\n", __func__, error));
+        DPRINTF(("%s: sendto: %R[sockerr]\n", __func__, error));
 
         status = pbuf_header(p, iphlen); /* back to IP header */
@@ -1076 +1076 @@
                             SO_ERROR, (char *)&sockerr, &optlen);
         if (status < 0) {
-            DPRINTF(("%s: sock %d: SO_ERROR failed with errno %d\n",
-                     __func__, fd, errno));
+            DPRINTF(("%s: sock %d: SO_ERROR failed: %R[sockerr]\n",
+                     __func__, fd, SOCKERRNO()));
         }
         else {
-            DPRINTF(("%s: sock %d: errno %d\n",
+            DPRINTF(("%s: sock %d: %R[sockerr]\n",
                      __func__, fd, sockerr));
         }

trunk/src/VBox/NetworkServices/NAT/pxtcp.c

@@ -935 +935 @@
     struct pxtcp *pxtcp = (struct pxtcp *)ctx;
 
-    DPRINTF0(("%s: pxtcp %p, pcb %p, sock %d: errno %d\n",
+    DPRINTF0(("%s: pxtcp %p, pcb %p, sock %d: %R[sockerr]\n",
               __func__, (void *)pxtcp, (void *)pxtcp->pcb,
               pxtcp->sock, pxtcp->sockerr));
@@ -1006 +1006 @@
                                   &dst_addr, newpcb->local_port);
     if (sock == INVALID_SOCKET) {
-        sockerr = errno;
+        sockerr = SOCKERRNO();
         goto abort;
     }
@@ -1038 +1038 @@
 
   abort:
-    DPRINTF0(("%s: pcb %p, sock %d: errno %d\n",
+    DPRINTF0(("%s: pcb %p, sock %d: %R[sockerr]\n",
               __func__, (void *)newpcb, sock, sockerr));
     pxtcp_pcb_reject(ip_current_netif(), newpcb, p, sockerr);
@@ -1080 +1080 @@
 {
     struct pxtcp *pxtcp;
-    int sockerr;
 
     pxtcp = (struct pxtcp *)handler->data;
@@ -1092 +1091 @@
         }
         else {
-            socklen_t optlen = (socklen_t)sizeof(sockerr);
+            socklen_t optlen = (socklen_t)sizeof(pxtcp->sockerr);
             int status;
             SOCKET s;
@@ -1098 +1097 @@
             status = getsockopt(pxtcp->sock, SOL_SOCKET, SO_ERROR,
                                 (char *)&pxtcp->sockerr, &optlen);
-            if (status < 0) {       /* should not happen */
-                sockerr = errno;    /* ??? */
-                perror("connect: getsockopt");
+            if (status < 0) {   /* should not happen */
+                DPRINTF(("%s: sock %d: SO_ERROR failed: %R[sockerr]\n",
+                         __func__, fd, SOCKERRNO()));
             }
             else {
-#ifndef RT_OS_WINDOWS
-                errno = pxtcp->sockerr; /* to avoid strerror_r */
-#else
-                /* see winutils.h */
-                WSASetLastError(pxtcp->sockerr);
-#endif
-                perror("connect");
+                DPRINTF(("%s: sock %d: connect: %R[sockerr]\n",
+                         __func__, fd, pxtcp->sockerr));
             }
             s = pxtcp->sock;
@@ -1484 +1478 @@
         }
         else {
+            sockerr = SOCKERRNO();
+
             /*
              * Some errors are really not errors - if we get them,
@@ -1489 +1485 @@
              * them out here.
              */
-            if (errno != EWOULDBLOCK
-                && errno != EAGAIN
-                && errno != ENOBUFS
-                && errno != ENOMEM
-                && errno != EINTR)
+            if (sockerr == EWOULDBLOCK
+                || sockerr == EAGAIN
+                || sockerr == ENOBUFS
+                || sockerr == ENOMEM
+                || sockerr == EINTR)
             {
-                sockerr = errno;
+                sockerr = 0;
             }
             q = qs;
@@ -1640 +1636 @@
                             (char *)&sockerr, &optlen);
         if (status < 0) {       /* should not happen */
-            perror("getsockopt");
-            sockerr = ECONNRESET;
-        }
-
-        DPRINTF0(("sock %d: errno %d\n", fd, sockerr));
+            DPRINTF(("sock %d: SO_ERROR failed: %R[sockerr]\n",
+                     fd, SOCKERRNO()));
+        }
+        else {
+            DPRINTF0(("sock %d: %R[sockerr]\n", fd, sockerr));
+        }
         return pxtcp_schedule_reset(pxtcp);
     }
@@ -1660 +1657 @@
         if (nread < 0) {
             sockerr = -(int)nread;
-            DPRINTF0(("sock %d: errno %d\n", fd, sockerr));
+            DPRINTF0(("sock %d: %R[sockerr]\n", fd, sockerr));
             return pxtcp_schedule_reset(pxtcp);
         }
@@ -1732 +1729 @@
                 status = ioctlsocket(fd, FIONREAD, &unread);
                 if (status == SOCKET_ERROR) {
-                    perror("FIONREAD");
+                    DPRINTF2(("sock %d: FIONREAD: %R[sockerr]\n",
+                              fd, SOCKERRNO()));
                 }
                 else {
@@ -1855 +1853 @@
         return 1;
     }
-    else if (errno == EWOULDBLOCK || errno == EAGAIN || errno == EINTR) {
-        /* haven't read anything, just return */
-        DPRINTF2(("pxtcp %p: sock %d read cancelled\n",
-                  (void *)pxtcp, pxtcp->sock));
-        return 0;
-    }
     else {
-        /* socket error! */
-        DPRINTF0(("pxtcp %p: sock %d read errno %d\n",
-                  (void *)pxtcp, pxtcp->sock, errno));
-        return -errno;
+        int sockerr = SOCKERRNO();
+
+        if (sockerr == EWOULDBLOCK || sockerr == EAGAIN || sockerr == EINTR) {
+            /* haven't read anything, just return */
+            DPRINTF2(("pxtcp %p: sock %d read cancelled\n",
+                      (void *)pxtcp, pxtcp->sock));
+            return 0;
+        }
+        else {
+            /* socket error! */
+            DPRINTF0(("pxtcp %p: sock %d read: %R[sockerr]\n",
+                      (void *)pxtcp, pxtcp->sock, sockerr));
+            return -sockerr;
+        }
     }
 }
@@ -2265 +2267 @@
                 int sockerr = -(int)nread;
                 LWIP_UNUSED_ARG(sockerr);
-                DPRINTF0(("%s: sock %d: errno %d\n",
+                DPRINTF0(("%s: sock %d: %R[sockerr]\n",
                           __func__, pxtcp->sock, sockerr));
 

trunk/src/VBox/NetworkServices/NAT/pxudp.c

@@ -564 +564 @@
                             SO_ERROR, (char *)&sockerr, &optlen);
         if (status < 0) {
-            DPRINTF(("%s: sock %d: SO_ERROR failed with errno %d\n",
-                     __func__, pxudp->sock, errno));
+            DPRINTF(("%s: sock %d: SO_ERROR failed:%R[sockerr]\n",
+                     __func__, pxudp->sock, SOCKERRNO()));
         }
         else {
-            DPRINTF(("%s: sock %d: errno %d\n",
+            DPRINTF(("%s: sock %d: %R[sockerr]\n",
                      __func__, pxudp->sock, sockerr));
         }

trunk/src/VBox/NetworkServices/NAT/winutils.h

@@ -36 +36 @@
 #  define __func__ __FUNCTION__
 #  define __attribute__(x) /* IGNORE */
+
+#  define SOCKERRNO() (WSAGetLastError())
 
 /**
@@ -110 +112 @@
 #  define SOCKET_ERROR (-1)
 
+#  define SOCKERRNO() (errno)
+
 #  define closesocket(s) close(s)
 #  define ioctlsocket(s, req, arg) ioctl((s), (req), (arg))