[asterisk-dev] [svn-commits] twilson: branch 1.4 r153270 - in /branches/1.4: apps/ res/]

[Steve Murphy]

From: Steve Murphy <murf at digium.com>
Reply-To: murf at digium.com
To: SVN commits to the Digium repositories
<svn-commits at lists.digium.com>
Subject: Re: [svn-commits] twilson: branch 1.4 r153270 -
in /branches/1.4: apps/ res/
Date: Mon, 03 Nov 2008 15:18:11 -0700

On Fri, 2008-10-31 at 22:36 +0000, SVN commits to the Digium
repositories wrote:
> Author: twilson
> Date: Fri Oct 31 17:36:57 2008
> New Revision: 153270
> 
> URL: http://svn.digium.com/view/asterisk?view=rev&rev=153270
> Log:
> Add end_bridge_callback for app_follome and add AUTOLOOP flag to res_features
> 
> Modified:
>     branches/1.4/apps/app_followme.c
>     branches/1.4/res/res_features.c
> 


Terry--

A really, really minor question--

Would it be better to put the AUTOLOOP stuff just inside the if, instead
of around the if? If we never execute the h exten, then do we need to
tweak the
AUTOLOOP stuff in the channel?

murf

> Modified: branches/1.4/res/res_features.c
> URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=153270&r1=153269&r2=153270
> ==============================================================================
> --- branches/1.4/res/res_features.c (original)
> +++ branches/1.4/res/res_features.c Fri Oct 31 17:36:57 2008
> @@ -1449,6 +1449,7 @@
>  	int diff;
>  	int hasfeatures=0;
>  	int hadfeatures=0;
> +	int autoloopflag;
>  	struct ast_option_header *aoh;
>  	struct ast_bridge_config backup_config;
>  	struct ast_cdr *bridge_cdr = NULL;
> @@ -1716,6 +1717,8 @@
>  		config->end_bridge_callback();
>  	}
>  
> +	autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP);
> +	ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP);
>  	if (res != AST_PBX_KEEPALIVE && !ast_test_flag(&(config->features_caller),AST_FEATURE_NO_H_EXTEN) && ast_exists_extension(chan, chan->context, "h", 1, chan->cid.cid_num)) {
>  		struct ast_cdr *swapper;
>  		char savelastapp[AST_MAX_EXTENSION];
> @@ -1760,6 +1763,7 @@
>  		ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp));
>  		ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata));
>  	}
> +	ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
>  
>  	/* obey the NoCDR() wishes. -- move the DISABLED flag to the bridge CDR if it was set on the channel during the bridge... */
>  	if (res != AST_PBX_KEEPALIVE) {
> 
> 

-- 
Steve Murphy
Software Developer
Digium
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3227 bytes
Desc: not available
Url : http://lists.digium.com/pipermail/asterisk-dev/attachments/20081103/c5493837/attachment.bin