diff options
| author | Henri Herscher <henri@oreka.org> | 2007-09-19 18:21:47 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2007-09-19 18:21:47 +0000 |
| commit | d9e471cb8b3a7e79407b9614212d6b93a2b69427 (patch) | |
| tree | 8b96afe348d69395d6bae1815a99d65fcf99c51b /orkaudio/audiocaptureplugins/voip/VoIp.cpp | |
| parent | 82a580070e685ab9a0502ed307fd50005130fa26 (diff) | |
Added SipUse200OkMediaAddress configuration switch. If enabled, SIP 200 OK SDP media address prevails over INVITE SDP media address.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@492 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio/audiocaptureplugins/voip/VoIp.cpp')
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIp.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp index 013a79a..d85d05c 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp @@ -1396,7 +1396,12 @@ bool TrySip200Ok(EthernetHeaderStruct* ethernetHeader, IpHeaderStruct* ipHeader, Sip200OkInfoRef info(new Sip200OkInfo()); - char* callIdField = memFindAfter("\r\ni:", (char*)udpPayload, sipEnd); + char* callIdField = memFindAfter("Call-ID:", (char*)udpPayload, sipEnd); + if(!callIdField) + { + callIdField = memFindAfter("\ni:", (char*)udpPayload, sipEnd); + } + char* audioField = NULL; char* connectionAddressField = NULL; @@ -1410,16 +1415,16 @@ bool TrySip200Ok(EthernetHeaderStruct* ethernetHeader, IpHeaderStruct* ipHeader, { info->m_hasSdp = true; - GrabToken(audioField, sipEnd, info->m_fromRtpPort); + GrabToken(audioField, sipEnd, info->m_mediaPort); CStdString connectionAddress; GrabToken(connectionAddressField, sipEnd, connectionAddress); - struct in_addr fromIp; + struct in_addr mediaIp; if(connectionAddress.size()) { - if(ACE_OS::inet_aton((PCSTR)connectionAddress, &fromIp)) + if(ACE_OS::inet_aton((PCSTR)connectionAddress, &mediaIp)) { - info->m_fromRtpIp = fromIp; + info->m_mediaIp = mediaIp; } } } |