kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Export MEETMEBOOKID and fix pin-less conferences with realtime conferences

Browse Source 
(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/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@256019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2010-04-02 23:55:57 +00:00
parent df3fc304c9
commit a541609dde
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_meetme.c
View File

@@ -3477,6 +3477,11 @@ bailoutandtrynormal:
/* 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 @@ static int conf_exec(struct ast_channel *chan, const char *data)
/* 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);
}