Changeset 98297 in vbox for trunk/src/VBox/Main/webservice
- Timestamp:
- Jan 25, 2023 1:59:25 AM (2 years ago)
- svn:sync-xref-src-repo-rev:
- 155502
- Location:
- trunk/src/VBox/Main/webservice
- Files:
-
- 4 edited
-
split-soapC.cpp (modified) (1 diff)
-
vboxweb.cpp (modified) (40 diffs)
-
vboxweb.h (modified) (4 diffs)
-
webtest.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/webservice/split-soapC.cpp
r98103 r98297 44 44 if (pFileIn) 45 45 { 46 int rc2 = fseek(pFileIn, 0, SEEK_END);46 int iRc2 = fseek(pFileIn, 0, SEEK_END); 47 47 long cbFileIn = ftell(pFileIn); 48 int rc3 = fseek(pFileIn, 0, SEEK_SET);49 if ( rc3 != -1 && rc2 != -1 && cbFileIn >= 0)48 int iRc3 = fseek(pFileIn, 0, SEEK_SET); 49 if (iRc3 != -1 && iRc2 != -1 && cbFileIn >= 0) 50 50 { 51 51 char *pBuffer = (char *)malloc(cbFileIn + 1); -
trunk/src/VBox/Main/webservice/vboxweb.cpp
r98103 r98297 386 386 m_soap->max_keep_alive = g_cMaxKeepAlive; 387 387 388 int rc = RTThreadCreate(&m_pThread,389 fntWrapper,390 this, // pvUser391 0, // cbStack392 RTTHREADTYPE_MAIN_HEAVY_WORKER,393 0,394 m_strThread.c_str());395 if (RT_FAILURE( rc))396 { 397 RTMsgError("Cannot start worker thread %d: %Rrc\n", u, rc);388 int vrc = RTThreadCreate(&m_pThread, 389 fntWrapper, 390 this, // pvUser 391 0, // cbStack 392 RTTHREADTYPE_MAIN_HEAVY_WORKER, 393 0, 394 m_strThread.c_str()); 395 if (RT_FAILURE(vrc)) 396 { 397 RTMsgError("Cannot start worker thread %d: %Rrc\n", u, vrc); 398 398 exit(1); 399 399 } … … 837 837 for (int i = 0; i < num_locks; i++) 838 838 { 839 int rc = RTCritSectInitEx(&g_pSSLMutexes[i], RTCRITSECT_FLAGS_NO_LOCK_VAL,840 NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE,841 "openssl-%d", i);842 if (RT_FAILURE( rc))839 int vrc = RTCritSectInitEx(&g_pSSLMutexes[i], RTCRITSECT_FLAGS_NO_LOCK_VAL, 840 NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, 841 "openssl-%d", i); 842 if (RT_FAILURE(vrc)) 843 843 { 844 844 for ( ; i >= 0; i--) … … 1076 1076 { 1077 1077 // initialize runtime 1078 int rc = RTR3InitExe(argc, &argv, 0);1079 if (RT_FAILURE( rc))1080 return RTMsgInitFailure( rc);1078 int vrc = RTR3InitExe(argc, &argv, 0); 1079 if (RT_FAILURE(vrc)) 1080 return RTMsgInitFailure(vrc); 1081 1081 #ifdef RT_OS_WINDOWS 1082 1082 ATL::CComModule _Module; /* Required internally by ATL (constructor records instance in global variable). */ … … 1133 1133 else 1134 1134 { 1135 intvrc = RTStrmOpen(ValueUnion.psz, "r", &StrmIn);1135 vrc = RTStrmOpen(ValueUnion.psz, "r", &StrmIn); 1136 1136 if (RT_FAILURE(vrc)) 1137 1137 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open password file (%s, %Rrc)", ValueUnion.psz, vrc); 1138 1138 } 1139 1139 char szPasswd[512]; 1140 intvrc = RTStrmGetLine(StrmIn, szPasswd, sizeof(szPasswd));1140 vrc = RTStrmGetLine(StrmIn, szPasswd, sizeof(szPasswd)); 1141 1141 if (RT_FAILURE(vrc)) 1142 1142 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to read password (%s, %Rrc)", ValueUnion.psz, vrc); … … 1223 1223 1224 1224 default: 1225 rc = RTGetOptPrintError(c, &ValueUnion); 1226 return rc; 1225 return RTGetOptPrintError(c, &ValueUnion); 1227 1226 } 1228 1227 } … … 1230 1229 /* create release logger, to stdout */ 1231 1230 RTERRINFOSTATIC ErrInfo; 1232 rc = com::VBoxLogRelCreate("web service", g_fDaemonize ? NULL : pszLogFile,1233 RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,1234 "all", "VBOXWEBSRV_RELEASE_LOG",1235 RTLOGDEST_STDOUT, UINT32_MAX /* cMaxEntriesPerGroup */,1236 g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize,1237 RTErrInfoInitStatic(&ErrInfo));1238 if (RT_FAILURE( rc))1239 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, rc);1231 vrc = com::VBoxLogRelCreate("web service", g_fDaemonize ? NULL : pszLogFile, 1232 RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG, 1233 "all", "VBOXWEBSRV_RELEASE_LOG", 1234 RTLOGDEST_STDOUT, UINT32_MAX /* cMaxEntriesPerGroup */, 1235 g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize, 1236 RTErrInfoInitStatic(&ErrInfo)); 1237 if (RT_FAILURE(vrc)) 1238 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, vrc); 1240 1239 1241 1240 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) … … 1247 1246 if (!pszLogFile || !*pszLogFile) 1248 1247 { 1249 rc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile));1250 if (RT_FAILURE( rc))1251 return RTMsgErrorExit(RTEXITCODE_FAILURE, "could not get base directory for logging: %Rrc", rc);1252 rc = RTPathAppend(szLogFile, sizeof(szLogFile), "vboxwebsrv.log");1253 if (RT_FAILURE( rc))1254 return RTMsgErrorExit(RTEXITCODE_FAILURE, "could not construct logging path: %Rrc", rc);1248 vrc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile)); 1249 if (RT_FAILURE(vrc)) 1250 return RTMsgErrorExit(RTEXITCODE_FAILURE, "could not get base directory for logging: %Rrc", vrc); 1251 vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "vboxwebsrv.log"); 1252 if (RT_FAILURE(vrc)) 1253 return RTMsgErrorExit(RTEXITCODE_FAILURE, "could not construct logging path: %Rrc", vrc); 1255 1254 pszLogFile = szLogFile; 1256 1255 } 1257 1256 1258 rc = RTProcDaemonizeUsingFork(false /* fNoChDir */, false /* fNoClose */, pszPidFile);1259 if (RT_FAILURE( rc))1260 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to daemonize, rc=%Rrc. exiting.",rc);1257 vrc = RTProcDaemonizeUsingFork(false /* fNoChDir */, false /* fNoClose */, pszPidFile); 1258 if (RT_FAILURE(vrc)) 1259 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to daemonize, vrc=%Rrc. exiting.", vrc); 1261 1260 1262 1261 /* create release logger, to file */ 1263 rc = com::VBoxLogRelCreate("web service", pszLogFile,1264 RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,1265 "all", "VBOXWEBSRV_RELEASE_LOG",1266 RTLOGDEST_FILE, UINT32_MAX /* cMaxEntriesPerGroup */,1267 g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize,1268 RTErrInfoInitStatic(&ErrInfo));1269 if (RT_FAILURE( rc))1270 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, rc);1262 vrc = com::VBoxLogRelCreate("web service", pszLogFile, 1263 RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG, 1264 "all", "VBOXWEBSRV_RELEASE_LOG", 1265 RTLOGDEST_FILE, UINT32_MAX /* cMaxEntriesPerGroup */, 1266 g_cHistory, g_uHistoryFileTime, g_uHistoryFileSize, 1267 RTErrInfoInitStatic(&ErrInfo)); 1268 if (RT_FAILURE(vrc)) 1269 return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", ErrInfo.Core.pszMsg, vrc); 1271 1270 } 1272 1271 #endif … … 1310 1309 if (FAILED(hrc)) 1311 1310 { 1312 RTMsgError("Failed to get VirtualBox object ( rc=%Rhrc)!", hrc);1311 RTMsgError("Failed to get VirtualBox object (hrc=%Rhrc)!", hrc); 1313 1312 return RTEXITCODE_FAILURE; 1314 1313 } … … 1345 1344 // SOAP queue pumper thread 1346 1345 RTTHREAD threadQPumper; 1347 rc = RTThreadCreate(&threadQPumper,1348 fntQPumper,1349 NULL, // pvUser1350 0, // cbStack (default)1351 RTTHREADTYPE_MAIN_WORKER,1352 RTTHREADFLAGS_WAITABLE,1353 "SQPmp");1354 if (RT_FAILURE( rc))1355 return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start SOAP queue pumper thread: %Rrc", rc);1346 vrc = RTThreadCreate(&threadQPumper, 1347 fntQPumper, 1348 NULL, // pvUser 1349 0, // cbStack (default) 1350 RTTHREADTYPE_MAIN_WORKER, 1351 RTTHREADFLAGS_WAITABLE, 1352 "SQPmp"); 1353 if (RT_FAILURE(vrc)) 1354 return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start SOAP queue pumper thread: %Rrc", vrc); 1356 1355 1357 1356 // watchdog thread … … 1360 1359 { 1361 1360 // start our watchdog thread 1362 rc = RTThreadCreate(&threadWatchdog,1363 fntWatchdog,1364 NULL,1365 0,1366 RTTHREADTYPE_MAIN_WORKER,1367 RTTHREADFLAGS_WAITABLE,1368 "Watchdog");1369 if (RT_FAILURE( rc))1370 return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start watchdog thread: %Rrc", rc);1361 vrc = RTThreadCreate(&threadWatchdog, 1362 fntWatchdog, 1363 NULL, 1364 0, 1365 RTTHREADTYPE_MAIN_WORKER, 1366 RTTHREADFLAGS_WAITABLE, 1367 "Watchdog"); 1368 if (RT_FAILURE(vrc)) 1369 return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start watchdog thread: %Rrc", vrc); 1371 1370 } 1372 1371 … … 1374 1373 if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)websrvSignalHandler, TRUE /* Add handler */)) 1375 1374 { 1376 rc = RTErrConvertFromWin32(GetLastError());1377 RTMsgError("Unable to install console control handler, rc=%Rrc\n",rc);1375 vrc = RTErrConvertFromWin32(GetLastError()); 1376 RTMsgError("Unable to install console control handler, vrc=%Rrc\n", vrc); 1378 1377 } 1379 1378 #else … … 1390 1389 // we have to process main event queue 1391 1390 WEBDEBUG(("Pumping COM event queue\n")); 1392 rc = pQ->processEventQueue(RT_INDEFINITE_WAIT);1393 if (RT_FAILURE( rc))1394 RTMsgError("processEventQueue -> %Rrc", rc);1391 vrc = pQ->processEventQueue(RT_INDEFINITE_WAIT); 1392 if (RT_FAILURE(vrc)) 1393 RTMsgError("processEventQueue -> %Rrc", vrc); 1395 1394 } 1396 1395 … … 1400 1399 if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)websrvSignalHandler, FALSE /* Remove handler */)) 1401 1400 { 1402 rc = RTErrConvertFromWin32(GetLastError());1403 RTMsgError("Unable to remove console control handler, rc=%Rrc\n",rc);1401 vrc = RTErrConvertFromWin32(GetLastError()); 1402 RTMsgError("Unable to remove console control handler, vrc=%Rrc\n", vrc); 1404 1403 } 1405 1404 #else … … 1654 1653 1655 1654 aStr.reserve(cchOut+1); 1656 int rc = RTBase64Encode(sfaData.raw(), cbData, 1657 aStr.mutableRaw(), aStr.capacity(), 1658 NULL); 1659 AssertRC(rc); 1655 int vrc = RTBase64Encode(sfaData.raw(), cbData, aStr.mutableRaw(), aStr.capacity(), NULL); 1656 AssertRC(vrc); 1660 1657 aStr.jolt(); 1661 1658 … … 1676 1673 1677 1674 com::SafeArray<BYTE> result(cbOut); 1678 int rc = RTBase64Decode(pszStr, result.raw(), cbOut, NULL, NULL);1679 if (FAILED( rc))1680 { 1681 LogRel(("String Decoding Failed. Error code: %Rrc\n", rc));1675 int vrc = RTBase64Decode(pszStr, result.raw(), cbOut, NULL, NULL); 1676 if (FAILED(vrc)) 1677 { 1678 LogRel(("String Decoding Failed. Error code: %Rrc\n", vrc)); 1682 1679 RaiseSoapRuntimeFault(soap, idThis, pszMethodName, E_INVALIDARG, pObj, iid); 1683 1680 } … … 1723 1720 1724 1721 // compose descriptive message 1725 com::Utf8Str str = com::Utf8StrFmt("VirtualBox error:rc=%#lx", apirc);1722 com::Utf8StrFmt str("VirtualBox error: apirc=%#lx", apirc); 1726 1723 if (info.isFullAvailable() || info.isBasicAvailable()) 1727 1724 { … … 1875 1872 IVirtualBox **ppVirtualBox) 1876 1873 { 1877 int rc = VERR_WEB_NOT_AUTHENTICATED;1874 int vrc = VERR_WEB_NOT_AUTHENTICATED; 1878 1875 ComPtr<IVirtualBox> pVirtualBox; 1879 1876 { … … 1882 1879 } 1883 1880 if (pVirtualBox.isNull()) 1884 return rc;1881 return vrc; 1885 1882 pVirtualBox.queryInterfaceTo(ppVirtualBox); 1886 1883 … … 1913 1910 { 1914 1911 if (RTPathHavePath(filename.c_str())) 1915 rc = RTLdrLoad(filename.c_str(), &hlibAuth);1912 vrc = RTLdrLoad(filename.c_str(), &hlibAuth); 1916 1913 else 1917 rc = RTLdrLoadAppPriv(filename.c_str(), &hlibAuth); 1918 1919 if (RT_FAILURE(rc)) 1914 vrc = RTLdrLoadAppPriv(filename.c_str(), &hlibAuth); 1915 if (RT_FAILURE(vrc)) 1920 1916 { 1921 1917 WEBDEBUG(("%s() Failed to load external authentication library '%s'. Error code: %Rrc\n", 1922 __FUNCTION__, filename.c_str(), rc));1918 __FUNCTION__, filename.c_str(), vrc)); 1923 1919 break; 1924 1920 } 1925 1921 1926 if (RT_FAILURE( rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY3_NAME, (void**)&pfnAuthEntry3)))1922 if (RT_FAILURE(vrc = RTLdrGetSymbol(hlibAuth, AUTHENTRY3_NAME, (void**)&pfnAuthEntry3))) 1927 1923 { 1928 1924 WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", 1929 __FUNCTION__, AUTHENTRY3_NAME, rc));1930 1931 if (RT_FAILURE( rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY2_NAME, (void**)&pfnAuthEntry2)))1925 __FUNCTION__, AUTHENTRY3_NAME, vrc)); 1926 1927 if (RT_FAILURE(vrc = RTLdrGetSymbol(hlibAuth, AUTHENTRY2_NAME, (void**)&pfnAuthEntry2))) 1932 1928 { 1933 1929 WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", 1934 __FUNCTION__, AUTHENTRY2_NAME, rc));1935 1936 if (RT_FAILURE( rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY_NAME, (void**)&pfnAuthEntry)))1930 __FUNCTION__, AUTHENTRY2_NAME, vrc)); 1931 1932 if (RT_FAILURE(vrc = RTLdrGetSymbol(hlibAuth, AUTHENTRY_NAME, (void**)&pfnAuthEntry))) 1937 1933 WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", 1938 __FUNCTION__, AUTHENTRY_NAME, rc));1934 __FUNCTION__, AUTHENTRY_NAME, vrc)); 1939 1935 } 1940 1936 } … … 1950 1946 { 1951 1947 LogRel(("Access denied, excessive username length: %zu\n", strlen(pcszUsername))); 1952 rc = VERR_WEB_NOT_AUTHENTICATED;1948 vrc = VERR_WEB_NOT_AUTHENTICATED; 1953 1949 } 1954 1950 else if (strlen(pcszPassword) >= _1K) 1955 1951 { 1956 1952 LogRel(("Access denied, excessive password length: %zu\n", strlen(pcszPassword))); 1957 rc = VERR_WEB_NOT_AUTHENTICATED;1953 vrc = VERR_WEB_NOT_AUTHENTICATED; 1958 1954 } 1959 1955 else if (pfnAuthEntry3 || pfnAuthEntry2 || pfnAuthEntry) … … 1981 1977 { 1982 1978 LogRel(("Access for user '%s' granted\n", pcszUsername)); 1983 rc = VINF_SUCCESS;1979 vrc = VINF_SUCCESS; 1984 1980 } 1985 1981 else … … 1987 1983 if (result == AuthResultAccessDenied) 1988 1984 LogRel(("Access for user '%s' denied\n", pcszUsername)); 1989 rc = VERR_WEB_NOT_AUTHENTICATED;1985 vrc = VERR_WEB_NOT_AUTHENTICATED; 1990 1986 } 1991 1987 } … … 1994 1990 // fAuthLibLoaded = true but all pointers are NULL: 1995 1991 // The authlib was "null" and auth was disabled 1996 rc = VINF_SUCCESS;1992 vrc = VINF_SUCCESS; 1997 1993 } 1998 1994 else 1999 1995 { 2000 1996 WEBDEBUG(("Could not resolve AuthEntry, VRDPAuth2 or VRDPAuth entry point")); 2001 rc = VERR_WEB_NOT_AUTHENTICATED;1997 vrc = VERR_WEB_NOT_AUTHENTICATED; 2002 1998 } 2003 1999 2004 2000 lock.release(); 2005 2001 2006 return rc;2002 return vrc; 2007 2003 } 2008 2004 … … 2232 2228 bool fNullAllowed) 2233 2229 { 2234 int rc = 0;2230 int vrc = VINF_SUCCESS; 2235 2231 2236 2232 do … … 2250 2246 &objId)) 2251 2247 { 2252 rc = VERR_WEB_INVALID_MANAGED_OBJECT_REFERENCE;2248 vrc = VERR_WEB_INVALID_MANAGED_OBJECT_REFERENCE; 2253 2249 break; 2254 2250 } … … 2258 2254 { 2259 2255 WEBDEBUG((" %s: cannot find websession for objref %s\n", __FUNCTION__, id.c_str())); 2260 rc = VERR_WEB_INVALID_SESSION_ID;2256 vrc = VERR_WEB_INVALID_SESSION_ID; 2261 2257 break; 2262 2258 } … … 2270 2266 { 2271 2267 WEBDEBUG((" %s: cannot find comobj for objref %s\n", __FUNCTION__, id.c_str())); 2272 rc = VERR_WEB_INVALID_OBJECT_ID;2268 vrc = VERR_WEB_INVALID_OBJECT_ID; 2273 2269 break; 2274 2270 } … … 2278 2274 } while (0); 2279 2275 2280 return rc;2276 return vrc; 2281 2277 } 2282 2278 … … 2304 2300 { 2305 2301 RT_NOREF(soap); 2306 HRESULT rc = S_OK;2302 HRESULT hrc = S_OK; /** @todo r=bird: hrc is not set.... */ 2307 2303 WEBDEBUG(("-- entering %s\n", __FUNCTION__)); 2308 2304 … … 2318 2314 } while (0); 2319 2315 2320 WEBDEBUG(("-- leaving %s, rc: %#lx\n", __FUNCTION__,rc));2321 if (FAILED( rc))2316 WEBDEBUG(("-- leaving %s, hrc: %#lx\n", __FUNCTION__, hrc)); 2317 if (FAILED(hrc)) 2322 2318 return SOAP_FAULT; 2323 2319 return SOAP_OK; … … 2340 2336 { 2341 2337 RT_NOREF(resp); 2342 HRESULT rc;2338 HRESULT hrc; 2343 2339 WEBDEBUG(("-- entering %s\n", __FUNCTION__)); 2344 2340 … … 2348 2344 2349 2345 ManagedObjectRef *pRef; 2350 rc = ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false);2351 if ( rc == S_OK)2346 hrc = ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false); 2347 if (hrc == S_OK) 2352 2348 { 2353 2349 WEBDEBUG((" found reference; deleting!\n")); … … 2362 2358 } 2363 2359 2364 WEBDEBUG(("-- leaving %s, rc: %#lx\n", __FUNCTION__,rc));2365 if (FAILED( rc))2360 WEBDEBUG(("-- leaving %s, hrc: %#lx\n", __FUNCTION__, hrc)); 2361 if (FAILED(hrc)) 2366 2362 return SOAP_FAULT; 2367 2363 return SOAP_OK; … … 2405 2401 { 2406 2402 RT_NOREF(soap); 2407 HRESULT rc = S_OK;2403 HRESULT hrc = S_OK; 2408 2404 WEBDEBUG(("-- entering %s\n", __FUNCTION__)); 2409 2405 … … 2436 2432 } 2437 2433 else 2438 rc = E_FAIL;2434 hrc = E_FAIL; 2439 2435 } while (0); 2440 2436 2441 WEBDEBUG(("-- leaving %s, rc: %#lx\n", __FUNCTION__,rc));2442 if (FAILED( rc))2437 WEBDEBUG(("-- leaving %s, hrc: %#lx\n", __FUNCTION__, hrc)); 2438 if (FAILED(hrc)) 2443 2439 return SOAP_FAULT; 2444 2440 return SOAP_OK; … … 2456 2452 _vbox__IWebsessionManager_USCOREgetSessionObjectResponse *resp) 2457 2453 { 2458 HRESULT rc = S_OK;2454 HRESULT hrc = S_OK; 2459 2455 WEBDEBUG(("-- entering %s\n", __FUNCTION__)); 2460 2456 … … 2463 2459 // create a new ISession object 2464 2460 ComPtr<ISession> pSession; 2465 rc = g_pVirtualBoxClient->COMGETTER(Session)(pSession.asOutParam());2466 if (FAILED( rc))2461 hrc = g_pVirtualBoxClient->COMGETTER(Session)(pSession.asOutParam()); 2462 if (FAILED(hrc)) 2467 2463 { 2468 2464 WEBDEBUG(("ERROR: cannot create session object!")); … … 2475 2471 } while (0); 2476 2472 2477 WEBDEBUG(("-- leaving %s, rc: %#lx\n", __FUNCTION__,rc));2478 if (FAILED( rc))2473 WEBDEBUG(("-- leaving %s, hrc: %#lx\n", __FUNCTION__, hrc)); 2474 if (FAILED(hrc)) 2479 2475 return SOAP_FAULT; 2480 2476 return SOAP_OK; … … 2494 2490 { 2495 2491 RT_NOREF(resp); 2496 HRESULT rc = S_OK;2492 HRESULT hrc = S_OK; 2497 2493 WEBDEBUG(("-- entering %s\n", __FUNCTION__)); 2498 2494 … … 2512 2508 } 2513 2509 2514 WEBDEBUG(("-- leaving %s, rc: %#lx\n", __FUNCTION__,rc));2515 if (FAILED( rc))2510 WEBDEBUG(("-- leaving %s, hrc: %#lx\n", __FUNCTION__, hrc)); 2511 if (FAILED(hrc)) 2516 2512 return SOAP_FAULT; 2517 2513 return SOAP_OK; -
trunk/src/VBox/Main/webservice/vboxweb.h
r98103 r98297 275 275 util::AutoWriteLock lock(g_pWebsessionsLockHandle COMMA_LOCKVAL_SRC_POS); 276 276 277 int rc;278 277 ManagedObjectRef *pRef; 279 if ((rc = ManagedObjectRef::findRefFromId(id, &pRef, fNullAllowed))) 278 int vrc = ManagedObjectRef::findRefFromId(id, &pRef, fNullAllowed); 279 if (vrc != VINF_SUCCESS) 280 280 // error: 281 281 RaiseSoapInvalidObjectFault(soap, id); … … 286 286 WEBDEBUG((" %s(): returning NULL object as permitted\n", __FUNCTION__)); 287 287 pComPtr.setNull(); 288 return 0;288 return VINF_SUCCESS; 289 289 } 290 290 … … 301 301 WEBDEBUG((" %s(): returning original %s*=0x%lX (IUnknown*=0x%lX)\n", __FUNCTION__, pRef->getInterfaceName(), pobjInterface, pobjUnknown)); 302 302 pComPtr = (T*)pobjInterface; // this calls AddRef() once 303 return 0;303 return VINF_SUCCESS; 304 304 } 305 305 … … 312 312 WEBDEBUG((" %s(): returning pointer 0x%lX for queried interface %RTuuid (IUnknown*=0x%lX)\n", __FUNCTION__, pT, guidCaller.raw(), pobjUnknown)); 313 313 *(pComPtr.asOutParam()) = pT; 314 return 0;314 return VINF_SUCCESS; 315 315 } 316 316 317 317 WEBDEBUG((" Interface not supported for object reference %s, which is of class %s\n", id.c_str(), pRef->getInterfaceName())); 318 rc = VERR_WEB_UNSUPPORTED_INTERFACE;318 vrc = VERR_WEB_UNSUPPORTED_INTERFACE; 319 319 RaiseSoapInvalidObjectFault(soap, id); // @todo better message 320 320 } 321 321 322 return rc;322 return vrc; 323 323 } 324 324 -
trunk/src/VBox/Main/webservice/webtest.cpp
r98103 r98297 94 94 95 95 /* SSL callbacks drag in IPRT sem/thread use, so make sure it is ready. */ 96 int rc = RTR3InitExe(argc, &argv, 0);97 if (RT_FAILURE( rc))98 return RTMsgInitFailure( rc);96 int vrc = RTR3InitExe(argc, &argv, 0); 97 if (RT_FAILURE(vrc)) 98 return RTMsgInitFailure(vrc); 99 99 100 100 int ap;
Note:
See TracChangeset
for help on using the changeset viewer.
