Changeset 41174 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageHostonly.cpp (modified) (1 diff)
• Main/src-server/HostImpl.cpp (modified) (1 diff)
• Main/src-server/generic/NetIf-generic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp

@@ -57 +57 @@
 
     ComPtr<IHost> host;
-    CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
+    CHECK_ERROR_RET(a->virtualBox, COMGETTER(Host)(host.asOutParam()), 1);
 
     ComPtr<IHostNetworkInterface> hif;
     ComPtr<IProgress> progress;
 
-    CHECK_ERROR(host, CreateHostOnlyNetworkInterface (hif.asOutParam(), progress.asOutParam()));
+    CHECK_ERROR_RET(host, CreateHostOnlyNetworkInterface (hif.asOutParam(), progress.asOutParam()), 1);
 
     rc = showProgress(progress);

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -1136 +1136 @@
         ComAssertComRCRet(hrc, hrc);
 #endif
-        return S_OK;
-    }
-
-    return r == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;
+    }
+
+    return S_OK;
 #else
     return E_NOTIMPL;

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')