Version 0.1.10 from FTP

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@386 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 11 insertions, 6 deletions

diff --git a/apps/app_playback.c b/apps/app_playback.c
index 444f2645e..11356e4b3 100755
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -32,9 +32,11 @@ static char *descrip =
 "extension). Options may also be  included following a pipe symbol. The only\n"
 "defined option at this time is 'skip',  which  causes  the  playback of the\n"
 "message to  be  skipped  if  the  channel is not in the 'up' state (i.e. it\n"
-"hasn't been  answered  yet. If 'skip' is not specified, the channel will be\n"
-"answered before the sound is played. Returns -1 if the channel was hung up,\n"
-"or if the file does not exist. Returns 0 otherwise.\n";
+"hasn't been  answered  yet. If 'skip' is specified, the application will\n"
+"return immediately should the channel not be off hook.  Otherwise, unless\n"
+"'noanswer' is specified, the channel channel will be answered before the sound\n"
+"is played. Not all channels support playing messages while on hook. Returns -1\n"
+"if the channel was hung up, or if the file does not exist. Returns 0 otherwise.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -47,23 +49,26 @@ static int playback_exec(struct ast_channel *chan, void *data)
 	char tmp[256];
 	char *options;
 	int option_skip=0;
+	int option_noanswer = 0;
 	if (!data || !strlen((char *)data)) {
 		ast_log(LOG_WARNING, "Playback requires an argument (filename)\n");
 		return -1;
 	}
-	strncpy(tmp, (char *)data, sizeof(tmp));
+	strncpy(tmp, (char *)data, sizeof(tmp)-1);
 	strtok(tmp, "|");
 	options = strtok(NULL, "|");
 	if (options && !strcasecmp(options, "skip"))
 		option_skip = 1;
+	if (options && !strcasecmp(options, "noanswer"))
+		option_noanswer = 1;
 	LOCAL_USER_ADD(u);
 	if (chan->state != AST_STATE_UP) {
 		if (option_skip) {
 			/* At the user's option, skip if the line is not up */
 			LOCAL_USER_REMOVE(u);
 			return 0;
-		} else
-			/* Otherwise answer */
+		} else if (!option_noanswer)
+			/* Otherwise answer unless we're supposed to send this while on-hook */
 			res = ast_answer(chan);
 	}
 	if (!res) {