From 1044a5896b3586dc8260ade0f1fb3b3ed2129006 Mon Sep 17 00:00:00 2001 From: Gerald Begumisa Date: Tue, 27 Nov 2007 17:27:19 +0000 Subject: Eliminated duplicate logging of SIP error packets git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@511 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkaudio/audiocaptureplugins/voip/RtpSession.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'orkaudio/audiocaptureplugins/voip/RtpSession.cpp') diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp index 51024fa..c6f6d4d 100644 --- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp +++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp @@ -830,12 +830,6 @@ void RtpSession::ReportSipErrorPacket(SipFailureMessageInfoRef& info) event->m_key = CStdString("failed"); event->m_value = CStdString("true"); g_captureEventCallBack(event, m_capturePort); - - // Do the logging - CStdString sipError; - - info->ToString(sipError, m_invite); - LOG4CXX_INFO(m_log, "[" + m_trackingId + "] SIP Error packet: " + sipError); } int RtpSession::ProtocolToEnum(CStdString& protocol) @@ -1043,9 +1037,11 @@ void RtpSessions::ReportSipErrorPacket(SipFailureMessageInfoRef& info) // Other error, stop the session session->ReportSipErrorPacket(info); - CStdString InviteInfoString; - session->m_invite->ToString(InviteInfoString); - LOG4CXX_INFO(m_log, "[" + session->m_trackingId + "] stopped by SIP \"" + info->m_errorCode + " " + info->m_errorString + "\" " + InviteInfoString); + CStdString sipError; + + info->ToString(sipError, session->m_invite); + LOG4CXX_INFO(m_log, "[" + session->m_trackingId + "] SIP Error packet: " + sipError); + Stop(session); } } @@ -1928,8 +1924,8 @@ void SipFailureMessageInfo::ToString(CStdString& string, SipInviteInfoRef invite char senderIp[16], receiverIp[16]; CStdString senderMac, receiverMac; - MemMacToHumanReadable((unsigned char*)m_senderMac, senderMac); - MemMacToHumanReadable((unsigned char*)m_receiverMac, receiverMac); + //MemMacToHumanReadable((unsigned char*)m_senderMac, senderMac); + //MemMacToHumanReadable((unsigned char*)m_receiverMac, receiverMac); ACE_OS::inet_ntop(AF_INET, (void*)&m_senderIp, senderIp, sizeof(senderIp)); ACE_OS::inet_ntop(AF_INET, (void*)&m_receiverIp, receiverIp, sizeof(receiverIp)); -- cgit v1.2.3