diff options
author | Henri Herscher <henri@oreka.org> | 2007-08-11 11:51:40 +0000 |
---|---|---|
committer | Henri Herscher <henri@oreka.org> | 2007-08-11 11:51:40 +0000 |
commit | 2bb9acafea271a124e42c3f0221bcf3fe9144afa (patch) | |
tree | a0eda9b1f5fac1b24925540ffaeb2f68b5b7c4ab /orkaudio/audiocaptureplugins | |
parent | 526cb3fffa3fc1e8091af575b224c081eb798f16 (diff) |
SIP failure now adds a "failed" tag to the CDR (not configuration dependant).
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@464 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio/audiocaptureplugins')
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/RtpSession.cpp | 38 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp | 3 | ||||
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIpConfig.h | 1 |
3 files changed, 3 insertions, 39 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp index 189b0ce..a4c50fe 100644 --- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp +++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp @@ -707,45 +707,11 @@ void RtpSession::ReportSipInvite(SipInviteInfoRef& invite) void RtpSession::ReportSipErrorPacket(SipFailureMessageInfoRef& info) { - if(!DLLCONFIG.m_sipReportZeroDurationWhenFailed) - { - return; - } - - /* - * We make sure that before we set the duration to 0, - * the session has already reported its meta data. If - * it hasn't then we do not attempt to report anything - * beyond the plugin. - */ - - if(!((DLLCONFIG.m_lookBackRecording == false) && (m_numRtpPackets > 0))) - { - // Not reported - return; - } - - if( ( ((m_protocol == ProtRawRtp) && m_numRtpPackets < 50) || - ((m_protocol == ProtSkinny) && m_numRtpPackets < 2) || - ((m_protocol == ProtSip) && m_numRtpPackets < 2)) && - DLLCONFIG.m_lookBackRecording == true) - { - // Not reported - return; - } - CaptureEventRef event(new CaptureEvent()); event->m_type = CaptureEvent::EtKeyValue; - event->m_key = CStdString("duration"); - event->m_value = CStdString("0"); + event->m_key = CStdString("failed"); + event->m_value = CStdString("true"); g_captureEventCallBack(event, m_capturePort); - - // Trigger metadata update - event.reset(new CaptureEvent()); - event->m_type = CaptureEvent::EtUpdate; - g_captureEventCallBack(event, m_capturePort); - - ReportMetadata(); } int RtpSession::ProtocolToEnum(CStdString& protocol) diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp index daa41d1..638f72d 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp @@ -40,7 +40,7 @@ VoIpConfig::VoIpConfig() m_rtpDetectOnOddPorts = false; m_sipOverTcpSupport = false; // Disabled by default m_sipLogFailedCalls = false; - m_sipReportZeroDurationWhenFailed = false; + m_useMacIfNoLocalParty = false; // Uses IP address by default m_skinnyIgnoreStopMediaTransmission = false; @@ -85,7 +85,6 @@ void VoIpConfig::Define(Serializer* s) s->CsvValue("SipExtractFields", m_sipExtractFields); s->BoolValue("SipOverTcpSupport", m_sipOverTcpSupport); s->BoolValue("SipLogFailedCalls", m_sipLogFailedCalls); - s->BoolValue("SipReportZeroDurationWhenFailed", m_sipReportZeroDurationWhenFailed); s->BoolValue("UseMacIfNoLocalParty", m_useMacIfNoLocalParty); s->BoolValue("SkinnyIgnoreStopMediaTransmission", m_skinnyIgnoreStopMediaTransmission); diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h index 24177a0..c1e8b48 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h @@ -74,7 +74,6 @@ public: bool m_iax2Support; bool m_sipOverTcpSupport; bool m_sipLogFailedCalls; - bool m_sipReportZeroDurationWhenFailed; bool m_useMacIfNoLocalParty; bool m_skinnyIgnoreStopMediaTransmission; |