diff options
| author | Gerald Begumisa <ben_g@users.sourceforge.net> | 2008-02-18 15:51:39 +0000 |
|---|---|---|
| committer | Gerald Begumisa <ben_g@users.sourceforge.net> | 2008-02-18 15:51:39 +0000 |
| commit | 42969445daa363f0b3ed371d99206e8b91c37215 (patch) | |
| tree | 0b57bd3a4294578110b947a6dfaf51b7cfcf466f /orkaudio | |
| parent | 27add11974dffb1d3a6b48d140e3f8dd689c995d (diff) | |
Added configuration variable <SkinnyTcpPort> for the <VoIpPlugin> section of config.xml. This should be set to the port from which Skinny control traffic is expected. If not set, then defaults to 2000.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@522 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio')
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIp.cpp | 2 | ||||
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp | 8 | ||||
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIpConfig.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp index f61ea67..9d6180b 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp @@ -2172,7 +2172,7 @@ void HandlePacket(u_char *param, const struct pcap_pkthdr *header, const u_char { TcpHeaderStruct* tcpHeader = (TcpHeaderStruct*)((char *)ipHeader + ipHeaderLength); - if(ntohs(tcpHeader->source) == SKINNY_CTRL_PORT || ntohs(tcpHeader->dest) == SKINNY_CTRL_PORT) + if(ntohs(tcpHeader->source) == DLLCONFIG.m_skinnyTcpPort || ntohs(tcpHeader->dest) == DLLCONFIG.m_skinnyTcpPort) { u_char* startTcpPayload = (u_char*)tcpHeader + TCP_HEADER_LENGTH; SkinnyHeaderStruct* skinnyHeader = (SkinnyHeaderStruct*)(startTcpPayload); diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp index 16e5574..79462ae 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp @@ -57,6 +57,7 @@ VoIpConfig::VoIpConfig() m_sangomaEnable = false; m_sangomaRxTcpPortStart = 0; m_sangomaTxTcpPortStart = 0; + m_skinnyTcpPort = 2000; } void VoIpConfig::Define(Serializer* s) @@ -104,6 +105,7 @@ void VoIpConfig::Define(Serializer* s) s->BoolValue("SkinnyIgnoreOpenReceiveChannelAck", m_skinnyIgnoreOpenReceiveChannelAck); s->BoolValue("SkinnyDynamicMediaAddress", m_skinnyDynamicMediaAddress); s->BoolValue("SkinnyAllowCallInfoUpdate", m_skinnyAllowCallInfoUpdate); + s->IntValue("SkinnyTcpPort", m_skinnyTcpPort); s->IntValue("SangomaRxTcpPortStart", m_sangomaRxTcpPortStart); s->IntValue("SangomaTxTcpPortStart", m_sangomaTxTcpPortStart); @@ -280,6 +282,12 @@ void VoIpConfig::Validate() exception.Format("VoIpConfig: RtpSessionWithSignallingInitialTimeoutSec must be > 0 (currently:%d)", m_rtpSessionWithSignallingInitialTimeoutSec); throw (exception); } + if(m_skinnyTcpPort < 1) + { + CStdString exception; + exception.Format("VoIpConfig: SkinnyTcpPort must be > 0 (currently:%d) please fix in config.xml", m_skinnyTcpPort); + throw (exception); + } if(m_sangomaRxTcpPortStart == 0) { } diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h index 949736c..fba1345 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h @@ -96,6 +96,7 @@ public: int m_sangomaTcpPortDelta; int m_sangomaRxTcpPortStart; int m_sangomaTxTcpPortStart; + int m_skinnyTcpPort; }; //======================================== |