diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-21 06:03:58 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-21 06:03:58 +0000 |
| commit | 2c6d45952055077c0d3f2e0231db318dec31f57b (patch) | |
| tree | 6c5237d510b43b37e7ba75d67ed178f5d4b5e6f0 /apps/app_meetme.c | |
| parent | 8cbd10e0545ff4479bdf29c1e106be353fd9c70a (diff) | |
Meetme file is parsed with comma-delimiters, not vertical bars
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@13733 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index b6b266237..30e62dd62 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1830,28 +1830,20 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, ast_log(LOG_WARNING, "No %s file :(\n", CONFIG_FILE_NAME); return NULL; } - var = ast_variable_browse(cfg, "rooms"); - for (; var; var = var->next) { + 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_STANDARD_APP_ARGS(args, parse); + AST_NONSTANDARD_APP_ARGS(args, parse, ','); if (!strcasecmp(args.confno, confno)) { /* Bingo it's a valid conference */ - if (args.pin) { - if (args.pinadmin) - cnf = build_conf(args.confno, args.pin, args.pinadmin, make, dynamic, refcount); - else - cnf = build_conf(args.confno, args.pin, "", make, dynamic, refcount); - } else { - if (args.pinadmin) - cnf = build_conf(args.confno, "", args.pinadmin, make, dynamic, refcount); - else - cnf = build_conf(args.confno, "", "", make, dynamic, refcount); - } + cnf = build_conf(args.confno, + ast_strlen_zero(args.pin) ? "" : args.pin, + ast_strlen_zero(args.pinadmin) ? "" : args.pinadmin, + make, dynamic, refcount); break; } } @@ -2026,7 +2018,7 @@ static int conf_exec(struct ast_channel *chan, void *data) AST_LIST_UNLOCK(&confs); if (!found) { /* At this point, we have a confno_tmp (static conference) that is empty */ - if ((empty_no_pin && ((!stringp) || (stringp && (stringp[0] == '\0')))) || (!empty_no_pin)) { + if ((empty_no_pin && ast_strlen_zero(stringp)) || (!empty_no_pin)) { /* Case 1: empty_no_pin and pin is nonexistent (NULL) * Case 2: empty_no_pin and pin is blank (but not NULL) * Case 3: not empty_no_pin |