diff options
| author | Henri Herscher <henri@oreka.org> | 2007-03-15 21:08:13 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2007-03-15 21:08:13 +0000 |
| commit | 527c0d62a2dd51e879f8013c84ac49fdaa8cf4ab (patch) | |
| tree | a760241d1ab372275362421b5cd85a07d725c445 /orkaudio/audiocaptureplugins/voip/VoIp.cpp | |
| parent | f78cc4927fd5f075ac9785f06c1dd7deb40b9703 (diff) | |
IAX2 support now disabled by default until it's proven it is stable.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@431 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio/audiocaptureplugins/voip/VoIp.cpp')
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIp.cpp | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp index 4148e16..e34330f 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp @@ -1462,17 +1462,21 @@ void HandlePacket(u_char *param, const struct pcap_pkthdr *header, const u_char MutexSentinel mutexSentinel(s_mutex); // serialize access for competing pcap threads - detectedUsefulPacket = TryRtp(ethernetHeader, ipHeader, udpHeader, udpPayload); - - if(!detectedUsefulPacket) { - detectedUsefulPacket= TrySipInvite(ethernetHeader, ipHeader, udpHeader, - udpPayload); - } - - if(!detectedUsefulPacket) { - detectedUsefulPacket = TrySipBye(ethernetHeader, ipHeader, udpHeader, - udpPayload); - } + detectedUsefulPacket = TryRtp(ethernetHeader, ipHeader, udpHeader, udpPayload); + + if(!detectedUsefulPacket) { + detectedUsefulPacket= TrySipInvite(ethernetHeader, ipHeader, udpHeader, + udpPayload); + } + + if(!detectedUsefulPacket) { + detectedUsefulPacket = TrySipBye(ethernetHeader, ipHeader, udpHeader, + udpPayload); + } + if(DLLCONFIG.m_iax2Support == false) + { + detectedUsefulPacket = true; // Stop trying to detect if this UDP packet could be of interest + } if(!detectedUsefulPacket) { detectedUsefulPacket = TryIax2New(ethernetHeader, ipHeader, udpHeader, udpPayload); @@ -1511,12 +1515,12 @@ void HandlePacket(u_char *param, const struct pcap_pkthdr *header, const u_char if(!detectedUsefulPacket) { detectedUsefulPacket = TryIax2MetaTrunkFrame(ethernetHeader, ipHeader, udpHeader, udpPayload); - } + } - if(!detectedUsefulPacket) { - detectedUsefulPacket = TryIax2MiniVoiceFrame(ethernetHeader, ipHeader, - udpHeader, udpPayload); - } + if(!detectedUsefulPacket) { + detectedUsefulPacket = TryIax2MiniVoiceFrame(ethernetHeader, ipHeader, + udpHeader, udpPayload); + } } } else if(ipHeader->ip_p == IPPROTO_TCP) |