[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-protocol-cvs
Subject: [Protocol-cvs]
From: liam_murray () helixcommunity ! org
Date: 2005-03-28 21:21:01
[Download RAW message or body]
Update of /cvsroot/protocol/rtsp
In directory cvs-new:/tmp/cvs-serv6909
Modified Files:
Tag: hxclient_1_5_0_cayenne
rateadaptinfo.cpp rtspclnt.cpp
Log Message:
added HXLOG; converted DPRINTF to HXLOG
Index: rateadaptinfo.cpp
===================================================================
RCS file: /cvsroot/protocol/rtsp/rateadaptinfo.cpp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- rateadaptinfo.cpp 22 Feb 2005 20:30:01 -0000 1.5.2.1
+++ rateadaptinfo.cpp 28 Mar 2005 21:20:58 -0000 1.5.2.2
@@ -56,6 +56,7 @@
#include "hxccf.h"
#include "ihx3gpp.h"
#include "hxprefs.h"
+#include "hxtlogutil.h"
#include "hxprefutil.h"
#include "pckunpck.h"
#include "3gpadapthdr.h"
@@ -389,6 +390,8 @@
CHXRateAdaptationInfo::OnStreamHeader(UINT16 uStreamNumber,
IHXValues* pHdr)
{
+ HXLOGL3(HXLOG_RTSP, "CHXRateAdaptationInfo[%p]::OnStreamHeader(): stream %u", \
this, uStreamNumber); +
HX_RESULT res = HXR_OK;
if (!pHdr)
{
@@ -496,6 +499,7 @@
IHXValues* pReqHdrs,
IHXValues* pRespHdrs)
{
+ HXLOGL3(HXLOG_RTSP, "CHXRateAdaptationInfo[%p]::OnRateAdaptResponse(): stream \
%u", this, uStreamNumber); HX_RESULT res = HXR_FAILED;
HXRAIStreamInfo* pInfo = GetStreamInfo(uStreamNumber);
@@ -505,15 +509,26 @@
IHXBuffer* pReqField = NULL;
IHXBuffer* pRespField = NULL;
- // The value in the request must match the value in the
- // response
- if ((HXR_OK == pReqHdrs->GetPropertyCString(pInfo->HeaderName(),
- pReqField)) &&
- (HXR_OK == pRespHdrs->GetPropertyCString(pInfo->HeaderName(),
- pRespField)) &&
- (pReqField->GetSize() == pRespField->GetSize()) &&
- (!memcmp(pReqField->GetBuffer(), pRespField->GetBuffer(),
- pReqField->GetSize())))
+ // The value in the request must match the value in the response
+ HX_RESULT hr = pReqHdrs->GetPropertyCString(pInfo->HeaderName(), pReqField);
+ if (HXR_OK == hr)
+ {
+ hr = pRespHdrs->GetPropertyCString(pInfo->HeaderName(), pRespField);
+ if (HXR_OK == hr)
+ {
+ HXLOGL3(HXLOG_RTSP, \
"HXRateAdaptationInfo[%p]::OnRateAdaptResponse(): request: %s", this, \
pReqField->GetBuffer()); + HXLOGL3(HXLOG_RTSP, \
"HXRateAdaptationInfo[%p]::OnRateAdaptResponse(): response: %s", this, \
pRespField->GetBuffer()); +
+ hr = HXR_FAIL;
+ if (pReqField->GetSize() == pRespField->GetSize() &&
+ !memcmp(pReqField->GetBuffer(), pRespField->GetBuffer(), \
pReqField->GetSize()) ) + {
+ hr = HXR_OK;
+ }
+ }
+ }
+
+ if (HXR_OK == hr)
{
// Disable client rate adaptation for this stream
res = m_pRateAdaptCtl->Disable(uStreamNumber);
@@ -529,6 +544,7 @@
}
else
{
+ HXLOGL3(HXLOG_RTSP, "CHXRateAdaptationInfo[%p]::OnRateAdaptResponse(): \
mismatch; removing stream %u", this, uStreamNumber); \
RemoveStreamInfo(uStreamNumber); res = HXR_OK;
}
Index: rtspclnt.cpp
===================================================================
RCS file: /cvsroot/protocol/rtsp/rtspclnt.cpp,v
retrieving revision 1.148.2.6
retrieving revision 1.148.2.7
diff -u -d -r1.148.2.6 -r1.148.2.7
--- rtspclnt.cpp 23 Mar 2005 01:35:40 -0000 1.148.2.6
+++ rtspclnt.cpp 28 Mar 2005 21:20:58 -0000 1.148.2.7
@@ -195,7 +195,8 @@
void
RTSPTransportInfo::addStreamNumber(UINT16 streamNumber)
{
- DPRINTF(D_INFO, ("RTSPTransportInfo::addStreamNumber() %u\n", streamNumber));
+ HXLOGL3(HXLOG_RTSP, "RTSPTransportInfo[%p]::addStreamNumber(); stream %u", this, \
streamNumber); +
//XXXTDM: warning: cast to pointer from integer of different size
// we should be using a vector or map here
m_streamNumberList.AddTail((void*)streamNumber);
@@ -231,7 +232,7 @@
m_bDelete(FALSE),
m_lListPos(0)
{
- DPRINTF(D_INFO, ("RTSPTransportRequest[%p](); type = %ld; port = %u\n",this, \
tType, m_sPort)); + HXLOGL3(HXLOG_RTSP, \
"RTSPTransportRequest[%p]::RTSPTransportRequest(): type = %ld; port = %u",this, \
tType, m_sPort); }
@@ -285,7 +286,8 @@
RTSPTransportRequest::addTransportInfo(RTSPTransport* pTrans,
RTCPBaseTransport* pRTCPTrans, UINT16 streamNumber)
{
- DPRINTF(D_INFO, ("RTSPTransportRequest::addTransportInfo() %u\n", \
streamNumber)); + HXLOGL3(HXLOG_RTSP, \
"RTSPTransportRequest[%p]::addTransportInfo(); stream %u (setting port 0)", this, \
streamNumber); +
HX_RESULT retVal = HXR_OK;
RTSPTransportInfo* pTransInfo = new RTSPTransportInfo;
if(pTransInfo)
@@ -313,11 +315,12 @@
RTSPTransportRequest::addTransportInfo(RTSPTransport* pTrans,
RTCPBaseTransport* pRTCPTrans, UINT16 streamNumber, IHXSockAddr* pAddr)
{
- DPRINTF(D_INFO, ("RTSPTransportRequest::addTransportInfo() %u\n", \
streamNumber)); HX_RESULT retVal = HXR_OK;
UINT16 uPort = pAddr->GetPort();
+ HXLOGL3(HXLOG_RTSP, "RTSPTransportRequest[%p]::addTransportInfo(); stream %u \
(addr port = %u)", this, streamNumber, uPort); +
RTSPTransportInfo* pTransInfo = new RTSPTransportInfo;
if(pTransInfo)
{
@@ -414,7 +417,7 @@
BOOL bHTTPOnly,
UINT16 cloakPort)
{
- DPRINTF(D_INFO, ("RTSPClientSession::Init(): '%s':%u\n", pHostName, hostPort));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::Init(): '%s':%u", this, pHostName, \
hostPort); HX_RESULT hr = HXR_OK;
HX_ASSERT(pConnectAddr); // XXXLCM TODO: pass in and use address collection
@@ -518,7 +521,7 @@
cleanup:
if(FAILED(hr))
{
- DPRINTF(D_INFO, ("RTSPClientSession::Init(): hr = %08x\n", hr));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::Init(): hr = %08x", this, hr);
ConnectDone(hr);
}
@@ -753,7 +756,8 @@
HX_RESULT
RTSPClientSession::Done()
{
- DPRINTF(D_INFO, ("RTSPClientSession::Done()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::Done()", this);
+
m_pMutex->Lock();
m_bSessionDone = TRUE;
closeSocket();
@@ -915,7 +919,6 @@
RTSPClientProtocol*
RTSPClientSession::findProtocolFromInterleave(INT8 interleave)
{
- DPRINTF(D_INFO, ("RTSPClientSession::findProtocolFromInterleave() %d\n", \
interleave)); CHXSimpleList::Iterator i;
for(i=m_protList.Begin();i!=m_protList.End();++i)
{
@@ -932,7 +935,6 @@
RTSPClientProtocol*
RTSPClientSession::findProtocolFromSeqNo(UINT32 seqNo)
{
- DPRINTF(D_INFO, ("RTSPClientSession::findProtocolFromSeqNo() %lu\n", seqNo));
CHXSimpleList::Iterator i;
for(i=m_protList.Begin();i!=m_protList.End();++i)
{
@@ -949,7 +951,6 @@
RTSPClientProtocol*
RTSPClientSession::findProtocolFromSessionID(CHXString* pszSessionID)
{
- DPRINTF(D_INFO, ("RTSPClientSession::findProtocolFromSessionID(): id = '%s'\n", \
(const char*)pszSessionID)); CHXSimpleList::Iterator i;
for(i=m_protList.Begin();i!=m_protList.End();++i)
{
@@ -987,7 +988,7 @@
HX_RESULT
RTSPClientSession::addProtocol(RTSPClientProtocol* pProt)
{
- DPRINTF(D_INFO, ("RTSPClientSession::addProtocol(): %p\n", pProt));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::addProtocol(): %p", this, pProt);
HX_RESULT rc = HXR_OK;
m_pMutex->Lock();
RTSPClientProtocolInfo* pInfo = new RTSPClientProtocolInfo;
@@ -1007,7 +1008,7 @@
HX_RESULT
RTSPClientSession::removeProtocol(RTSPClientProtocol* pProt)
{
- DPRINTF(D_INFO, ("RTSPClientSession::removeProtocol(): %p\n", pProt));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::removeProtocol(): %p", this, pProt);
m_pMutex->Lock();
HX_RESULT hr = HXR_FAIL;
LISTPOSITION pos = m_protList.GetHeadPosition();
@@ -1146,7 +1147,7 @@
HX_RESULT
RTSPClientSession::closeSocket()
{
- DPRINTF(D_INFO, ("RTSPClientSession::closeSocket()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::closeSocket()", this);
m_pMutex->Lock();
if (m_pSocket != NULL)
{
@@ -1163,7 +1164,6 @@
HX_RESULT
RTSPClientSession::CreateAndConnectSessionSocket(RTSPClientProtocol* pProt)
{
- DPRINTF(D_INFO, ("RTSPClientSession::CreateAndConnectSessionSocket(): prot = \
%p\n", pProt)); HX_ASSERT(m_pConnectAddr);
HX_ASSERT(!m_pSocket);
HX_ASSERT(!m_pConnectingProt);
@@ -1203,7 +1203,7 @@
HX_RESULT
RTSPClientSession::reopenSocket(RTSPClientProtocol* pProt)
{
- DPRINTF(D_INFO, ("RTSPClientSession::reopenSocket(): prot = %p\n", pProt));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::reopenSocket(): prot = %p", this, \
pProt); m_pMutex->Lock();
/*
@@ -1257,7 +1257,7 @@
STDMETHODIMP
RTSPClientSession::ConnectDone(HX_RESULT status)
{
- DPRINTF(D_INFO, ("RTSPClientSession::ConnectDone() %08x\n", status));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::ConnectDone(): %08x", this, status);
HX_ASSERT(m_pConnectingProt); // reset called while connecting?
if (!m_pConnectingProt)
{
@@ -1484,7 +1484,7 @@
BOOL bHTTPOnly,
UINT16 cloakPort)
{
- DPRINTF(D_INFO, ("RTSPClientSessionManager::newSession(): prot %p ('%s':%lu)\n", \
pProt, pHostName, hostPort)); + HXLOGL3(HXLOG_RTSP, \
"RTSPClientSessionManager[%p]::newSession(): prot %p ('%s':%lu)", this, pProt, \
pHostName, hostPort); m_pMutex->Lock();
RTSPClientSession* pSession = new RTSPClientSession;
pSession->AddRef();
@@ -1551,7 +1551,7 @@
RTSPClientSessionManager::removeFromSession(RTSPClientProtocol* pProt,
RTSPClientSession* pSessionRemoved)
{
- DPRINTF(D_INFO, ("RTSPClientSessionManager::removeFromSession(): prot %p\n", \
pProt)); + HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::removeFromSession(): prot \
%p", this, pProt); HX_RESULT hr = HXR_OK;
LISTPOSITION pos = m_sessionList.GetHeadPosition();
@@ -1585,8 +1585,6 @@
UINT16 hostPort,
IUnknown* pContext)
{
- DPRINTF(D_INFO, ("RTSPClientSessionManager::findSession(): '%s':%u (conn port \
%u)\n", pHostName, hostPort, connectPort));
-
m_pMutex->Lock();
RTSPClientSession* pSession = NULL;
CHXSimpleList::Iterator i;
@@ -1611,6 +1609,7 @@
}
}
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSessionManager[%p]::findSession(): found \
sess %p for '%s':%u (conn port %u)", this, pSession, pHostName, hostPort, \
connectPort); pSession = pThis;
break;
}
@@ -1852,7 +1851,7 @@
HX_RESULT rc = HXR_FAIL;
if (m_bSDPInitiated && m_bMulticast)
{
- HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol::FinishSDPInit()");
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::FinishSDPInit()", this);
m_pResp->InitDone(HXR_OK);
char szStatsMask[MAX_DISPLAY_NAME];
@@ -1892,7 +1891,7 @@
STDMETHODIMP
RTSPClientProtocol::GetAddrInfoDone(HX_RESULT status, UINT32 nVecLen, IHXSockAddr** \
ppAddrVec) {
- HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol::GetAddrInfoDone() %08x", status);
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::GetAddrInfoDone() %08x", this, \
status); HX_RESULT rc = HXR_OK;
HX_ASSERT(m_pResp); //XXXLCM fix (handle); handle case where reset() called \
while resolving; similar to connectdone case @@ -2082,7 +2081,6 @@
UINT16 cloakPort,
BOOL bNoReuseConnection)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::InitExt()\n"));
HX_RESULT hresult = HXR_OK;
BOOL bFWIntegration = TRUE;
IUnknown* pUnknown = NULL;
@@ -2522,7 +2520,7 @@
{
HX_RESULT rc = HXR_OK;
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendStreamDescriptionRequest()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SendStreamDescriptionRequest()", \
this);
#if defined(HELIX_FEATURE_TRANSPORT_MULTICAST)
if (m_bSDPInitiated && m_bMulticast)
@@ -2611,7 +2609,7 @@
RTSPClientProtocol::sendPendingStreamDescription(const char* pURL,
IHXValues* pRequestHeaders, BOOL bLockMutex)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::sendPendingStreamDescription()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::sendPendingStreamDescription()", \
this); if (bLockMutex && m_pMutex)
{
m_pMutex->Lock();
@@ -2812,7 +2810,7 @@
CHXSimpleList* pStreams,
IHXValues* pRequestHeaders)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendStreamRecordDescriptionRequest()\n"));
+ HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::SendStreamRecordDescriptionRequest()", this); HX_RESULT rc \
= HXR_OK; IHXBuffer* pDescription = 0;
@@ -2973,7 +2971,7 @@
RTSPClientProtocol::SendSetupRequest(RTSPTransportType* pTransType,
UINT16 nTransTypes, IHXValues* pRequestHeaders)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendSetupRequest()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SendSetupRequest()", this);
m_pMutex->Lock();
HX_RESULT rc = HXR_OK;
@@ -2992,7 +2990,7 @@
RTSPTransportRequest* pRequest = new RTSPTransportRequest(RTSP_TR_RTP_MCAST, \
0); if(pRequest)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendSetupRequest(): created \
transport request %p type RTSP_TR_RTP_MCAST\n", pRequest)); + \
HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SendSetupRequest(): multicast: adding \
RTSP trans request %p", this, pRequest); m_transportRequestList.AddTail(pRequest);
}
else
@@ -3015,7 +3013,7 @@
rc = HXR_OUTOFMEMORY;
goto cleanup;
}
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendSetupRequest(): created \
RTPUDPTransport transport %p (sockets %p)\n", pTrans, pUDPSocket)); + \
HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SendSetupRequest(): adding rtp/rtcp \
(UDP) trans %p/%p", this, pTrans, pRTCPTrans);
pTrans->AddRef();
@@ -3033,7 +3031,8 @@
rc = HXR_OUTOFMEMORY;
goto cleanup;
}
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendSetupRequest(): created \
RTCPUDPTransport transport %p (sockets %p)\n", pRTCPTrans, pRTCPUDPSocket)); + \
HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SendSetupRequest(): adding rtp/rtcp \
(UDP) trans %p/%p", this, pTrans, pRTCPTrans); +
pRTCPTrans->AddRef();
if (HXR_OK != pRTCPTrans->init(m_pContext, pRTCPUDPSocket, pTrans,
@@ -3046,8 +3045,9 @@
pTrans->setRTCPTransport(pRTCPTrans);
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendSetupRequest(): updating \
stream,port map stream %u; port = %u\n", pStreamInfo->m_streamNumber, \
pStreamInfo->m_sPort)); + HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::SendSetupRequest(): updating stream,port map stream %u; port \
= %u", this, pStreamInfo->m_streamNumber, pStreamInfo->m_sPort); \
pTrans->addStreamInfo(pStreamInfo); + HX_ASSERT(0 == \
m_pTransportStreamMap->Lookup(pStreamInfo->m_streamNumber));
(*m_pTransportStreamMap)[pStreamInfo->m_streamNumber] = pTrans;
if (!m_activeTransportList.Find(pTrans))
@@ -3168,7 +3168,7 @@
{
HX_RESULT rc = HXR_FAILED;
- DPRINTF(D_INFO, ("RTSPClientProtocol::sendFirstSetupRequest()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::sendFirstSetupRequest()", this);
HX_ASSERT(m_activeTransportList.IsEmpty());
m_activeTransportList.RemoveAll();
@@ -3189,7 +3189,8 @@
HX_RESULT
RTSPClientProtocol::sendRemainingSetupRequests()
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::sendRemainingSetupRequests()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::sendRemainingSetupRequests()", \
this); +
HX_RESULT status = HXR_OK;
CHXSimpleList::Iterator i;
BOOL bFirst = TRUE;
@@ -3214,7 +3215,7 @@
IHXValues* pIHXValuesRequestHeaders,
BOOL bFirstSetup)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::sendSetupRequestMessage() (first setup = \
%ld)\n", bFirstSetup)); + HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::sendSetupRequestMessage(): stream %u", this, \
pStreamInfo->m_streamNumber); m_pMutex->Lock();
RTSPSetupMessage* pMsg = new RTSPSetupMessage;
if(!pMsg)
@@ -3276,7 +3277,7 @@
BOOL bFirstSetup,
RTSPSetupMessage*& pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::sendSetupRequestMessageExt()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::sendSetupRequestMessageExt(): \
stream %u", this, pStreamInfo->m_streamNumber); MIMEHeader* pHeader = new \
MIMEHeader("Transport"); if(!pHeader)
{
@@ -3307,7 +3308,8 @@
return HXR_OUTOFMEMORY;
}
pTrans->AddRef();
- DPRINTF(D_INFO, (" tranport %p = RTSP_TR_RTP_UDP\n", pTrans));
+ HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::sendSetupRequestMessageExt(): created rtp (UDP) trans %p", \
this, pTrans); +
if (m_bPrefetch)
{
pTrans->EnterPrefetch();
@@ -3338,7 +3340,6 @@
{
HX_DELETE(pHeader);
HX_RELEASE(pTrans);
- //m_pMutex->Unlock(); //XXXLCM do we need lock?
return HXR_OUTOFMEMORY;
}
pRTCPTran->AddRef();
@@ -3366,8 +3367,7 @@
return HXR_OUTOFMEMORY;
}
pTrans->AddRef();
- DPRINTF(D_INFO, (" tranport %p = RTSP_TR_RTP_TCP\n", pTrans));
-
+ HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::sendSetupRequestMessageExt(): created rtp (TCP) trans %p", \
this, pTrans);
if (m_bPrefetch)
{
@@ -3714,7 +3714,8 @@
STDMETHODIMP
RTSPClientProtocol::SendTeardownRequest()
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendTeardownRequest()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SendTeardownRequest()", this);
+
// make sure not to send a TEARDOWN unless SETUP succeeded
if (m_setupResponseCount <= 0 || !m_pSession)
{
@@ -3921,7 +3922,8 @@
if ((HXR_OK == rc) && m_pSrcBufStats &&
(!pPacket->IsLost()))
{
- m_pSrcBufStats->OnPacket(pPacket, uSeqNum);
+ HX_ASSERT(uSeqNum <= 0xFFFF);
+ m_pSrcBufStats->OnPacket(pPacket, UINT16(uSeqNum));
}
}
@@ -3999,7 +4001,8 @@
RTSPClientProtocol::SendGetParameterRequest(UINT32 lParamType,
const char* pParamName)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendGetParameterRequest() %s\n", \
pParamName)); + HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::SendGetParameterRequest(): %s", this, pParamName); +
if (!m_pIsMethodSupported[GET_PARAM])
{
return HXR_OK;
@@ -4074,7 +4077,8 @@
RTSPClientProtocol::SendSetParameterRequest(UINT32 lParamType,
const char* pParamName, IHXBuffer* pParamValue)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendSetParameterRequest() %s\n", \
pParamName)); + HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::SendSetParameterRequest(): %s = %s", this, pParamName, \
pParamValue); +
if (!m_pIsMethodSupported[SET_PARAM])
{
return HXR_OK;
@@ -4098,7 +4102,7 @@
const char* pParamValue, const char* pMimeType,
const char* pContent)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SendSetParameterRequest()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SendSetParameterRequest(): %s = \
%s", this, pParamName, pParamValue); if (!m_pIsMethodSupported[SET_PARAM])
{
return HXR_OK;
@@ -4210,7 +4214,7 @@
STDMETHODIMP
RTSPClientProtocol::OnProtocolError(HX_RESULT status)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::OnProtocolError() %08x\n", status));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::OnProtocolError(): %08x", this, \
status); HX_RESULT rc = HXR_OK;
// called from transport layer
m_pMutex->Lock();
@@ -4313,7 +4317,8 @@
HX_RESULT
RTSPClientProtocol::HandleUnexpected(RTSPMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::HandleUnexpected()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::HandleUnexpected()", this);
+
m_pMutex->Lock();
RTSPResponseMessage* pRspMsg = makeResponseMessage(pMsg->seqNo(), "405");
pRspMsg->addHeader("Allow", allowedMethods());
@@ -4344,7 +4349,7 @@
HX_RESULT
RTSPClientProtocol::HandleTeardown(RTSPTeardownMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::HandleTeardown()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::HandleTeardown()", this);
m_pMutex->Lock();
RTSPResponseMessage* pRespMsg = makeResponseMessage(pMsg->seqNo(), "200");
sendResponse(pRespMsg);
@@ -4356,7 +4361,7 @@
HX_RESULT
RTSPClientProtocol::HandleGetParam(RTSPGetParamMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::HandleGetParam()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::HandleGetParam()", this);
IHXBuffer* pBuffer = 0;
m_pMutex->Lock();
@@ -4384,7 +4389,8 @@
HX_RESULT
RTSPClientProtocol::HandleSetParam(RTSPSetParamMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::HandleSetParam()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::HandleSetParam()", this);
+
RTSPResponseMessage* pRespMsg = 0;
HX_RESULT rc = HXR_OK;
IHXValues* pReconnectValues = NULL;
@@ -4533,12 +4539,13 @@
HX_RESULT
RTSPClientProtocol::HandleRedirect(RTSPRedirectMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::HandleRedirect()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::HandleRedirect()", this);
+
m_pMutex->Lock();
HX_RESULT rc = HXR_OK;
RTSPResponseMessage* pRspMsg = makeResponseMessage(pMsg->seqNo(), "200");
sendResponse(pRspMsg);
- delete pRspMsg;
+ HX_DELETE(pRspMsg);
UINT32 msFromNow = 0;
@@ -4560,8 +4567,7 @@
CHXString redirectURL = pURLValue->value();
if(redirectURL.GetLength() > 0)
{
- rc = m_pResp->HandleRedirectRequest((const char*)redirectURL,
- msFromNow);
+ rc = m_pResp->HandleRedirectRequest(redirectURL,msFromNow);
goto exit;
}
}
@@ -4575,7 +4581,7 @@
HX_RESULT
RTSPClientProtocol::HandleRedirectResponse(RTSPResponseMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::HandleRedirectResponse()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::HandleRedirectResponse()", this);
m_pMutex->Lock();
HX_RESULT rc = HXR_OK;
@@ -4652,7 +4658,7 @@
void
RTSPClientProtocol::SessionCreated(RTSPClientSession* pSession)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SessionCreated() sess %p\n", pSession));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SessionCreated(): %p", this, \
pSession); m_sessionList.AddTail(pSession);
}
@@ -4660,7 +4666,7 @@
RTSPClientProtocol::SessionSucceeded(RTSPClientSession* pSession,
IHXSocket* pSocket)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SessionSucceeded() sess %p\n", pSession));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SessionSucceeded(): %p", this, \
pSession);
RTSPClientSession* pTempSession = NULL;
@@ -4692,7 +4698,8 @@
RTSPClientProtocol::SessionFailed(RTSPClientSession* pSession,
IHXSocket* pSocket)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::SessionFailed() sess %p\n", pSession));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::SessionFailed(): %p", this, \
pSession); +
LISTPOSITION lPos = NULL;
m_pMutex->Lock();
@@ -4709,7 +4716,7 @@
HX_RESULT
RTSPClientProtocol::InitDone(HX_RESULT status)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::InitDone() %08x\n", status));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::InitDone(): %08x",this, status);
HX_RESULT rc = HXR_OK;
AddRef();
@@ -4729,7 +4736,8 @@
STDMETHODIMP
RTSPClientProtocol::InitSockets()
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::InitSockets()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::InitSockets()", this);
+
HX_RESULT hr = HXR_OK;
UINT32 nMaxUDPPort = MAX_UDP_PORT;
IHXBuffer* pBuffer = 0;
@@ -4780,9 +4788,10 @@
}
}
+
pUDPPort = new UDP_PORTS;
pUDPPort->uFrom = MIN_UDP_PORT;
- pUDPPort->uTo = nMaxUDPPort;
+ pUDPPort->uTo = (UINT16)nMaxUDPPort;
pUDPPortList->AddTail((void*)pUDPPort);
}
@@ -4790,6 +4799,8 @@
{
if(m_pPreferences->ReadPref("UDPPort", pBuffer) == HXR_OK)
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::InitSockets(): port \
range(s) = %s", this, pBuffer->GetBuffer()); +
ReadUDPPorts(pBuffer, pUDPPortList);
}
}
@@ -4805,6 +4816,7 @@
for (; lIterator != pUDPPortList->End(); ++lIterator)
{
pUDPPort = (UDP_PORTS*) (*lIterator);
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::InitSockets(): using \
%lu to %lu ", this, pUDPPort->uFrom, pUDPPort->uTo);
if ((pUDPPort->uTo - pUDPPort->uFrom + 1) < 2)
{
@@ -4813,6 +4825,7 @@
for (datagramPort = pUDPPort->uFrom; datagramPort <= pUDPPort->uTo; \
datagramPort += 2) {
+
if (datagramPort % 2)
{
datagramPort = datagramPort + 1;
@@ -4822,24 +4835,27 @@
{
break;
}
-
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::InitSockets(): \
trying %lu...", this, datagramPort);
if (HXR_OK == CreateUDPSockets(pStreamInfo->m_streamNumber, \
datagramPort)) {
bGotSocket = TRUE;
break;
}
+
}
if (bGotSocket)
{
break;
}
+
}
// bail out if we failed to create UDP sockets, HXR_NET_UDP is returned
// so we will attempt to switch to TCP if it's enabled
if (!bGotSocket)
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::InitSockets(): \
HXR_NET_UDP", this); hr = HXR_NET_UDP;
}
}
@@ -5753,6 +5769,7 @@
HX_RESULT
RTSPClientProtocol::handleMessage(RTSPMessage* pMsg)
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleMessage()", this);
HX_RESULT rc = HXR_OK;
m_pMutex->Lock();
@@ -6309,7 +6326,8 @@
RTSPResponseMessage* pRTSPResponseMessageIncoming
)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleOptionsResponse\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleOptionsResponse()",this);
+
HX_RESULT rc = HXR_OK;
if (m_pPipelinedDescLogic)
@@ -6482,7 +6500,7 @@
HX_RESULT
RTSPClientProtocol::handleGetParamResponse(RTSPResponseMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleGetParamResponse()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleGetParamResponse()",this);
if (ABD_STATE_PENDING == m_pSession->m_autoBWDetectionState &&
ABD_ACTION_REQUESTING == m_autoBWDetectionAction)
@@ -6637,7 +6655,7 @@
goto bail;
}
- DPRINTF(D_INFO, (" mcast socket joined to %s:%s (source port %s)\n", \
pMulticastDestPort, pMulticastIP,pMulticastSourcePort)); + HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::HandleSetParamMulticastTransportHelper(): joined %s:%s \
(source port %s)", this, pMulticastDestPort, pMulticastIP,pMulticastSourcePort);
pUDPResponseHelper = new UDPResponseHelper(this);
if (!pUDPResponseHelper)
@@ -6678,7 +6696,7 @@
HX_RESULT
RTSPClientProtocol::handleSetParamResponse(RTSPResponseMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleSetParamResponse()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleSetParamResponse()", this);
IHXValues* pValues = NULL;
HX_RESULT theErr = HXR_FAIL;
@@ -6744,7 +6762,7 @@
HX_RESULT
RTSPClientProtocol::handleTeardownResponse(RTSPResponseMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleTeardownResponse()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleTeardownResponse()", this);
if(m_pResp)
{
if(strcmp(pMsg->errorCode(), "200") != 0)
@@ -6967,7 +6985,8 @@
RTSPClientProtocol::handleSetupResponse(RTSPResponseMessage* pMsg,
RTSPSetupMessage* pSetupMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleSetupResponse()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleSetupResponse()", this);
+
HX_RESULT status = HXR_OK;
UINT16 streamNumber = 0;
IHXValues* pReconnectValues = NULL;
@@ -7090,7 +7109,8 @@
RTSPResponseMessage* pMsg,
RTSPSetupMessage* pSetupMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleSetupResponseExt()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleSetupResponseExt()", this);
+
HX_RESULT status = HXR_OK;
// get transport info
@@ -7146,7 +7166,7 @@
pStreamInfo->m_sPort = pTransInfo->m_sPort;
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleSetupResponseExt(): str # = %u; \
resend port %u\n", pStreamInfo->m_streamNumber, pTransInfo->m_sPort)); + \
HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleSetupResponseExt(): stream %u; \
port %u", this, pStreamInfo->m_streamNumber, pTransInfo->m_sPort);
#if defined(HELIX_FEATURE_RTP)
switch(pRequest->m_lTransportType)
@@ -7157,7 +7177,7 @@
RTPTCPTransport* pRtpTran = \
(RTPTCPTransport*)pTransInfo->m_pTransport;
RTCPTCPTransport* pRtcpTran = \
(RTCPTCPTransport*)pTransInfo->m_pRTCPTransport;
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleSetupResponseExt(): \
transport type RTSP_TR_RTP_TCP (pRtp = %p; pRtcp = %p)\n", pRtpTran, pRtcpTran)); + \
HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleSetupResponseExt(): rtp (TCP) \
transport ", this);
if ((!m_bHasSyncMasterStream) &&
(pStreamInfo->m_eMediaType == RTSPMEDIA_TYPE_AUDIO))
@@ -7201,7 +7221,8 @@
{
RTPUDPTransport* pRtpTran = \
(RTPUDPTransport*)pTransInfo->m_pTransport;
RTCPUDPTransport* pRtcpTran = \
(RTCPUDPTransport*)pTransInfo->m_pRTCPTransport;
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleSetupResponseExt(): \
transport type RTSP_TR_RTP_UDP (pRtp = %p; pRtcp = %p)\n", pRtpTran, pRtcpTran)); +
+ HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::handleSetupResponseExt(): rtp (UDP) transport", this);
if ((!m_bHasSyncMasterStream) &&
(pStreamInfo->m_eMediaType == RTSPMEDIA_TYPE_AUDIO))
@@ -7258,7 +7279,8 @@
HX_RESULT
RTSPClientProtocol::handleAnnounceResponse(RTSPResponseMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleAnnounceResponse()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleAnnounceResponse()", this);
+
HX_RESULT rc = HXR_OK;
if(!m_bSetupRecord) // better only get one of these if recording...
@@ -7315,7 +7337,8 @@
HX_RESULT
RTSPClientProtocol::handleDescribeResponse(RTSPResponseMessage* pMsg)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::handleDescribeResponse()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleDescribeResponse()", this);
+
HX_RESULT rc = HXR_OK;
BOOL bSDResponseCalled = FALSE;
@@ -7332,6 +7355,7 @@
if(pMsg->errorCodeAsUINT32() == 401 || pMsg->errorCodeAsUINT32() == 407)
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleDescribeResponse(): \
calling handleAuthentication()", this); rc = handleAuthentication(pMsg);
return rc;
}
@@ -7397,6 +7421,7 @@
if (pAgent)
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::handleDescribeResponse(): \
agent = %s", this, pAgent->GetBuffer());
if (strncasecmp((const char*)pAgent->GetBuffer(), "Columbia RTSP \
Server", 20) == 0)
{
@@ -7567,7 +7592,8 @@
RTSPClientProtocol::sendInitialMessage(RTSPClientSession* pSession,
IHXSocket* pSocket)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::sendInitialMessage()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::sendInitialMessage()", this);
+
HX_RESULT rc = HXR_OK;
UINT32 seqNo = 0;
RTSPOptionsMessage* pMsg = NULL;
@@ -7795,7 +7821,7 @@
void
RTSPClientProtocol::reset()
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::reset()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::reset()", this);
HX_ASSERT(!m_pSessionManager); // Done() cleans this
@@ -7974,6 +8000,7 @@
RTSPTransportRequest*
RTSPClientProtocol::getTransportRequest(MIMEHeaderValue* pValue)
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::getTransportRequest()", this);
RTSPTransportRequest* pTransportRequest = 0;
if(pValue)
{
@@ -7999,6 +8026,9 @@
*pFirstValue = 0; // get rid of second port value
}
requestPort = (UINT16)strtol(portString, 0, 10);
+
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::getTransportRequest(): \
client_port = %s", this, portString); +
}
else if(0 == pParam->m_attribute.CompareNoCase("server_port"))
{
@@ -8010,9 +8040,12 @@
*pFirstValue = 0; // get rid of second port value
}
resendPort = (UINT16)strtol(portString, 0, 10);
+
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::getTransportRequest(): \
server_port = %s", this, portString); }
else if(0 == pParam->m_attribute.CompareNoCase("source"))
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::getTransportRequest(): \
source = %s", this, (const char*) pParam->m_value); HX_RELEASE(m_pPeerAddr);
HXSockUtil::CreateAddr(m_pNetSvc, HX_SOCK_FAMILY_INANY, (const \
char*) pParam->m_value, 0, m_pPeerAddr); HX_ASSERT(m_pPeerAddr);
@@ -8154,7 +8187,7 @@
HX_RESULT
RTSPClientProtocol::closeSocket()
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::closeSocket()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::closeSocket()", this);
m_pSocket = NULL; // weak ref
return m_pSession->closeSocket();
@@ -8163,7 +8196,7 @@
HX_RESULT
RTSPClientProtocol::reopenSocket()
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::reopenSocket()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::reopenSocket()", this);
m_pMutex->Lock();
m_pSession->m_bReopenSocket = TRUE;
HX_RESULT hr = m_pSession->reopenSocket(this);
@@ -8174,7 +8207,7 @@
HX_RESULT
RTSPClientProtocol::ReopenSocketDone(HX_RESULT status)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::ReopenSocketDone() %08x\n", status));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::ReopenSocketDone(): %08x", this, \
status); m_pMutex->Lock();
HX_RESULT hresult = HXR_OK;
@@ -8208,14 +8241,15 @@
void
RTSPClientProtocol::DoConnectionCheck()
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::DoConnectionCheck()\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::DoConnectionCheck()", this);
+
m_uConnectionCheckCallbackHandle = 0;
HX_ASSERT(m_pConnectionlessControl);
if (!m_bConnectionAlive)
{
- DPRINTF(D_INFO, (" *** HXR_SERVER_TIMEOUT\n"));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::DoConnectionCheck(): \
HXR_SERVER_TIMEOUT", this);
m_pConnectionlessControl->ConnectionCheckFailed(HXR_SERVER_TIMEOUT);
return;
}
@@ -9130,7 +9164,7 @@
HX_RESULT
RTSPClientProtocol::ParseSDP(const char* pszContentType, IHXBuffer* pSDPBuffer)
{
- HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol::ParseSDP()");
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::ParseSDP()", this);
HX_RESULT rc = HXR_OK;
UINT16 nValues = 0;
UINT32 ulNumStreams = 0;
@@ -9187,9 +9221,15 @@
if(pControl)
{
if (!strcmp((const char*)pControl->GetBuffer(),"*"))
+ {
m_headerControl = m_contentBase;
+ }
else
+ {
m_headerControl = pControl->GetBuffer();
+ }
+
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::ParseSDP(): header control \
'%s'", this, (const char*)m_headerControl);
HX_RELEASE(pControl);
}
@@ -9407,6 +9447,7 @@
ppRealHeaders[i]->GetPropertyULONG32("RtcpRRRate", ulRtpRRBitRate);
ppRealHeaders[i]->GetPropertyULONG32("RtcpRSRate", ulRtpRSBitRate);
ppRealHeaders[i]->GetPropertyULONG32("port", ulPort);
+ HX_ASSERT(ulPort <= 0xFFFF);
if(pControl)
{
@@ -9454,13 +9495,13 @@
// get multicast address from the media description
if (HXR_OK == ppRealHeaders[i]->GetPropertyCString("MulticastAddress", \
pIPAddress)) {
- SetMulticastAddrHelper(pInfo, (const char*)pIPAddress->GetBuffer(), \
ulPort); + SetMulticastAddrHelper(pInfo, (const \
char*)pIPAddress->GetBuffer(), (UINT16)ulPort); HX_RELEASE(pIPAddress);
}
// otherwise, apply the session multicast address to media component
else if (m_bMulticast && !m_sessionHost.IsEmpty())
{
- SetMulticastAddrHelper(pInfo, m_sessionHost, ulPort);
+ SetMulticastAddrHelper(pInfo, m_sessionHost, (UINT16)ulPort);
}
#endif /* HELIX_FEATURE_TRANSPORT_MULTICAST */
@@ -9913,7 +9954,7 @@
m_pSDPRequestHeader->GetPropertyCString("Language", pLanguage);
IHXBuffer* pValue = NULL;
- for (int i = 0; i < ulHeaderEntries; i++)
+ for (UINT32 i = 0; i < ulHeaderEntries; i++)
{
if (HXR_OK == \
m_pSDPRequestHeader->GetPropertyCString(pszHeaderEntries[i], pValue)) {
@@ -10025,7 +10066,7 @@
HX_RESULT
RTSPClientProtocol::CreateUDPSockets(UINT32 ulStream, UINT16 uPort)
{
- HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol::CreateUDPSockets() str = %lu; port = \
%u", ulStream, uPort); + HXLOGL3(HXLOG_RTSP, \
"RTSPClientProtocol[%p]::CreateUDPSockets() str = %lu; port = %u",this, ulStream, \
uPort); HX_RESULT rc = HXR_OK;
IHXSocket* pUDPSocket1 = NULL;
IHXSocket* pUDPSocket2 = NULL;
@@ -10105,9 +10146,9 @@
if (HXR_OK == rc)
{
- HXLOGL3(HXLOG_RTSP, " adding sockets %p and %p for stream %lu", pUDPSocket1, \
pUDPSocket2, ulStream);
- HX_ASSERT(!(*m_pUDPSocketStreamMap)[ulStream]);
- HX_ASSERT(!(*m_pRTCPSocketStreamMap)[ulStream]);
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::CreateUDPSockets(): adding \
sockets %p and %p for stream %lu", this, pUDPSocket1, pUDPSocket2, ulStream); + \
HX_ASSERT(0 == m_pUDPSocketStreamMap->Lookup(ulStream)); + HX_ASSERT(0 == \
m_pRTCPSocketStreamMap->Lookup(ulStream)); (*m_pUDPSocketStreamMap)[ulStream] = \
pUDPSocket1; (*m_pRTCPSocketStreamMap)[ulStream] = pUDPSocket2;
@@ -10152,7 +10193,7 @@
void
RTSPClientProtocol::ReportError(HX_RESULT theErr)
{
- DPRINTF(D_INFO, ("RTSPClientProtocol::ReportError(): %08x\n", theErr));
+ HXLOGL3(HXLOG_RTSP, "RTSPClientProtocol[%p]::ReportError(): %08x", theErr);
if (m_pSession)
{
m_pSession->ReportError(theErr);
@@ -10162,6 +10203,8 @@
void
RTSPClientSession::ReportError(HX_RESULT theErr)
{
+ HXLOGL3(HXLOG_RTSP, "RTSPClientSession[%p]::ReportError(): %08x", theErr);
+
IHXErrorMessages * pErrorNotifier = NULL;
IUnknown * pPlayer = NULL;
IHXClientEngine* pEngine = NULL;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic