Changeset 49347 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Oct 31, 2013 2:08:05 PM (11 years ago)

Author:

vboxsync

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

90356

Message:

NAT: Use RW critsect to protect the handler chain list against concurrent access

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_mod.c (modified) (1 diff)
• slirp.c (modified) (2 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -115 +115 @@
 #else /* VBOX */
 # define LIBALIAS_WLOCK_ASSERT() ;
-# define LIBALIAS_RLOCK() ;
-# define LIBALIAS_RUNLOCK() ;
-# define LIBALIAS_WLOCK() ;
-# define LIBALIAS_WUNLOCK() ;
+# define LIBALIAS_RLOCK() \
+    do { \
+        int rc = RTCritSectRwEnterShared(&pData->CsRwHandlerChain); \
+        AssertRC(rc); \
+    } while (0)
+# define LIBALIAS_RUNLOCK() \
+    do { \
+        int rc = RTCritSectRwLeaveShared(&pData->CsRwHandlerChain); \
+        AssertRC(rc); \
+    } while (0)
+# define LIBALIAS_WLOCK() \
+    do { \
+        int rc = RTCritSectRwEnterExcl(&pData->CsRwHandlerChain); \
+        AssertRC(rc); \
+    } while (0)
+# define LIBALIAS_WUNLOCK() \
+    do { \
+        int rc = RTCritSectRwLeaveExcl(&pData->CsRwHandlerChain); \
+        AssertRC(rc); \
+    } while (0)
 # define _handler_chain_init() ;
 # define _handler_chain_destroy() ;

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

@@ -309 +309 @@
     pData->netmask = u32Netmask;
 
+    rc = RTCritSectRwInit(&pData->CsRwHandlerChain);
+    if (RT_FAILURE(rc))
+        return rc;
+
     /* sockets & TCP defaults */
     pData->socket_rcv = 64 * _1K;
@@ -555 +559 @@
 #endif
 #endif
+    RTCritSectRwDelete(&pData->CsRwHandlerChain);
     RTMemFree(pData);
 }

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -286 +286 @@
     struct libalias *dns_alias;
     LIST_HEAD(handler_chain, proto_handler) handler_chain;
+    /** Critical R/W section to protect the handler chain list. */
+    RTCRITSECTRW CsRwHandlerChain;
     struct port_forward_rule_list port_forward_rule_head;
     int cRedirectionsActive;