diff options
| author | Harald Welte <laforge@gnumonks.org> | 2015-12-26 08:42:07 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2015-12-26 08:42:07 +0100 |
| commit | 8c572fee2a123344b698e42aba779a490a7be453 (patch) | |
| tree | d8f1ed79744578ed359749b505997af80e6dccac /src/sccp_helpers.c | |
| parent | efef6fb4deedbfdc61e6aa2ca9f8e8625532bfc5 (diff) | |
use libosmocore SCCP_SSN_RANAP definition
Diffstat (limited to 'src/sccp_helpers.c')
| -rw-r--r-- | src/sccp_helpers.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index ca580ea..cdb26e7 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -25,6 +25,13 @@ #include "sccp_helpers.h" +void sccp_make_addr_pc_ssn(struct osmo_sccp_addr *addr, uint32_t pc, uint32_t ssn) +{ + addr->presence = OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC; + addr->ssn = ssn; + addr->pc = pc; +} + int sccp_tx_unitdata(struct osmo_sua_link *link, const struct osmo_sccp_addr *calling_addr, const struct osmo_sccp_addr *called_addr, @@ -36,8 +43,8 @@ int sccp_tx_unitdata(struct osmo_sua_link *link, prim = (struct osmo_scu_prim *) msgb_put(msg, sizeof(*prim)); param = &prim->u.unitdata; - param->calling_addr.presence = OSMO_SCCP_ADDR_T_SSN; - param->called_addr.presence = OSMO_SCCP_ADDR_T_SSN; + sccp_make_addr_pc_ssn(¶m->calling_addr, 1, OSMO_SCCP_SSN_RANAP); + sccp_make_addr_pc_ssn(¶m->called_addr, 2, OSMO_SCCP_SSN_RANAP); osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST, msg); msg->l2h = msgb_put(msg, len); @@ -60,15 +67,6 @@ int sccp_tx_unitdata_msg(struct osmo_sua_link *link, return rc; } - -#define SSN_RANAP 142 -void sccp_make_addr_pc_ssn(struct osmo_sccp_addr *addr, uint32_t pc, uint32_t ssn) -{ - addr->presence = OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC; - addr->ssn = ssn; - addr->pc = pc; -} - int sccp_tx_conn_req(struct osmo_sua_link *link, uint32_t conn_id, const struct osmo_sccp_addr *calling_addr, const struct osmo_sccp_addr *called_addr, @@ -81,7 +79,7 @@ int sccp_tx_conn_req(struct osmo_sua_link *link, uint32_t conn_id, osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST, msg); - sccp_make_addr_pc_ssn(&prim->u.connect.calling_addr, 1, SSN_RANAP); + sccp_make_addr_pc_ssn(&prim->u.connect.calling_addr, 1, OSMO_SCCP_SSN_RANAP); prim->u.connect.sccp_class = 2; prim->u.connect.conn_id = conn_id; |