Changeset 61610 in vbox

Timestamp:

Jun 9, 2016 10:22:42 AM (9 years ago)

Author:

vboxsync

Message:

Main: properly inform the user if the VRDE server cannot be started at runtime

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -336 +336 @@
 
     void notifyNatDnsChange(PUVM pUVM, const char *pszDevice, ULONG ulInstanceMax);
+    Utf8Str VRDPServerErrorToMsg(int vrc);
 
     /**

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -5173 +5173 @@
 
 /**
+ * Check the return code of mConsoleVRDPServer->Launch. LogRel() the error reason and
+ * return an error message appropriate for setError().
+ */
+Utf8Str Console::VRDPServerErrorToMsg(int vrc)
+{
+    Utf8Str errMsg;
+    if (vrc == VERR_NET_ADDRESS_IN_USE)
+    {
+        Bstr bstr;
+        mVRDEServer->GetVRDEProperty(Bstr("TCP/Ports").raw(), bstr.asOutParam());
+        errMsg = Utf8StrFmt(tr("VirtualBox Remote Desktop Extension server can't bind to the port(s): %s"),
+                                Utf8Str(bstr).c_str());
+        LogRel(("VRDE: Warning: failed to launch VRDE server (%Rrc): '%s'\n", vrc, errMsg.c_str()));
+    }
+    else if (vrc == VINF_NOT_SUPPORTED)
+    {
+        /* This means that the VRDE is not installed. */
+        LogRel(("VRDE: VirtualBox Remote Desktop Extension is not available.\n"));
+        errMsg = Utf8Str("VirtualBox Remote Desktop Extension is not available");
+    }
+    else if (RT_FAILURE(vrc))
+    {
+        /* Fail if the server is installed but can't start. */
+        switch (vrc)
+        {
+            case VERR_FILE_NOT_FOUND:
+                errMsg = Utf8StrFmt(tr("Could not find the VirtualBox Remote Desktop Extension library."));
+                break;
+            default:
+                errMsg = Utf8StrFmt(tr("Failed to launch the Remote Desktop Extension server (%Rrc)"), vrc);
+                break;
+        }
+        LogRel(("VRDE: Failed: (%Rrc): %s\n", vrc, errMsg.c_str()));
+    }
+
+    return errMsg;
+}
+
+/**
  * Called by IInternalSessionControl::OnVRDEServerChange().
  *
@@ -5225 +5264 @@
 
                             int vrc = mConsoleVRDPServer->Launch();
-                            if (RT_FAILURE(vrc))
-                                rc = setError(E_FAIL,
-                                              tr("Could not start the VRDP server (%Rrc)"), vrc);
+                            Utf8Str errMsg = VRDPServerErrorToMsg(vrc);
+                            if (vrc != VINF_SUCCESS)
+                                rc = setError(E_FAIL, errMsg.c_str());
                             else
                                 mConsoleVRDPServer->EnableConnections();
@@ -5254 +5293 @@
     }
 
+    LogRel(("RETURN %Rhrc\n", rc));
     return rc;
 }
@@ -9558 +9598 @@
         alock.acquire();
 
-        if (vrc == VERR_NET_ADDRESS_IN_USE)
-        {
-            Utf8Str errMsg;
-            Bstr bstr;
-            pConsole->mVRDEServer->GetVRDEProperty(Bstr("TCP/Ports").raw(), bstr.asOutParam());
-            Utf8Str ports = bstr;
-            errMsg = Utf8StrFmt(tr("VirtualBox Remote Desktop Extension server can't bind to the port: %s"),
-                                ports.c_str());
-            LogRel(("VRDE: Warning: failed to launch VRDE server (%Rrc): '%s'\n",
-                    vrc, errMsg.c_str()));
-        }
-        else if (vrc == VINF_NOT_SUPPORTED)
-        {
-            /* This means that the VRDE is not installed. */
-            LogRel(("VRDE: VirtualBox Remote Desktop Extension is not available.\n"));
-        }
-        else if (RT_FAILURE(vrc))
-        {
-            /* Fail, if the server is installed but can't start. */
-            Utf8Str errMsg;
-            switch (vrc)
-            {
-                case VERR_FILE_NOT_FOUND:
-                {
-                    /* VRDE library file is missing. */
-                    errMsg = Utf8StrFmt(tr("Could not find the VirtualBox Remote Desktop Extension library."));
-                    break;
-                }
-                default:
-                    errMsg = Utf8StrFmt(tr("Failed to launch Remote Desktop Extension server (%Rrc)"),
-                                        vrc);
-            }
-            LogRel(("VRDE: Failed: (%Rrc), error message: '%s'\n",
-                     vrc, errMsg.c_str()));
+        Utf8Str errMsg = pConsole->VRDPServerErrorToMsg(vrc);
+        if (   RT_FAILURE(vrc)
+            && vrc != VERR_NET_ADDRESS_IN_USE) /* this is not fatal */
             throw i_setErrorStatic(E_FAIL, errMsg.c_str());
-        }
 
         ComPtr<IMachine> pMachine = pConsole->i_machine();
@@ -9855 +9863 @@
                  */
                 AssertMsgFailed(("Missing error message during powerup for status code %Rrc\n", vrc));
-                task->mErrorMsg = Utf8StrFmt(tr("Failed to start VM execution (%Rrc)"),
-                                             vrc);
+                task->mErrorMsg = Utf8StrFmt(tr("Failed to start VM execution (%Rrc)"), vrc);
             }