Added configuration parameter LocalPartyForceLocalMac to the VoIpPlugin section of config.xml. Setting LocalPartyForceLocalMac to 'true' forces the local party to be set to the local MAC address

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@533 09dcff7a-b715-0410-9601-b79a96267cd0

3 files changed, 9 insertions, 0 deletions

diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index 46535fc..2ade65d 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -428,6 +428,12 @@ void RtpSession::ReportMetadata()
 		}
 	}
 
+	if(DLLCONFIG.m_localPartyForceLocalMac)
+	{
+		m_localParty = "";
+		MemMacToHumanReadable((unsigned char*)m_localMac, m_localParty);
+	}
+
 	// Report Local party
 	CaptureEventRef event(new CaptureEvent());
 	event->m_type = CaptureEvent::EtLocalParty;
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
index ddd1758..9c46d77 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
@@ -48,6 +48,7 @@ VoIpConfig::VoIpConfig()
 
 	m_useMacIfNoLocalParty = false; // Uses IP address by default
 	m_localPartyForceLocalIp = false;
+	m_localPartyForceLocalMac = false;
 
 	m_skinnyIgnoreStopMediaTransmission = false;
 	m_skinnyIgnoreOpenReceiveChannelAck = false;
@@ -100,6 +101,7 @@ void VoIpConfig::Define(Serializer* s)
 
 	s->BoolValue("UseMacIfNoLocalParty", m_useMacIfNoLocalParty);
 	s->BoolValue("LocalPartyForceLocalIp", m_localPartyForceLocalIp);
+	s->BoolValue("LocalPartyForceLocalMac", m_localPartyForceLocalMac);
 
 	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 801bdc6..78716cf 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
@@ -83,6 +83,7 @@ public:
 
 	bool m_useMacIfNoLocalParty;
 	bool m_localPartyForceLocalIp;
+	bool m_localPartyForceLocalMac;
 
 	bool m_skinnyIgnoreStopMediaTransmission;
 	bool m_skinnyIgnoreOpenReceiveChannelAck;