Now logs session type (Raw RTP or SIP) when session starting

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

2 files changed, 37 insertions, 1 deletions

diff --git a/orkaudio/audiocaptureplugins/voip/SipSession.cpp b/orkaudio/audiocaptureplugins/voip/SipSession.cpp
index b6b3132..591175c 100644
--- a/orkaudio/audiocaptureplugins/voip/SipSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/SipSession.cpp
@@ -54,7 +54,7 @@ void SipSession::Stop()
 void SipSession::Start()
 {
 	m_started = true;
-	LOG4CXX_DEBUG(m_log, m_capturePort + " Session start");
+	LOG4CXX_DEBUG(m_log, m_capturePort + " " + ProtocolToString(m_protocol) + " Session start");
 	m_rtpRingBuffer.SetCapturePort(m_capturePort);
 	CaptureEventRef startEvent(new CaptureEvent);
 	startEvent->m_type = CaptureEvent::EtStart;
@@ -249,6 +249,37 @@ void SipSession::ReportSipInvite(SipInviteInfoRef& invite)
 	m_invitorIp = invite->m_fromIp;
 }
 
+int SipSession::ProtocolToEnum(CStdString& protocol)
+{
+	int protocolEnum = ProtUnkn;
+	if(protocol.CompareNoCase(PROT_RAW_RTP) == 0)
+	{
+		protocolEnum = ProtRawRtp;
+	}
+	else if (protocol.CompareNoCase(PROT_SIP) == 0)
+	{
+		protocolEnum = ProtSip;
+	}
+	return protocolEnum;
+}
+
+CStdString SipSession::ProtocolToString(int protocolEnum)
+{
+	CStdString protocolString;
+	switch (protocolEnum)
+	{
+	case ProtRawRtp:
+		protocolString = PROT_RAW_RTP;
+		break;
+	case ProtSip:
+		protocolString = PROT_SIP;
+		break;
+	default:
+		protocolString = PROT_UNKN;
+	}
+	return protocolString;
+}
+
 //=====================================================================
 SipSessions::SipSessions()
 {
diff --git a/orkaudio/audiocaptureplugins/voip/SipSession.h b/orkaudio/audiocaptureplugins/voip/SipSession.h
index 399e4f4..566574e 100644
--- a/orkaudio/audiocaptureplugins/voip/SipSession.h
+++ b/orkaudio/audiocaptureplugins/voip/SipSession.h
@@ -40,7 +40,12 @@ public:
 class SipSession
 {
 public:
+#define PROT_RAW_RTP "RawRtp"
+#define PROT_SIP "Sip"
+#define PROT_UNKN "Unkn"
 	typedef enum{ProtRawRtp, ProtSip, ProtUnkn} ProtocolEnum;
+	static int ProtocolToEnum(CStdString& protocol);
+	static CStdString ProtocolToString(int protocolEnum);
 
 	SipSession();
 	void Stop();