summaryrefslogtreecommitdiff
path: root/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-12-03 22:06:59 +0200
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-12-03 22:06:59 +0200
commit62bd277292494772b3b92ff9bd76dc64f80795db (patch)
treebedd48a44464d91f85f03782e52da34a2af2cd17 /orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
parentc40d8adf40f048e3a435fdc7c32f2cef42c5ea7c (diff)
parente727d533a411c5625d6c1361f3b5ee4bb514cb89 (diff)
Merge branch 'master' into autotoolsautotools
* Re-fixing build issues * add messages/InitMsg.h to be installed as well.
Diffstat (limited to 'orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp')
-rw-r--r--orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
index 69d51d7..6263660 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
@@ -52,6 +52,7 @@ VoIpConfig::VoIpConfig()
m_sipRequestUriAsLocalParty = true;
m_sipTreat200OkAsInvite = false;
m_sipAllowMultipleMediaAddresses = false;
+ m_sip302MovedTemporarilySupport = true;
m_rtcpDetect = false;
m_inInMode = false;
@@ -70,6 +71,7 @@ VoIpConfig::VoIpConfig()
m_skinnyNameAsLocalParty = false;
m_skinnyCallInfoStopsPrevious = false;
m_cucm7_1Mode = false;
+ m_skinnyAllowMediaAddressTransfer = false;
m_sangomaEnable = false;
m_sangomaRxTcpPortStart = 0;
@@ -131,6 +133,7 @@ void VoIpConfig::Define(Serializer* s)
s->BoolValue("SipRequestUriAsLocalParty", m_sipRequestUriAsLocalParty);
s->BoolValue("SipTreat200OkAsInvite", m_sipTreat200OkAsInvite);
s->BoolValue("SipAllowMultipleMediaAddresses", m_sipAllowMultipleMediaAddresses);
+ s->BoolValue("Sip302MovedTemporarilySupport", m_sip302MovedTemporarilySupport);
s->BoolValue("RtcpDetect", m_rtcpDetect);
s->BoolValue("InInMode", m_inInMode);
@@ -151,6 +154,8 @@ void VoIpConfig::Define(Serializer* s)
s->BoolValue("SkinnyCallInfoStopsPrevious", m_skinnyCallInfoStopsPrevious);
s->CsvValue("SkinnyReportTags", m_skinnyReportTags);
s->BoolValue("Cucm7-1Mode", m_cucm7_1Mode);
+ s->BoolValue("SkinnyCucm7Mode", m_cucm7_1Mode); // synonym to the preceding line (Cucm7-1Mode)
+ s->BoolValue("SkinnyAllowMediaAddressTransfer", m_skinnyAllowMediaAddressTransfer);
s->IntValue("SangomaRxTcpPortStart", m_sangomaRxTcpPortStart);
s->IntValue("SangomaTxTcpPortStart", m_sangomaTxTcpPortStart);