diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-12 15:30:40 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-12 15:30:40 +0000 |
| commit | 97ad30eec0c3b9e9a1a0452fb42be0eee3f61f58 (patch) | |
| tree | e12dae3f17feef0f1debc45ae2ae3ed6f845a935 | |
| parent | 3e4f97968a3a42ff731e5de11fcd33401347a4cf (diff) | |
Remove automatic switching from T.38 to voice mode in chan_sip.
chan_sip has some code to automatically switch from T.38 mode to voice mode when
a voice frame is written to the channel while it is in T.38 mode; this was
intended to handle the situation when a FAX transmission has ended and the channel
is not yet hung up, but is causing problems at the beginning of FAX sessions as
well when there are still voice frames 'in flight' at the time the T.38 negotiation
completes. This patch removes the automatic switchover.
(issue #16025)
Reported by: jamicque
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@223692 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 15e00ba64..bb49cd72e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3910,8 +3910,7 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame) ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT); } } else if (p->t38.state == T38_ENABLED && !p->t38.direct) { - p->t38.state = T38_DISABLED; - transmit_reinvite_with_sdp(p); + /* drop frame, can't sent VOICE frames while in T.38 mode */ } else { p->lastrtptx = time(NULL); res = ast_rtp_write(p->rtp, frame); |