Changeset 58305 in vbox for trunk/src/VBox

Timestamp:

Oct 18, 2015 11:41:37 PM (9 years ago)

Author:

vboxsync

Message:

RTLocalIpcServerCreate: Dropped the RTLOCALIPC_FLAGS_MULTI_SESSION as it's not easy to implement single session servers on windows and especially linux.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxIPC.cpp (modified) (1 diff)
• Runtime/r3/posix/localipc-posix.cpp (modified) (2 diffs)
• Runtime/r3/win/localipc-win.cpp (modified) (1 diff)
• Runtime/testcase/tstRTLocalIpc.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

@@ -195 +195 @@
                                 VBOXTRAY_IPC_PIPE_PREFIX, pszUserName))
                 {
-                    rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName,
-                                                RTLOCALIPC_FLAGS_MULTI_SESSION);
+                    rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName, 0 /*fFlags*/);
                     if (RT_SUCCESS(rc))
                     {

trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp

@@ -207 +207 @@
     AssertPtrReturn(phServer, VERR_INVALID_POINTER);
     *phServer = NIL_RTLOCALIPCSERVER;
-
     AssertReturn(!(fFlags & ~RTLOCALIPC_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
-
     int rc = rtLocalIpcPosixValidateName(pszName, RT_BOOL(fFlags & RTLOCALIPC_FLAGS_NATIVE_NAME));
     if (RT_SUCCESS(rc))
@@ -248 +246 @@
                         if (RT_SUCCESS(rc))
                         {
-                            rc = rtSocketListen(pThis->hSocket, pThis->fFlags & RTLOCALIPC_FLAGS_MULTI_SESSION ? 10 : 0);
+                            rc = rtSocketListen(pThis->hSocket, 16);
                             if (RT_SUCCESS(rc))
                             {

trunk/src/VBox/Runtime/r3/win/localipc-win.cpp

@@ -392 +392 @@
      */
     AssertPtrReturn(phServer, VERR_INVALID_POINTER);
-
+    *phServer = NIL_RTLOCALIPCSERVER;
     AssertReturn(!(fFlags & ~RTLOCALIPC_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
-    AssertReturn(fFlags & RTLOCALIPC_FLAGS_MULTI_SESSION, VERR_NOT_IMPLEMENTED); /** @todo Implement !RTLOCALIPC_FLAGS_MULTI_SESSION */
-
     size_t cwcFullName;
     int rc = rtLocalIpcWinValidateName(pszName, &cwcFullName, RT_BOOL(fFlags & RTLOCALIPC_FLAGS_NATIVE_NAME));

trunk/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp

@@ -61 +61 @@
     RTLOCALIPCSERVER hIpcServer;
     int rc;
-    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, NULL, RTLOCALIPC_FLAGS_MULTI_SESSION), VERR_INVALID_POINTER);
+    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, NULL, 0), VERR_INVALID_POINTER);
     if (RT_SUCCESS(rc)) RTLocalIpcServerDestroy(hIpcServer);
-    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, "", RTLOCALIPC_FLAGS_MULTI_SESSION), VERR_INVALID_NAME);
+    RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, "", 0), VERR_INVALID_NAME);
     if (RT_SUCCESS(rc)) RTLocalIpcServerDestroy(hIpcServer);
     RTTESTI_CHECK_RC(rc = RTLocalIpcServerCreate(&hIpcServer, "BasicTest", 1234 /* Invalid flags */), VERR_INVALID_FLAGS);
@@ -72 +72 @@
 
     /* Basic server creation / destruction. */
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "BasicTest", RTLOCALIPC_FLAGS_MULTI_SESSION), VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "BasicTest", 0), VINF_SUCCESS);
     RTTESTI_CHECK_RC(RTLocalIpcServerCancel(hIpcServer), VINF_SUCCESS);
     RTTESTI_CHECK_RC(RTLocalIpcServerDestroy(hIpcServer), VINF_OBJECT_DESTROYED);
@@ -157 +157 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionConnection", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionConnection", 0), VINF_SUCCESS);
 
     /*
@@ -331 +330 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionWait", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionWait", 0), VINF_SUCCESS);
 
     /*
@@ -610 +608 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionData", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionData", 0), VINF_SUCCESS);
 
     /*
@@ -809 +806 @@
      */
     RTLOCALIPCSERVER hIpcServer;
-    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionPerf", RTLOCALIPC_FLAGS_MULTI_SESSION),
-                          VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(RTLocalIpcServerCreate(&hIpcServer, "tstRTLocalIpcSessionPerf", 0), VINF_SUCCESS);
 
     /*