Added support for SIGTRAN M2UA (SS7 MTP2) UAS and IUA (ISDN Q.921) UAS.
Merged SVN branch paulc/pstn -r 3446:3448 and -r 3450:3453 git-svn-id: http://yate.null.ro/svn/yate/trunk@3463 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc
parent
a03169c089
commit
3815285258
File diff suppressed because it is too large
Load Diff
|
|
@ -31,19 +31,36 @@ using namespace TelEngine;
|
|||
#define CMD_STOP 0
|
||||
#define CMD_SINGLE 1
|
||||
#define CMD_START 2
|
||||
#define CMD_RESET 3
|
||||
|
||||
// Control operations
|
||||
static const TokenDict s_dict_control[] = {
|
||||
{ "stop", CMD_STOP, },
|
||||
{ "single", CMD_SINGLE, },
|
||||
{ "start", CMD_START, },
|
||||
{ "reset", CMD_RESET, },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
bool SS7Testing::receivedMSU(const SS7MSU& msu, const SS7Label& label, SS7Layer3* network, int sls)
|
||||
{
|
||||
if (msu.getSIF() != sif() || label.type() != m_lbl.type() || label.dpc() != m_lbl.opc())
|
||||
if (msu.getSIF() != sif())
|
||||
return false;
|
||||
String src;
|
||||
int lvl = DebugNote;
|
||||
if (m_lbl.type() != SS7PointCode::Other) {
|
||||
if (label.type() != m_lbl.type())
|
||||
return false;
|
||||
if (label.opc() == m_lbl.opc() && label.dpc() == m_lbl.dpc()) {
|
||||
src = "MYSELF!";
|
||||
lvl = DebugWarn;
|
||||
}
|
||||
else if (label.dpc() != m_lbl.opc())
|
||||
return false;
|
||||
}
|
||||
if (src.null())
|
||||
src << SS7PointCode::lookup(label.type()) << ":" << label.opc();
|
||||
|
||||
XDebug(this,DebugStub,"Possibly incomplete SS7Testing::receivedMSU(%p,%p,%p,%d) [%p]",
|
||||
&msu,&label,network,sls,this);
|
||||
|
||||
|
|
@ -57,11 +74,14 @@ bool SS7Testing::receivedMSU(const SS7MSU& msu, const SS7Label& label, SS7Layer3
|
|||
|
||||
const unsigned char* t = msu.getData(label.length()+6,len);
|
||||
if (!t) {
|
||||
Debug(this,DebugMild,"Received MTP_T seq %u, length %u with invalid test length %u [%p]",
|
||||
seq,msu.length(),len,this);
|
||||
if (lvl > DebugMild)
|
||||
lvl = DebugMild;
|
||||
Debug(this,lvl,"Received MTP_T from %s, seq %u, length %u with invalid test length %u [%p]",
|
||||
src.c_str(),seq,msu.length(),len,this);
|
||||
return false;
|
||||
}
|
||||
Debug(this,DebugNote,"Received MTP_T seq %u, test length %u",seq,len);
|
||||
Debug(this,lvl,"Received MTP_T from %s, seq %u, test length %u",
|
||||
src.c_str(),seq,len);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -148,8 +168,14 @@ bool SS7Testing::control(NamedList& params)
|
|||
m_timer.start();
|
||||
return sendTraffic();
|
||||
case CMD_SINGLE:
|
||||
if (!m_lbl.length())
|
||||
return false;
|
||||
m_timer.stop();
|
||||
return sendTraffic();
|
||||
case CMD_RESET:
|
||||
m_timer.stop();
|
||||
m_lbl.assign(SS7PointCode::Other,m_lbl.opc(),m_lbl.dpc(),m_lbl.sls());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return SignallingComponent::control(params);
|
||||
|
|
|
|||
|
|
@ -80,6 +80,10 @@ class SS7Label; // SS7 Routing Label
|
|||
class SS7MSU; // A block of data that holds a Message Signal Unit
|
||||
class SIGTRAN; // Abstract SIGTRAN component
|
||||
class SIGTransport; // Abstract transport for SIGTRAN
|
||||
class SIGAdaptation; // Abstract Adaptation style SIGTRAN
|
||||
class SIGAdaptClient; // Client side of adaptation (ASP)
|
||||
class SIGAdaptServer; // Server side of adaptation (SG)
|
||||
class SIGAdaptUser; // Abstract Adaptation User SIGTRAN
|
||||
class ASPUser; // Abstract SS7 ASP user interface
|
||||
class SCCP; // Abstract SS7 SCCP interface
|
||||
class SCCPUser; // Abstract SS7 SCCP user interface
|
||||
|
|
@ -3884,7 +3888,7 @@ protected:
|
|||
* Constructor
|
||||
* @param name Default empty component name
|
||||
*/
|
||||
inline SIGTransport(const char* name = 0)
|
||||
inline explicit SIGTransport(const char* name = 0)
|
||||
: SignallingComponent(name), m_sigtran(0)
|
||||
{ }
|
||||
|
||||
|
|
@ -3949,7 +3953,7 @@ public:
|
|||
CLMSG = 7,
|
||||
// Connection-Oriented Messages (SUA)
|
||||
COMSG = 8,
|
||||
// Routing Key Management (M3UA)
|
||||
// Routing Key Management (M3UA/SUA)
|
||||
RKM = 9,
|
||||
// Interface Identifier Management (M2UA)
|
||||
IIM = 10,
|
||||
|
|
@ -3957,11 +3961,74 @@ public:
|
|||
M2PA = 11,
|
||||
};
|
||||
|
||||
/**
|
||||
* Management messages
|
||||
*/
|
||||
enum MsgMGMT {
|
||||
MgmtERR = 0,
|
||||
MgmtNTFY = 1,
|
||||
};
|
||||
|
||||
/**
|
||||
* Signalling Network Management messages
|
||||
*/
|
||||
enum MsgSSNM {
|
||||
SsnmDUNA = 1, // Destination Unavailable
|
||||
SsnmDAVA = 2, // Destination Available
|
||||
SsnmDAUD = 3, // Destination State Audit
|
||||
SsnmSCON = 4, // Signalling Congestion
|
||||
SsnmDUPU = 5, // Destination User Part Unavailable
|
||||
SsnmDRST = 6, // Destination Restricted
|
||||
};
|
||||
|
||||
/**
|
||||
* ASP State Maintenance messages
|
||||
*/
|
||||
enum MsgASPSM {
|
||||
AspsmUP = 1,
|
||||
AspsmDOWN = 2,
|
||||
AspsmBEAT = 3,
|
||||
AspsmUP_ACK = 4,
|
||||
AspsmDOWN_ACK = 5,
|
||||
AspsmBEAT_ACK = 6,
|
||||
};
|
||||
|
||||
/**
|
||||
* ASP Traffic Maintenance messages
|
||||
*/
|
||||
enum MsgASPTM {
|
||||
AsptmACTIVE = 1,
|
||||
AsptmINACTIVE = 2,
|
||||
AsptmACTIVE_ACK = 3,
|
||||
AsptmINACTIVE_ACK = 4,
|
||||
};
|
||||
|
||||
/**
|
||||
* Routing Key Management messages
|
||||
*/
|
||||
enum MsgRKM {
|
||||
RkmREG_REQ = 1,
|
||||
RkmREG_RSP = 2,
|
||||
RkmDEREG_REQ = 3,
|
||||
RkmDEREG_RSP = 4,
|
||||
};
|
||||
|
||||
/**
|
||||
* Interface Identifier Management messages
|
||||
*/
|
||||
enum MsgIIM {
|
||||
IimREG_REQ = 1,
|
||||
IimREG_RSP = 2,
|
||||
IimDEREG_REQ = 3,
|
||||
IimDEREG_RSP = 4,
|
||||
};
|
||||
|
||||
/**
|
||||
* Constructs an uninitialized signalling transport
|
||||
* @param payload SCTP payload code, ignored for other transports
|
||||
* @param port SCTP/TCP/UDP default port used for transport
|
||||
*/
|
||||
SIGTRAN(u_int32_t payload = 0);
|
||||
explicit SIGTRAN(u_int32_t payload = 0, u_int16_t port = 0);
|
||||
|
||||
/**
|
||||
* Destructor, terminates transport layer
|
||||
|
|
@ -3988,6 +4055,13 @@ public:
|
|||
inline u_int32_t payload() const
|
||||
{ return m_payload; }
|
||||
|
||||
/**
|
||||
* Get the default SCTP/TCP/UDP port used for transport
|
||||
* @return Default protocol port, 0 if unknown or not set
|
||||
*/
|
||||
inline u_int16_t defPort() const
|
||||
{ return m_defPort; }
|
||||
|
||||
/**
|
||||
* Check if the network transport layer is connected
|
||||
* @param streamId Identifier of the stream to check if applicable
|
||||
|
|
@ -3996,7 +4070,7 @@ public:
|
|||
bool connected(int streamId = 0) const;
|
||||
|
||||
virtual void notifyLayer(SignallingInterface::Notification status)
|
||||
{}
|
||||
{ }
|
||||
|
||||
/**
|
||||
* Message class names dictionary
|
||||
|
|
@ -4004,6 +4078,40 @@ public:
|
|||
*/
|
||||
static const TokenDict* classNames();
|
||||
|
||||
/**
|
||||
* Message types name lookup
|
||||
* @param msgClass Class of the message to look up
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param defValue Value to return if lookup fails
|
||||
* @return Pointer to message type name
|
||||
*/
|
||||
static const char* typeName(unsigned char msgClass, unsigned char msgType,
|
||||
const char* defValue = 0);
|
||||
|
||||
/**
|
||||
* Transmit a message to the network transport layer
|
||||
* @param msgVersion Version of the protocol
|
||||
* @param msgClass Class of the message
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream to send the data over
|
||||
* @return True if the message was transmitted to network
|
||||
*/
|
||||
bool transmitMSG(unsigned char msgVersion, unsigned char msgClass,
|
||||
unsigned char msgType, const DataBlock& msg, int streamId = 0) const;
|
||||
|
||||
/**
|
||||
* Transmit a message with default version to the network transport layer
|
||||
* @param msgClass Class of the message
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream to send the data over
|
||||
* @return True if the message was transmitted to network
|
||||
*/
|
||||
inline bool transmitMSG(unsigned char msgClass, unsigned char msgType,
|
||||
const DataBlock& msg, int streamId = 0) const
|
||||
{ return transmitMSG(1,msgClass,msgType,msg,streamId); }
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Process a complete message
|
||||
|
|
@ -4017,24 +4125,403 @@ protected:
|
|||
virtual bool processMSG(unsigned char msgVersion, unsigned char msgClass,
|
||||
unsigned char msgType, const DataBlock& msg, int streamId) = 0;
|
||||
|
||||
/**
|
||||
* Transmit a message to the network transport layer
|
||||
* @param msgVersion Version of the protocol
|
||||
* @param msgClass Class of the message
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream to send the data over
|
||||
* @return True if the message was transmitted to network
|
||||
*/
|
||||
bool transmitMSG(unsigned char msgVersion, unsigned char msgClass,
|
||||
unsigned char msgType, const DataBlock& msg, int streamId = 0) const;
|
||||
|
||||
private:
|
||||
SIGTransport* m_trans;
|
||||
u_int32_t m_payload;
|
||||
u_int16_t m_defPort;
|
||||
mutable Mutex m_transMutex;
|
||||
};
|
||||
|
||||
/**
|
||||
* An interface to a Signalling Transport User Adaptation component
|
||||
* @short Abstract SIGTRAN User Adaptation component
|
||||
*/
|
||||
class YSIG_API SIGAdaptation : public SignallingComponent, public SIGTRAN, public Mutex
|
||||
{
|
||||
YCLASS(SIGAdaptation,SignallingComponent)
|
||||
public:
|
||||
/**
|
||||
* Traffic modes
|
||||
*/
|
||||
enum TrafficMode {
|
||||
TrafficUnused = 0,
|
||||
TrafficOverride = 1,
|
||||
TrafficLoadShare = 2,
|
||||
TrafficBroadcast = 3,
|
||||
};
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
virtual ~SIGAdaptation();
|
||||
|
||||
/**
|
||||
* Transport initialization
|
||||
* @param config Configuration section for the adaptation
|
||||
*/
|
||||
virtual bool initialize(const NamedList* config);
|
||||
|
||||
/**
|
||||
* Advance to next tag in a Type-Length-Value set of parameters
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param offset Offset of current parameter in block, initialize to negative for first tag
|
||||
* @param tag Type tag of returned parameter
|
||||
* @param length Unpadded length of returned parameter in octets
|
||||
* @return True if the current parameter was valid
|
||||
*/
|
||||
static bool nextTag(const DataBlock& data, int& offset, uint16_t& tag, uint16_t& length);
|
||||
|
||||
/**
|
||||
* Find a specific tag in a Type-Length-Value set of parameters
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param offset Offset of current parameter in block, gets updated
|
||||
* @param tag Type tag of searched parameter
|
||||
* @param length Unpadded length of returned parameter in octets
|
||||
* @return True if the requested parameter was found
|
||||
*/
|
||||
static bool findTag(const DataBlock& data, int& offset, uint16_t tag, uint16_t& length);
|
||||
|
||||
/**
|
||||
* Get the value of a 32 bit integer parameter
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param tag Type tag of searched parameter
|
||||
* @param value Variable to store the decoded parameter if found
|
||||
* @return True if the requested parameter was found and decoded
|
||||
*/
|
||||
static bool getTag(const DataBlock& data, uint16_t tag, uint32_t& value);
|
||||
|
||||
/**
|
||||
* Get the value of a String parameter
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param tag Type tag of searched parameter
|
||||
* @param value Variable to store the decoded parameter if found
|
||||
* @return True if the requested parameter was found and decoded
|
||||
*/
|
||||
static bool getTag(const DataBlock& data, uint16_t tag, String& value);
|
||||
|
||||
/**
|
||||
* Get the value of a raw binary parameter
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param tag Type tag of searched parameter
|
||||
* @param value Variable to store the decoded parameter if found
|
||||
* @return True if the requested parameter was found and decoded
|
||||
*/
|
||||
static bool getTag(const DataBlock& data, uint16_t tag, DataBlock& value);
|
||||
|
||||
/**
|
||||
* Add a 32 bit integer parameter
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param tag Type tag of parameter to add
|
||||
* @param value Value of parameter to add
|
||||
*/
|
||||
static void addTag(DataBlock& data, uint16_t tag, uint32_t value);
|
||||
|
||||
/**
|
||||
* Add a String parameter
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param tag Type tag of parameter to add
|
||||
* @param value Value of parameter to add
|
||||
*/
|
||||
static void addTag(DataBlock& data, uint16_t tag, const String& value);
|
||||
|
||||
/**
|
||||
* Add a raw binary parameter
|
||||
* @param data Block of data containing TLV parameters
|
||||
* @param tag Type tag of parameter to add
|
||||
* @param value Value of parameter to add
|
||||
*/
|
||||
static void addTag(DataBlock& data, uint16_t tag, const DataBlock& value);
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Constructs an uninitialized User Adaptation component
|
||||
* @param name Name of this component
|
||||
* @param params Optional pointer to creation parameters
|
||||
* @param payload SCTP payload code, ignored for other transports
|
||||
* @param port SCTP/TCP/UDP default port used for transport
|
||||
*/
|
||||
explicit SIGAdaptation(const char* name = 0, const NamedList* params = 0,
|
||||
u_int32_t payload = 0, u_int16_t port = 0);
|
||||
|
||||
/**
|
||||
* Processing of common management messages
|
||||
* @param msgClass Class of the message
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processCommonMSG(unsigned char msgClass,
|
||||
unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
|
||||
/**
|
||||
* Abstract processing of Management messages
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processMgmtMSG(unsigned char msgType, const DataBlock& msg, int streamId) = 0;
|
||||
|
||||
/**
|
||||
* Abstract processing of ASP State Maintenance messages
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processAspsmMSG(unsigned char msgType, const DataBlock& msg, int streamId) = 0;
|
||||
|
||||
/**
|
||||
* Abstract processing of ASP Traffic Maintenance messages
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processAsptmMSG(unsigned char msgType, const DataBlock& msg, int streamId) = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* Generic client side (ASP) Signalling Transport User Adaptation component
|
||||
* @short Client side SIGTRAN User Adaptation component
|
||||
*/
|
||||
class YSIG_API SIGAdaptClient : public SIGAdaptation
|
||||
{
|
||||
friend class SIGAdaptUser;
|
||||
YCLASS(SIGAdaptClient,SIGAdaptation)
|
||||
public:
|
||||
/**
|
||||
* ASP Client states
|
||||
*/
|
||||
enum AspState {
|
||||
AspDown = 0,
|
||||
AspUpRq,
|
||||
AspUp,
|
||||
AspActRq,
|
||||
AspActive
|
||||
};
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Constructs an uninitialized User Adaptation client component
|
||||
* @param name Name of this component
|
||||
* @param params Optional pointer to creation parameters
|
||||
* @param payload SCTP payload code, ignored for other transports
|
||||
* @param port SCTP/TCP/UDP default port used for transport
|
||||
*/
|
||||
explicit SIGAdaptClient(const char* name = 0, const NamedList* params = 0,
|
||||
u_int32_t payload = 0, u_int16_t port = 0);
|
||||
|
||||
/**
|
||||
* Process Management messages as ASP
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processMgmtMSG(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
|
||||
/**
|
||||
* Process ASP State Maintenance messages as ASP
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processAspsmMSG(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
|
||||
/**
|
||||
* Process ASP Traffic Maintenance messages as ASP
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processAsptmMSG(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
|
||||
/**
|
||||
* Traffic activity state change notification
|
||||
* @param active True if the ASP is active and traffic is allowed
|
||||
*/
|
||||
virtual void activeChange(bool active);
|
||||
|
||||
/**
|
||||
* Check if the ASP is Up
|
||||
* @return True if the ASPSM is in UP state
|
||||
*/
|
||||
inline bool aspUp() const
|
||||
{ return m_state >= AspUp; }
|
||||
|
||||
/**
|
||||
* Check if the ASP is Active
|
||||
* @return True if the ASPTM is in ACTIVE state
|
||||
*/
|
||||
inline bool aspActive() const
|
||||
{ return m_state >= AspActive; }
|
||||
|
||||
/**
|
||||
* Request activation of the ASP
|
||||
* @return True if ASP activation started, false on failure
|
||||
*/
|
||||
bool activate();
|
||||
|
||||
/**
|
||||
* Set the state of the ASP, notify user components of changes
|
||||
* @param state New state of the ASP
|
||||
* @param notify True to notify user layers, false if the changes are internal
|
||||
*/
|
||||
void setState(AspState state, bool notify = true);
|
||||
|
||||
/**
|
||||
* Get access to the list of Adaptation Users of this component
|
||||
* @return Reference to the list of Adaptation Users
|
||||
*/
|
||||
inline ObjList& users()
|
||||
{ return m_users; }
|
||||
|
||||
/**
|
||||
* ASP Identifier for ASPSM UP messages
|
||||
*/
|
||||
int32_t m_aspId;
|
||||
|
||||
/**
|
||||
* Traffic mode for ASPTM ACTIVE messages
|
||||
*/
|
||||
TrafficMode m_traffic;
|
||||
|
||||
private:
|
||||
void attach(SIGAdaptUser* user);
|
||||
void detach(SIGAdaptUser* user);
|
||||
ObjList m_users;
|
||||
AspState m_state;
|
||||
};
|
||||
|
||||
/**
|
||||
* Generic server side (SG) Signalling Transport User Adaptation component
|
||||
* @short Server side SIGTRAN User Adaptation component
|
||||
*/
|
||||
class YSIG_API SIGAdaptServer : public SIGAdaptation
|
||||
{
|
||||
YCLASS(SIGAdaptServer,SIGAdaptation)
|
||||
protected:
|
||||
/**
|
||||
* Constructs an uninitialized User Adaptation server component
|
||||
* @param name Name of this component
|
||||
* @param params Optional pointer to creation parameters
|
||||
* @param payload SCTP payload code, ignored for other transports
|
||||
* @param port SCTP/TCP/UDP default port used for transport
|
||||
*/
|
||||
inline explicit SIGAdaptServer(const char* name = 0, const NamedList* params = 0,
|
||||
u_int32_t payload = 0, u_int16_t port = 0)
|
||||
: SIGAdaptation(name,params,payload,port)
|
||||
{ }
|
||||
|
||||
/**
|
||||
* Process Management messages as SG
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processMgmtMSG(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
|
||||
/**
|
||||
* Process ASP State Maintenance messages as SG
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processAspsmMSG(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
|
||||
/**
|
||||
* Process ASP Traffic Maintenance messages as SG
|
||||
* @param msgType Type of the message, depends on the class
|
||||
* @param msg Message data, may be empty
|
||||
* @param streamId Identifier of the stream the message was received on
|
||||
* @return True if the message was handled
|
||||
*/
|
||||
virtual bool processAsptmMSG(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
};
|
||||
|
||||
/**
|
||||
* An interface to a Signalling Transport Adaptation user
|
||||
* @short Abstract SIGTRAN Adaptation user
|
||||
*/
|
||||
class YSIG_API SIGAdaptUser
|
||||
{
|
||||
friend class SIGAdaptClient;
|
||||
public:
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
virtual ~SIGAdaptUser();
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Default constructor
|
||||
*/
|
||||
inline SIGAdaptUser()
|
||||
: m_autostart(false), m_adaptation(0)
|
||||
{ }
|
||||
|
||||
/**
|
||||
* Get the User Adaptation to which this component belongs
|
||||
* @return Pointer to the User Adaptation layer
|
||||
*/
|
||||
inline SIGAdaptClient* adaptation() const
|
||||
{ return m_adaptation; }
|
||||
|
||||
/**
|
||||
* Get the transport of the user adaptation component
|
||||
* @return Pointer to the transport layer or NULL
|
||||
*/
|
||||
inline SIGTransport* transport() const
|
||||
{ return m_adaptation ? m_adaptation->transport() : 0; }
|
||||
|
||||
/**
|
||||
* Set the User Adaptation to which this component belongs
|
||||
* @param adapt Pointer to the new User Adaptation layer
|
||||
*/
|
||||
void adaptation(SIGAdaptClient* adapt);
|
||||
|
||||
/**
|
||||
* Traffic activity state change notification
|
||||
* @param active True if the ASP is active and traffic is allowed
|
||||
*/
|
||||
virtual void activeChange(bool active) = 0;
|
||||
|
||||
/**
|
||||
* Request activation of the ASP
|
||||
* @return True if ASP activation started, false on failure
|
||||
*/
|
||||
inline bool activate()
|
||||
{ return m_adaptation && m_adaptation->activate(); }
|
||||
|
||||
/**
|
||||
* Check if the ASP is Up
|
||||
* @return True if the ASPSM is in UP state
|
||||
*/
|
||||
inline bool aspUp() const
|
||||
{ return m_adaptation && m_adaptation->aspUp(); }
|
||||
|
||||
/**
|
||||
* Check if the ASP is Active
|
||||
* @return True if the ASPTM is in ACTIVE state
|
||||
*/
|
||||
inline bool aspActive() const
|
||||
{ return m_adaptation && m_adaptation->aspActive(); }
|
||||
|
||||
/**
|
||||
* Automatically start on init flag
|
||||
*/
|
||||
bool m_autostart;
|
||||
|
||||
private:
|
||||
SIGAdaptClient* m_adaptation;
|
||||
};
|
||||
|
||||
/**
|
||||
* An interface to a SS7 Application Signalling Part user
|
||||
* @short Abstract SS7 ASP user interface
|
||||
|
|
@ -4779,6 +5266,7 @@ protected:
|
|||
*/
|
||||
class YSIG_API SS7M2PA : public SS7Layer2, public SIGTRAN
|
||||
{
|
||||
YCLASS(SS7M2PA,SS7Layer2)
|
||||
public:
|
||||
enum m2paState {
|
||||
Alignment = 1,
|
||||
|
|
@ -4814,9 +5302,9 @@ public:
|
|||
~SS7M2PA();
|
||||
|
||||
/**
|
||||
* Configure and initialize MTP2 and its interface
|
||||
* Configure and initialize M2PA and its transport
|
||||
* @param config Optional configuration parameters override
|
||||
* @return True if MTP2 and the interface were initialized properly
|
||||
* @return True if M2PA and the transport were initialized properly
|
||||
*/
|
||||
virtual bool initialize(const NamedList* config);
|
||||
|
||||
|
|
@ -4980,8 +5468,6 @@ private:
|
|||
unsigned int m_remoteStatus;
|
||||
unsigned int m_transportState;
|
||||
Mutex m_mutex;
|
||||
bool m_reliable;
|
||||
bool m_autostart;
|
||||
ObjList m_ackList;
|
||||
ObjList m_bufMsg;
|
||||
SignallingTimer m_t1;
|
||||
|
|
@ -4990,17 +5476,102 @@ private:
|
|||
SignallingTimer m_t4;
|
||||
SignallingTimer m_ackTimer;
|
||||
SignallingTimer m_confTimer;
|
||||
bool m_autostart;
|
||||
bool m_dumpMsg;
|
||||
};
|
||||
|
||||
/**
|
||||
* The common client side of SIGTRAN SS7 MTP2 User Adaptation (RFC3331)
|
||||
* @short Client side of SIGTRAN SS7 MTP2 UA
|
||||
*/
|
||||
class YSIG_API SS7M2UAClient : public SIGAdaptClient
|
||||
{
|
||||
YCLASS(SS7M2UAClient,SIGAdaptClient)
|
||||
public:
|
||||
/**
|
||||
* Contructor of an empty IUA client
|
||||
*/
|
||||
inline SS7M2UAClient(const NamedList& params)
|
||||
: SIGAdaptClient("SS7M2UAClient",¶ms,2,2904)
|
||||
{ }
|
||||
virtual bool processMSG(unsigned char msgVersion, unsigned char msgClass,
|
||||
unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
};
|
||||
|
||||
/**
|
||||
* RFC3331 SS7 Layer 2 implementation over SCTP/IP.
|
||||
* M2UA is intended to be used as a Provider-User where real MTP2 runs on a
|
||||
* Signalling Gateway and MTP3 runs on an Application Server.
|
||||
* @short SIGTRAN MTP2 User Adaptation Layer
|
||||
*/
|
||||
class YSIG_API SS7M2UA : public SS7Layer2, public SIGTRAN
|
||||
class YSIG_API SS7M2UA : public SS7Layer2, public SIGAdaptUser
|
||||
{
|
||||
friend class SS7M2UAClient;
|
||||
YCLASS(SS7M2UA,SS7Layer2)
|
||||
public:
|
||||
/**
|
||||
* Constructor
|
||||
* @param params List of construction parameters
|
||||
*/
|
||||
SS7M2UA(const NamedList& params);
|
||||
|
||||
/**
|
||||
* Configure and initialize M2UA and its transport
|
||||
* @param config Optional configuration parameters override
|
||||
* @return True if M2UA and the transport were initialized properly
|
||||
*/
|
||||
virtual bool initialize(const NamedList* config);
|
||||
|
||||
/**
|
||||
* Execute a control operation. Operations can change the link status or
|
||||
* can query the aligned status.
|
||||
* @param oper Operation to execute
|
||||
* @param params Optional parameters for the operation
|
||||
* @return True if the command completed successfully, for query operations
|
||||
* also indicates the data link is aligned and operational
|
||||
*/
|
||||
virtual bool control(Operation oper, NamedList* params = 0);
|
||||
|
||||
/**
|
||||
* Push a Message Signal Unit down the protocol stack
|
||||
* @param msu Message data, starting with Service Indicator Octet
|
||||
* @return True if message was successfully queued
|
||||
*/
|
||||
virtual bool transmitMSU(const SS7MSU& msu);
|
||||
|
||||
/**
|
||||
* Check if the link is fully operational
|
||||
* @return True if the link is aligned and operational
|
||||
*/
|
||||
virtual bool operational() const;
|
||||
|
||||
/**
|
||||
* Traffic activity state change notification
|
||||
* @param active True if the ASP is active and traffic is allowed
|
||||
*/
|
||||
virtual void activeChange(bool active);
|
||||
|
||||
/**
|
||||
* Retrieve the numeric Interface Identifier (if any)
|
||||
* @return IID value, -1 if not set
|
||||
*/
|
||||
inline int32_t iid() const
|
||||
{ return m_iid; }
|
||||
|
||||
protected:
|
||||
enum LinkState {
|
||||
LinkDown,
|
||||
LinkReq,
|
||||
LinkReqEmg,
|
||||
LinkUp,
|
||||
LinkUpEmg,
|
||||
};
|
||||
SS7M2UAClient* client() const
|
||||
{ return static_cast<SS7M2UAClient*>(adaptation()); }
|
||||
virtual bool processMGMT(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
virtual bool processMAUP(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
int32_t m_iid;
|
||||
int m_linkState;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -5009,8 +5580,9 @@ class YSIG_API SS7M2UA : public SS7Layer2, public SIGTRAN
|
|||
* Signalling Gateway and MTP users are located on an Application Server.
|
||||
* @short SIGTRAN MTP3 User Adaptation Layer
|
||||
*/
|
||||
class YSIG_API SS7M3UA : public SS7Layer3, public SIGTRAN
|
||||
class YSIG_API SS7M3UA : public SS7Layer3, public SIGAdaptUser
|
||||
{
|
||||
YCLASS(SS7M3UA,SS7Layer3)
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -6486,7 +7058,7 @@ class YSIG_API SS7SCCP : public SS7Layer4, public SCCP
|
|||
* Signalling Gateway and SCCP users are located on an Application Server.
|
||||
* @short SIGTRAN SCCP User Adaptation Layer
|
||||
*/
|
||||
class YSIG_API SS7SUA : public SIGTRAN, public SCCP
|
||||
class YSIG_API SS7SUA : public SIGAdaptUser, public SCCP
|
||||
{
|
||||
};
|
||||
|
||||
|
|
@ -7742,31 +8314,100 @@ private:
|
|||
bool m_errorReceive; // Receive error
|
||||
};
|
||||
|
||||
/**
|
||||
* The common client side of SIGTRAN ISDN Q.921 User Adaptation (RFC4233)
|
||||
* @short Client side of SIGTRAN ISDN Q.921 UA
|
||||
*/
|
||||
class YSIG_API ISDNIUAClient : public SIGAdaptClient
|
||||
{
|
||||
YCLASS(ISDNIUAClient,SIGAdaptClient)
|
||||
public:
|
||||
/**
|
||||
* Contructor of an empty IUA client
|
||||
*/
|
||||
inline ISDNIUAClient(const NamedList& params)
|
||||
: SIGAdaptClient("ISDNIUAClient",¶ms,1,9900)
|
||||
{ }
|
||||
|
||||
virtual bool processMSG(unsigned char msgVersion, unsigned char msgClass,
|
||||
unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
};
|
||||
|
||||
/**
|
||||
* RFC4233 ISDN Layer 2 implementation over SCTP/IP
|
||||
* IUA is intended to be used as a Provider-User where Q.921 runs on a
|
||||
* Signalling Gateway and the user (Q.931) runs on an Application Server.
|
||||
* @short SIGTRAN ISDN Q.921 User Adaptation Layer
|
||||
*/
|
||||
class YSIG_API ISDNIUA : public ISDNLayer2, public SIGTRAN
|
||||
class YSIG_API ISDNIUA : public ISDNLayer2, public SIGAdaptUser
|
||||
{
|
||||
friend class ISDNIUAClient;
|
||||
YCLASS(ISDNIUA,ISDNLayer2)
|
||||
protected:
|
||||
public:
|
||||
/**
|
||||
* Constructor
|
||||
* Initialize this object and the layer 2
|
||||
* @param params Object and Layer 2 parameters
|
||||
* @param name Optional name for Layer 2
|
||||
* @param tei Value of TEI for this component
|
||||
*/
|
||||
inline ISDNIUA(const NamedList& params, const char* name = 0)
|
||||
: ISDNLayer2(params,name)
|
||||
{ }
|
||||
ISDNIUA(const NamedList& params, const char* name = 0, u_int8_t tei = 0);
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
virtual ~ISDNIUA()
|
||||
{ }
|
||||
virtual ~ISDNIUA();
|
||||
|
||||
/**
|
||||
* Configure and initialize IUA and its transport
|
||||
* @param config Optional configuration parameters override
|
||||
* @return True if IUA and the transport were initialized properly
|
||||
*/
|
||||
virtual bool initialize(const NamedList* config);
|
||||
|
||||
/**
|
||||
* Implements Q.921 DL-ESTABLISH and DL-RELEASE request primitives
|
||||
* @param tei This layer's TEI
|
||||
* @param establish True to establish. False to release
|
||||
* @param force True to establish even if we already are in this mode. This
|
||||
* parameter is ignored if establish is false
|
||||
* @return True if the request was accepted
|
||||
*/
|
||||
virtual bool multipleFrame(u_int8_t tei, bool establish, bool force);
|
||||
|
||||
/**
|
||||
* Implements Q.921 DL-DATA and DL-UNIT DATA request primitives
|
||||
* @param data Data to send
|
||||
* @param tei The TEI to send with the data frane
|
||||
* @param ack True to send an acknowledged frame, false to send an unacknowledged one
|
||||
* @return False if the request was not accepted or send operation failed
|
||||
*/
|
||||
virtual bool sendData(const DataBlock& data, u_int8_t tei, bool ack);
|
||||
|
||||
/**
|
||||
* Emergency release.
|
||||
*/
|
||||
virtual void cleanup();
|
||||
|
||||
/**
|
||||
* Traffic activity state change notification
|
||||
* @param active True if the ASP is active and traffic is allowed
|
||||
*/
|
||||
virtual void activeChange(bool active);
|
||||
|
||||
/**
|
||||
* Retrieve the numeric Interface Identifier (if any)
|
||||
* @return IID value, -1 if not set
|
||||
*/
|
||||
inline int32_t iid() const
|
||||
{ return m_iid; }
|
||||
|
||||
protected:
|
||||
ISDNIUAClient* client() const
|
||||
{ return static_cast<ISDNIUAClient*>(adaptation()); }
|
||||
virtual bool processMGMT(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
virtual bool processQPTM(unsigned char msgType, const DataBlock& msg, int streamId);
|
||||
int32_t m_iid;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ public:
|
|||
Configure = 0x02,
|
||||
Unknown = 0x03,
|
||||
};
|
||||
|
||||
|
||||
SigDriver();
|
||||
~SigDriver();
|
||||
virtual void initialize();
|
||||
|
|
@ -430,13 +430,22 @@ public:
|
|||
Unknown = 0,
|
||||
SigISDNLayer2 = 0x01 | SigDefaults,
|
||||
SigISDNLayer3 = 0x02 | SigDefaults,
|
||||
SigSS7Layer2 = 0x03 | SigOnDemand,
|
||||
SigSS7Layer3 = 0x04 | SigTopMost,
|
||||
SigSS7Router = 0x05 | SigDefaults,
|
||||
SigSS7Management = 0x06 | SigDefaults,
|
||||
SigSS7Maintenance = 0x07 | SigDefaults,
|
||||
SigSS7M2PA = 0x08 | SigOnDemand,
|
||||
SigSS7Testing = 0x09 | SigTopMost,
|
||||
SigISDNIUA = 0x03 | SigDefaults,
|
||||
SigSS7Layer2 = 0x11 | SigOnDemand,
|
||||
SigSS7Layer3 = 0x12 | SigTopMost,
|
||||
SigSS7Router = 0x13 | SigDefaults,
|
||||
SigSS7Management = 0x14 | SigDefaults,
|
||||
SigSS7Maintenance = 0x15 | SigDefaults,
|
||||
SigSS7Testing = 0x16 | SigTopMost,
|
||||
SigSS7M2PA = 0x21 | SigOnDemand,
|
||||
SigSS7M2UA = 0x22 | SigOnDemand,
|
||||
SigSS7M3UA = 0x23 | SigTopMost,
|
||||
SigISDNIUAClient = 0x31 | SigDefaults,
|
||||
SigISDNIUAGateway = 0x32 | SigTopMost,
|
||||
SigSS7M2UAClient = 0x33 | SigDefaults,
|
||||
SigSS7M2UAGateway = 0x34 | SigTopMost,
|
||||
SigSS7M3UAClient = 0x35 | SigDefaults,
|
||||
SigSS7M3UAGateway = 0x36 | SigTopMost,
|
||||
SigSS7Isup = SigTrunk::SS7Isup | SigIsTrunk | SigTopMost,
|
||||
SigSS7Bicc = SigTrunk::SS7Bicc | SigIsTrunk | SigTopMost,
|
||||
SigISDNPN = SigTrunk::IsdnPriNet | SigIsTrunk | SigTopMost,
|
||||
|
|
@ -603,22 +612,31 @@ static const char s_miniHelp[] = "sigdump component [filename]";
|
|||
static const char s_fullHelp[] = "Command to dump signalling data to a file";
|
||||
|
||||
const TokenDict SigFactory::s_compNames[] = {
|
||||
{ "isdn-q921", SigISDNLayer2 },
|
||||
{ "isdn-q931", SigISDNLayer3 },
|
||||
{ "ss7-router", SigSS7Router },
|
||||
{ "ss7-mtp2", SigSS7Layer2 },
|
||||
{ "ss7-mtp3", SigSS7Layer3 },
|
||||
{ "ss7-snm", SigSS7Management },
|
||||
{ "ss7-mtn", SigSS7Maintenance },
|
||||
{ "ss7-test", SigSS7Testing },
|
||||
{ "ss7-m2pa", SigSS7M2PA },
|
||||
{ "ss7-isup", SigSS7Isup },
|
||||
{ "ss7-bicc", SigSS7Bicc },
|
||||
{ "isdn-pri-net", SigISDNPN },
|
||||
{ "isdn-bri-net", SigISDNBN },
|
||||
{ "isdn-pri-cpe", SigISDNPC },
|
||||
{ "isdn-bri-cpe", SigISDNBC },
|
||||
{ "isdn-pri-mon", SigISDNMon },
|
||||
{ "isdn-q921", SigISDNLayer2 },
|
||||
{ "isdn-q931", SigISDNLayer3 },
|
||||
{ "isdn-iua", SigISDNIUA },
|
||||
{ "isdn-iua-client", SigISDNIUAClient },
|
||||
{ "isdn-iua-gateway", SigISDNIUAGateway },
|
||||
{ "ss7-router", SigSS7Router },
|
||||
{ "ss7-mtp2", SigSS7Layer2 },
|
||||
{ "ss7-mtp3", SigSS7Layer3 },
|
||||
{ "ss7-snm", SigSS7Management },
|
||||
{ "ss7-mtn", SigSS7Maintenance },
|
||||
{ "ss7-test", SigSS7Testing },
|
||||
{ "ss7-m2pa", SigSS7M2PA },
|
||||
{ "ss7-m2ua", SigSS7M2UA },
|
||||
{ "ss7-m2ua-client", SigSS7M2UAClient },
|
||||
{ "ss7-m2ua-gateway", SigSS7M2UAGateway },
|
||||
{ "ss7-m3ua", SigSS7M3UA },
|
||||
{ "ss7-m3ua-client", SigSS7M3UAClient },
|
||||
{ "ss7-m3ua-gateway", SigSS7M3UAGateway },
|
||||
{ "ss7-isup", SigSS7Isup },
|
||||
{ "ss7-bicc", SigSS7Bicc },
|
||||
{ "isdn-pri-net", SigISDNPN },
|
||||
{ "isdn-bri-net", SigISDNBN },
|
||||
{ "isdn-pri-cpe", SigISDNPC },
|
||||
{ "isdn-bri-cpe", SigISDNBC },
|
||||
{ "isdn-pri-mon", SigISDNMon },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
|
@ -632,6 +650,8 @@ const TokenDict SigDriver::s_operations[] = {
|
|||
const TokenDict SigFactory::s_compClass[] = {
|
||||
#define MAKE_CLASS(x) { #x, Sig##x }
|
||||
MAKE_CLASS(ISDNLayer2),
|
||||
MAKE_CLASS(ISDNIUA),
|
||||
MAKE_CLASS(ISDNIUAClient),
|
||||
MAKE_CLASS(SS7Router),
|
||||
MAKE_CLASS(SS7Layer2),
|
||||
MAKE_CLASS(SS7Layer3),
|
||||
|
|
@ -639,6 +659,10 @@ const TokenDict SigFactory::s_compClass[] = {
|
|||
MAKE_CLASS(SS7Maintenance),
|
||||
MAKE_CLASS(SS7Testing),
|
||||
MAKE_CLASS(SS7M2PA),
|
||||
MAKE_CLASS(SS7M2UA),
|
||||
MAKE_CLASS(SS7M2UAClient),
|
||||
MAKE_CLASS(SS7M3UA),
|
||||
MAKE_CLASS(SS7M3UAClient),
|
||||
MAKE_CLASS(SS7Isup),
|
||||
MAKE_CLASS(SS7Bicc),
|
||||
MAKE_CLASS(ISDNPN),
|
||||
|
|
@ -671,21 +695,34 @@ SignallingComponent* SigFactory::create(const String& type, const NamedList& nam
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
String* ty = config->getParam("type");
|
||||
switch (compType) {
|
||||
case SigISDNLayer2:
|
||||
if (ty && *ty == "isdn-iua")
|
||||
return new ISDNIUA(*config);
|
||||
if (name.getBoolValue("primary",true))
|
||||
return new ISDNQ921(*config,name);
|
||||
return new ISDNQ921Management(*config,name,name.getBoolValue("network",true));
|
||||
case SigISDNLayer3:
|
||||
return new ISDNQ931(*config,name);
|
||||
case SigSS7Layer2: {
|
||||
String* ty = config->getParam("type");
|
||||
if (ty && *ty == "ss7-m2pa")
|
||||
return new SS7M2PA(*config);
|
||||
case SigISDNIUA:
|
||||
return new ISDNIUA(*config);
|
||||
case SigISDNIUAClient:
|
||||
return new ISDNIUAClient(*config);
|
||||
case SigSS7Layer2:
|
||||
if (ty) {
|
||||
if (*ty == "ss7-m2pa")
|
||||
return new SS7M2PA(*config);
|
||||
if (*ty == "ss7-m2ua")
|
||||
return new SS7M2UA(*config);
|
||||
}
|
||||
return new SS7MTP2(*config);
|
||||
}
|
||||
case SigSS7M2PA:
|
||||
return new SS7M2PA(*config);
|
||||
case SigSS7M2UA:
|
||||
return new SS7M2UA(*config);
|
||||
case SigSS7M2UAClient:
|
||||
return new SS7M2UAClient(*config);
|
||||
case SigSS7Layer3:
|
||||
return new SS7MTP3(*config);
|
||||
case SigSS7Router:
|
||||
|
|
@ -2008,6 +2045,7 @@ bool SigDriver::initTopmost(NamedList& sect, int type)
|
|||
if (create) {
|
||||
switch (type) {
|
||||
case SigFactory::SigSS7Layer3:
|
||||
case SigFactory::SigSS7M3UA:
|
||||
topmost = new SigLinkSet(sect);
|
||||
break;
|
||||
case SigFactory::SigSS7Testing:
|
||||
|
|
|
|||
Loading…
Reference in New Issue