Added local rtp proxy

Author: joegen

.gitignore

@@ -1,3 +1,4 @@
+nbproject
 Makefile.in
 aclocal.m4
 autom4te.cache/

include/OSS/SIP/SBC/SBCMediaProxy.h

@@ -26,6 +26,7 @@
 
 
 #include "OSS/SIP/SBC/SBCMediaProxyClient.h"
+#include "OSS/RTP/RTPProxyManager.h"
 
 
 namespace OSS {
@@ -55,7 +56,7 @@ class SBCMediaProxy
 
   bool getSDP(const std::string& sessionId, std::string& lastOffer, std::string& lastAnswer);
 
-  bool initialize();
+  bool initialize(bool remoteRtpEnabled = false);
 
   bool removeSession(const std::string& sessionId);
 
@@ -73,6 +74,8 @@ class SBCMediaProxy
   SBCMediaProxyClient _node3;
   SBCMediaProxyClient _node4;
   SBCManager* _pManager;
+  OSS::RTP::RTPProxyManager _rtp;
+  bool _remoteRtpEnabled;
 };
 
 //

src/js/oss_js.cpp src/js/oss_core.cpp

@@ -39,7 +39,7 @@ int main(int argc, char** argv)
 {
   if (argc < 2)
   {
-    std::cerr << "Usage:  ossjs [script] [script_options]" << std::endl;
+    std::cerr << "Usage:  " << argv[0] << " [script] [script_options]" << std::endl;
     _exit(1);
   }
 

src/js/src.am

@@ -17,8 +17,8 @@ liboss_core_la_SOURCES +=  \
     js/JSInterIsolateCallManager.cpp \
     js/JSFileDescriptorManager.cpp
 
-    bin_PROGRAMS += ossjs
-    ossjs_SOURCES = js/oss_js.cpp
+    bin_PROGRAMS += oss_core
+    oss_core_SOURCES = js/oss_core.cpp
 endif
 
 

src/rtp/RTPProxyManager.cpp

@@ -51,17 +51,7 @@ RTPProxyManager::~RTPProxyManager()
 
 void RTPProxyManager::run(int threadCount, int readTimeout)
 {
-  if (_rtpProxyThreadCount > 0)
-    return;
-
-  
-  
-#if RTP_THREADED  
   _rtpProxyThreadCount = threadCount;
-#else
-  (void)threadCount;
-  _rtpProxyThreadCount = 1;
-#endif
   _readTimeout = readTimeout;
   //
   // start the houseKeepingTimer to keep the io_service busy

src/sbc/SBCMediaProxy.cpp

@@ -30,6 +30,7 @@ namespace OSS {
 namespace SIP {
 namespace SBC {
 
+#define RTP_PROXY_THREAD_COUNT 30
 
 static int get_node(const std::string& sessionId, bool& spillOver)
 {
@@ -77,43 +78,55 @@ SBCMediaProxy::SBCMediaProxy(SBCManager* pManager) :
   _node2(2),
   _node3(3),
   _node4(4),
-  _pManager(pManager)
+  _pManager(pManager),
+  _remoteRtpEnabled(false)
 {
 }
 
 SBCMediaProxy::~SBCMediaProxy()
 {
 }
 
-bool SBCMediaProxy::initialize()
+bool SBCMediaProxy::initialize(bool remoteRtpEnabled)
 {
-  if (!_node0.initialize())
-    return false;
-  if (!_node1.initialize())
-    return false;
-  if (!_node2.initialize())
-    return false;
-  if (!_node3.initialize())
-    return false;
-  if (!_node4.initialize())
-    return false;
-  
+  _remoteRtpEnabled = remoteRtpEnabled;
+
+  if (_remoteRtpEnabled)
+  {
+    if (!_node0.initialize())
+      return false;
+    if (!_node1.initialize())
+      return false;
+    if (!_node2.initialize())
+      return false;
+    if (!_node3.initialize())
+      return false;
+    if (!_node4.initialize())
+      return false;
+  }
+  else
+  {
+    _rtp.run(RTP_PROXY_THREAD_COUNT);
+  }  
   return true;
 }
 
 SBCMediaProxyClient* SBCMediaProxy::getNode(const std::string& sessionId, bool& spillOver)
 {
-  int node = get_node(sessionId, spillOver);
-  if (node == 0)
-    return &_node0;
-  else if (node == 1)
-    return &_node1;
-  else if (node == 2)
-    return &_node2;
-  else if (node == 3)
-    return &_node3;
-  else if (node == 4)
-    return &_node4;
+  if (_remoteRtpEnabled)
+  {
+    int node = get_node(sessionId, spillOver);
+    if (node == 0)
+      return &_node0;
+    else if (node == 1)
+      return &_node1;
+    else if (node == 2)
+      return &_node2;
+    else if (node == 3)
+      return &_node3;
+    else if (node == 4)
+      return &_node4;
+  }
   return 0;
 }
 
@@ -136,6 +149,18 @@ bool SBCMediaProxy::handleSDP(
   {
     return pNode->handleSDP(logId, sessionId, sentBy, packetSourceIP, packetLocalInterface, route, routeLocalInterface, requestType, sdp, rtpAttribute);
   }
+  else
+  {
+    try
+    {
+      _rtp.handleSDP(logId, sessionId, sentBy, packetSourceIP, packetLocalInterface, route, routeLocalInterface, requestType, sdp, rtpAttribute);
+      return true;
+    }
+    catch (...)
+    {
+      return false;
+    }
+  }
   return false;
 }
 
@@ -147,6 +172,11 @@ bool SBCMediaProxy::getSDP(const std::string& sessionId, std::string& lastOffer,
   {
     return pNode->getSDP( sessionId, lastOffer, lastAnswer);
   }
+  else
+  {
+    _rtp.getSDP(sessionId, lastOffer, lastAnswer);
+    return true;
+  }
   return false;
 }
 
@@ -159,6 +189,11 @@ bool SBCMediaProxy::removeSession(const std::string& sessionId)
   {
     return pNode->removeSession(sessionId);
   }
+  else
+  {
+    _rtp.removeSession(sessionId);
+    return true;
+  }
   return false;
 }
 
@@ -179,11 +214,18 @@ unsigned int SBCMediaProxy::getMaxSession() const
 
 unsigned int SBCMediaProxy::getSessionCount() const
 {
-  return _node0.getSessionCount() +
-    _node1.getSessionCount() +
-    _node2.getSessionCount() +
-    _node3.getSessionCount() +
-    _node4.getSessionCount();
+  if (_remoteRtpEnabled)
+  {
+    return _node0.getSessionCount() +
+      _node1.getSessionCount() +
+      _node2.getSessionCount() +
+      _node3.getSessionCount() +
+      _node4.getSessionCount();
+  }
+  else
+  {
+    return _rtp.getSessionCount();
+  }
 }
 
 } } } //OSS::SIP::SBC