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

Timestamp:

Oct 22, 2009 12:34:22 PM (16 years ago)

Author:

vboxsync

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

53801

Message:

*,RTFileOpen: Fixing RTFileOpen flag misdesign: The deny, access and action flags are mandatory now.

File:

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

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

@@ -375 +375 @@
     {
         RTStrmPrintf(buff, sizeof(buff), "%s/RESOLV2", etc);
-        rc = RTFileOpen(&f, buff, RTFILE_O_READ);
+        rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     }
     if (RT_FAILURE(rc))
     {
         RTStrmPrintf(buff, sizeof(buff), "%s/RESOLV2", _PATH_ETC);
-        rc = RTFileOpen(&f, buff, RTFILE_O_READ);
+        rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     }
     if (RT_FAILURE(rc))
     {
         RTStrmPrintf(buff, sizeof(buff), "%s/resolv.conf", _PATH_ETC);
-        rc = RTFileOpen(&f, buff, RTFILE_O_READ);
+        rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     }
 #else
 # ifndef DEBUG_vvl
-    rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ);
+    rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
 # else
     char *home = getenv("HOME");
     RTStrPrintf(buff, sizeof(buff), "%s/resolv.conf", home);
-    rc = RTFileOpen(&f, buff, RTFILE_O_READ);
+    rc = RTFileOpen(&f, buff, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_SUCCESS(rc))
     {
@@ -400 +400 @@
     else
     {
-        rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ);
+        rc = RTFileOpen(&f, "/etc/resolv.conf", RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
         Log(("NAT: DNS we're using %s\n", buff));
     }
@@ -771 +771 @@
     if (!link_up)
         goto done;
-    
+
     /*
      * *_slowtimo needs calling if there are IP fragments
@@ -804 +804 @@
         if (pData->fmbuf_water_line == 1)
         {
-            if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
+            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
             {
                 pData->fmbuf_water_warn_sent = 0;
@@ -887 +887 @@
         if (pData->fmbuf_water_line == 1)
         {
-            if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
+            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
             {
                 pData->fmbuf_water_line = 0;
@@ -1027 +1027 @@
         if (pData->fmbuf_water_line == 1)
         {
-            if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
+            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
             {
                 pData->fmbuf_water_line = 0;
@@ -1324 +1324 @@
         if (pData->fmbuf_water_line == 1)
         {
-            if (mbuf_alloced < pData->mbuf_water_line_limit/2) 
+            if (mbuf_alloced < pData->mbuf_water_line_limit/2)
             {
                 pData->fmbuf_water_line = 0;
@@ -1549 +1549 @@
         return;
     }
-    eh = mtod(m, struct ethhdr *); 
+    eh = mtod(m, struct ethhdr *);
     proto = ntohs(eh->h_proto);
 #else
@@ -1621 +1621 @@
 #endif
 #if 1
-            if (   pData->fmbuf_water_line 
+            if (   pData->fmbuf_water_line
                 && pData->fmbuf_water_warn_sent == 0
                 && (curtime - pData->tsmbuf_water_warn_sent) > 500)
             {
-                icmp_error(pData, m, ICMP_SOURCEQUENCH, 0, 0, "Out of resources!!!"); 
+                icmp_error(pData, m, ICMP_SOURCEQUENCH, 0, 0, "Out of resources!!!");
                 pData->fmbuf_water_warn_sent = 1;
                 pData->tsmbuf_water_warn_sent = curtime;