[asterisk-dev] file: branch 1.4 r87970 - /branches/1.4/apps/app_meetme.c

[Tony Mountifield]

I think there are a couple of errors in the following commit:

In article <20071101015356.AA9ECA9DF61 at lists.digium.internal>,
SVN commits to the Digium repositories <svn-commits at lists.digium.com> wrote:
> Author: file
> Date: Wed Oct 31 20:53:55 2007
> New Revision: 87970
> 
> URL: http://svn.digium.com/view/asterisk?view=rev&rev=87970
> Log:
> If a Zap channel contains a spy or a spy is added take it out of the conference in kernel
> space and make it go through Asterisk so the spy gets audio from both sides.
> (closes issue #10060)
> Reported by: mparker
> 
> Modified:
>     branches/1.4/apps/app_meetme.c
> 
> Modified: branches/1.4/apps/app_meetme.c
> URL:
> http://svn.digium.com/view/asterisk/branches/1.4/apps/app_meetme.c?view=diff&rev=87970&r1=87969&r2=87970
> ==============================================================================
> --- branches/1.4/apps/app_meetme.c (original)
> +++ branches/1.4/apps/app_meetme.c Wed Oct 31 20:53:55 2007
> @@ -1572,7 +1572,7 @@
>  		goto outrun;
>  	}
>  
> -	retryzap = strcasecmp(chan->tech->type, "Zap");
> +	retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->spies ? 1 : 0);
>  	user->zapchannel = !retryzap;
>  
>   zapretry:
> @@ -1890,14 +1890,14 @@
>  				break;
>  

In the following section, the channel is identified by c, not chan:

>  			if (c) {
> -				if (c->fds[0] != origfd) {
> +				if (c->fds[0] != origfd || (user->zapchannel && chan->spies)) {

I think the above should be c->spies

>  					if (using_pseudo) {
>  						/* Kill old pseudo */
>  						close(fd);
>  						using_pseudo = 0;
>  					}
>  					ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
> -					retryzap = strcasecmp(c->tech->type, "Zap");
> +					retryzap = (strcasecmp(chan->tech->type, "Zap") || chan->spies ? 1 : 0);

And I think this should be c->tech->type (like the old statement) and c->spies

>  					user->zapchannel = !retryzap;
>  					goto zapretry;
>  				}

Likewise in trunk.

Cheers
Tony
-- 
Tony Mountifield
Work: tony at softins.co.uk - http://www.softins.co.uk
Play: tony at mountifield.org - http://tony.mountifield.org