Modified the record command to return the orkuid for the ongoing call which matches

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

4 files changed, 14 insertions, 4 deletions

diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index 07f2e32..107e003 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -1221,6 +1221,11 @@ void RtpSession::ReportSkinnyCallInfo(SkCallInfoStruct* callInfo, IpHeaderStruct
 	}
 }
 
+CStdString RtpSession::GetOrkUid()
+{
+	return m_orkUid;
+}
+
 //=====================================================================
 RtpSessions::RtpSessions()
 {
@@ -2516,12 +2521,13 @@ void RtpSessions::StartCaptureOrkuid(CStdString& orkuid)
 	LOG4CXX_INFO(m_log, logMsg);
 }
 
-void RtpSessions::StartCapture(CStdString& party)
+CStdString RtpSessions::StartCapture(CStdString& party)
 {
 	std::map<CStdString, RtpSessionRef>::iterator pair;
 	bool found = false;
 	CStdString logMsg;
 	RtpSessionRef session;
+	CStdString orkUid = CStdString("");
 
 	for(pair = m_byIpAndPort.begin(); pair != m_byIpAndPort.end() && found == false; pair++)
 	{
@@ -2531,6 +2537,7 @@ void RtpSessions::StartCapture(CStdString& party)
 		{
 			session->m_keep = true;
 			found = true;
+			orkUid = session->GetOrkUid();
 		}
 	}
 
@@ -2544,6 +2551,8 @@ void RtpSessions::StartCapture(CStdString& party)
 	}
 	
 	LOG4CXX_INFO(m_log, logMsg);
+
+	return orkUid;
 }
 
 void RtpSessions::PauseCapture(CStdString& party)
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.h b/orkaudio/audiocaptureplugins/voip/RtpSession.h
index 3626936..6742a58 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.h
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.h
@@ -153,6 +153,7 @@ public:
 	bool PartyMatches(CStdString &party);
 	void UpdateMetadataSkinny();
 	void ReportSkinnyCallInfo(SkCallInfoStruct*, IpHeaderStruct* ipHeader);
+	CStdString GetOrkUid();
 
 	CStdString m_capturePort;
 	CStdString m_trackingId;
@@ -259,7 +260,7 @@ public:
 	void ReportSipSessionProgress(SipSessionProgressInfoRef& info);
 	void Hoover(time_t now);
 	EndpointInfoRef GetEndpointInfo(struct in_addr endpointIp);
-	void StartCapture(CStdString& party);
+	CStdString StartCapture(CStdString& party);
 	void StartCaptureOrkuid(CStdString& orkuid);
 	void PauseCapture(CStdString& party);
 	void PauseCaptureOrkuid(CStdString& orkuid);
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
index 98bab14..6c7c558 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
@@ -3335,7 +3335,7 @@ void __CDECL__ StartCapture(CStdString& party, CStdString& orkuid)
 	}
 	else
 	{
-		RtpSessionsSingleton::instance()->StartCapture(party);
+		orkuid = RtpSessionsSingleton::instance()->StartCapture(party);
 	}
 }
 
diff --git a/orkbasecxx/messages/RecordMsg.cpp b/orkbasecxx/messages/RecordMsg.cpp
index b72300f..35a21b6 100644
--- a/orkbasecxx/messages/RecordMsg.cpp
+++ b/orkbasecxx/messages/RecordMsg.cpp
@@ -76,8 +76,8 @@ ObjectRef RecordMsg::Process()
 	ObjectRef ref(msg);
 	CStdString logMsg;
 
-	logMsg.Format("Starting capture for party:%s orkuid:%s", m_party, m_orkuid);
 	CapturePluginProxy::Singleton()->StartCapture(m_party, m_orkuid);
+	logMsg.Format("Starting capture for party:%s orkuid:%s", m_party, m_orkuid);
 	msg->m_success = true;
 	msg->m_comment = logMsg;