ekiga r6880 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Mon Sep  8 17:50:09 2008
New Revision: 6880
URL: http://svn.gnome.org/viewvc/ekiga?rev=6880&view=rev

Log:
Resurrected stun_server gconf key. Make it empty to disable STUN.
Otherwise, keep the automatic test.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/manager.h
   trunk/src/endpoints/opal-gmconf-bridge.cpp
   trunk/src/endpoints/opal-main.cpp

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Mon Sep  8 17:50:09 2008
@@ -160,7 +160,7 @@
 void CallManager::start ()
 {
   // Ready
-  new StunDetector ("stun.voxgratia.org", *this, queue);
+  new StunDetector (stun_server, *this, queue);
 
   patience = 3;
   runtime.run_in_main (sigc::mem_fun (this, &CallManager::HandleSTUNResult), 1);
@@ -482,6 +482,13 @@
 }
 
 
+void CallManager::set_stun_server (const std::string & server)
+{
+  stun_server = server;
+  start ();
+}
+
+
 bool CallManager::dial (const std::string & uri)
 {
   for (CallManager::iterator iter = begin ();
@@ -712,7 +719,7 @@
       patience--;
       runtime.run_in_main (sigc::mem_fun (this,
 					  &CallManager::HandleSTUNResult),
-			   12);
+			   3);
     } else if (patience == 2) {
 
       patience--;

Modified: trunk/src/endpoints/manager.h
==============================================================================
--- trunk/src/endpoints/manager.h	(original)
+++ trunk/src/endpoints/manager.h	Mon Sep  8 17:50:09 2008
@@ -125,6 +125,7 @@
     void get_tcp_ports (unsigned & min_port, 
                         unsigned & max_port) const;
 
+    void set_stun_server (const std::string & server);
 
     /**/
     struct VideoOptions 
@@ -177,6 +178,7 @@
     uint patience;
 
     std::string display_name;
+    std::string stun_server;
     unsigned reject_delay;
     bool forward_on_busy;
     bool unconditional_forward;

Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp	Mon Sep  8 17:50:09 2008
@@ -89,6 +89,8 @@
   keys.push_back (H323_KEY "dtmf_mode");
   keys.push_back (H323_KEY "forward_host"); 
 
+  keys.push_back (NAT_KEY "stun_server");
+
   load (keys);
 }
 
@@ -140,6 +142,14 @@
     manager.set_video_options (options);
   }
 
+  //
+  // NAT Key
+  //
+  else if (key == NAT_KEY "stun_server") {
+
+    manager.set_stun_server (gm_conf_entry_get_string (entry));
+  }
+
 
   // 
   // Jitter buffer configuration

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Mon Sep  8 17:50:09 2008
@@ -124,7 +124,6 @@
   call_core->add_manager (*call_manager);
 
   new ConfBridge (*call_manager);
-  call_manager->start ();
 
   // Add the bank of accounts when the CallManager is ready
   call_manager->ready.connect (sigc::bind (sigc::ptr_fun (on_call_manager_ready_cb), &core));