Changeset 41174 in vbox for trunk/src/VBox/Main/src-server/generic

Timestamp:

May 4, 2012 5:02:07 PM (13 years ago)

Author:

vboxsync

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

77794

Message:

Main/Network: Pass error messages from VBoxNetAdpCtl all the way up to frontends.

File:

• trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp (modified) (1 diff)

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

@@ -166 +166 @@
             else
                 strcat(szAdpCtl, "add");
+            if (strlen(szAdpCtl) < RTPATH_MAX - sizeof(" 2>&1"))
+                strcat(szAdpCtl, " 2>&1");
             FILE *fp = popen(szAdpCtl, "r");
 
             if (fp)
             {
-                char szBuf[VBOXNET_MAX_SHORT_NAME];
+                char szBuf[128]; /* We are not interested in long error messages. */
                 if (fgets(szBuf, sizeof(szBuf), fp))
                 {
+                    if (!strncmp(VBOXNETADPCTL_NAME ":", szBuf, sizeof(VBOXNETADPCTL_NAME)))
+                    {
+                        progress->notifyComplete(E_FAIL,
+                                                 COM_IIDOF(IHostNetworkInterface),
+                                                 HostNetworkInterface::getStaticComponentName(),
+                                                 "%s", szBuf);
+                        return E_FAIL;
+                    }
                     char *pLast = szBuf + strlen(szBuf) - 1;
                     if (pLast >= szBuf && *pLast == '\n')