[asterisk-commits] russell: trunk r55007 - in /trunk: ./ apps/
configs/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 16 15:50:23 MST 2007
Author: russell
Date: Fri Feb 16 16:50:22 2007
New Revision: 55007
URL: http://svn.digium.com/view/asterisk?view=rev&rev=55007
Log:
Merged revisions 55006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r55006 | russell | 2007-02-16 16:49:42 -0600 (Fri, 16 Feb 2007) | 17 lines
Merged revisions 55005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r55005 | russell | 2007-02-16 16:48:22 -0600 (Fri, 16 Feb 2007) | 9 lines
Revert the change I did in revisions 54955, 54969, and 54970, in 1.2, 1.4,
and trunk. I decided that once a conference is created from meetme.conf,
it is acceptable behavior that the pin can not be changed until the
conference goes away. I also added a note in meetme.conf to describe this
behavior.
We still have another issue in 1.4 and trunk where some conferences with no
users don't go away. That is the real bug that needs to be addressed here.
........
................
Modified:
trunk/ (props changed)
trunk/apps/app_meetme.c
trunk/configs/meetme.conf.sample
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=55007&r1=55006&r2=55007
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Feb 16 16:50:22 2007
@@ -631,8 +631,7 @@
* \return A pointer to the conference struct, or NULL if it wasn't found and
* make or dynamic were not set.
*/
-static struct ast_conference *build_conf(const char *confno, const char *pin,
- const char *pinadmin, int make, int dynamic, int refcount)
+static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic, int refcount)
{
struct ast_conference *cnf;
struct zt_confinfo ztc;
@@ -2094,55 +2093,6 @@
return ret;
}
-static struct ast_conference *build_conf_from_config(struct ast_conference *conf, const char *confno,
- int make, int dynamic, int refcount)
-{
- struct ast_config *cfg;
- struct ast_variable *var;
-
- if (!(cfg = ast_config_load(CONFIG_FILE_NAME))) {
- ast_log(LOG_WARNING, "No %s file :(\n", CONFIG_FILE_NAME);
- return NULL;
- }
-
- var = ast_variable_browse(cfg, "rooms");
- for (; var; var = var->next) {
- char *parse;
- AST_DECLARE_APP_ARGS(args,
- AST_APP_ARG(confno);
- AST_APP_ARG(pin);
- AST_APP_ARG(pinadmin);
- );
-
- if (strcasecmp(var->name, "conf"))
- continue;
-
- parse = ast_strdupa(var->value);
- AST_NONSTANDARD_APP_ARGS(args, parse, ',');
-
- if (strcasecmp(args.confno, confno))
- continue;
-
- if (!conf) {
- conf = build_conf(args.confno, S_OR(args.pin, ""),
- S_OR(args.pinadmin, ""), make, dynamic, refcount);
- break;
- }
-
- ast_copy_string(conf->pin, S_OR(args.pin, ""), sizeof(conf->pin));
- ast_copy_string(conf->pinadmin, S_OR(args.pinadmin, ""), sizeof(conf->pinadmin));
-
- break;
- }
-
- if (!var && !conf)
- ast_log(LOG_DEBUG, "%s isn't a valid conference\n", confno);
-
- ast_config_destroy(cfg);
-
- return conf;
-}
-
static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char *confno, int make, int dynamic,
char *dynamic_pin, size_t pin_buf_len, int refcount, struct ast_flags *confflags)
{
@@ -2199,10 +2149,19 @@
return cnf;
}
+
static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, int make, int dynamic,
char *dynamic_pin, size_t pin_buf_len, int refcount, struct ast_flags *confflags)
{
+ struct ast_config *cfg;
+ struct ast_variable *var;
struct ast_conference *cnf;
+ char *parse;
+ AST_DECLARE_APP_ARGS(args,
+ AST_APP_ARG(confno);
+ AST_APP_ARG(pin);
+ AST_APP_ARG(pinadmin);
+ );
/* Check first in the conference list */
AST_LIST_LOCK(&confs);
@@ -2231,7 +2190,33 @@
cnf = build_conf(confno, "", "", make, dynamic, refcount);
}
} else {
- cnf = build_conf_from_config(NULL, confno, make, dynamic, refcount);
+ /* Check the config */
+ cfg = ast_config_load(CONFIG_FILE_NAME);
+ if (!cfg) {
+ ast_log(LOG_WARNING, "No %s file :(\n", CONFIG_FILE_NAME);
+ return NULL;
+ }
+ for (var = ast_variable_browse(cfg, "rooms"); var; var = var->next) {
+ if (strcasecmp(var->name, "conf"))
+ continue;
+
+ if (!(parse = ast_strdupa(var->value)))
+ return NULL;
+
+ AST_NONSTANDARD_APP_ARGS(args, parse, ',');
+ if (!strcasecmp(args.confno, confno)) {
+ /* Bingo it's a valid conference */
+ cnf = build_conf(args.confno,
+ S_OR(args.pin, ""),
+ S_OR(args.pinadmin, ""),
+ make, dynamic, refcount);
+ break;
+ }
+ }
+ if (!var) {
+ ast_log(LOG_DEBUG, "%s isn't a valid conference\n", confno);
+ }
+ ast_config_destroy(cfg);
}
} else if (dynamic_pin) {
/* Correct for the user selecting 'D' instead of 'd' to have
@@ -2239,10 +2224,6 @@
with a pin. */
if (dynamic_pin[0] == 'q')
dynamic_pin[0] = '\0';
- } else if (!cnf->isdynamic) {
- /* If the conference exists, check the config again, just in case
- * the pin in the file has changed. */
- build_conf_from_config(cnf, confno, 0, 0, 0);
}
if (cnf) {
Modified: trunk/configs/meetme.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/meetme.conf.sample?view=diff&rev=55007&r1=55006&r2=55007
==============================================================================
--- trunk/configs/meetme.conf.sample (original)
+++ trunk/configs/meetme.conf.sample Fri Feb 16 16:50:22 2007
@@ -17,5 +17,10 @@
;
; Usage is conf => confno[,pin][,adminpin]
;
+; Note that once a participant has called the conference, a change to the pin
+; number done in this file will not take effect until there are no more users
+; in the conference and it goes away. When it is created again, it will have
+; the new pin number.
+;
;conf => 1234
;conf => 2345,9938
More information about the asterisk-commits
mailing list