Changeset 46345 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 31, 2013 1:42:37 PM (12 years ago)

Author:

vboxsync

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

86137

Message:

Main/NetIf: Fixed socket leaks introduced in r83847 (#6345, #6788)

Location:

trunk/src/VBox/Main/src-server

Files:

• generic/NetIf-generic.cpp (modified) (2 diffs)
• linux/NetIf-linux.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -26 +26 @@
 #include <net/if.h>
 #include <errno.h>
+#include <unistd.h>
 
 #if defined(RT_OS_SOLARIS)
@@ -389 +390 @@
     else
         *penmState = (Req.ifr_flags & IFF_UP) ? NETIF_S_UP : NETIF_S_DOWN;
+    close(sock);
     return VINF_SUCCESS;
 }

trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp

@@ -295 +295 @@
             if (Req.ifr_flags & IFF_UP)
             {
+                close(sock);
                 *puMbits = getInterfaceSpeed(pcszIfName);
                 return VINF_SUCCESS;
             }
     }
+    close(sock);
     *puMbits = 0;
     return VWRN_NOT_FOUND;