Meetme file is parsed with comma-delimiters, not vertical bars

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13733 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index b6b2662371cc1606dc55d31768d5b0926813c49f..30e62dd6250cd1f8e2d0e7fe1386e0219ef2dc69 100644 (file)
--- 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