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

Early load module. Fixed some debug messages. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@1722 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2008-02-14 08:44:01 +00:00
parent 426b955629
commit 3af124344a
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/server/zapcard.cpp
View File

@ -574,8 +574,6 @@ protected:
virtual void statusDetail(String& str); virtual void statusDetail(String& str);
virtual bool commandComplete(Message& msg, const String& partLine, virtual bool commandComplete(Message& msg, const String& partLine,
const String& partWord); const String& partWord);
// Process status commands except for module status
void processStatus(const String& cmd);
private: private:
bool m_init; // Already initialized flag bool m_init; // Already initialized flag
String m_prefix; // Module prefix String m_prefix; // Module prefix
@ -758,6 +756,7 @@ static TokenDict s_ioctl_request[] = {
MAKE_NAME(GetParams), MAKE_NAME(GetParams),
MAKE_NAME(GetEvent), MAKE_NAME(GetEvent),
MAKE_NAME(GetInfo), MAKE_NAME(GetInfo),
MAKE_NAME(GetVersion),
MAKE_NAME(GetDialParams), MAKE_NAME(GetDialParams),
MAKE_NAME(StartEchoTrain), MAKE_NAME(StartEchoTrain),
MAKE_NAME(FlushBuffers), MAKE_NAME(FlushBuffers),
@ -2582,7 +2581,7 @@ ZapConsumer::~ZapConsumer()
String ZapModule::s_statusCmd[StatusCmdCount] = {"spans","channels","all"}; String ZapModule::s_statusCmd[StatusCmdCount] = {"spans","channels","all"};
ZapModule::ZapModule() ZapModule::ZapModule()
: Module("zaptel","misc"), : Module("zaptel","misc",true),
m_init(false), m_init(false),
m_count(0), m_count(0),
m_active(0) m_active(0)
@ -2629,32 +2628,28 @@ void ZapModule::initialize()
general = &dummy; general = &dummy;
ZapDevice dev(0,false,true); ZapDevice dev(0,false,true);
int dtmfLen = 0; if (!dev.valid())
Debug(this,DebugNote,"Failed to open zaptel device: driver might not be loaded");
int dtmfLen = 0;
if (!m_init) { if (!m_init) {
m_init = true;
setup(); setup();
installRelay(Command); installRelay(Command);
// Set DTMF/MF length // Set DTMF/MF length
if (dev.dialParams(false,dtmfLen,dtmfLen)) { if (dev.valid() && dev.dialParams(false,dtmfLen,dtmfLen)) {
dtmfLen = general->getIntValue("tonelength",dtmfLen); dtmfLen = general->getIntValue("tonelength",dtmfLen);
dev.dialParams(true,dtmfLen,dtmfLen); dev.dialParams(true,dtmfLen,dtmfLen);
} }
} }
m_init = true; if (dev.valid() && debugAt(DebugAll)) {
NamedList nl("");
#ifdef DEBUG dev.getVersion(nl);
if (!debugAt(DebugAll)) dtmfLen = 0;
return; dev.dialParams(false,dtmfLen,dtmfLen);
String tmp; Debug(this,DebugAll,"version=%s echocanceller=%s tonelength=%d samples",
NamedList nl(""); nl.getValue("version"),nl.getValue("echocanceller"),dtmfLen);
dev.getVersion(nl); }
tmp << "\r\nversion: " << nl.getValue("version");
tmp << "\r\nechocanceller: " << nl.getValue("echocanceller");
dtmfLen = 0;
dev.dialParams(false,dtmfLen,dtmfLen);
tmp << "\r\ntonelength (samples): " << dtmfLen;
Debug(this,DebugAll,"Initialized:%s",tmp.c_str());
#endif
} }
@ -2676,7 +2671,7 @@ bool ZapModule::received(Message& msg, int id)
String dest = msg.getValue("module"); String dest = msg.getValue("module");
// Module status // Module status
if (dest == name()) { if (!dest || dest == name()) {
Module::msgStatus(msg); Module::msgStatus(msg);
return true; return true;
} }