Created API call ast_dtmf_stream

int ast_dtmf_stream(struct ast_channel *chan,struct ast_channel *peer,char *digits,int between)

changed app_senddtmf.c to use this new call
added D() parameter to app_dial to allow post connect dtmf stream to be sent using above call

-Tony


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

app.c

@@ -259,3 +259,48 @@ int ast_app_messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
 	}
 	return 0;
 }
+
+int ast_dtmf_stream(struct ast_channel *chan,struct ast_channel *peer,char *digits,int between) {
+  char *ptr=NULL;
+  int res=0;
+  struct ast_frame f;
+  if(!between)
+    between = 100;
+  
+  if(peer)
+    res = ast_autoservice_start(peer);
+
+  if (!res) {
+    res = ast_waitfor(chan,100);
+    if(res > -1) {
+      for(ptr=digits;*ptr;*ptr++) {
+	if(*ptr == 'w') {
+	  res = ast_safe_sleep(chan, 500);
+	  if(res) 
+	    break;
+	  continue;
+	}
+	memset(&f, 0, sizeof(f));
+	f.frametype = AST_FRAME_DTMF;
+	f.subclass = *ptr;
+	f.src = "ast_dtmf_stream";
+	if (strchr("0123456789*#abcdABCD",*ptr)==NULL) {
+	  ast_log(LOG_WARNING, "Illegal DTMF character '%c' in string. (0-9*#aAbBcCdD allowed)\n",*ptr);
+	} 
+	else {
+	  res = ast_write(chan, &f);
+	  if (res) 
+	    break;
+	  /* pause between digits */
+	  res = ast_safe_sleep(chan,between);
+	  if (res) 
+	    break;
+	}
+      }
+    }
+    if(peer)
+      res = ast_autoservice_stop(peer);
+  }
+
+  return res;
+}

apps/app_dial.c

@@ -70,6 +70,8 @@ static char *descrip =
 "      'g' -- goes on in context if the destination channel hangs up\n"
 "      'A(x)' -- play an announcement to the called party, using x as file\n"
 "      'S(x)' -- hangup the call after x seconds AFTER called party picked up\n"  	
+"      'D([digits])'  -- Send DTMF digit string *after* called party has answered\n"
+"                        but before the bridge. (w=500ms sec pause)\n"
 "      'L(x[:y][:z])' -- Limit the call to 'x' ms warning when 'y' ms are left (repeated every 'z' ms)\n"
 "                     -- Only 'x' is required, 'y' and 'z' are optional.\n"
 "                     -- The following special variables are optional:\n"
@@ -410,6 +412,8 @@ static int dial_exec(struct ast_channel *chan, void *data)
 	char *start_sound=NULL;
 	char *limitptr;
 	char limitdata[256];
+	char *sdtmfptr;
+	char sdtmfdata[256] = "";
 	char *stack,*var;
 	int play_to_caller=0,play_to_callee=0;
 	int playargs=0;
@@ -461,6 +465,23 @@ static int dial_exec(struct ast_channel *chan, void *data)
 				ast_verbose(VERBOSE_PREFIX_3 "Setting call duration limit to %i seconds.\n",calldurationlimit);			
 		} 
 
+		/* DTMF SCRIPT*/
+		if ((sdtmfptr = strstr(transfer, "D("))) {
+		  strncpy(sdtmfdata, sdtmfptr + 2, sizeof(sdtmfdata) - 1);
+		  /* Overwrite with X's what was the sdtmf info */
+		  while(*sdtmfptr && (*sdtmfptr != ')')) 
+		    *(sdtmfptr++) = 'X';
+		  if (*sdtmfptr)
+		    *sdtmfptr = 'X';
+		  /* Now find the end  */
+		  sdtmfptr = strchr(sdtmfdata, ')');
+		  if (sdtmfptr)
+		    *sdtmfptr = '\0';
+		  else {
+		    ast_log(LOG_WARNING, "D( Data lacking trailing ')'\n");
+		  }
+		}
+		
 		/* XXX LIMIT SUPPORT */
 		if ((limitptr = strstr(transfer, "L("))) {
 		  strncpy(limitdata, limitptr + 2, sizeof(limitdata) - 1);
@@ -469,7 +490,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
 		    *(limitptr++) = 'X';
 		  if (*limitptr)
 		    *limitptr = 'X';
-            /* Now find the end of the privdb */
+		  /* Now find the end */
 		  limitptr = strchr(limitdata, ')');
 		  if (limitptr)
 		    *limitptr = '\0';
@@ -501,30 +522,30 @@ static int dial_exec(struct ast_channel *chan, void *data)
 		  if(var) {
 		    timelimit = atol(var);
 		    playargs++;
-            }
 		    var = strsep(&stack, ":");
 		    if(var) {
 		      play_warning = atol(var);
 		      playargs++;
-            }
-
 		      var = strsep(&stack, ":");
 		      if(var) {
 			warning_freq = atol(var);
 			playargs++;
 		      }
+		    }
+		  }
 		  
 		  if(! timelimit) {
 		    timelimit=play_to_caller=play_to_callee=play_warning=warning_freq=0;
 		    warning_sound=NULL;
 		  }
-            calldurationlimit=0; /* undo effect of S(x) in case they are both used */
+		  /* undo effect of S(x) in case they are both used */
+		  calldurationlimit=0; 
 		  /* more efficient do it like S(x) does since no advanced opts*/
 		  if(! play_warning && ! start_sound && ! end_sound && timelimit) { 
 		    calldurationlimit=timelimit/1000;
 		    timelimit=play_to_caller=play_to_callee=play_warning=warning_freq=0;
 		  }
-	    else {
+		  else if (option_verbose > 2) {
 		    ast_verbose(VERBOSE_PREFIX_3"Limit Data:\n");
 		    ast_verbose(VERBOSE_PREFIX_3"timelimit=%ld\n",timelimit);
 		    ast_verbose(VERBOSE_PREFIX_3"play_warning=%ld\n",play_warning);
@@ -813,24 +834,32 @@ static int dial_exec(struct ast_channel *chan, void *data)
  			ast_log(LOG_DEBUG, "app_dial: sendurl=%s.\n", url);
  			ast_channel_sendurl( peer, url );
  		} /* /JDG */
-		if (announce && announcemsg)
-		{
-			int res2;
+		if (announce && announcemsg) {
 			// Start autoservice on the other chan
-			res2 = ast_autoservice_start(chan);
+			res = ast_autoservice_start(chan);
 			// Now Stream the File
-			if (!res2)
-				res2 = ast_streamfile(peer,announcemsg,peer->language);
-			if (!res2)
-				res2 = ast_waitstream(peer,"");
+			if (!res)
+				res = ast_streamfile(peer,announcemsg,peer->language);
+			if (!res)
+				res = ast_waitstream(peer,"");
+			
 			// Ok, done. stop autoservice
-			res2 = ast_autoservice_stop(chan);
+			res = ast_autoservice_stop(chan);
 		}
+		else 
+		  res = 0;
+
+		if(!res) {
 		  if (calldurationlimit > 0) {
 		    time(&now);
 		    chan->whentohangup = now + calldurationlimit;
 		  }
 
+		  if(strlen(sdtmfdata)) 
+		    res = ast_dtmf_stream(peer,chan,sdtmfdata,0);
+		}
+		
+		if(!res) {
 		  memset(&config,0,sizeof(struct ast_bridge_config));
 		  config.play_to_caller=play_to_caller;
 		  config.play_to_callee=play_to_callee;
@@ -844,6 +873,9 @@ static int dial_exec(struct ast_channel *chan, void *data)
 		  config.end_sound = end_sound;
 		  config.start_sound = start_sound;
 		  res = ast_bridge_call(chan,peer,&config);
+		}
+		else 
+		  res = -1;
 		
 		if (res != AST_PBX_NO_HANGUP_PEER)
 		  ast_hangup(peer);

apps/app_senddtmf.c

@@ -43,34 +43,13 @@ static int senddtmf_exec(struct ast_channel *chan, void *data)
 	int res = 0;
 	struct localuser *u;
 	char *digits = data;
-	struct ast_frame f;
-	int x;
+
 	if (!digits || !strlen(digits)) {
-		ast_log(LOG_WARNING, "SendDTMF requires an argument (digits or *#abcd)\n");
+		ast_log(LOG_WARNING, "SendDTMF requires an argument (digits or *#aAbBcCdD)\n");
 		return -1;
 	}
 	LOCAL_USER_ADD(u);
-	for (x=0;x<strlen(digits);x++) {
-		memset(&f, 0, sizeof(f));
-		f.frametype = AST_FRAME_DTMF;
-		f.subclass = digits[x];
-		f.src = "app_senddtmf";
-		if (strchr("0123456789*#abcd",digits[x])==NULL) {
-			ast_log(LOG_WARNING, "Illegal DTMF character in string. (0-9*#abcd allowed)\n");
-		} else {
-        	res = ast_write(chan, &f);
-			if (res)
-				break;
-		  	/* Wait 250ms */
-		  	res = ast_safe_sleep(chan, 250);
-		  	if (res)
-				break;
-	    }
-	}
-	if (!res)
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "Sent digit string '%s' on %s\n", digits, chan->name);
-			
+	res = ast_dtmf_stream(chan,NULL,digits,250);
 	LOCAL_USER_REMOVE(u);
 	return res;
 }

include/asterisk/app.h

@@ -48,6 +48,9 @@ extern int ast_app_messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
 //! Safely spawn an external program while closingn file descriptors
 extern int ast_safe_system(const char *s);
 
+// send DTMF to chan (optionally entertain peer)  
+int ast_dtmf_stream(struct ast_channel *chan,struct ast_channel *peer,char *digits,int between);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif