summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Begumisa <ben_g@users.sourceforge.net>2009-01-23 16:16:06 +0000
committerGerald Begumisa <ben_g@users.sourceforge.net>2009-01-23 16:16:06 +0000
commita9fb9c523802d01e50260ce94941746c7ffb4fc1 (patch)
treecf5bc0416ee024ecaa958ee3f369744dcd9a51fc
parente8190b79e536d2d3a95af2d9ffdf260dddef24fe (diff)
Added configuration parameter, MediaAddressBlockedIpRanges for the VoIpPlugin. This is used to control the IP ranges which get associated with a recording session.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@598 09dcff7a-b715-0410-9601-b79a96267cd0
-rw-r--r--orkaudio/audiocaptureplugins/voip/RtpSession.cpp11
-rw-r--r--orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp1
-rw-r--r--orkaudio/audiocaptureplugins/voip/VoIpConfig.h1
3 files changed, 13 insertions, 0 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index 92cc1f0..aaf9723 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -1732,6 +1732,17 @@ void RtpSessions::SetMediaAddress(RtpSessionRef& session, struct in_addr mediaIp
{
return;
}
+ if(DLLCONFIG.m_mediaAddressBlockedIpRanges.Matches(mediaIp))
+ {
+ char szMediaIp[16];
+ CStdString logMsg;
+ ACE_OS::inet_ntop(AF_INET, (void*)&mediaIp, szMediaIp, sizeof(szMediaIp));
+
+ logMsg.Format("[%s] %s,%d rejected by MediaAddressBlockedIpRanges", session->m_trackingId, szMediaIp, mediaPort);
+ LOG4CXX_INFO(m_log, logMsg);
+
+ return;
+ }
CStdString logMsg;
CStdString ipAndPort;
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
index dbdd586..5e38e0d 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp
@@ -142,6 +142,7 @@ void VoIpConfig::Define(Serializer* s)
s->CsvValue("SipDomains", m_sipDomains);
s->CsvValue("SipDirectionReferenceIpAddresses", m_sipDirectionReferenceIpAddresses);
s->IpRangesValue("LanIpRanges", m_lanIpRanges);
+ s->IpRangesValue("MediaAddressBlockedIpRanges", m_mediaAddressBlockedIpRanges);
}
void VoIpConfig::Validate()
diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
index ccf7db8..f7225e9 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
+++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h
@@ -113,6 +113,7 @@ public:
std::list<CStdString> m_sipDomains;
std::list<CStdString> m_sipDirectionReferenceIpAddresses;
IpRanges m_lanIpRanges;
+ IpRanges m_mediaAddressBlockedIpRanges;
};
//========================================