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

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/rtsp crtspbase.cpp, 1.9, 1.10 rtspserv.cpp,
From:       seansmith () helixcommunity ! org
Date:       2007-10-29 19:55:38
Message-ID: 200710291955.l9TJtl3H010629 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/protocol/rtsp
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv19557/server/protocol/rtsp


Modified Files:
	crtspbase.cpp rtspserv.cpp 
Log Message:
Synopsis
========
Cleans up some socket init issues.

Branches: HEAD
Reviewer: dcollins


Description
===========
Moves the socket response and event mask setting code to the base class. The \
RTSPProxyProtocol::EventPending method doesn't need to handle connect events, since \
this method only deals with client sockets, which are already connected! I believe \
this EventPending code was copied from CRTSPProxyProtocol (or derived class), which \
needed to handle new sockets connecting to origin/upstream proxy.


Files Affected
==============
server/protocol/rtsp/crtspbase.cpp
server/protocol/rtsp/rtspserv.cpp
server-restricted/proxy/rproxy/rtspprxy.cpp
server-restricted/proxy/rproxy/pub/rtspprxy.h


Testing Performed
=================
Unit Tests:
n/a

Integration Tests:
Verified playback of realvideo10.rm via proxy.

Leak Tests:
Currently working on proxy leak issues...

Performance Tests:
n/a

Platforms Tested: win32-i386-vc7
Build verified: linux-rhel4-i686, win32-i386-vc7 


Index: rtspserv.cpp
===================================================================
RCS file: /cvsroot/server/protocol/rtsp/rtspserv.cpp,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- rtspserv.cpp	26 Oct 2007 04:39:42 -0000	1.308
+++ rtspserv.cpp	29 Oct 2007 19:55:32 -0000	1.309
@@ -340,8 +340,6 @@
 {
     CRTSPBaseProtocol::init(pProc, pSock);
 
-    m_pSock->SetResponse((IHXSocketResponse*)this);
-
     m_ulClientStatsObjId = m_pClient->GetClientStats()->GetID();
     if (m_bTrackEvents)
     {

Index: crtspbase.cpp
===================================================================
RCS file: /cvsroot/server/protocol/rtsp/crtspbase.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- crtspbase.cpp	26 Oct 2007 04:40:03 -0000	1.9
+++ crtspbase.cpp	29 Oct 2007 19:55:32 -0000	1.10
@@ -13016,8 +13016,9 @@
     HX_ASSERT(pSock != NULL);
 
     HX_RELEASE(m_pSock);
-        m_pSock = pSock;
-        m_pSock->AddRef();
+    m_pSock = pSock;
+    m_pSock->AddRef();
+    m_pSock->SetResponse(this);
     m_pSock->SelectEvents(HX_SOCK_EVENT_READ|HX_SOCK_EVENT_CLOSE|HX_SOCK_EVENT_WRITE);
  
     m_proc->pc->qos_diffserv_cfg->ConfigureSocket(pSock,


_______________________________________________
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]