]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Monitor application arguments requirements fixed.
authorJonathan Rose <jrose@digium.com>
Thu, 14 Jul 2011 19:21:02 +0000 (19:21 +0000)
committerJonathan Rose <jrose@digium.com>
Thu, 14 Jul 2011 19:21:02 +0000 (19:21 +0000)
Monitor was requiring options in spite of no individual option on Monitor being required.

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

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

res/res_monitor.c

index d508da13a6af17c917a77629a07eaa5bcde9d54e..86d1d1e02399de3d074724467d447128a13785a6 100644 (file)
@@ -650,12 +650,6 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data)
                AST_APP_ARG(fname_base);
                AST_APP_ARG(options);
        );
-       
-       /* Parse arguments. */
-       if (ast_strlen_zero(data)) {
-               ast_log(LOG_ERROR, "Monitor requires an argument\n");
-               return 0;
-       }
 
        parse = ast_strdupa(data);
        AST_STANDARD_APP_ARGS(args, parse);
@@ -671,7 +665,9 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data)
                        stream_action &= ~X_REC_OUT;
        }
 
-       arg = strchr(args.format, ':');
+       if (args.format) {
+               arg = strchr(args.format, ':');
+       }
        if (arg) {
                *arg++ = 0;
                urlprefix = arg;