Merged revisions 223330 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r223330 | kpfleming | 2009-10-09 15:58:44 -0500 (Fri, 09 Oct 2009) | 10 lines

  Initiate T.38 switchover when acting as called party, regardless of FAX direction.

  SendFAX() and ReceiveFAX() can be given options to indicate whether they should
  act as the calling or called party; this mode should be used to decide whether
  to initiate a switchover to T.38, not the direction that the FAX transfer will
  take place.

  (closes issue #16039)
  Reported by: jamicque
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@223332 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_fax.c b/apps/app_fax.c
index 7e1e55810dc744050aec3b50d1efd50e1d5d75c1..908cab79d1508a8696537bc52b778efb845295a8 100644 (file)
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -334,8 +334,8 @@ static int transmit_audio(fax_session *s)
                                                             .transcoding_jbig = 1,
        };
 
-       /* if in receive mode, try to use T.38 */
-       if (!s->direction) {
+       /* if in called party mode, try to use T.38 */
+       if (s->caller_mode == FALSE) {
                /* check if we are already in T.38 mode (unlikely), or if we can request
                 * a switch... if so, request it now and wait for the result, rather
                 * than starting an audio FAX session that will have to be cancelled