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

Implemented destruct() for interface. Changed debug message 

git-svn-id: http://yate.null.ro/svn/yate/trunk@1354 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2007-06-06 07:44:33 +00:00
parent df7d9ef7ec
commit 1270f0ace8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/wpcard.cpp
View File

@ -176,6 +176,9 @@ public:
virtual ~WpInterface();
// Initialize interface. Return false on failure
bool init(const NamedList& config, NamedList& params);
// Remove links. Dispose memory
virtual void destruct()
{ cleanup(true); }
// Send signalling packet
virtual bool transmitPacket(const DataBlock& packet, bool repeat, PacketType type);
// Interface control
@ -185,6 +188,12 @@ protected:
// Read data from socket
bool receiveAttempt();
private:
inline void cleanup(bool release) {
control(Disable,0);
attach(0);
if (release)
GenObject::destruct();
}
WpSocket m_socket;
WpSigThread* m_thread; // Thread used to read data from socket
bool m_readOnly; // Readonly interface
@ -532,7 +541,7 @@ WpInterface::WpInterface(const NamedList& params)
WpInterface::~WpInterface()
{
control(Disable,0);
cleanup(false);
XDebug(this,DebugAll,"WpInterface::~WpInterface() [%p]",this);
}
@ -542,7 +551,9 @@ bool WpInterface::init(const NamedList& config, NamedList& params)
m_socket.card(config);
const char* sig = params.getValue("siggroup",config.getValue("siggroup"));
if (!sig) {
Debug(this,DebugNote,"Missing or invalid signalling group '%s' in configuration",sig);
Debug(this,DebugWarn,
"Missing or invalid siggroup='%s' in configuration [%p]",
c_safe(sig),this);
return false;
}
m_socket.device(sig);