[Semsdev] r1180 - in trunk: apps/webconference doc

[sayer]

Author: sayer
Date: 2008-12-08 19:15:44 +0100 (Mon, 08 Dec 2008)
New Revision: 1180

Modified:
   trunk/apps/webconference/WebConference.cpp
   trunk/doc/Readme.webconference
Log:
SEMS-42: callee domain optionally specified in webconference dialout


Modified: trunk/apps/webconference/WebConference.cpp
===================================================================
--- trunk/apps/webconference/WebConference.cpp  2008-12-08 17:57:29 UTC (rev 
1179)
+++ trunk/apps/webconference/WebConference.cpp  2008-12-08 18:15:44 UTC (rev 
1180)
@@ -478,26 +478,35 @@
   string domain      = args.get(4).asCStr();
   string auth_user   = args.get(5).asCStr();
   string auth_pwd    = args.get(6).asCStr();
+  string callee_domain;
   string headers;
 
   try {
-      assertArgCStr(args.get(7));
-      headers = args.get(7).asCStr();
-      int i, len;
-      len = headers.length();
-      for (i = 0; i < len; i++) {
-         if (headers[i] == '|') headers[i] = '\n';
-      }
-      if (headers[len - 1] != '\n') {
-         headers += '\n';
-      }
+    assertArgCStr(args.get(7));
+    headers = args.get(7).asCStr();
+    int i, len;
+    len = headers.length();
+    for (i = 0; i < len; i++) {
+      if (headers[i] == '|') headers[i] = '\n';
+    }
+    if (headers[len - 1] != '\n') {
+      headers += '\n';
+    }
   }
   catch (AmArg::OutOfBoundsException &e) {
-      headers = "";
+    headers = "";
   }
 
+  try {
+    assertArgCStr(args.get(8));
+    callee_domain = args.get(8).asCStr();
+  }
+  catch (AmArg::OutOfBoundsException &e) {
+    callee_domain = domain;
+  }
+
   string from = "sip:" + from_user + "@" + domain;
-  string to   = "sip:" + callee + "@" + domain;
+  string to   = "sip:" + callee + "@" + callee_domain;
 
   // check adminpin
   rooms_mut.lock();

Modified: trunk/doc/Readme.webconference
===================================================================
--- trunk/doc/Readme.webconference      2008-12-08 17:57:29 UTC (rev 1179)
+++ trunk/doc/Readme.webconference      2008-12-08 18:15:44 UTC (rev 1180)
@@ -60,7 +60,7 @@
 ----
 dialout(string room, string adminpin, string callee,
         string from_user, string domain,
-        string auth_user, string auth_pwd [, headers]) :
+        string auth_user, string auth_pwd [, headers [, callee_domain]]) :
      int code, string result, string callid
 
    code/result:

_______________________________________________
Semsdev mailing list
Semsdev@lists.iptel.org
http://lists.iptel.org/mailman/listinfo/semsdev