[ekiga/ds-opal-refactoring] SIP: Move more EndPoint methods to the SIP::CallManager.

[Damien Sandras <dsandras src gnome org>]

commit 96cf7e2895e3a1e664475c0370a2ca9018364283
Author: Damien Sandras <dsandras seconix com>
Date:   Sat Mar 21 18:43:56 2015 +0100

    SIP: Move more EndPoint methods to the SIP::CallManager.

 .../components/opal/process/sip-endpoint.cpp       |   25 +-------------------
 lib/engine/components/opal/process/sip-endpoint.h  |    4 ---
 lib/engine/components/opal/sip-call-manager.cpp    |    4 ++-
 3 files changed, 4 insertions(+), 29 deletions(-)
---
diff --git a/lib/engine/components/opal/process/sip-endpoint.cpp 
b/lib/engine/components/opal/process/sip-endpoint.cpp
index 6761533..23604e7 100644
--- a/lib/engine/components/opal/process/sip-endpoint.cpp
+++ b/lib/engine/components/opal/process/sip-endpoint.cpp
@@ -132,7 +132,7 @@ Opal::Sip::EndPoint::EndPoint (Opal::EndPoint & _endpoint,
   PTimeInterval timeout;
   KeepAliveType type;
   GetKeepAlive (timeout, type);
-  SetKeepAlive(timeout, KeepAliveByOPTION);
+  SetKeepAlive (timeout, KeepAliveByOPTION);
 
   std::cout << "FIXME" << std::endl;
   //manager.ready.connect (boost::bind (&EndPoint::setup, this, ""));
@@ -250,29 +250,6 @@ Opal::Sip::EndPoint::get_outbound_proxy () const
 }
 
 
-void
-Opal::Sip::EndPoint::set_nat_binding_delay (unsigned delay)
-{
-  if (delay > 0) {
-    PTRACE (4, "Opal::Sip::EndPoint\tNat binding delay set to " << delay);
-    PTimeInterval timeout;
-    KeepAliveType type;
-    GetKeepAlive (timeout, type);
-    SetKeepAlive (PTimeInterval (0, delay), type);
-  }
-}
-
-
-unsigned
-Opal::Sip::EndPoint::get_nat_binding_delay ()
-{
-  PTimeInterval timeout;
-  KeepAliveType type;
-  GetKeepAlive (timeout, type);
-  return timeout.GetSeconds ();
-}
-
-
 std::string
 Opal::Sip::EndPoint::get_aor_domain (const std::string & aor)
 {
diff --git a/lib/engine/components/opal/process/sip-endpoint.h 
b/lib/engine/components/opal/process/sip-endpoint.h
index d342cd1..0a50d24 100644
--- a/lib/engine/components/opal/process/sip-endpoint.h
+++ b/lib/engine/components/opal/process/sip-endpoint.h
@@ -76,10 +76,6 @@ namespace Opal {
 
       bool StartListener (unsigned port);
 
-      /* SIP EndPoint */
-      void set_nat_binding_delay (unsigned delay);
-      unsigned get_nat_binding_delay ();
-
       void set_outbound_proxy (const std::string & uri);
       const std::string & get_outbound_proxy () const;
 
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index 74eed69..98845c5 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -170,7 +170,9 @@ void Opal::Sip::CallManager::setup (const std::string & setting)
     set_listen_port (sip_settings->get_int ("listen-port"));
   }
   if (setting.empty () || setting == "binding-timeout")  {
-    sip_endpoint.set_nat_binding_delay (sip_settings->get_int ("binding-timeout"));
+    int delay = sip_settings->get_int ("binding-timeout");
+    PTRACE (4, "Opal::Sip::EndPoint\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"));