[<rjongbloed@us...>]

Revision: 24538
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=24538&view=rev
Author:   rjongbloed
Date:     2010-06-28 09:35:45 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
Fixed "internal" transfer (e.g. pc: to ivr:) in "C" API.

Fixed ivr only configuration for "C" API.

Modified Paths:
--------------
    opal/trunk/src/opal/opal_c.cxx

Modified: opal/trunk/src/opal/opal_c.cxx
===================================================================
--- opal/trunk/src/opal/opal_c.cxx	2010-06-24 05:10:36 UTC (rev 24537)
+++ opal/trunk/src/opal/opal_c.cxx	2010-06-28 09:35:45 UTC (rev 24538)
@@ -836,9 +836,10 @@
 
 
 #if OPAL_IVR
-  if (options.Find("ivr") != P_MAX_INDEX) {
-    new OpalIVREndPoint_C(*this);
-    AddRouteEntry(".*:#=ivr:"); // A hash from anywhere goes to IVR
+  PINDEX ivrPos = options.Find("ivr");
+  if (ivrPos < defUserPos) {
+    defUser = "ivr:";
+    defUserPos = localPos;
   }
 #endif
 
@@ -899,6 +900,13 @@
     AddRouteEntry("local:.*=" + defProto + ":<da>");
   }
 
+#if OPAL_IVR
+  if (ivrPos != P_MAX_INDEX) {
+    new OpalIVREndPoint_C(*this);
+    AddRouteEntry("ivr:.*=" + defProto + ":<da>");
+  }
+#endif
+
   return true;
 }
 
@@ -1744,7 +1752,7 @@
   if (connection->GetPhase() < OpalConnection::ConnectedPhase)
     connection->ForwardCall(command.m_param.m_callSetUp.m_partyB);
   else
-    connection->TransferConnection(command.m_param.m_callSetUp.m_partyB);
+    call->Transfer(command.m_param.m_callSetUp.m_partyB, connection);
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.