Changeset 87068 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp

Timestamp:

Dec 9, 2020 2:53:08 PM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: More code for HTTP instance creation / destruction. bugref:9874

File:

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

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

@@ -182 +182 @@
 }
 
+/**
+ * Destroys a Shared Clipboard HTTP server instance, internal version.
+ *
+ * @returns VBox status code.
+ * @param   pSrv                Shared Clipboard HTTP server instance to destroy.
+ */
 int shClTransferHttpServerDestroyInternal(PSHCLHTTPSERVER pSrv)
 {
@@ -195 +201 @@
     RTHttpServerResponseDestroy(&pSrv->Resp);
 
+    pSrv->hHTTPServer = NIL_RTHTTPSERVER;
+
     return RTCritSectDelete(&pSrv->CritSect);
 }
 
+/**
+ * Locks the critical section of a Shared Clipboard HTTP server instance.
+ *
+ * @param   pSrv                Shared Clipboard HTTP server instance to lock.
+ */
 DECLINLINE(void) shClTransferHttpServerLock(PSHCLHTTPSERVER pSrv)
 {
@@ -204 +217 @@
 }
 
+/**
+ * Unlocks the critical section of a Shared Clipboard HTTP server instance.
+ *
+ * @param   pSrv                Shared Clipboard HTTP server instance to unlock.
+ */
 DECLINLINE(void) shClTransferHttpServerUnlock(PSHCLHTTPSERVER pSrv)
 {
@@ -209 +227 @@
     AssertRC(rc2);
 }
-
-
-/*********************************************************************************************************************************
-*   Public functions                                                                                                             *
-*********************************************************************************************************************************/
 
 /**
@@ -230 +243 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Public functions                                                                                                             *
+*********************************************************************************************************************************/
+
+/**
+ * Initializes a new Shared Clipboard HTTP server instance.
+ *
+ * @param   pSrv                HTTP server instance to initialize.
+ */
+void ShClTransferHttpServerInit(PSHCLHTTPSERVER pSrv)
+{
+    AssertPtrReturnVoid(pSrv);
+
+    shClTransferHttpServerInitInternal(pSrv);
+}
+
 /**
  * Creates a new Shared Clipboard HTTP server instance, extended version.
@@ -240 +270 @@
 {
     AssertPtrReturn(pSrv, VERR_INVALID_POINTER);
-
-    shClTransferHttpServerInitInternal(pSrv);
 
     RTHTTPSERVERCALLBACKS Callbacks;
@@ -374 +402 @@
             AssertReturn(cch, VERR_BUFFER_OVERFLOW);
 
+            pSrvTx->pTransfer = pTransfer;
+
             RTListAppend(&pSrv->lstTransfers, &pSrvTx->Node);
-
             pSrv->cTransfers++;
+
+            LogFunc(("pTransfer=%p, idTransfer=%RU16, szPath=%s -> %RU32 transfers\n",
+                     pSrvTx->pTransfer, pSrvTx->pTransfer->State.uID, pSrvTx->szPathVirtual, pSrv->cTransfers));
+
+            LogRel2(("Shared Clipboard: Registered HTTP transfer %RU16, now %RU32 HTTP transfers total\n",
+                     pTransfer->State.uID, pSrv->cTransfers));
         }
     }
@@ -385 +420 @@
     shClTransferHttpServerUnlock(pSrv);
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -403 +439 @@
 
     AssertReturn(pSrv->cTransfers, VERR_WRONG_ORDER);
+
+    int rc = VINF_SUCCESS;
 
     PSHCLHTTPSERVERTRANSFER pSrvTx;
@@ -418 +456 @@
             pSrv->cTransfers--;
 
-            shClTransferHttpServerUnlock(pSrv);
-            return VINF_SUCCESS;
+            LogFunc(("pTransfer=%p, idTransfer=%RU16, szPath=%s -> %RU32 transfers\n",
+                     pSrvTx->pTransfer, pSrvTx->pTransfer->State.uID, pSrvTx->szPathVirtual, pSrv->cTransfers));
+
+            LogRel2(("Shared Clipboard: Unregistered HTTP transfer %RU16, now %RU32 HTTP transfers total\n",
+                     pTransfer->State.uID, pSrv->cTransfers));
+
+            rc = VINF_SUCCESS;
+            break;
         }
     }
 
     shClTransferHttpServerUnlock(pSrv);
-    return VERR_NOT_FOUND;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }