[svn-commits] russell: trunk r256019 - /trunk/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Apr  2 18:55:57 2010
New Revision: 256019

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256019
Log:
Export MEETMEBOOKID and fix pin-less conferences with realtime conferences

(closes issue #16866)
Reported by: DEA
Patches:
      rt-meetme-options.txt uploaded by DEA (license 3)
Tested by: DEA

Review: https://reviewboard.asterisk.org/r/582/

Modified:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=256019&r1=256018&r2=256019
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Apr  2 18:55:57 2010
@@ -3477,6 +3477,11 @@
 		/* Return the number of seconds the user was in the conf */
 		snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
 		pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
+
+		/* Return the RealTime bookid for CDR linking */
+		if (rt_schedule) {
+			pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
+		}
 	}
 	ast_free(user);
 	AST_LIST_UNLOCK(&confs);
@@ -4051,6 +4056,14 @@
 					/* No pin required */
 					allowretry = 0;
 
+					/* For RealTime conferences without a pin 
+					 * should still support loading options
+					 */
+					if (!ast_strlen_zero(cnf->useropts)) {
+						char *opts = ast_strdupa(cnf->useropts);
+						ast_app_parse_options64(meetme_opts, &confflags, optargs, opts);
+					}
+
 					/* Run the conference */
 					res = conf_run(chan, cnf, &confflags, optargs);
 				}