[svn-commits] murf: branch group/newcdr r166897 - in /team/group/newcdr: ./ apps/ channels/...

Mon Dec 29 16:15:45 CST 2008

Author: murf
Date: Mon Dec 29 16:15:44 2008
New Revision: 166897

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166897
Log:
Merged revisions 166773,166823,166861 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r166773 | russell | 2008-12-28 08:15:14 -0700 (Sun, 28 Dec 2008) | 12 lines

Merged revisions 166772 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r166772 | russell | 2008-12-28 09:13:48 -0600 (Sun, 28 Dec 2008) | 4 lines

Use strncat() instead of an sprintf() in which source and target buffers overlap

http://lists.digium.com/pipermail/asterisk-dev/2008-December/035919.html

........

................
r166823 | eliel | 2008-12-28 08:36:25 -0700 (Sun, 28 Dec 2008) | 3 lines

Fix a typo in the XML documentation of the AUDIOHOOK_INHERIT dialplan function.


................
r166861 | mmichelson | 2008-12-29 11:04:52 -0700 (Mon, 29 Dec 2008) | 14 lines

Update app_queue to deal with the removal of AST_PBX_KEEPALIVE

When placing a call to a queue which ran a gosub on the member's
channel, Asterisk would crash every time, stemming from the fact
that the member's channel was being hung up unexpectedly when the
Gosub completed. The necessary change was pretty much copied and
pasted from app_dial's similar changes made last week.

I also took the opportunity to change a LOG_DEBUG message in
app_dial to use ast_debug. I am guessing this was due to a direct
merge from 1.4 that was not corrected to use trunk's preferred
syntax.


................

Modified:
    team/group/newcdr/   (props changed)
    team/group/newcdr/apps/app_dial.c
    team/group/newcdr/apps/app_queue.c
    team/group/newcdr/channels/misdn_config.c
    team/group/newcdr/funcs/func_audiohookinherit.c

Propchange: team/group/newcdr/
------------------------------------------------------------------------------
    automerge = yesssss

Propchange: team/group/newcdr/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/newcdr/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 29 16:15:44 2008
@@ -1,1 +1,1 @@
-/trunk:1-166765
+/trunk:1-166896

Modified: team/group/newcdr/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_dial.c?view=diff&rev=166897&r1=166896&r2=166897
==============================================================================
--- team/group/newcdr/apps/app_dial.c (original)
+++ team/group/newcdr/apps/app_dial.c Mon Dec 29 16:15:44 2008
@@ -2094,8 +2094,7 @@
 						ast_pbx_run_args(peer, &args);
 					}
 					ast_free(gosub_args);
-					if (option_debug)
-						ast_log(LOG_DEBUG, "Gosub exited with status %d\n", res9);
+					ast_debug(1, "Gosub exited with status %d\n", res9);
 				} else {
 					ast_log(LOG_ERROR, "Could not Allocate string for Gosub arguments -- Gosub Call Aborted!\n");
 				}

Modified: team/group/newcdr/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_queue.c?view=diff&rev=166897&r1=166896&r2=166897
==============================================================================
--- team/group/newcdr/apps/app_queue.c (original)
+++ team/group/newcdr/apps/app_queue.c Mon Dec 29 16:15:44 2008
@@ -4017,9 +4017,12 @@
 				if (gosub_args) {
 					res = pbx_exec(peer, application, gosub_args);
 					if (!res) {
-						ast_pbx_run(peer);
+						struct ast_pbx_args args;
+						memset(&args, 0, sizeof(args));
+						args.no_hangup_chan = 1;
+						ast_pbx_run_args(peer, &args);
 					}
-					free(gosub_args);
+					ast_free(gosub_args);
 					ast_debug(1, "Gosub exited with status %d\n", res);
 				} else {
 					ast_log(LOG_ERROR, "Could not Allocate string for Gosub arguments -- Gosub Call Aborted!\n");
@@ -6696,7 +6699,7 @@
 	if (!con)
 		ast_log(LOG_ERROR, "Queue virtual context 'app_queue_gosub_virtual_context' does not exist and unable to create\n");
 	else
-		ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free_ptr, "app_queue");
+		ast_add_extension2(con, 1, "s", 1, NULL, NULL, "NoOp", ast_strdup(""), ast_free_ptr, "app_queue");
 
 	if (queue_persistent_members)
 		reload_queue_members();

Modified: team/group/newcdr/channels/misdn_config.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/channels/misdn_config.c?view=diff&rev=166897&r1=166896&r2=166897
==============================================================================
--- team/group/newcdr/channels/misdn_config.c (original)
+++ team/group/newcdr/channels/misdn_config.c Mon Dec 29 16:15:44 2008
@@ -790,8 +790,9 @@
 			else
 				iter = port_cfg[0][place].ml;
 			if (iter) {
-				for (; iter; iter = iter->next)
-					sprintf(tempbuf, "%s%s, ", tempbuf, iter->msn);
+				for (; iter; iter = iter->next) {
+					strncat(tempbuf, iter->msn, sizeof(tempbuf) - strlen(tempbuf) - 1);
+				}
 				tempbuf[strlen(tempbuf)-2] = 0;
 			}
 			snprintf(buf, bufsize, " -> msns: %s", *tempbuf ? tempbuf : "none");

Modified: team/group/newcdr/funcs/func_audiohookinherit.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/funcs/func_audiohookinherit.c?view=diff&rev=166897&r1=166896&r2=166897
==============================================================================
--- team/group/newcdr/funcs/func_audiohookinherit.c (original)
+++ team/group/newcdr/funcs/func_audiohookinherit.c Mon Dec 29 16:15:44 2008
@@ -40,7 +40,7 @@
  	<function name = "AUDIOHOOK_INHERIT" language="en_US">
 		<synopsis>
 			Set whether an audiohook may be inherited to another channel
-		</snopsis>
+		</synopsis>
 		<syntax>
 			<parameter name="source" required="true">
 				<para>The built-in sources in Asterisk are</para>


