Added SipIgnoredMediaAddresses config parameter. If a SIP INVITE has an RTP address that matches this csv list of CIDR ranges, it will be ignored.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@521 09dcff7a-b715-0410-9601-b79a96267cd0

4 files changed, 117 insertions, 1 deletions

diff --git a/orkbasecxx/Utils.cpp b/orkbasecxx/Utils.cpp
index 3a6bc84..272a90d 100644
--- a/orkbasecxx/Utils.cpp
+++ b/orkbasecxx/Utils.cpp
@@ -194,7 +194,7 @@ int FileSetOwnership(CStdString filename, CStdString owner, CStdString group)
 
 
 //=====================================================
-// Network related stuff
+// TcpAddress
 
 void TcpAddress::ToString(CStdString& string)
 {
@@ -235,3 +235,78 @@ bool TcpAddressList::HasAddressOrAdd(struct in_addr ip, unsigned short port)
 	return true;
 }
 
+//=========================
+// IpRanges
+
+void IpRanges::Compute()
+{
+	m_ipRangePrefixes.clear();
+	m_ipRangeBitWidths.clear();
+	std::list<CStdString>::iterator it;
+
+	for(it = m_asciiIpRanges.begin(); it != m_asciiIpRanges.end(); it++)
+	{
+		CStdString cidrPrefixLengthString;
+		unsigned int cidrPrefixLength = 32;		// by default, x.x.x.x/32
+		CStdString cidrIpAddressString;
+		struct in_addr cidrIpAddress;
+		
+		CStdString entry = *it;
+		int slashPosition = entry.Find('/');
+		if(slashPosition > 0)
+		{
+			cidrIpAddressString = entry.Left(slashPosition);
+			cidrPrefixLengthString = entry.Mid(slashPosition+1);
+
+			bool notAnInt = false;
+			try
+			{
+				cidrPrefixLength = StringToInt(cidrPrefixLengthString);
+			}
+			catch (...) {notAnInt = true;}
+			if(cidrPrefixLength < 1 || cidrPrefixLength > 32 || notAnInt)
+			{
+				throw (CStdString("IpRanges: invalid CIDR prefix length" + entry));
+			}
+		}
+		else
+		{
+			cidrIpAddressString = entry;
+		}
+
+		if(ACE_OS::inet_aton((PCSTR)cidrIpAddressString, &cidrIpAddress))
+		{
+			unsigned int rangeBitWidth = 32-cidrPrefixLength;
+			unsigned int prefix = ntohl((unsigned int)cidrIpAddress.s_addr) >> (rangeBitWidth);
+			m_ipRangePrefixes.push_back(prefix);
+			m_ipRangeBitWidths.push_back(rangeBitWidth);
+		}
+		else
+		{
+			throw (CStdString("invalid IP range:" + entry));
+		}
+	}
+}
+
+bool IpRanges::Matches(struct in_addr ip)
+{
+	bool matches = false;
+	std::list<unsigned int>::iterator bitWidthIt = m_ipRangeBitWidths.begin();
+	std::list<unsigned int>::iterator prefixIt = m_ipRangePrefixes.begin();
+
+	while(prefixIt != m_ipRangePrefixes.end())
+	{
+		unsigned int bitWidth = *bitWidthIt;
+		unsigned int prefix = *prefixIt;
+		unsigned int packetSourcePrefix = ntohl((unsigned int)ip.s_addr) >> bitWidth;
+		if(packetSourcePrefix == prefix)
+		{
+			matches = true;
+			break;
+		}
+		prefixIt++; 
+		bitWidthIt++;
+	}
+	return matches;
+}
+
diff --git a/orkbasecxx/Utils.h b/orkbasecxx/Utils.h
index a0ef277..048d7c9 100644
--- a/orkbasecxx/Utils.h
+++ b/orkbasecxx/Utils.h
@@ -104,6 +104,19 @@ private:
 	std::list<TcpAddress> m_addresses;
 };
 
+class DLL_IMPORT_EXPORT_ORKBASE IpRanges
+{
+public:
+	bool Matches(struct in_addr ip);
+	void Compute();
+
+	std::list<CStdString> m_asciiIpRanges;
+private:
+	std::list<unsigned int> m_ipRangePrefixes;
+	std::list<unsigned int> m_ipRangeBitWidths;
+};
+
+
 //=====================================================
 // Miscellanous stuff
 
diff --git a/orkbasecxx/serializers/Serializer.cpp b/orkbasecxx/serializers/Serializer.cpp
index b337070..3318833 100644
--- a/orkbasecxx/serializers/Serializer.cpp
+++ b/orkbasecxx/serializers/Serializer.cpp
@@ -134,6 +134,19 @@ void Serializer::DateValue(const char* key, time_t& value, bool required)
 	}
 }
 
+void Serializer::IpRangesValue(const char* key, IpRanges& value, bool required)
+{
+	if (m_deSerialize == true)
+	{
+		GetIpRanges(key, value, required);
+	}
+	else
+	{
+		AddIpRanges(key, value);
+	}
+}
+
+
 
 //=====================================
 void Serializer::AddInt(const char* key, int value)
@@ -231,6 +244,10 @@ void Serializer::AddDate(const char* key, time_t value)
 	AddString(key, dateString);
 }
 
+void Serializer::AddIpRanges(const char* key,  IpRanges& value)
+{
+	;	// Not yet implemented
+}
 
 //====================================================================
 void Serializer::GetInt(const char* key, int&value, bool required)
@@ -376,6 +393,13 @@ void Serializer::GetDate(const char* key, time_t& value, bool required)
 	}
 }
 
+void Serializer::GetIpRanges(const char* key,  IpRanges& value, bool required)
+{
+	GetCsv(key, value.m_asciiIpRanges, required);
+	value.Compute();
+}
+
+
 //-------------------------------------------------------------------------
 // Escape the comma and percent characters for adding string to csv list
 void Serializer::EscapeCsv(CStdString& in, CStdString& out)
diff --git a/orkbasecxx/serializers/Serializer.h b/orkbasecxx/serializers/Serializer.h
index 832fbde..fc60b02 100644
--- a/orkbasecxx/serializers/Serializer.h
+++ b/orkbasecxx/serializers/Serializer.h
@@ -16,6 +16,7 @@
 
 #pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning
 
+#include "Utils.h"
 #include "dll.h"
 #include "OrkBase.h"
 #include <map>
@@ -49,6 +50,7 @@ public:
 	void CsvMapValue(const char* key, std::map<CStdString, CStdString>& value, bool required = false);
 	void DateValue(const char* key, time_t& value, bool required = false);
 	virtual void ListValue(const char* key, std::list<ObjectRef>& value, Object& model, bool required = false) = 0;
+	void IpRangesValue(const char* key, IpRanges& value, bool required = false);
 
 	void AddInt(const char* key, int value);
 	void AddDouble(const char* key, double value);
@@ -58,6 +60,7 @@ public:
 	void AddCsvMap(const char* key,  std::map<CStdString, CStdString>& value);
 	void AddDate(const char* key, time_t value);
 	virtual void AddString(const char* key, CStdString& value) = 0;
+	void AddIpRanges(const char* key,  IpRanges& value);
 
 	void GetInt(const char* key, int& value, bool required = false);
 	void GetDouble(const char* key, double& value, bool required = false);
@@ -67,6 +70,7 @@ public:
 	void GetCsvMap(const char* key,  std::map<CStdString, CStdString>& value, bool required = false);
 	void GetDate(const char* key, time_t& value, bool required = false);
 	virtual void GetString(const char* key, CStdString& value, bool required = false) = 0;
+	void GetIpRanges(const char* key,  IpRanges& value, bool required = false);
 
 	void EscapeCsv(CStdString& in, CStdString& out);
 	void UnEscapeCsv(CStdString& in, CStdString& out);