[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/session clientsession.cpp,1.72.2.15,1.72.2.16
From:       dsingh () helixcommunity ! org
Date:       2008-01-25 11:04:09
Message-ID: 200801251104.m0PB4N7P019607 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/session
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22675

Modified Files:
      Tag: SERVER_12
	clientsession.cpp 
Log Message:
Synopsis
========
Fix for Bug 210591: FCS with MDP: The helix server CA's during switches attempted \
from on demand contents to a live SLTA feed with MDP enabled.

Branch: HEAD , SERVER_12_RN.
Suggested Reviewer: Jamie Gordon, Darrick, Anyone.

Description
===========
This is a case of switching live over MDP enabled OD stream. Since live over MDP is \
not supported so this switch can not happen. This switch will be treated as Not \
Compatible. So a "274 Not Compatible" will be returned.

Files Affected
==============
server/engine/session/clientsession.cpp
server/engine/session/pub/clientsession.h

Testing Performed
=================

Unit Tests:
- None

Integration Tests:
- Tested by switching slta live stream over to OD with MDP enabled and observed no \
CAs.

Leak Tests:
- None.

Performance Tests:
- None

Platforms Tested: win32-i386-vc7.
Build verified: win32-i386-vc7.

QA Hints
===============
Please note the HTTP response. It should be "274 Not Compatible" not "204 No Content" \
as stated in bug. Please update the test case accordingly. I discussed with Jamie \
regarding return response and she will also inform David regarding this.

Regards
-Dalvinder


Index: clientsession.cpp
===================================================================
RCS file: /cvsroot/server/engine/session/clientsession.cpp,v
retrieving revision 1.72.2.15
retrieving revision 1.72.2.16
diff -u -d -r1.72.2.15 -r1.72.2.16
--- clientsession.cpp	16 Jan 2008 13:06:37 -0000	1.72.2.15
+++ clientsession.cpp	25 Jan 2008 11:04:06 -0000	1.72.2.16
@@ -5429,7 +5429,7 @@
 
     m_pSwitchabilityTest = new CSwitchabilityTest(this, m_pActualFileHeader, \
m_ppStreams, m_num_streams);  m_pSwitchabilityTest->AddRef();
-    m_pSwitchabilityTest->TestSource(pSourceContainer);
+    m_pSwitchabilityTest->TestSource(pSourceContainer, m_bUseMDP);
     //continue in SwitchabilityTestDone
     return HXR_OK;
 }
@@ -6404,7 +6404,7 @@
     
 }
 
-HX_RESULT CSwitchabilityTest::TestSource(IUnknown* pSource)
+HX_RESULT CSwitchabilityTest::TestSource(IUnknown* pSource, BOOL bIsMDPSession)
 {
     HX_RESULT theErr = HXR_OK;
 
@@ -6414,7 +6414,17 @@
     {
         return CallSwitchDone(theErr);
     }
-
+  
+    /* check whether we are trying to switch a live stream over to MDP OD stream.
+    ** if yes return "274 Not Compatible", because live with MDP is not switchable
+    */
+    if(SUCCEEDED(theErr))
+    {
+        if(bIsMDPSession && IsLive())
+        {
+            return CallSwitchDone(HXR_FAILED);
+        }
+    }
     return m_pRealSourceControl->Init(this);
     //continue in InitDone
 }


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]