Fix for correct Skinny on-hold handling. Now, only one recording is created when an endpoint goes on hold then returns.

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

1 files changed, 38 insertions, 0 deletions

diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
index 1c9cddb..c008bfc 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
@@ -1377,6 +1377,7 @@ void HandleSkinnyMessage(SkinnyHeaderStruct* skinnyHeader, IpHeaderStruct* ipHea
 	SkOpenReceiveChannelAckStruct* openReceiveAck;
 	SkLineStatStruct* lineStat;
 	SkCcm5CallInfoStruct* ccm5CallInfo;
+	SkSoftKeyEventMessageStruct* softKeyEvent;
 
 	char szEndpointIp[16];
 	struct in_addr endpointIp = ipHeader->ip_dest;	// most of the interesting skinny messages are CCM -> phone
@@ -1491,6 +1492,43 @@ void HandleSkinnyMessage(SkinnyHeaderStruct* skinnyHeader, IpHeaderStruct* ipHea
 		}
 
 		break;
+	case SkSoftKeyEventMessage:
+		softKeyEvent = (SkSoftKeyEventMessageStruct*)skinnyHeader;
+		if(SkinnyValidateSoftKeyEvent(softKeyEvent))
+		{
+			useful = true;
+			logMsg.Format(" eventString:%s eventNumber:%d line_instance:%lu call_identifier:%lu",
+					SoftKeyEvent::SoftKeyEventToString(softKeyEvent->soft_key_event),
+					softKeyEvent->soft_key_event,
+					softKeyEvent->line_instance,
+					softKeyEvent->call_identifier);
+
+			endpointIp = ipHeader->ip_src;  // this skinny message is phone -> CCM
+
+			switch(softKeyEvent->soft_key_event)
+			{
+			case SoftKeyEvent::SkSoftKeyHold:
+				RtpSessionsSingleton::instance()->ReportSkinnySoftKeyHold(softKeyEvent, ipHeader);
+				break;
+			case SoftKeyEvent::SkSoftKeyResume:
+				RtpSessionsSingleton::instance()->ReportSkinnySoftKeyResume(softKeyEvent, ipHeader);
+				break;
+			default:
+				CStdString logSoftKey;
+
+				logSoftKey.Format("Ignoring unsupported event %s (%d)",
+					SoftKeyEvent::SoftKeyEventToString(softKeyEvent->soft_key_event),
+					softKeyEvent->soft_key_event);
+				LOG4CXX_INFO(s_skinnyPacketLog, logSoftKey);
+				break;
+			}
+		}
+		else
+		{
+			useful = false;
+			LOG4CXX_WARN(s_skinnyPacketLog, "Invalid SoftKeyEventMessage.");
+		}
+		break;
 	default:
 		useful = false;
 	}