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

Derived TCAPUser from SignallingComponent. Removed tcap.request message handler from ysigchan, use relay instead. Removed multiple inheritance of SigTcapUser class. 

git-svn-id: http://voip.null.ro/svn/yate@4741 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
oana 2011-12-07 16:24:34 +00:00
parent 642d5d44bf
commit d6fb3cccbe
3 changed files with 95 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ysig/tcap.cpp
View File

@ -46,6 +46,11 @@ static void dumpData(int debugLevel, SS7TCAP* tcap, String message, void* obj, N
TCAPUser::~TCAPUser()
{
Debug(this,DebugAll,"TCAPUser::~TCAPUser() [%p] - tcap user destroyed",this);
}
void TCAPUser::destroyed()
{
Debug(this,DebugAll,"TCAPUser::destroyed() [%p]",this);
Lock lock(m_tcapMtx);
if (m_tcap) {
m_tcap->detach(this);
@ -53,6 +58,8 @@ TCAPUser::~TCAPUser()
m_tcap->deref();
m_tcap = 0;
}
lock.drop();
SignallingComponent::destroyed();
}
void TCAPUser::attach(SS7TCAP* tcap)
@ -64,7 +71,7 @@ void TCAPUser::attach(SS7TCAP* tcap)
SS7TCAP* tmp = m_tcap;
m_tcap = tcap;
lock.drop();
DDebug(this,DebugAll,"TCAPUser::atach(tcap=%s [%p], replacing tcap=%s [%p] [%p]",(m_tcap ? m_tcap->toString().safe() : ""),m_tcap,
DDebug(this,DebugAll,"TCAPUser::attach(tcap=%s [%p], replacing tcap=%s [%p] [%p]",(m_tcap ? m_tcap->toString().safe() : ""),m_tcap,
(tmp ? tmp->toString().c_str() : ""),tmp,this);
if (tmp) {
tmp->detach(this);

24
libs/ysig/yatesig.h
View File

@ -5340,15 +5340,15 @@ private:
* An interface to a SS7 Transactional Capabilities Application Part user
* @short Abstract SS7 TCAP user interface
*/
class YSIG_API TCAPUser : public GenObject, public DebugEnabler
class YSIG_API TCAPUser : public SignallingComponent
{
YCLASS(TCAPUser,SignallingComponent)
friend class SS7TCAP;
public:
TCAPUser(const char* name)
: m_name(name), m_tcap(0)
{
debugName(m_name);
}
TCAPUser(const char* name, const NamedList* params = 0)
: SignallingComponent(name,params),
m_tcap(0)
{}
/**
* Destructor, detaches from the TCAP implementation
*/
@ -5359,18 +5359,21 @@ public:
* @param tcap Pointer to the TCAP to use
*/
virtual void attach(SS7TCAP* tcap);
/**
* Receive a TCAP message from TCAP layer
* @param params The message in NamedList form
* @return True or false if the message was processed by this user
*/
virtual bool tcapIndication(NamedList& params);
/**
* Retrieve the TCAP to which this user is attached
* @return Pointer to a SS7 TCAP interface or NULL
*/
inline SS7TCAP* tcap() const
{ return m_tcap; }
/**
* Received a management notification from SCCP layer
* @param type SCCP management notification type
@ -5378,14 +5381,18 @@ public:
* @return True or false if the notification was handled bu this user
*/
virtual bool managementNotify(SCCP::Type type, NamedList& params);
/**
* Get TCAP user management state
* @return The state of the user
*/
virtual int managementState();
virtual const String& toString() const
{ return m_name; }
/**
* This method is called to clean up and destroy the object after the
* reference counter becomes zero
*/
virtual void destroyed();
protected:
inline void setTCAP(SS7TCAP* tcap)
@ -5395,7 +5402,6 @@ protected:
}
private:
String m_name;
SS7TCAP* m_tcap;
Mutex m_tcapMtx;
};

137
modules/server/ysigchan.cpp
View File

@ -49,7 +49,6 @@ class IsupEncodeHandler; // Handler for "isup.encode" message
class SigNotifier; // Class for handling received notifications
class SigSS7Tcap; // SS7 TCAP - Transaction Capabilities Application Part
class SigTCAPUser; // Default TCAP user
class TCAPMsgHandler; // TCAP Message handler
// The signalling channel
class SigChannel : public Channel
@ -173,6 +172,9 @@ public:
Unknown = 0x03,
};
enum PrivateRelays {
TcapRequest = Private,
};
SigDriver();
~SigDriver();
virtual void initialize();
@ -215,6 +217,9 @@ public:
static const TokenDict s_operations[];
// Append an onDemand component
bool appendOnDemand(SignallingComponent* cmp, int type);
// Install a relay
inline bool requestRelay(int id, const char* name, unsigned priority = 100)
{ return installRelay(id,name,priority); }
private:
// Handle command complete requests
virtual bool commandComplete(Message& msg, const String& partLine,
@ -559,40 +564,42 @@ private:
SS7TCAP* m_tcap;
};
class SigTCAPUser : public SigTopmost, public TCAPUser
class MsgTCAPUser : public TCAPUser
{
YCLASS(SigTCAPUser,TCAPUser)
public:
inline SigTCAPUser(const char* name)
: SigTopmost(name),
TCAPUser(name), m_handler(0)
{ }
virtual ~SigTCAPUser();
// { }
inline MsgTCAPUser(const char* name)
: TCAPUser(name)
{ }
virtual ~MsgTCAPUser();
// Initialize the TCAP user
// Return false on failure
virtual bool initialize(NamedList& params);
virtual bool tcapRequest(NamedList& params);
virtual bool tcapIndication(NamedList& params);
protected:
SS7TCAP* tcapAttach();
String m_tcapName;
};
class SigTCAPUser : public SigTopmost
{
public:
inline SigTCAPUser(const char* name)
: SigTopmost(name), m_user(0)
{ }
virtual ~SigTCAPUser();
// Initialize the TCAP user
// Return false on failure
virtual bool initialize(NamedList& params);
virtual bool tcapRequest(NamedList& params);
// Return the status of this component
virtual void status(String& retVal);
protected:
SS7TCAP* tcapAttach();
TCAPMsgHandler* m_handler;
String m_tcapName;
MsgTCAPUser* m_user;
virtual void destroyed();
};
class TCAPMsgHandler : public MessageHandler
{
public:
TCAPMsgHandler(SigTCAPUser* user);
virtual bool received(Message& msg);
virtual void destruct();
private:
SigTCAPUser* m_user;
};
// Factory for locally configured components
class SigFactory : public SignallingFactory
{
@ -2183,6 +2190,14 @@ bool SigDriver::received(Message& msg, int id)
if (m_engine && m_engine->control(msg))
return true;
return Driver::received(msg,id);
case TcapRequest:
{
target = msg.getValue(YSTRING("tcap.user"));
m_topmostMutex.lock();
RefPointer<SigTCAPUser> user = static_cast<SigTCAPUser*>(m_topmost[target]);
m_topmostMutex.unlock();
return (user && user->tcapRequest(msg));
}
case Halt:
clearTrunk();
if (m_engine)
@ -4096,30 +4111,25 @@ void SigSS7Tcap::status(String& retVal)
}
/**
* SigTCAPUser
* MsgTcapUser
*/
SigTCAPUser::~SigTCAPUser()
MsgTCAPUser::~MsgTCAPUser()
{
DDebug(&plugin,DebugAll,"SigTCAPUser::~SigTCAPUser() [%p]",this);
if (!TelEngine::null(m_handler))
TelEngine::destruct(m_handler);
DDebug(&plugin,DebugAll,"MsgTCAPUser::~MsgTCAPUser() [%p]",this);
}
bool SigTCAPUser::initialize(NamedList& params)
bool MsgTCAPUser::initialize(NamedList& params)
{
DDebug(&plugin,DebugAll,"SigTCAPUser::initialize() [%p]",this);
DDebug(&plugin,DebugAll,"MsgTCAPUser::initialize() [%p]",this);
m_tcapName = params.getValue("tcap");
if (!m_handler) {
m_handler = new TCAPMsgHandler(this);
Engine::install(m_handler);
}
plugin.requestRelay(SigDriver::TcapRequest,"tcap.request");
if (!tcapAttach())
Debug(DebugMild,"Please move configuration of [%s] after [%s], cannot attach now",
TCAPUser::toString().c_str(),m_tcapName.c_str());
return true;
}
SS7TCAP* SigTCAPUser::tcapAttach()
SS7TCAP* MsgTCAPUser::tcapAttach()
{
if (!tcap()) {
SignallingComponent* tc = plugin.engine()->find(m_tcapName,"SS7TCAP");
@ -4129,30 +4139,50 @@ SS7TCAP* SigTCAPUser::tcapAttach()
return tcap();
}
bool SigTCAPUser::tcapRequest(NamedList& params)
bool MsgTCAPUser::tcapRequest(NamedList& params)
{
const String* name = params.getParam(YSTRING("tcap"));
if (m_tcapName && !TelEngine::null(name) && (*name != m_tcapName))
return false;
name = params.getParam(YSTRING("tcap_user"));
if (!TelEngine::null(name) && (*name != TCAPUser::toString()))
return false;
if (tcapAttach()) {
SS7TCAPError err = tcap()->userRequest(params);
return err.error() != SS7TCAPError::NoError;
return err.error() == SS7TCAPError::NoError;
}
return false;
}
bool SigTCAPUser::tcapIndication(NamedList& params)
bool MsgTCAPUser::tcapIndication(NamedList& params)
{
Message msg("tcap.indication");
msg.addParam("tcap",m_tcapName,false);
msg.addParam("tcap_user",TCAPUser::toString(),false);
msg.addParam("tcap.user",TCAPUser::toString(),false);
msg.copyParams(params);
return Engine::dispatch(&msg);
}
/**
* SigTCAPUser
*/
SigTCAPUser::~SigTCAPUser()
{
DDebug(&plugin,DebugAll,"SigTCAPUser::~SigTCAPUser() [%p]",this);
}
bool SigTCAPUser::initialize(NamedList& params)
{
DDebug(&plugin,DebugAll,"SigTCAPUser::initialize() [%p]",this);
if (!m_user)
m_user = new MsgTCAPUser(toString().c_str());
if (m_user)
m_user->initialize(params);
return true;
}
bool SigTCAPUser::tcapRequest(NamedList& params)
{
return (m_user && m_user->tcapRequest(params));
}
void SigTCAPUser::status(String& retVal)
{
}
@ -4160,33 +4190,10 @@ void SigTCAPUser::status(String& retVal)
void SigTCAPUser::destroyed()
{
DDebug(&plugin,DebugAll,"SigTCAPUser::destroyed() [%p]",this);
Engine::uninstall(m_handler);
attach(0);
TelEngine::destruct(m_user);
SigTopmost::destroyed();
}
/**
* TCAPMsgHandler
*/
TCAPMsgHandler::TCAPMsgHandler(SigTCAPUser* user)
: MessageHandler("tcap.request"),
m_user(user)
{
DDebug(&plugin,DebugAll,"TCAPMsgHandler created [%p]",this);
}
bool TCAPMsgHandler::received(Message& msg)
{
return (m_user && m_user->tcapRequest(msg));
}
void TCAPMsgHandler::destruct()
{
DDebug(&plugin,DebugAll,"TCAPMsgHandler::destroyed() [%p]",this);
m_user = 0;
MessageHandler::destruct();
}
/**
* SigConsumerMux
*/