summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp4
-rw-r--r--orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h6
-rw-r--r--orkaudio/audiocaptureplugins/voip/RtpSession.cpp288
-rw-r--r--orkaudio/audiocaptureplugins/voip/RtpSession.h10
-rw-r--r--orkaudio/audiocaptureplugins/voip/VoIp.cpp16
-rw-r--r--orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp2
-rw-r--r--orkaudio/audiocaptureplugins/voip/VoIpConfig.h1
7 files changed, 192 insertions, 135 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp
index efc9396..500f740 100644
--- a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp
+++ b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.cpp
@@ -187,8 +187,8 @@ bool SkinnyValidateSoftKeyEvent(SkSoftKeyEventMessageStruct* softKeyEvent)
{
bool valid = true;
- if(softKeyEvent->soft_key_event > SKINNY_SOFTKEY_MAX_EVENT ||
- softKeyEvent->soft_key_event < SKINNY_SOFTKEY_MIN_EVENT)
+ if(softKeyEvent->softKeyEvent > SKINNY_SOFTKEY_MAX_EVENT ||
+ softKeyEvent->softKeyEvent < SKINNY_SOFTKEY_MIN_EVENT)
{
valid = false;
}
diff --git a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h
index 982021c..c01303a 100644
--- a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h
+++ b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h
@@ -188,9 +188,9 @@ bool SkinnyValidateOpenReceiveChannelAck(SkOpenReceiveChannelAckStruct *);
typedef struct
{
SkinnyHeaderStruct header;
- unsigned long soft_key_event;
- unsigned long line_instance;
- unsigned long call_identifier;
+ unsigned long softKeyEvent;
+ unsigned long lineInstance;
+ unsigned long callIdentifier;
} SkSoftKeyEventMessageStruct;
bool SkinnyValidateSoftKeyEvent(SkSoftKeyEventMessageStruct *);
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index 3bf117e..2d0ceea 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -34,6 +34,8 @@ RtpSession::RtpSession(CStdString& trackingId)
{
m_trackingId = trackingId;
m_lastUpdated = time(NULL);
+ m_creationDate = ACE_OS::gettimeofday();
+ m_skinnyLastCallInfoTime = m_creationDate;
m_log = Logger::getLogger("rtpsession");
m_invitorIp.s_addr = 0;
m_invitorTcpPort = 0;
@@ -50,6 +52,7 @@ RtpSession::RtpSession(CStdString& trackingId)
m_highestRtpSeqNumDelta = 0;
m_minRtpSeqDelta = (double)DLLCONFIG.m_rtpDiscontinuityMinSeqDelta;
m_minRtpTimestampDelta = (double)DLLCONFIG.m_rtpDiscontinuityMinSeqDelta * 160; // arbitrarily based on 160 samples per packet (does not need to be precise)
+ m_skinnyPassThruPartyId = 0;
memset(m_localMac, 0, sizeof(m_localMac));
memset(m_remoteMac, 0, sizeof(m_remoteMac));
}
@@ -806,7 +809,11 @@ void RtpSessions::ReportSkinnyCallInfo(SkCallInfoStruct* callInfo, IpHeaderStruc
if (pair != m_byCallId.end())
{
- return; // CM can resend the same message more than once in a session, so do nothing in this case
+ // CM can resend the same message more than once in a session,
+ // just update timestamp
+ RtpSessionRef existingSession = pair->second;
+ existingSession->m_skinnyLastCallInfoTime = ACE_OS::gettimeofday();
+ return;
}
// create new session and insert into the callid map
@@ -852,110 +859,161 @@ void RtpSessions::ReportSkinnyCallInfo(SkCallInfoStruct* callInfo, IpHeaderStruc
}
-RtpSessionRef RtpSessions::findByEndpointIpUsingIpAndPort(struct in_addr endpointIpAddr)
+//RtpSessionRef RtpSessions::findByEndpointIpUsingIpAndPort(struct in_addr endpointIpAddr)
+//{
+// RtpSessionRef session;
+// std::map<CStdString, RtpSessionRef>::iterator pair;
+//
+// // Scan all sessions and try to find a session on the same IP endpoint
+// // This function uses the m_byIpAndPort mapping unlike findByEndpointIp()
+//
+// for(pair = m_byIpAndPort.begin(); pair != m_byIpAndPort.end(); pair++)
+// {
+// RtpSessionRef tmpSession = pair->second;
+//
+// if((unsigned int)tmpSession->m_endPointIp.s_addr == (unsigned int)endpointIpAddr.s_addr)
+// {
+// session = tmpSession;
+// break;
+// }
+// }
+//
+// return session;
+//}
+
+// Find a session by Skinny endpoint IP address.
+// If a passThruPartyId is supplied, only returns session matching both criteria
+RtpSessionRef RtpSessions::findByEndpointIp(struct in_addr endpointIpAddr, int passThruPartyId)
{
RtpSessionRef session;
std::map<CStdString, RtpSessionRef>::iterator pair;
- // Scan all sessions and try to find a session on the same IP endpoint
- // This function uses the m_byIpAndPort mapping unlike findByEndpointIp()
-
- for(pair = m_byIpAndPort.begin(); pair != m_byIpAndPort.end(); pair++)
- {
- RtpSessionRef tmpSession = pair->second;
+ // Scan all sessions and try to find a session on the same IP endpoint
+ for(pair = m_byCallId.begin(); pair != m_byCallId.end(); pair++)
+ {
+ RtpSessionRef tmpSession = pair->second;
if((unsigned int)tmpSession->m_endPointIp.s_addr == (unsigned int)endpointIpAddr.s_addr)
- {
- session = tmpSession;
- break;
- }
+ {
+ if(passThruPartyId == 0 || tmpSession->m_skinnyPassThruPartyId == passThruPartyId)
+ {
+ session = tmpSession;
+ break;
+ }
+ }
}
return session;
}
-RtpSessionRef RtpSessions::findByEndpointIp(struct in_addr endpointIpAddr)
+RtpSessionRef RtpSessions::findNewestByEndpointIp(struct in_addr endpointIpAddr)
{
RtpSessionRef session;
std::map<CStdString, RtpSessionRef>::iterator pair;
- // Scan all sessions and try to find a session on the same IP endpoint
+ // Scan all sessions and try to find the most recently signalled session on the IP endpoint
+ // This always scans the entire session list, might be good to index sessions by endpoint at some point
for(pair = m_byCallId.begin(); pair != m_byCallId.end(); pair++)
{
RtpSessionRef tmpSession = pair->second;
if((unsigned int)tmpSession->m_endPointIp.s_addr == (unsigned int)endpointIpAddr.s_addr)
{
- session = tmpSession;
- break;
+ if(session.get())
+ {
+ if(tmpSession->m_skinnyLastCallInfoTime > session->m_skinnyLastCallInfoTime)
+ {
+ session = tmpSession;
+ }
+ }
+ else
+ {
+ session = tmpSession;
+ }
}
}
return session;
}
-bool RtpSessions::ChangeCallId(RtpSessionRef& session, unsigned int newId)
-{
- bool result = false;
- if(newId)
- {
- CStdString newCallId = GenerateSkinnyCallId(session->m_endPointIp, newId);
-
- std::map<CStdString, RtpSessionRef>::iterator pair = m_byCallId.find(newCallId);
- if (pair == m_byCallId.end())
- {
- // Ok, no session exists with the new Call ID, go ahead
- result = true;
- CStdString oldCallId = session->m_callId;
- m_byCallId.erase(oldCallId);
- session->m_callId = newCallId;
- m_byCallId.insert(std::make_pair(newCallId, session));
-
- if(m_log->isInfoEnabled())
- {
- CStdString logMsg;
- logMsg.Format("[%s] callId %s becomes %s", session->m_trackingId, oldCallId, newCallId);
- LOG4CXX_INFO(m_log, logMsg);
- }
- }
- else
- {
- // a session already exists with the new Call ID, ignore
- }
- }
- return result;
-}
+//bool RtpSessions::ChangeCallId(RtpSessionRef& session, unsigned int newId)
+//{
+// bool result = false;
+// if(newId)
+// {
+// CStdString newCallId = GenerateSkinnyCallId(session->m_endPointIp, newId);
+//
+// std::map<CStdString, RtpSessionRef>::iterator pair = m_byCallId.find(newCallId);
+// if (pair == m_byCallId.end())
+// {
+// // Ok, no session exists with the new Call ID, go ahead
+// result = true;
+// CStdString oldCallId = session->m_callId;
+// m_byCallId.erase(oldCallId);
+// session->m_callId = newCallId;
+// m_byCallId.insert(std::make_pair(newCallId, session));
+//
+// if(m_log->isInfoEnabled())
+// {
+// CStdString logMsg;
+// logMsg.Format("[%s] callId %s becomes %s", session->m_trackingId, oldCallId, newCallId);
+// LOG4CXX_INFO(m_log, logMsg);
+// }
+// }
+// else
+// {
+// // a session already exists with the new Call ID, ignore
+// }
+// }
+// return result;
+//}
void RtpSessions::SetMediaAddress(RtpSessionRef& session, struct in_addr mediaIp, unsigned short mediaPort)
{
+ CStdString logMsg;
CStdString ipAndPort;
char szMediaIp[16];
ACE_OS::inet_ntop(AF_INET, (void*)&mediaIp, szMediaIp, sizeof(szMediaIp));
ipAndPort.Format("%s,%u", szMediaIp, mediaPort);
-
+ bool doChangeMediaAddress = true;
+
std::map<CStdString, RtpSessionRef>::iterator pair = m_byIpAndPort.find(ipAndPort);
if (pair != m_byIpAndPort.end())
{
- // A session exists on the same IP+port, stop old session (e.g. stop raw RTP session and have a Skinny session instead)
- RtpSessionRef session = pair->second;
- Stop(session);
+ // A session exists on the same IP+port
+ RtpSessionRef oldSession = pair->second;
+ if(oldSession->m_protocol == RtpSession::ProtRawRtp)
+ {
+ logMsg.Format("[%s] on %s replaces [%s]",
+ session->m_trackingId, ipAndPort, oldSession->m_trackingId);
+ LOG4CXX_INFO(m_log, logMsg);
+ Stop(oldSession);
+ }
+ else
+ {
+ doChangeMediaAddress = false;
+ logMsg.Format("[%s] on %s will not replace [%s]",
+ session->m_trackingId, ipAndPort, oldSession->m_trackingId);
+ LOG4CXX_INFO(m_log, logMsg);
+ }
}
-
- if(m_log->isInfoEnabled())
+ if(doChangeMediaAddress)
{
- char szEndPointIp[16];
- ACE_OS::inet_ntop(AF_INET, (void*)&session->m_endPointIp, szEndPointIp, sizeof(szEndPointIp));
- CStdString logMsg;
- logMsg.Format("[%s] media address:%s callId:%s endpoint:%s", session->m_trackingId, ipAndPort, session->m_callId, szEndPointIp);
- LOG4CXX_INFO(m_log, logMsg);
- }
+ if(m_log->isInfoEnabled())
+ {
+ char szEndPointIp[16];
+ ACE_OS::inet_ntop(AF_INET, (void*)&session->m_endPointIp, szEndPointIp, sizeof(szEndPointIp));
+ logMsg.Format("[%s] media address:%s callId:%s endpoint:%s", session->m_trackingId, ipAndPort, session->m_callId, szEndPointIp);
+ LOG4CXX_INFO(m_log, logMsg);
+ }
- session->m_ipAndPort = ipAndPort;
- m_byIpAndPort.insert(std::make_pair(session->m_ipAndPort, session));
+ session->m_ipAndPort = ipAndPort;
+ m_byIpAndPort.insert(std::make_pair(session->m_ipAndPort, session));
- CStdString numSessions = IntToString(m_byIpAndPort.size());
- LOG4CXX_DEBUG(m_log, CStdString("ByIpAndPort: ") + numSessions);
+ CStdString numSessions = IntToString(m_byIpAndPort.size());
+ LOG4CXX_DEBUG(m_log, CStdString("ByIpAndPort: ") + numSessions);
+ }
}
CStdString RtpSessions::GenerateSkinnyCallId(struct in_addr endpointIp, unsigned int callId)
@@ -973,23 +1031,17 @@ void RtpSessions::ReportSkinnyOpenReceiveChannelAck(SkOpenReceiveChannelAckStruc
{
return;
}
- RtpSessionRef session = findByEndpointIp(openReceive->endpointIpAddr);
+ RtpSessionRef session = findNewestByEndpointIp(openReceive->endpointIpAddr);
if(session.get())
{
- if(session->m_ipAndPort.size() == 0)
+ if(session->m_ipAndPort.size() == 0 || DLLCONFIG.m_skinnyDynamicMediaAddress)
{
- if(ChangeCallId(session, openReceive->passThruPartyId))
- {
- SetMediaAddress(session, openReceive->endpointIpAddr, openReceive->endpointTcpPort);
- }
- else
- {
- Stop(session); // Most probably a repeat CallInfo
- }
+ session->m_skinnyPassThruPartyId = openReceive->passThruPartyId;
+ SetMediaAddress(session, openReceive->endpointIpAddr, openReceive->endpointTcpPort);
}
else
{
- LOG4CXX_DEBUG(m_log, "[" + session->m_trackingId + "] OpenReceiveChannelAck: session already got media address signalling");
+ LOG4CXX_INFO(m_log, "[" + session->m_trackingId + "] OpenReceiveChannelAck: already got media address");
}
}
else
@@ -1002,24 +1054,18 @@ void RtpSessions::ReportSkinnyOpenReceiveChannelAck(SkOpenReceiveChannelAckStruc
void RtpSessions::ReportSkinnyStartMediaTransmission(SkStartMediaTransmissionStruct* startMedia, IpHeaderStruct* ipHeader)
{
- RtpSessionRef session = findByEndpointIp(ipHeader->ip_dest);
+ RtpSessionRef session = findNewestByEndpointIp(ipHeader->ip_dest);
if(session.get())
{
- if(session->m_ipAndPort.size() == 0)
+ if(session->m_ipAndPort.size() == 0 || DLLCONFIG.m_skinnyDynamicMediaAddress)
{
- if(ChangeCallId(session, startMedia->passThruPartyId))
- {
- SetMediaAddress(session, startMedia->remoteIpAddr, startMedia->remoteTcpPort);
- }
- else
- {
- Stop(session); // Most probably a repeat CallInfo
- }
+ session->m_skinnyPassThruPartyId = startMedia->passThruPartyId;
+ SetMediaAddress(session, startMedia->remoteIpAddr, startMedia->remoteTcpPort);
}
else
{
- LOG4CXX_DEBUG(m_log, "[" + session->m_trackingId + "] StartMediaTransmission: session already got media address signalling");
+ LOG4CXX_INFO(m_log, "[" + session->m_trackingId + "] StartMediaTransmission: already got media address");
}
}
else
@@ -1041,28 +1087,20 @@ void RtpSessions::ReportSkinnyStopMediaTransmission(SkStopMediaTransmissionStruc
std::map<CStdString, RtpSessionRef>::iterator pair = m_byCallId.end();
RtpSessionRef session;
- // Try to locate the session using either conferenceId or passThruPartyId
+ // Try to locate the session using 1. conferenceId or 2. endpoint/passThruPartyId
if(stopMedia->conferenceId != 0)
{
conferenceId = IntToString(stopMedia->conferenceId);
skinnyCallId = GenerateSkinnyCallId(ipHeader->ip_dest, stopMedia->conferenceId);
pair = m_byCallId.find(skinnyCallId);
+ if (pair != m_byCallId.end())
+ {
+ session = pair->second;
+ }
}
- if(pair == m_byCallId.end() && stopMedia->passThruPartyId != 0)
- {
- passThruPartyId = IntToString(stopMedia->passThruPartyId);
- skinnyCallId = GenerateSkinnyCallId(ipHeader->ip_dest, stopMedia->passThruPartyId);
- pair = m_byCallId.find(skinnyCallId);
- }
- if (pair != m_byCallId.end())
- {
- // Session found: stop it
- session = pair->second;
- }
- else
+ if(session.get() == NULL && stopMedia->passThruPartyId != 0)
{
- // Session was not found by conferenceId or passThruPartyId, try to find it by endpoint IP address
- session = findByEndpointIp(ipHeader->ip_dest);
+ session = findByEndpointIp(ipHeader->ip_dest, stopMedia->passThruPartyId);
}
if(session.get())
{
@@ -1070,10 +1108,10 @@ void RtpSessions::ReportSkinnyStopMediaTransmission(SkStopMediaTransmissionStruc
{
if(m_log->isInfoEnabled())
{
- CStdString logMsg;
- logMsg.Format("[%s] Ignoring Skinny StopMedia conferenceId:%s passThruPartyId:%s because we are on hold", session->m_trackingId, conferenceId, passThruPartyId);
- LOG4CXX_INFO(m_log, logMsg);
- }
+ CStdString logMsg;
+ logMsg.Format("[%s] Ignoring Skinny StopMedia conferenceId:%s passThruPartyId:%s because on hold", session->m_trackingId, conferenceId, passThruPartyId);
+ LOG4CXX_INFO(m_log, logMsg);
+ }
}
else
{
@@ -1127,7 +1165,13 @@ void RtpSessions::ReportSkinnySoftKeyHold(SkSoftKeyEventMessageStruct* skEvent,
RtpSessionRef session;
CStdString logMsg;
- session = findByEndpointIp(ipHeader->ip_src);
+ std::map<CStdString, RtpSessionRef>::iterator pair;
+ CStdString callId = GenerateSkinnyCallId(ipHeader->ip_src, skEvent->callIdentifier);
+ pair = m_byCallId.find(callId);
+ if (pair != m_byCallId.end())
+ {
+ session = pair->second;
+ }
if(session.get())
{
session->m_onHold = true;
@@ -1148,26 +1192,32 @@ void RtpSessions::ReportSkinnySoftKeyHold(SkSoftKeyEventMessageStruct* skEvent,
void RtpSessions::ReportSkinnySoftKeyResume(SkSoftKeyEventMessageStruct* skEvent, IpHeaderStruct* ipHeader)
{
- RtpSessionRef session;
+ RtpSessionRef session;
CStdString logMsg;
- session = findByEndpointIp(ipHeader->ip_src);
- if(session.get())
- {
- session->m_onHold = false;
+ std::map<CStdString, RtpSessionRef>::iterator pair;
+ CStdString callId = GenerateSkinnyCallId(ipHeader->ip_src, skEvent->callIdentifier);
+ pair = m_byCallId.find(callId);
+ if (pair != m_byCallId.end())
+ {
+ session = pair->second;
+ }
+ if(session.get())
+ {
+ session->m_onHold = false;
logMsg.Format("[%s] Going off hold due to SoftKeyEvent: RESUME", session->m_trackingId);
LOG4CXX_INFO(m_log, logMsg);
- }
- else
- {
- char szEndpointIp[16];
+ }
+ else
+ {
+ char szEndpointIp[16];
- ACE_OS::inet_ntop(AF_INET, (void*)&ipHeader->ip_src, szEndpointIp, sizeof(szEndpointIp));
- logMsg.Format("Received RESUME notification from endpoint %s but couldn't find any valid RTP Session",
- szEndpointIp);
+ ACE_OS::inet_ntop(AF_INET, (void*)&ipHeader->ip_src, szEndpointIp, sizeof(szEndpointIp));
+ logMsg.Format("Received RESUME notification from endpoint %s but couldn't find any valid RTP Session",
+ szEndpointIp);
- LOG4CXX_WARN(m_log, logMsg);
- }
+ LOG4CXX_WARN(m_log, logMsg);
+ }
}
EndpointInfoRef RtpSessions::GetEndpointInfo(struct in_addr endpointIp)
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.h b/orkaudio/audiocaptureplugins/voip/RtpSession.h
index fe7e17a..7754873 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.h
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.h
@@ -18,6 +18,7 @@
#include "RtpSession.h"
#include "Rtp.h"
#include <map>
+#include "ace/OS_NS_sys_time.h"
#include "ace/Singleton.h"
#include "PacketHeaderDefs.h"
@@ -82,6 +83,8 @@ public:
CStdString m_ipAndPort; // IP address and TCP port of one side of the session, serves as a key for session storage and retrieval. Not necessarily the same as the capturePort (capturePort is usually the client (phone) IP+port)
CStdString m_callId;
SipInviteInfoRef m_invite;
+ ACE_Time_Value m_creationDate; // When the session is first created
+ time_t m_beginDate; // When the session has seen a few RTP packets
time_t m_lastUpdated;
ProtocolEnum m_protocol;
CStdString m_localParty;
@@ -89,7 +92,8 @@ public:
CaptureEvent::DirectionEnum m_direction;
int m_numRtpPackets;
struct in_addr m_endPointIp; // only used for Skinny
-
+ int m_skinnyPassThruPartyId;
+ ACE_Time_Value m_skinnyLastCallInfoTime;
bool m_onHold;
private:
@@ -122,7 +126,6 @@ private:
CStdString m_capturePort;
bool m_started;
bool m_stopped;
- time_t m_beginDate;
CStdString m_orkUid;
bool m_hasDuplicateRtp;
unsigned int m_highestRtpSeqNumDelta;
@@ -154,7 +157,8 @@ public:
void Hoover(time_t now);
EndpointInfoRef GetEndpointInfo(struct in_addr endpointIp);
private:
- RtpSessionRef findByEndpointIp(struct in_addr);
+ RtpSessionRef findByEndpointIp(struct in_addr, int passThruPartyId = 0);
+ RtpSessionRef findNewestByEndpointIp(struct in_addr endpointIpAddr);
RtpSessionRef findByEndpointIpUsingIpAndPort(struct in_addr endpointIpAddr);
bool ChangeCallId(RtpSessionRef& session, unsigned int newId);
void SetMediaAddress(RtpSessionRef& session, struct in_addr mediaIp, unsigned short mediaPort);
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;
}
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
index 7471ad0..c9dfdfe 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
@@ -43,6 +43,7 @@ VoIpConfig::VoIpConfig()
m_skinnyIgnoreStopMediaTransmission = false;
m_skinnyIgnoreOpenReceiveChannelAck = false;
+ m_skinnyDynamicMediaAddress = false;
}
void VoIpConfig::Define(Serializer* s)
@@ -78,6 +79,7 @@ void VoIpConfig::Define(Serializer* s)
s->BoolValue("SkinnyIgnoreStopMediaTransmission", m_skinnyIgnoreStopMediaTransmission);
s->BoolValue("SkinnyIgnoreOpenReceiveChannelAck", m_skinnyIgnoreOpenReceiveChannelAck);
+ s->BoolValue("SkinnyDynamicMediaAddress", m_skinnyDynamicMediaAddress);
}
void VoIpConfig::Validate()
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
index 31bbea9..092c4a5 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
@@ -76,6 +76,7 @@ public:
bool m_skinnyIgnoreStopMediaTransmission;
bool m_skinnyIgnoreOpenReceiveChannelAck;
+ bool m_skinnyDynamicMediaAddress;
std::list<CStdString> m_dnisNumbers;
std::list<CStdString> m_sipExtractFields;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 00:08:02 +0000