Changeset 94981 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

May 10, 2022 2:48:36 PM (3 years ago)

Author:

vboxsync

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

151394

Message:

Main/Update check Removed update agent-specific proxy settings. ​bugref:7983

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageUpdateCheck.cpp (modified) (8 diffs)

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

@@ -42 +42 @@
 
 
-/**
- * Returns the proxy mode as a string.
- *
- * @returns Proxy mode as string.
- * @param   enmMode             Proxy mode to return as string.
- */
-static const char *proxyModeToStr(ProxyMode_T enmMode)
-{
-    switch (enmMode)
-    {
-        case ProxyMode_System:  return "System";
-        case ProxyMode_Manual:  return "Manual";
-        case ProxyMode_NoProxy: return "None";
-        default:                break;
-    }
-
-    AssertFailed();
-    return "<Invalid>";
-}
-
 static RTEXITCODE doUpdateList(int argc, char **argv, ComPtr<IUpdateAgent> pUpdateAgent)
 {
@@ -167 +147 @@
         RTPrintf(UpdateCheck::tr("Repository:             %ls\n"), bstrVal.raw());
 
-    ProxyMode_T enmProxyMode;
-    CHECK_ERROR2I_RET(pUpdateAgent, COMGETTER(ProxyMode)(&enmProxyMode), RTEXITCODE_FAILURE);
-    if (fMachineReadable)
-        outputMachineReadableString("proxy-mode", proxyModeToStr(enmProxyMode));
-    else
-        RTPrintf(UpdateCheck::tr("Proxy mode:             %s\n"), proxyModeToStr(enmProxyMode));
-    CHECK_ERROR2I_RET(pUpdateAgent, COMGETTER(ProxyURL)(bstrVal.asOutParam()), RTEXITCODE_FAILURE);
-    if (fMachineReadable)
-        outputMachineReadableString("proxy-url", &bstrVal);
-    else
-        RTPrintf(UpdateCheck::tr("Proxy URL:              %ls\n"), bstrVal.raw());
-
     return RTEXITCODE_SUCCESS;
 }
@@ -187 +155 @@
      * Parse options.
      */
-    enum GETOPTDEF_UPDATEMODIFY
-    {
-        GETOPTDEF_UPDATEMODIFY_PROXY_MODE = 2000,
-        GETOPTDEF_UPDATEMODIFY_PROXY_URL
-    };
     static const RTGETOPTDEF s_aOptions[] =
     {
@@ -198 +161 @@
         { "--channel",       'c',                                   RTGETOPT_REQ_STRING  },
         { "--frequency",     'f',                                   RTGETOPT_REQ_UINT32  },
-        { "--proxy-mode",    GETOPTDEF_UPDATEMODIFY_PROXY_MODE,     RTGETOPT_REQ_STRING  },
-        { "--proxy-url",     GETOPTDEF_UPDATEMODIFY_PROXY_URL,      RTGETOPT_REQ_STRING  }
     };
 
@@ -209 +170 @@
     UpdateChannel_T             enmChannel     = (UpdateChannel_T)-1;
     uint32_t                    cFrequencyDays = 0;
-    ProxyMode_T                 enmProxyMode   = (ProxyMode_T)-1; /* Default  if not modified, or ProxyMode_T values. */
-    Bstr                        strProxyURL    = "unmodified";    /* Default if not modified, so that empty values also can be set (clears proxy). */
 
     int c;
@@ -244 +203 @@
                 break;
 
-            case GETOPTDEF_UPDATEMODIFY_PROXY_MODE:
-                if (!RTStrICmp(ValueUnion.psz, "system"))
-                    enmProxyMode = ProxyMode_System;
-                else if (   !RTStrICmp(ValueUnion.psz, "none")
-                         || !RTStrICmp(ValueUnion.psz, "disabled")
-                         || !RTStrICmp(ValueUnion.psz, "off"))
-                    enmProxyMode = ProxyMode_NoProxy;
-                else if (!RTStrICmp(ValueUnion.psz, "manual"))
-                    enmProxyMode = ProxyMode_Manual;
-                else
-                    return errorArgument(UpdateCheck::tr("Invalid proxy mode specified: '%s'"), ValueUnion.psz);
-                break;
-
-            case GETOPTDEF_UPDATEMODIFY_PROXY_URL:
-                strProxyURL = ValueUnion.psz;
-                break;
-
             /** @todo Add more options like repo handling etc. */
 
@@ -270 +212 @@
     if (   fEnabled       == -1
         && enmChannel     == (UpdateChannel_T)-1
-        && cFrequencyDays == 0
-        && enmProxyMode   == (ProxyMode_T)-1
-        && strProxyURL    == "unmodified")
+        && cFrequencyDays == 0)
         return errorSyntax(UpdateCheck::tr("No change requested"));
 
@@ -289 +229 @@
     {
         CHECK_ERROR2I_RET(pUpdateAgent, COMSETTER(CheckFrequency)(cFrequencyDays * RT_SEC_1DAY), RTEXITCODE_FAILURE);
-    }
-    if (enmProxyMode != (ProxyMode_T)-1)
-    {
-        CHECK_ERROR2I_RET(pUpdateAgent, COMSETTER(ProxyMode)(enmProxyMode), RTEXITCODE_FAILURE);
-    }
-    if (strProxyURL.compare("unmodified") != 0)
-    {
-        CHECK_ERROR2I_RET(pUpdateAgent, COMSETTER(ProxyURL)(strProxyURL.raw()), RTEXITCODE_FAILURE);
     }
     return RTEXITCODE_SUCCESS;