[ekiga/ds-opal-refactoring] SIP: Moved Outbound Proxy handling to the CallManager.



commit 2e49160dfaab74a222cf8f45b6ef0926851ae6e8
Author: Damien Sandras <dsandras seconix com>
Date:   Sat Mar 21 18:49:36 2015 +0100

    SIP: Moved Outbound Proxy handling to the CallManager.

 .../components/opal/process/sip-endpoint.cpp       |   18 ------------------
 lib/engine/components/opal/sip-call-manager.cpp    |    6 ++++--
 2 files changed, 4 insertions(+), 20 deletions(-)
---
diff --git a/lib/engine/components/opal/process/sip-endpoint.cpp 
b/lib/engine/components/opal/process/sip-endpoint.cpp
index a98d76c..faf5518 100644
--- a/lib/engine/components/opal/process/sip-endpoint.cpp
+++ b/lib/engine/components/opal/process/sip-endpoint.cpp
@@ -233,24 +233,6 @@ Opal::Sip::EndPoint::StartListener (unsigned port)
 
 
 void
-Opal::Sip::EndPoint::set_outbound_proxy (const std::string & uri)
-{
-  if (!uri.empty ()) {
-    outbound_proxy = uri;
-    PTRACE (4, "Opal::Sip::EndPoint\tSet outbound proxy to " << uri);
-    SetProxy (SIPURL (outbound_proxy));
-  }
-}
-
-
-const std::string&
-Opal::Sip::EndPoint::get_outbound_proxy () const
-{
-  return outbound_proxy;
-}
-
-
-void
 Opal::Sip::EndPoint::enable_account (Account & account)
 {
   new registrar_handler (account, *this, true);
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index 98845c5..6b9ff0c 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -171,11 +171,13 @@ void Opal::Sip::CallManager::setup (const std::string & setting)
   }
   if (setting.empty () || setting == "binding-timeout")  {
     int delay = sip_settings->get_int ("binding-timeout");
-    PTRACE (4, "Opal::Sip::EndPoint\tNat binding delay set to " << delay);
+    PTRACE (4, "Opal::Sip::CallManager\tNat binding delay set to " << delay);
     sip_endpoint.SetKeepAlive (PTimeInterval (0, delay), SIPEndPoint::KeepAliveByOPTION);
   }
   if (setting.empty () || setting == "outbound-proxy-host")  {
-    sip_endpoint.set_outbound_proxy (sip_settings->get_string ("outbound-proxy-host"));
+    std::string uri = sip_settings->get_string ("outbound-proxy-host");
+    PTRACE (4, "Opal::Sip::CallManager\tSet outbound proxy to " << uri);
+    sip_endpoint.SetProxy (SIPURL (uri));
   }
 
   if (setting.empty () || setting == "dtmf-mode")  {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]