Changeset 84645 in vbox

Timestamp:

Jun 2, 2020 5:21:10 PM (5 years ago)

Author:

vboxsync

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

138396

Message:

OCI: (bugref:9469) partial proxy implementation.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (1 diff)
• Main/include/UnattendedImpl.h (modified) (2 diffs)
• Main/src-server/UnattendedImpl.cpp (modified) (3 diffs)
• Main/src-server/UnattendedScript.cpp (modified) (2 diffs)

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

@@ -2296 +2296 @@
     if (aProxy.isNotEmpty())
     {
-        hrc = unattended->COMSETTER(ExtraInstallKernelParameters)(BstrFmt(" ks=cdrom:/ks.cfg proxy=\"%ls\"", aProxy.raw()).raw());
+        hrc = unattended->COMSETTER(Proxy)(aProxy.raw());
         if (errorOccured(hrc, "Failed to set post install script template for the unattended installer."))
             return hrc;

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

@@ -56 +56 @@
     Utf8Str const &i_getFullUserName() const;
     Utf8Str const &i_getProductKey() const;
+    Utf8Str const &i_getProxy() const;
     Utf8Str const &i_getAdditionsIsoPath() const;
     bool           i_getInstallGuestAdditions() const;
@@ -122 +123 @@
     RTCList<RTCString, RTCString *> mDetectedOSLanguages; /**< (only relevant for windows at the moment) */
     Utf8Str         mStrDetectedOSHints;
+    Utf8Str         mStrProxy;
     /** @} */
 

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

@@ -2213 +2213 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    aProxy = ""; /// @todo turn schema map into string or something.
+    aProxy = mStrProxy; /// @todo turn schema map into string or something.
     return S_OK;
 }
@@ -2228 +2228 @@
     {
         /* clear proxy config */
+        mStrProxy = "";
     }
     else
     {
-        /* Parse and set proxy config into a schema map or something along those lines. */
-        return E_NOTIMPL;
+        /** @todo Parse and set proxy config into a schema map or something along those lines. */
+        // return E_NOTIMPL;
+        mStrProxy = aProxy;
     }
     return S_OK;
@@ -2545 +2547 @@
 }
 
+Utf8Str const &Unattended::i_getProxy() const
+{
+    Assert(isReadLockedOnCurrentThread());
+    return mStrProxy;
+}
+
 Utf8Str const &Unattended::i_getAdditionsIsoPath() const
 {

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

@@ -418 +418 @@
     else if (IS_PLACEHOLDER_MATCH("HOSTNAME_DOMAIN"))
         rValue.assign(mpUnattended->i_getHostname(), mpUnattended->i_getHostname().find(".") + 1);
+    else if (IS_PLACEHOLDER_MATCH("PROXY"))
+        rValue = mpUnattended->i_getProxy();
     else
     {
@@ -469 +471 @@
     else if (IS_PLACEHOLDER_MATCH("IS_NOT_RTC_USING_UTC"))
         *pfOutputting = !mpUnattended->i_isRtcUsingUtc();
+    else if (IS_PLACEHOLDER_MATCH("HAS_PROXY"))
+        *pfOutputting = mpUnattended->i_getProxy().isNotEmpty();
     else
         return mpSetError->setErrorBoth(E_FAIL, VERR_NOT_FOUND, mpSetError->tr("Unknown conditional placeholder '%.*s'"),