diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-12-03 22:06:59 +0200 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-12-03 22:06:59 +0200 |
commit | 62bd277292494772b3b92ff9bd76dc64f80795db (patch) | |
tree | bedd48a44464d91f85f03782e52da34a2af2cd17 /orkaudio/audiocaptureplugins/voip/VoIpConfig.h | |
parent | c40d8adf40f048e3a435fdc7c32f2cef42c5ea7c (diff) | |
parent | e727d533a411c5625d6c1361f3b5ee4bb514cb89 (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.h')
-rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIpConfig.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h index d853b85..ade0ff7 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h @@ -89,6 +89,7 @@ public: bool m_sipRequestUriAsLocalParty; bool m_sipTreat200OkAsInvite; bool m_sipAllowMultipleMediaAddresses; + bool m_sip302MovedTemporarilySupport; bool m_rtcpDetect; bool m_inInMode; @@ -101,13 +102,14 @@ public: bool m_skinnyIgnoreStopMediaTransmission; bool m_skinnyIgnoreOpenReceiveChannelAck; - bool m_skinnyDynamicMediaAddress; + bool m_skinnyDynamicMediaAddress; // Controls whether a single session can have a changing media address bool m_skinnyAllowCallInfoUpdate; bool m_skinnyAllowLateCallInfo; bool m_skinnyNameAsLocalParty; bool m_skinnyCallInfoStopsPrevious; bool m_cucm7_1Mode; std::list<CStdString> m_skinnyReportTags; + bool m_skinnyAllowMediaAddressTransfer; // Controls whether a new session (new CallInfo) can take a media address away from an existing session that has already received RTP. std::list<CStdString> m_dnisNumbers; std::list<CStdString> m_sipExtractFields; |