diff options
| author | Henri Herscher <henri@oreka.org> | 2007-05-08 21:34:22 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2007-05-08 21:34:22 +0000 |
| commit | d699831cfc45869aa74b35fb00ee6f94748c3605 (patch) | |
| tree | b8d328ab2ddcf48313e4fea6c2adb689f15a2dbc /orkaudio/audiocaptureplugins/voip/VoIp.cpp | |
| parent | dbbc010093d9ddda3fd4372580aeb9a60c089ce1 (diff) | |
SIP over TCP now builds under win32. Also made it disabled by default.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@439 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, 8 insertions, 7 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp index 9f34247..1c9cddb 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp @@ -1218,9 +1218,9 @@ bool TrySipTcp(EthernetHeaderStruct* ethernetHeader, IpHeaderStruct* ipHeader, T } } - for(std::list<SipTcpStreamRef>::iterator it = toErase.begin(); it != toErase.end(); it++) + for(std::list<SipTcpStreamRef>::iterator it2 = toErase.begin(); it2 != toErase.end(); it2++) { - SipTcpStreamRef tcpstream = *it; + SipTcpStreamRef tcpstream = *it2; s_SipTcpStreams.remove(tcpstream); } @@ -1694,11 +1694,6 @@ void HandlePacket(u_char *param, const struct pcap_pkthdr *header, const u_char else if(ipHeader->ip_p == IPPROTO_TCP) { TcpHeaderStruct* tcpHeader = (TcpHeaderStruct*)((char *)ipHeader + ipHeaderLength); - CStdString tcpSeq; - - memToHex((unsigned char *)&tcpHeader->seq, 4, tcpSeq); - - TrySipTcp(ethernetHeader, ipHeader, tcpHeader); if(ntohs(tcpHeader->source) == SKINNY_CTRL_PORT || ntohs(tcpHeader->dest) == SKINNY_CTRL_PORT) { @@ -1727,6 +1722,12 @@ void HandlePacket(u_char *param, const struct pcap_pkthdr *header, const u_char skinnyHeader = (SkinnyHeaderStruct*)((u_char*)skinnyHeader + SKINNY_HEADER_LENGTH + skinnyHeader->len); } } + else if(DLLCONFIG.m_sipOverTcpSupport) + { + //CStdString tcpSeq; + //memToHex((unsigned char *)&tcpHeader->seq, 4, tcpSeq); + TrySipTcp(ethernetHeader, ipHeader, tcpHeader); + } } if((now - s_lastHooveringTime) > 5) |