From 4501ab5c6cfc68fb2f2a958e39bbc47487c1826d Mon Sep 17 00:00:00 2001
From: Henri Herscher <henri@oreka.org>
Date: Thu, 11 Jun 2009 23:00:18 +0000
Subject: Added PartiesUseName configuration parameter so that it is possible
 to report name instead of number for local and remote parties.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@622 09dcff7a-b715-0410-9601-b79a96267cd0
---
 orkaudio/audiocaptureplugins/voip/RtpSession.cpp | 12 ++++++++++--
 orkaudio/audiocaptureplugins/voip/VoIp.cpp       | 10 ++--------
 orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp |  2 ++
 orkaudio/audiocaptureplugins/voip/VoIpConfig.h   |  1 +
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index dadaa8d..479e0c8 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -705,7 +705,8 @@ void RtpSession::ReportMetadata()
 	// Report Local party
 	CaptureEventRef event(new CaptureEvent());
 	event->m_type = CaptureEvent::EtLocalParty;
-	if(m_protocol == ProtSkinny && DLLCONFIG.m_skinnyNameAsLocalParty == true && m_localPartyName.size())
+	if( ( m_protocol == ProtSkinny && DLLCONFIG.m_skinnyNameAsLocalParty == true && m_localPartyName.size() )   || 
+		( DLLCONFIG.m_partiesUseName == true && m_localPartyName.size() )		 )
 	{
 		event->m_value = m_localPartyName;
 	}
@@ -719,7 +720,14 @@ void RtpSession::ReportMetadata()
 	// Report remote party
 	event.reset(new CaptureEvent());
 	event->m_type = CaptureEvent::EtRemoteParty;
-	event->m_value = m_remoteParty;
+	if(DLLCONFIG.m_partiesUseName == true && m_remotePartyName.size())
+	{
+		event->m_value = m_remotePartyName;
+	}
+	else
+	{
+		event->m_value = m_remoteParty;
+	}
 	g_captureEventCallBack(event, m_capturePort);
 	m_remotePartyReported = true;
 
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
index bb22b7d..8c45c51 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
@@ -2140,10 +2140,7 @@ bool TrySipInvite(EthernetHeaderStruct* ethernetHeader, IpHeaderStruct* ipHeader
 
 			char* fromFieldEnd = memFindEOL(fromField, sipEnd);
 
-			if(DLLCONFIG.m_sipReportNamesAsTags == true)
-			{
-				GrabSipName(fromField, fromFieldEnd, info->m_fromName);
-			}
+			GrabSipName(fromField, fromFieldEnd, info->m_fromName);
 
 			char* sipUser = memFindAfter("sip:", fromField, fromFieldEnd);
 			if(sipUser)
@@ -2177,10 +2174,7 @@ bool TrySipInvite(EthernetHeaderStruct* ethernetHeader, IpHeaderStruct* ipHeader
 			char* toFieldEnd = GrabLine(toField, sipEnd, to);
 			LOG4CXX_DEBUG(s_sipExtractionLog, "to: " + to);
 
-			if(DLLCONFIG.m_sipReportNamesAsTags == true)
-			{
-				GrabSipName(toField, toFieldEnd, info->m_toName);
-			}
+			GrabSipName(toField, toFieldEnd, info->m_toName);
 
 			char* sipUser = memFindAfter("sip:", toField, toFieldEnd);
 			if(sipUser)
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
index 9e65141..17e868b 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
@@ -56,6 +56,7 @@ VoIpConfig::VoIpConfig()
 	m_useMacIfNoLocalParty = false; // Uses IP address by default
 	m_localPartyForceLocalIp = false;
 	m_localPartyForceLocalMac = false;
+	m_partiesUseName = false;
 
 	m_skinnyIgnoreStopMediaTransmission = false;
 	m_skinnyIgnoreOpenReceiveChannelAck = false;
@@ -127,6 +128,7 @@ void VoIpConfig::Define(Serializer* s)
 	s->BoolValue("UseMacIfNoLocalParty", m_useMacIfNoLocalParty);
 	s->BoolValue("LocalPartyForceLocalIp", m_localPartyForceLocalIp);
 	s->BoolValue("LocalPartyForceLocalMac", m_localPartyForceLocalMac);
+	s->BoolValue("PartiesUseName", m_partiesUseName);
 
 	s->BoolValue("SkinnyIgnoreStopMediaTransmission", m_skinnyIgnoreStopMediaTransmission);
 	s->BoolValue("SkinnyIgnoreOpenReceiveChannelAck", m_skinnyIgnoreOpenReceiveChannelAck);
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
index a809023..b83bd8e 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
@@ -93,6 +93,7 @@ public:
 	bool m_useMacIfNoLocalParty;
 	bool m_localPartyForceLocalIp;
 	bool m_localPartyForceLocalMac;
+	bool m_partiesUseName;
 
 	bool m_skinnyIgnoreStopMediaTransmission;
 	bool m_skinnyIgnoreOpenReceiveChannelAck;
-- 
cgit v1.2.3