Changeset 16611 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 10, 2009 3:30:04 AM (16 years ago)

Author:

vboxsync

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

42577

Message:

NAT:Poll specific error handling was added

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (6 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -31 +31 @@
 
 #  define DO_CHECK_FD_SET(so, events, fdset) (FD_ISSET((so)->s, fdset))
+#  define DO_UNIX_CHECK_FD_SET(so, events, fdset )  0 /*specific for Unix API */
 # else /* !VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
 #  define DO_ENGAGE_EVENT1(so, fdset, label)            \
@@ -51 +52 @@
 #  define DO_POLL_EVENTS(rc, error, so, events, label) do {} while (0)
 
-#  define DO_CHECK_FD_SET(so, events, fdset) (  ((so)->so_poll_index != -1)                     \
-                                                && ((so)->so_poll_index <= ndfs)                \
-                                                && ((so)->s == polls[so->so_poll_index].fd)     \
+#  define DO_CHECK_FD_SET(so, events, fdset) (  ((so)->so_poll_index != -1)                                     \
+                                                && ((so)->so_poll_index <= ndfs)                                \
+                                                && ((so)->s == polls[so->so_poll_index].fd)                     \
                                                 && (polls[(so)->so_poll_index].revents & N_(fdset ## _poll)))
+#  define DO_UNIX_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset) /*specific for Unix API */
+#  define DO_WIN_CHECK_FD_SET(so, events, fdset ) 0 /* specific for Windows Winsock API */
 # endif /* VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
 
-#  define DO_WIN_CHECK_FD_SET(so, events, fdset ) 0 /* specific for Windows Winsock API */
 # ifndef RT_OS_WINDOWS
 
@@ -79 +81 @@
     } while (0)
 # else /* !RT_OS_WINDOWS */
+#  define DO_WIN_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset)
 #  define ICMP_ENGAGE_EVENT(so, fdset) do {} while(0)
 #endif /* RT_OS_WINDOWS */
@@ -130 +133 @@
     (((events).lNetworkEvents & fdset ## _win) && ((events).iErrorCode[fdset ## _win_bit] == 0))
 
-# define DO_WIN_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset)
+# define DO_UNIX_CHECK_FD_SET(so, events, fdset ) 1 /*specific for Unix API */
 
 #endif /* defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) */
@@ -154 +157 @@
 #define WIN_CHECK_FD_SET(so, events, set)           \
     (DO_WIN_CHECK_FD_SET((so), (events), set))
+#define UNIX_CHECK_FD_SET(so, events, set) \
+    (DO_UNIX_CHECK_FD_SET(so, events, set))
 
 /*
@@ -1075 +1080 @@
             } /* SS_ISFCONNECTING */
 #endif
+#ifndef RT_OS_WINDOWS
+            if (   UNIX_CHECK_FD_SET(so, NetworkEvents, rdhup)
+                && UNIX_CHECK_FD_SET(so, NetworkEvents, rderr))
+            {
+                if (so->so_state & SS_ISFCONNECTING)
+                {
+                    so->so_state = SS_NOFDREF;
+                    TCP_INPUT(pData, (struct mbuf *)NULL, sizeof(struct ip), so);
+                }
+                /* Here should be other error handlings */
+            }
+#endif
             LOOP_LABEL(tcp, so, so_next);
         }