Changeset 51584 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Jun 10, 2014 1:33:55 AM (11 years ago)

Author:

vboxsync

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

94289

Message:

NAT/Net: Hide checking for transient errors (EWOULDBLOCK &co) in an
inline function to prevent #ifdef sprawl.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• pxtcp.c (modified) (3 diffs)
• winutils.h (modified) (1 diff)

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

@@ -1485 +1485 @@
              * them out here.
              */
-            if (sockerr == EWOULDBLOCK
-                || sockerr == EAGAIN
-                || sockerr == ENOBUFS
-                || sockerr == ENOMEM
-                || sockerr == EINTR)
-            {
+            if (proxy_error_is_transient(sockerr)) {
                 sockerr = 0;
             }
@@ -1775 +1770 @@
  *
  * Returns zero if nothing was read, either because buffer is full, or
- * if no data is available (EAGAIN, EINTR &c).
+ * if no data is available (EWOULDBLOCK, EINTR &c).
  *
  * Returns -errno on real socket errors.
@@ -1856 +1851 @@
         int sockerr = SOCKERRNO();
 
-        if (sockerr == EWOULDBLOCK || sockerr == EAGAIN || sockerr == EINTR) {
+        if (proxy_error_is_transient(sockerr)) {
             /* haven't read anything, just return */
             DPRINTF2(("pxtcp %p: sock %d read cancelled\n",

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

@@ -165 +165 @@
 #  define IOVEC_SET_LEN(iov, l) ((iov).iov_len = (l))
 # endif
+
+DECLINLINE(int)
+proxy_error_is_transient(int error)
+{
+# if !defined(RT_OS_WINDOWS)
+    return error == EWOULDBLOCK
+#  if EAGAIN != EWOULDBLOCK
+        || error == EAGAIN
+#  endif
+        || error == EINTR
+        || error == ENOBUFS
+        || error == ENOMEM;
+# else
+    return error == WSAEWOULDBLOCK
+        || error == WSAEINTR    /* NB: we don't redefine EINTR above */
+        || error == WSAENOBUFS;
+# endif
+}
+
 #endif