Changeset 58302 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Oct 18, 2015 10:44:23 PM (9 years ago)

Author:

vboxsync

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

103498

Message:

localipc-posix.cpp: rtSocketListen should be done when creating the server, not in the misnamed RTLocalIpcServerListen method.

File:

• trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp (modified) (3 diffs)

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

@@ -248 +248 @@
                         if (RT_SUCCESS(rc))
                         {
-                            LogFlow(("RTLocalIpcServerCreate: Created %p (%s)\n", pThis, pThis->Name.sun_path));
-                            *phServer = pThis;
-                            return VINF_SUCCESS;
+                            rc = rtSocketListen(pThis->hSocket, pThis->fFlags & RTLOCALIPC_FLAGS_MULTI_SESSION ? 10 : 0);
+                            if (RT_SUCCESS(rc))
+                            {
+                                LogFlow(("RTLocalIpcServerCreate: Created %p (%s)\n", pThis, pThis->Name.sun_path));
+                                *phServer = pThis;
+                                return VINF_SUCCESS;
+                            }
+                            unlink(pThis->Name.sun_path);
                         }
                     }
@@ -401 +406 @@
             for (;;)
             {
-                if (pThis->fCancelled)
+                if (!pThis->fCancelled)
                 {
-                    rc = VERR_CANCELLED;
-                    break;
-                }
-
-                rc = RTCritSectLeave(&pThis->CritSect);
-                AssertRCBreak(rc);
-
-                rc = rtSocketListen(pThis->hSocket, pThis->fFlags & RTLOCALIPC_FLAGS_MULTI_SESSION ? 10 : 0);
-                if (RT_SUCCESS(rc))
-                {
+                    rc = RTCritSectLeave(&pThis->CritSect);
+                    AssertRCBreak(rc);
+
                     struct sockaddr_un  Addr;
                     size_t              cbAddr = sizeof(Addr);
@@ -457 +455 @@
                 else
                 {
-                    int rc2 = RTCritSectEnter(&pThis->CritSect);
-                    AssertRCBreakStmt(rc2, rc = RT_SUCCESS(rc) ? rc2 : rc);
-                    if (   rc != VERR_INTERRUPTED
-                        && rc != VERR_TRY_AGAIN)
-                        break;
+                    rc = VERR_CANCELLED;
+                    break;
                 }
             }