[asterisk-dev] [svn-commits] mnicholson: branch 1.4 r322646 - /branches/1.4/channels/chan_sip.c

[Olle E Johansson]

Have we stopped  attributing patches and bug reports ? I did remember reporting this and putting something on reviewboard...

/O

9 jun 2011 kl. 17.10 skrev SVN commits to the Digium repositories:

> Author: mnicholson
> Date: Thu Jun  9 10:10:30 2011
> New Revision: 322646
> 
> URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322646
> Log:
> don't drop any voice frames when checking for T.38 during early media
> 
> (closes ASTERISK-17705)
> Review: https://reviewboard.asterisk.org/r/1186/
> 
> Modified:
> branches/1.4/channels/chan_sip.c
> 
> Modified: branches/1.4/channels/chan_sip.c
> URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=322646&r1=322645&r2=322646
> ==============================================================================
> --- branches/1.4/channels/chan_sip.c (original)
> +++ branches/1.4/channels/chan_sip.c Thu Jun  9 10:10:30 2011
> @@ -4062,7 +4062,10 @@
> 		}
> 		if (p) {
> 			ast_mutex_lock(&p->lock);
> -			if (p->rtp) {
> +			if (p->t38.state == T38_ENABLED && !p->t38.direct) {
> +				/* drop frame, can't sent VOICE frames while in T.38 mode */
> +				break;
> +			} else  if (p->rtp) {
> 				/* If channel is not up, activate early media session */
> 				if ((ast->_state != AST_STATE_UP) &&
> 				    !ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) &&
> @@ -4073,12 +4076,9 @@
> 						transmit_provisional_response(p, "183 Session Progress", &p->initreq, 1);
> 						ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT);
> 					}
> -				} else if (p->t38.state == T38_ENABLED && !p->t38.direct) {
> -					/* drop frame, can't sent VOICE frames while in T.38 mode */
> -				} else {
> -					p->lastrtptx = time(NULL);
> -					res = ast_rtp_write(p->rtp, frame);
> 				}
> +				p->lastrtptx = time(NULL);
> +				res = ast_rtp_write(p->rtp, frame);
> 			}
> 			ast_mutex_unlock(&p->lock);
> 		}
> 
> 
> --
> _____________________________________________________________________
> -- Bandwidth and Colocation Provided by http://www.api-digital.com --
> 
> svn-commits mailing list
> To UNSUBSCRIBE or update options visit:
> http://lists.digium.com/mailman/listinfo/svn-commits