diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-03-23 10:53:42 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-03-23 11:06:51 +0100 |
commit | 4d244d3c31486f4e353dc997c92fa46129d82406 (patch) | |
tree | b2b5356b2b8895902ae6b2d87aa01e1e2b657586 | |
parent | a93c6f3113f71d3128ae516586319e22215970bd (diff) |
XUA: Move m2ua headers to sigtran, create xua_types.h and m3ua_types.h
Begin with type definitions for m3ua
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/Makefile.am | 2 | ||||
-rw-r--r-- | include/m2ua/Makefile.am | 2 | ||||
-rw-r--r-- | include/sigtran/Makefile.am | 2 | ||||
-rw-r--r-- | include/sigtran/m2ua_msg.h (renamed from include/m2ua/m2ua_msg.h) | 0 | ||||
-rw-r--r-- | include/sigtran/m2ua_types.h (renamed from include/m2ua/m2ua_types.h) | 26 | ||||
-rw-r--r-- | include/sigtran/m3ua_types.h | 113 | ||||
-rw-r--r-- | include/sigtran/xua_types.h | 28 | ||||
-rw-r--r-- | src/m2ua_msg.c | 2 | ||||
-rw-r--r-- | tests/m2ua/m2ua_test.c | 2 |
10 files changed, 147 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index 98a6b1f..49c5f7e 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ AC_OUTPUT( libosmo-mtp.pc include/sccp/Makefile include/mtp/Makefile - include/m2ua/Makefile + include/sigtran/Makefile include/Makefile src/Makefile tests/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 882d1e2..8045946 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1 @@ -SUBDIRS = sccp mtp m2ua +SUBDIRS = sccp mtp sigtran diff --git a/include/m2ua/Makefile.am b/include/m2ua/Makefile.am deleted file mode 100644 index d740a6c..0000000 --- a/include/m2ua/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -m2ua_HEADERS = m2ua_types.h m2ua_msg.h -m2uadir = $(includedir)/osmocom/m2ua diff --git a/include/sigtran/Makefile.am b/include/sigtran/Makefile.am new file mode 100644 index 0000000..053530a --- /dev/null +++ b/include/sigtran/Makefile.am @@ -0,0 +1,2 @@ +sigtran_HEADERS = m3ua_types.h xua_types.h m2ua_types.h m2ua_msg.h +sigtrandir = $(includedir)/osmocom/sigtran diff --git a/include/m2ua/m2ua_msg.h b/include/sigtran/m2ua_msg.h index e878edd..e878edd 100644 --- a/include/m2ua/m2ua_msg.h +++ b/include/sigtran/m2ua_msg.h diff --git a/include/m2ua/m2ua_types.h b/include/sigtran/m2ua_types.h index ee25af8..d6854e8 100644 --- a/include/m2ua/m2ua_types.h +++ b/include/sigtran/m2ua_types.h @@ -100,32 +100,6 @@ struct m2ua_common_hdr { /** - * Common tag values used by all user adaption layers - */ -enum { - MUA_TAG_RESERVED, /* Reserved */ - MUA_TAG_IDENT_INT, /* Interface Identifier (Integer) */ - MUA_TAG_UNUSED1, /* Unused */ - MUA_TAG_IDENT_TEXT, /* Interface Identifier (Text) */ - MUA_TAG_INFO, /* Info String */ - MUA_TAG_UNUSED2, /* Unused */ - MUA_TAG_UNUSED3, /* Unused */ - MUA_TAG_DIAG_INF, /* Diagnostic Information */ - MUA_TAG_IDENT_RANGE, /* Interface Identifier (Integer Range) */ - MUA_TAG_BEAT_DATA, /* Heartbeat Data */ - MUA_TAG_UNUSED4, /* Unused */ - MUA_TAG_TRA_MODE, /* Traffic Mode Type */ - MUA_TAG_ERR_CODE, /* Error Code */ - MUA_TAG_STATUS, /* Status Type/Information */ - MUA_TAG_UNUSED5, /* Unused */ - MUA_TAG_UNUSED6, /* Unused */ - MUA_TAG_UNUSED7, /* Unused */ - MUA_TAG_ASP_IDENT, /* ASP Identifier */ - MUA_TAG_UNUSED8, /* Unused */ - MUA_TAG_CORREL_ID, /* Correlation Id */ -}; - -/** * Tag Values for M2UA */ enum { diff --git a/include/sigtran/m3ua_types.h b/include/sigtran/m3ua_types.h new file mode 100644 index 0000000..ce8e985 --- /dev/null +++ b/include/sigtran/m3ua_types.h @@ -0,0 +1,113 @@ +#pragma once + +/** + * Types found in the M3UA RFC 4666 + */ + +#include <stdint.h> + + +#define M3UA_VERSION 1 + +enum { + M3UA_CLS_MGMT, /* Management (MGMT) Message [IUA/M2UA/M3UA/SUA] */ + M3UA_CLS_TRANS, /* Transfer Messages [M3UA] */ + M3UA_CLS_SSNM, /* SS7 Signalling Network Management (SSNM) Messages [M3UA/SUA] */ + M3UA_CLS_ASPSM, /* ASP State Maintenance (ASPSM) Messages [IUA/M2UA/M3UA/SUA] */ + M3UA_CLS_ASPTM, /* ASP Traffic Maintenance (ASPTM) Messages [IUA/M2UA/M3UA/SUA] */ + M3UA_CLS_RESERVED1, /* Reserved for Other SIGTRAN Adaptation Layers */ + M3UA_CLS_RESERVED2, /* Reserved for Other SIGTRAN Adaptation Layers */ + M3UA_CLS_RESERVED3, /* Reserved for Other SIGTRAN Adaptation Layers */ + M3UA_CLS_RESERVED4, /* Reserved for Other SIGTRAN Adaptation Layers */ + M3UA_CLS_RKM, /* Routing Key Management (RKM) Messages (M3UA) */ +}; + +/** + * Management (MGMT) messages + */ +enum { + M3UA_MGMT_ERROR, /* Error (ERR) */ + M3UA_MGMT_NTFY, /* Notify (NTFY) */ +}; + +/** + * Transfer Messages + */ +enum { + M3UA_TRANS_RESERVED, /* Reserved */ + M3UA_TRANS_DATA, /* Payload Data (DATA) */ +}; + +/** + * SS7 Signalling Network Management (SSNM) Messages + */ +enum { + M3UA_SSNM_RESERVED, /* Reserved */ + M3UA_SSNM_DUNA, /* Destination Unavailable (DUNA) */ + M3UA_SSNM_DAVA, /* Destination Available (DAVA) */ + M3UA_SSNM_DAUD, /* Destination State Audit (DAUD) */ + M3UA_SSNM_SCON, /* Signalling Congestion (SCON) */ + M3UA_SSNM_DUPU, /* Destination User Part Unavailable (DUPU) */ + M3UA_SSNM_DRST, /* Destination Restricted (DRST) */ +}; + +/** + * Application Server Process State Maintaenance (ASPSM) messages + */ +enum { + M3UA_ASPSM_RESERVED, /* Reserved */ + M3UA_ASPSM_UP, /* ASP Up (UP) */ + M3UA_ASPSM_DOWN, /* ASP Down (DOWN) */ + M3UA_ASPSM_BEAT, /* Heartbeat (BEAT) */ + M3UA_ASPSM_UP_ACK, /* ASP Up Ack (UP ACK) */ + M3UA_ASPSM_DOWN_ACK, /* ASP Down Ack (DOWN ACK) */ + M3UA_ASPSM_BEAT_ACK, /* Heartbeat Ack (BEAT ACK) */ +}; + +/** + * Application Server Process Traffic Maintaenance (ASPTM) messages. + */ +enum { + M3UA_ASPTM_RESERVED, /* Reserved */ + M3UA_ASPTM_ACTIV, /* ASP Active (ACTIVE) */ + M3UA_ASPTM_INACTIV, /* ASP Inactive (INACTIVE) */ + M3UA_ASPTM_ACTIV_ACK, /* ASP Active Ack (ACTIVE ACK) */ + M3UA_ASPTM_INACTIV_ACK, /* ASP Inactive Ack (INACTIVE ACK) */ +}; + +/** + * Routing Key Management (RKM) Messages + */ +enum { + M3UA_RKM_RESERVED, /* Reserved */ + M3UA_RKM_REG_REQ, /* Registration Request (REG REQ) */ + M3UA_RKM_REG_RSP, /* Registration Response (REG RSP) */ + M3UA_RKM_DEREG_REQ, /* Deregistration Request (DEREG REQ) */ + M3UA_RKM_DEREG_RSP, /* Deregistration Response (DEREG RSP) */ +}; + +/** + * Tag Values for M3UA + */ +enum { + M3UA_TAG_NET_APPEAR = 0x0200, /* Network Appearance */ + M3UA_TAG_RESERVED1, /* Reserved */ + M3UA_TAG_RESERVED2, /* Reserved */ + M3UA_TAG_RESERVED3, /* Reserved */ + M3UA_TAG_USER_CAUSE, /* User/Cause */ + M3UA_TAG_CONGEST_IND, /* Congestion Indications */ + M3UA_TAG_CONCERN_DEST, /* Concerned Destination */ + M3UA_TAG_ROUTING_KEY, /* Routing Key */ + M3UA_TAG_REG_RESULT, /* Registration Result */ + M3UA_TAG_DEREG_RESULT, /* Deregistration Result */ + M3UA_TAG_LOCAL_ROUT_KEY_IDENT, /* Local Routing Key Identifier */ + M3UA_TAG_DEST_PC, /* Destination Point Code */ + M3UA_TAG_SERV_IND, /* Service Indicators */ + M3UA_TAG_RESERVED4, /* Reserved */ + M3UA_TAG_ORIG_PC_LIST, /* Originating Point Code List */ + M3UA_TAG_RESERVED5, /* Reserved */ + M3UA_TAG_PROTO_DATA, /* Protocol Data */ + M3UA_TAG_RESERVED6, /* Reserved */ + M3UA_TAG_REG_STATUS, /* Registration Status */ + M3UA_TAG_DEREG_STATUS, /* Deregistration Status */ +}; diff --git a/include/sigtran/xua_types.h b/include/sigtran/xua_types.h new file mode 100644 index 0000000..7a74d91 --- /dev/null +++ b/include/sigtran/xua_types.h @@ -0,0 +1,28 @@ +#pragma once + +/** + * Common tag values used by all user adaption layers + */ +enum { + MUA_TAG_RESERVED, /* Reserved */ + MUA_TAG_IDENT_INT, /* Interface Identifier (Integer) (M2UA) */ + MUA_TAG_UNUSED1, /* Unused */ + MUA_TAG_IDENT_TEXT, /* Interface Identifier (Text) (M2UA) */ + MUA_TAG_INFO, /* Info String */ + MUA_TAG_UNUSED2, /* Unused */ + MUA_TAG_ROUTING_CTX, /* Routing Context (M3UA) */ + MUA_TAG_DIAG_INF, /* Diagnostic Information */ + MUA_TAG_IDENT_RANGE, /* Interface Identifier (Integer Range) */ + MUA_TAG_BEAT_DATA, /* Heartbeat Data */ + MUA_TAG_UNUSED4, /* Unused */ + MUA_TAG_TRA_MODE, /* Traffic Mode Type */ + MUA_TAG_ERR_CODE, /* Error Code */ + MUA_TAG_STATUS, /* Status Type/Information */ + MUA_TAG_UNUSED5, /* Unused */ + MUA_TAG_UNUSED6, /* Unused */ + MUA_TAG_UNUSED7, /* Unused */ + MUA_TAG_ASP_IDENT, /* ASP Identifier */ + MUA_TAG_AFF_PC, /* Affected Point Code (M3UA) */ + MUA_TAG_CORREL_ID, /* Correlation Id */ +}; + diff --git a/src/m2ua_msg.c b/src/m2ua_msg.c index c04586f..8e053e9 100644 --- a/src/m2ua_msg.c +++ b/src/m2ua_msg.c @@ -16,7 +16,7 @@ * */ -#include <m2ua/m2ua_msg.h> +#include <sigtran/m2ua_msg.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> diff --git a/tests/m2ua/m2ua_test.c b/tests/m2ua/m2ua_test.c index d629ad5..1699d92 100644 --- a/tests/m2ua/m2ua_test.c +++ b/tests/m2ua/m2ua_test.c @@ -15,7 +15,7 @@ * */ -#include <m2ua/m2ua_msg.h> +#include <sigtran/m2ua_msg.h> #include <osmocom/core/utils.h> #include <osmocom/core/msgb.h> |