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

Timestamp:

Jun 1, 2010 12:53:39 PM (15 years ago)

Author:

vboxsync

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

62226

Message:

slirp.c/activate_port_forwarding: Must used LIST_FOREACH_SAFE when removing the current element during a list enumeration.

File:

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

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

@@ -473 +473 @@
     {
         struct dns_entry *pDns = NULL;
-        if (   cNameserversFound == 4 
+        if (   cNameserversFound == 4
             && fWarnTooManyDnsServers == 0
             && sscanf(buff, "nameserver%*[ \t]%255s", buff2) == 1)
@@ -480 +480 @@
             LogRel(("NAT: too many nameservers registered.\n"));
         }
-        if (   sscanf(buff, "nameserver%*[ \t]%255s", buff2) == 1 
+        if (   sscanf(buff, "nameserver%*[ \t]%255s", buff2) == 1
             && cNameserversFound < 4) /* Unix doesn't accept more than 4 name servers*/
         {
@@ -1721 +1721 @@
 static void activate_port_forwarding(PNATState pData, const uint8_t *h_source)
 {
-    struct port_forward_rule *rule;
+    struct port_forward_rule *rule, *tmp;
 
     /* check mac here */
-    LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
+    LIST_FOREACH_SAFE(rule, &pData->port_forward_rule_head, list, tmp)
     {
         struct socket *so;
@@ -1790 +1790 @@
         lib = LibAliasInit(pData, NULL);
         flags = LibAliasSetMode(lib, 0, 0);
-        flags |= pData->i32AliasMode; 
+        flags |= pData->i32AliasMode;
         flags |= PKT_ALIAS_REVERSE; /* set reverse  */
         flags = LibAliasSetMode(lib, flags, ~0);