Send a CancelMessage to all active calls, when the caller's session t…

…erminates
Volicon · Sep 8, 2016 · dc478ec · dc478ec
1 parent 1fddead
commit dc478ec
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Thruway/Role/Dealer.php b/src/Thruway/Role/Dealer.php
@@ -355,7 +355,7 @@ private function processCancel(Session $session, CancelMessage $msg)
     {
         $call = $this->getCallByRequestId($msg->getRequestId());
 
-        if ($call->getCallerSession() !== $session) {
+        if ($call && $call->getCallerSession() !== $session) {
             Logger::warning($this, "Attempt to cancel call by non-owner");
 
             return;
@@ -554,6 +554,13 @@ public function leave(Session $session)
             $procedure->leave($session);
         }
 
+        foreach ($this->callInvocationIndex as $call) {
+            if ($session->getSessionId() === $call->getCallerSession()->getSessionId()) {
+                $cancelMsg = new CancelMessage($call->getCallMessage()->getRequestId(), (object)[]);
+                $this->processCancel($session, $cancelMsg);
+            }
+        }
+
         // remove the list of registrations
         if ($this->registrationsBySession->contains($session)) {
             $this->registrationsBySession->detach($session);