kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of AST_CONTROL_T38 and AST_CONTROL_T38_PARAMETERS for non-T.38-capable channels.

Browse Source 
This change allows applications that request T.38 negotiation on a channel that
does not support it to get the proper indication that it is not supported, rather
than thinking that negotiation was started when it was not.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204948 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-07-06 13:38:29 +00:00
parent ee0cd5a32c
commit 8b878c8303
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/channel.c
View File

@@ -3548,6 +3548,7 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
default: default:
break; break;
} }
if (chan->tech->indicate) { if (chan->tech->indicate) {
/* See if the channel driver can handle this condition. */ /* See if the channel driver can handle this condition. */
res = chan->tech->indicate(chan, condition, data, datalen); res = chan->tech->indicate(chan, condition, data, datalen);
@@ -3557,7 +3558,7 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
ast_channel_unlock(chan); ast_channel_unlock(chan);
if (chan->tech->indicate && !res) { if (!res) {
/* The channel driver successfully handled this indication */ /* The channel driver successfully handled this indication */
if (is_visible_indication(condition)) { if (is_visible_indication(condition)) {
chan->visible_indication = condition; chan->visible_indication = condition;
@@ -3579,6 +3580,15 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
/* Handle conditions that we have tones for. */ /* Handle conditions that we have tones for. */
switch (condition) { switch (condition) {
case AST_CONTROL_T38:
case AST_CONTROL_T38_PARAMETERS:
/* there is no way to provide 'default' behavior for these
* control frames, so we need to return failure, but there
* is also no value in the log message below being emitted
* since failure to handle these frames is not an 'error'
* so just return right now.
*/
return -1;
case AST_CONTROL_RINGING: case AST_CONTROL_RINGING:
ts = ast_get_indication_tone(chan->zone, "ring"); ts = ast_get_indication_tone(chan->zone, "ring");
/* It is common practice for channel drivers to return -1 if trying /* It is common practice for channel drivers to return -1 if trying
@@ -3614,11 +3624,9 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
case AST_CONTROL_RING: case AST_CONTROL_RING:
case AST_CONTROL_HOLD: case AST_CONTROL_HOLD:
case AST_CONTROL_UNHOLD: case AST_CONTROL_UNHOLD:
case AST_CONTROL_T38:
case AST_CONTROL_TRANSFER: case AST_CONTROL_TRANSFER:
case AST_CONTROL_CONNECTED_LINE: case AST_CONTROL_CONNECTED_LINE:
case AST_CONTROL_REDIRECTING: case AST_CONTROL_REDIRECTING:
case AST_CONTROL_T38_PARAMETERS:
/* Nothing left to do for these. */ /* Nothing left to do for these. */
res = 0; res = 0;
break; break;