retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Convert RTP telephone-event 36 (CNG) to a call.fax message, indicate detection method. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@2866 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2009-10-05 14:50:37 +00:00
parent 4c2d060eb5
commit 4ea2bfae71
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/tonedetect.cpp
View File

@ -384,8 +384,10 @@ void ToneConsumer::checkFax()
m->addParam("callto",m_divert);
m->addParam("reason","fax");
}
else
else {
m->addParam("message","call.fax");
m->addParam("detected","inband");
}
Engine::enqueue(m);
}

33
modules/yrtpchan.cpp
View File

@ -124,6 +124,7 @@ public:
bool setRemote(const char* raddr, unsigned int rport, const Message& msg);
bool sendDTMF(char dtmf, int duration = 0);
void gotDTMF(char tone);
void gotFax();
void timeout(bool initial);
inline YRTPSession* rtp() const
{ return m_rtp; }
@ -178,7 +179,7 @@ class YRTPSession : public RTPSession
{
public:
inline YRTPSession(YRTPWrapper* wrap)
: m_wrap(wrap), m_resync(false), m_anyssrc(false)
: m_wrap(wrap), m_resync(false), m_anyssrc(false), m_getFax(true)
{ }
virtual ~YRTPSession();
virtual bool rtpRecvData(bool marker, unsigned int timestamp,
@ -199,6 +200,7 @@ private:
YRTPWrapper* m_wrap;
bool m_resync;
bool m_anyssrc;
bool m_getFax;
};
class YRTPSource : public DataSource
@ -687,6 +689,18 @@ void YRTPWrapper::gotDTMF(char tone)
Engine::enqueue(m);
}
void YRTPWrapper::gotFax()
{
Debug(&splugin,DebugInfo,"YRTPWrapper::gotFax() [%p]",this);
if (m_master.null())
return;
Message* m = new Message("chan.masquerade");
m->addParam("id",m_master);
m->addParam("message","call.fax");
m->addParam("detected","rfc2833");
Engine::enqueue(m);
}
void YRTPWrapper::timeout(bool initial)
{
if (!(initial || s_warnLater))
@ -789,10 +803,21 @@ bool YRTPSession::rtpRecvData(bool marker, unsigned int timestamp, const void* d
bool YRTPSession::rtpRecvEvent(int event, char key, int duration,
int volume, unsigned int timestamp)
{
if (!(m_wrap && key))
if (!m_wrap)
return false;
m_wrap->gotDTMF(key);
return true;
if (key) {
m_wrap->gotDTMF(key);
return true;
}
if (event == 36) {
// got G3 CNG
if (m_getFax) {
m_getFax = false;
m_wrap->gotFax();
}
return true;
}
return false;
}
void YRTPSession::rtpNewPayload(int payload, unsigned int timestamp)