From 3d436f683ca56ce566a7bed92343b0550aeca14d Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Wed, 13 Jun 2007 20:48:15 +0000 Subject: 1. Skinny sessions can not change CallId anymore (CallId used to change to passThruPartyId when startMediaTransmission was received). 2. StartMediaTransmission and OpenReceiveChannelAck are now associated to the most recent CallInfo. 3. StopMediaTransmission is now dismissed if passThruPartyId does not match. 4. Skinny sessions can now have dynamic media address when is set to true. 5. Skinny Hold and Resume now associated to sessions on the basis of CallID. git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@448 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkaudio/audiocaptureplugins/voip/VoIp.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'orkaudio/audiocaptureplugins/voip/VoIp.cpp') diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp index f5f70e0..17c8d9e 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp @@ -1500,15 +1500,15 @@ void HandleSkinnyMessage(SkinnyHeaderStruct* skinnyHeader, IpHeaderStruct* ipHea 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); + logMsg.Format(" eventString:%s eventNum:%d lineInstance:%lu callId:%lu", + SoftKeyEvent::SoftKeyEventToString(softKeyEvent->softKeyEvent), + softKeyEvent->softKeyEvent, + softKeyEvent->lineInstance, + softKeyEvent->callIdentifier); endpointIp = ipHeader->ip_src; // this skinny message is phone -> CCM - switch(softKeyEvent->soft_key_event) + switch(softKeyEvent->softKeyEvent) { case SoftKeyEvent::SkSoftKeyHold: RtpSessionsSingleton::instance()->ReportSkinnySoftKeyHold(softKeyEvent, ipHeader); @@ -1520,8 +1520,8 @@ void HandleSkinnyMessage(SkinnyHeaderStruct* skinnyHeader, IpHeaderStruct* ipHea CStdString logSoftKey; logSoftKey.Format("Ignoring unsupported event %s (%d)", - SoftKeyEvent::SoftKeyEventToString(softKeyEvent->soft_key_event), - softKeyEvent->soft_key_event); + SoftKeyEvent::SoftKeyEventToString(softKeyEvent->softKeyEvent), + softKeyEvent->softKeyEvent); LOG4CXX_INFO(s_skinnyPacketLog, logSoftKey); break; } -- cgit v1.2.3