Author: ctrix
Date: 2007-04-02 20:18:11 -0400 (Mon, 02 Apr 2007)
New Revision: 2585
Modified:
openpbx/trunk/channels/chan_sip.c
Log:
Moving chan_sip features to a proper place: applications.
Modified: openpbx/trunk/channels/chan_sip.c
============================================================
=======
--- openpbx/trunk/channels/chan_sip.c 2007-04-03 00:10:37
UTC (rev 2584)
+++ openpbx/trunk/channels/chan_sip.c 2007-04-03 00:18:11
UTC (rev 2585)
 -3424,6
+3424,7
time(&p->lastrtptx);
res = opbx_rtp_write(p->rtp, frame);
+/*
// Outgoing Fax detection
if ((opbx_test_flag(p, SIP_DTMF) ==
SIP_DTMF_INBAND) &&
p->options &&
p->options->t38txdetection && p->vadtx)
-3438,6
+3439,7
}
}
}
+*/
}
opbx_mutex_unlock(&p->lock);
}
-3492,9
+3494,11
{
int res=0;
int faxdetected = 0;
+
+ res = sip_rtp_write(ast,frame,&faxdetected);
+/*
struct sip_pvt *p = ast->tech_pvt;
- res = sip_rtp_write(ast,frame,&faxdetected);
if (faxdetected && t38udptlsupport &&
(p->t38state == 0) &&
!(opbx_bridged_channel(ast)))
{
opbx_log(LOG_VERBOSE, "Faxdetect set to 1. DSP
detected fax tones on TXn");
-3516,6
+3520,7
opbx_set_flag(p, SIP_NEEDREINVITE);
}
}
+*/
return res;
}
-4044,6
+4049,7
opbx_set_read_format(p->owner,
p->owner->readformat);
opbx_set_write_format(p->owner,
p->owner->writeformat);
}
+/*
if ((opbx_test_flag(p, SIP_DTMF) ==
SIP_DTMF_INBAND) && p->vad )
{
f = opbx_dsp_process(p->owner,
p->vad, f);
-4051,13
+4057,14
{
if (t38udptlsupport &&
f->subclass == 'f' &&
!(opbx_bridged_channel(ast)))
{
- /* Fax tone */
+ // Fax tone
opbx_log(LOG_DEBUG, "Fax CNG
detected on %sn", ast->name);
*faxdetect = 1;
}
opbx_log(LOG_DEBUG, "* Detected
inband DTMF '%c'n", f->subclass);
}
}
+*/
}
}
return f;
-4076,6
+4083,7
opbx_mutex_unlock(&p->lock);
/* If we are NOT bridged to another channel, and we
have detected fax tone we issue T38 re-invite to a peer */
/* If we are bridged then it is responsibility of the
SIP device to issue T38 re-invite if it detects CNG or fax
preabmle */
+/*
if (faxdetected && t38udptlsupport &&
(p->t38state == 0) &&
!(opbx_bridged_channel(ast)))
{
if (!opbx_test_flag(p, SIP_GOTREFER))
-4096,6
+4104,7
opbx_set_flag(p, SIP_NEEDREINVITE);
}
}
+*/
return fr;
}
-16734,7
+16743,11
return 0;
}
- if (t38udptlsupport && (p->t38state == 0)
&& !(opbx_bridged_channel(chan)))
+ if (
+ t38udptlsupport
+ && (p->t38state == 0)
+ //&& !(opbx_bridged_channel(chan))
+ )
{
if (!opbx_test_flag(p, SIP_GOTREFER))
{
-16755,7
+16768,12
}
}
else {
- opbx_log(LOG_WARNING,"Cannot execute T38
reinviten");
+ opbx_log(LOG_WARNING,
+ "Cannot execute T38 reinvite [ t38udptlsupport:
%d, p->t38state %d, bridged %d ]n",
+ t38udptlsupport,
+ p->t38state,
+ ( opbx_bridged_channel(chan) ) ? 1 : 0
+ );
}
opbx_mutex_unlock(&chan->lock);
_______________________________________________
Openpbx-svn mailing list
Openpbx-svnopenpbx.org
http://lists.openpbx.org/mailman/listinfo/openpbx-svn
|