summaryrefslogtreecommitdiff
path: root/orkaudio
diff options
context:
space:
mode:
authorHenri Herscher <henri@oreka.org>2006-08-01 14:34:34 +0000
committerHenri Herscher <henri@oreka.org>2006-08-01 14:34:34 +0000
commita9bb4f02d44aa6b641057eaa888e9028b4cf25e0 (patch)
treee822a744bb2e0efe05d39759d59f553e9930f1e2 /orkaudio
parent4d1b7ce6a753132aa2e7a70737c6cfef906d3bce (diff)
Applying changeset 0.5 264:
Make sure Local Party is never empty (populated with Local IP if we don't have the info). git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@317 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio')
-rw-r--r--orkaudio/audiocaptureplugins/voip/RtpSession.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index 8cc54d0..76af190 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -241,6 +241,17 @@ void RtpSession::ProcessMetadataSkinny(RtpPacketInfoRef& rtpPacket)
void RtpSession::ReportMetadata()
{
+ char szLocalIp[16];
+ ACE_OS::inet_ntop(AF_INET, (void*)&m_localIp, szLocalIp, sizeof(szLocalIp));
+ char szRemoteIp[16];
+ ACE_OS::inet_ntop(AF_INET, (void*)&m_remoteIp, szRemoteIp, sizeof(szRemoteIp));
+
+ // Make sure Local Party is always reported
+ if(m_localParty.IsEmpty())
+ {
+ m_localParty = szLocalIp;
+ }
+
// Report Local party
CaptureEventRef event(new CaptureEvent());
event->m_type = CaptureEvent::EtLocalParty;
@@ -260,16 +271,12 @@ void RtpSession::ReportMetadata()
g_captureEventCallBack(event, m_capturePort);
// Report Local IP address
- char szLocalIp[16];
- ACE_OS::inet_ntop(AF_INET, (void*)&m_localIp, szLocalIp, sizeof(szLocalIp));
event.reset(new CaptureEvent());
event->m_type = CaptureEvent::EtLocalIp;
event->m_value = szLocalIp;
g_captureEventCallBack(event, m_capturePort);
// Report Remote IP address
- char szRemoteIp[16];
- ACE_OS::inet_ntop(AF_INET, (void*)&m_remoteIp, szRemoteIp, sizeof(szRemoteIp));
event.reset(new CaptureEvent());
event->m_type = CaptureEvent::EtRemoteIp;
event->m_value = szRemoteIp;