Changeset 100288 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jun 26, 2023 8:02:07 AM (20 months ago)

Author:

vboxsync

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

158003

Message:

Shared Clipboard: More bugfixes for transfers HTTP server. bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp (modified) (16 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp

@@ -93 +93 @@
 static const char *shClTransferHttpServerGetHost(PSHCLHTTPSERVER pSrv);
 static int shClTransferHttpServerDestroyTransfer(PSHCLHTTPSERVER pSrv, PSHCLHTTPSERVERTRANSFER pSrvTx);
-static SHCLHTTPSERVERSTATUS shclTransferHttpServerSetStatusLocked(PSHCLHTTPSERVER pSrv, SHCLHTTPSERVERSTATUS enmStatus);
+static SHCLHTTPSERVERSTATUS shclTransferHttpServerSetStatusLocked(PSHCLHTTPSERVER pSrv, SHCLHTTPSERVERSTATUS fStatus);
 
 
@@ -430 +430 @@
 }
 
-/** @copydoc RTHTTPSERVERCALLBACKS::pfnDestroy */
-static DECLCALLBACK(int) shClTransferHttpDestroy(PRTHTTPCALLBACKDATA pData)
-{
-    PSHCLHTTPSERVER pThis = (PSHCLHTTPSERVER)pData->pvUser;
-    Assert(pData->cbUser == sizeof(SHCLHTTPSERVER));
-
-    return shClTransferHttpServerDestroyInternal(pThis);
-}
-
 
 /*********************************************************************************************************************************
@@ -449 +440 @@
  * @returns VBox status code.
  * @param   pSrv                Shared Clipboard HTTP server instance to destroy.
+ *
+ * @note    Caller needs to take the critical section.
  */
 static int shClTransferHttpServerDestroyInternal(PSHCLHTTPSERVER pSrv)
 {
+    Assert(RTCritSectIsOwner(&pSrv->CritSect));
+
     LogFlowFuncEnter();
 
-    if (!ASMAtomicReadBool(&pSrv->fInitialized))
-        return VINF_SUCCESS;
-
     ASMAtomicXchgBool(&pSrv->fInitialized, false);
-
-    shClTransferHttpServerLock(pSrv);
 
     int rc = VINF_SUCCESS;
@@ -475 +465 @@
     pSrv->hHTTPServer = NIL_RTHTTPSERVER;
 
-    shClTransferHttpServerUnlock(pSrv);
+    shClTransferHttpServerUnlock(pSrv); /* Unlock critical section taken by the caller before deleting it. */
 
     if (RTCritSectIsInitialized(&pSrv->CritSect))
@@ -572 +562 @@
     AssertReturn(!shClTransferHttpServerPortIsBuggy(uPort), VERR_ADDRESS_CONFLICT);
 
+    shClTransferHttpServerLock(pSrv);
+
     RTHTTPSERVERCALLBACKS Callbacks;
     RT_ZERO(Callbacks);
@@ -581 +573 @@
     Callbacks.pfnClose         = shClTransferHttpClose;
     Callbacks.pfnQueryInfo     = shClTransferHttpQueryInfo;
-    Callbacks.pfnDestroy       = shClTransferHttpDestroy;
 
     /* Note: The server always and *only* runs against the localhost interface. */
@@ -592 +583 @@
 
         LogRel2(("Shared Clipboard: HTTP server started at port %RU16\n", pSrv->uPort));
-    }
+
+        rc = shclTransferHttpServerSetStatusLocked(pSrv, SHCLHTTPSERVERSTATUS_STARTED);
+    }
+
+    shClTransferHttpServerUnlock(pSrv);
 
     if (RT_FAILURE(rc))
@@ -661 +656 @@
 int ShClTransferHttpServerStop(PSHCLHTTPSERVER pSrv)
 {
-     if (!ASMAtomicReadBool(&pSrv->fRunning))
-         return VINF_SUCCESS;
-
-     Assert(pSrv->hHTTPServer != NIL_RTHTTPSERVER);
-
-     int rc = RTHttpServerDestroy(pSrv->hHTTPServer);
-     if (RT_SUCCESS(rc))
+     LogFlowFuncEnter();
+
+     shClTransferHttpServerLock(pSrv);
+
+     int rc = VINF_SUCCESS;
+
+     if (ASMAtomicReadBool(&pSrv->fRunning))
      {
-         pSrv->hHTTPServer = NIL_RTHTTPSERVER;
-         ASMAtomicXchgBool(&pSrv->fRunning, false);
-         LogRel2(("Shared Clipboard: HTTP server stopped\n"));
+         Assert(pSrv->hHTTPServer != NIL_RTHTTPSERVER);
+
+         rc = RTHttpServerDestroy(pSrv->hHTTPServer);
+         if (RT_SUCCESS(rc))
+         {
+             pSrv->hHTTPServer = NIL_RTHTTPSERVER;
+             pSrv->fRunning    = false;
+
+             /* Let any eventual waiters know. */
+             shclTransferHttpServerSetStatusLocked(pSrv, SHCLHTTPSERVERSTATUS_STOPPED);
+
+             LogRel2(("Shared Clipboard: HTTP server stopped\n"));
+         }
      }
-     else
+
+     if (RT_FAILURE(rc))
          LogRel(("Shared Clipboard: HTTP server failed to stop, rc=%Rrc\n", rc));
 
+     shClTransferHttpServerUnlock(pSrv);
+
+     LogFlowFuncLeaveRC(rc);
      return rc;
 }
@@ -693 +702 @@
         return rc;
 
+    if (!ASMAtomicReadBool(&pSrv->fInitialized))
+        return VINF_SUCCESS;
+
+    shClTransferHttpServerLock(pSrv);
+
     rc = shClTransferHttpServerDestroyInternal(pSrv);
+
+    /* Unlock not needed anymore, as the critical section got destroyed. */
+
     return rc;
 }
@@ -719 +736 @@
  *                              The pointer will be invalid on success.
  *
- * @note    Caller must take the server critical section.
+ * @note    Caller needs to take the server critical section.
  */
 static int shClTransferHttpServerDestroyTransfer(PSHCLHTTPSERVER pSrv, PSHCLHTTPSERVERTRANSFER pSrvTx)
@@ -834 +851 @@
     shClTransferHttpServerLock(pSrv);
 
-    AssertReturn(pSrv->cTransfers, VERR_WRONG_ORDER);
-
     int rc = VINF_SUCCESS;
 
@@ -862 +877 @@
  * @returns New status set.
  * @param   pSrv                HTTP server instance to set status for.
- * @param   enmStatus           New status to set.
+ * @param   fStatus             New status to set.
  *
  * @note    Caller needs to take critical section.
@@ -968 +983 @@
 
     const uint32_t cTransfers = pSrv->cTransfers;
+    LogFlowFunc(("cTransfers=%RU32\n", cTransfers));
 
     shClTransferHttpServerUnlock(pSrv);
@@ -1044 +1060 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_STATE_CHANGED if the HTTP server status has changed (not running anymore).
  * @param   pSrv                HTTP server instance to wait for.
  * @param   fStatus             Status to wait for.
@@ -1052 +1069 @@
 {
     AssertPtrReturn(pSrv, VERR_INVALID_POINTER);
+    AssertMsgReturn(ASMAtomicReadBool(&pSrv->fInitialized), ("Server not initialized yet\n"), VERR_WRONG_ORDER);
 
     shClTransferHttpServerLock(pSrv);
@@ -1063 +1081 @@
     while (RTTimeMilliTS() - tsStartMs <= msTimeout)
     {
+        if (   !pSrv->fInitialized
+            || !pSrv->fRunning)
+        {
+            rc = VERR_STATE_CHANGED;
+            break;
+        }
+
         shClTransferHttpServerUnlock(pSrv); /* Leave lock before waiting. */