aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bsc/osmo_bsc_sigtran.c
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-12-18 17:57:35 +0100
committerHarald Welte <laforge@gnumonks.org>2017-12-19 17:53:14 +0000
commite94d7d1bdff6cbedc2394fa2ced8151c8da35fa5 (patch)
treebf4c065ff27ea649500989d7c7cef04def616a72 /src/osmo-bsc/osmo_bsc_sigtran.c
parent3edbd0e0652e192cf2451926a25c08f8893b0423 (diff)
remove libosmo-sccp dependency for osmo-bsc
libosmo-sccp is the old sccp-lite-focused SCCP implementation that we used before libosmo-sigtran was created. The new osmo-bsc in this repository is using libosmo-sigtran and shouldn't be using parts of libosmo-sccp anymore. We only keep it around in configure.ac and Makefile.am for osmo-bsc_nat, which is not even built in this repository anymore (or 'again yet'?) Change-Id: I8f274be7d196cd7a5b1ec9ada949130fb06e984d
Diffstat (limited to 'src/osmo-bsc/osmo_bsc_sigtran.c')
-rw-r--r--src/osmo-bsc/osmo_bsc_sigtran.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index a18d4f3ad..7669b67b7 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -22,7 +22,6 @@
#include <osmocom/core/logging.h>
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/sccp_sap.h>
-#include <osmocom/sccp/sccp_types.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/core/msgb.h>
@@ -511,7 +510,8 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs)
/* If unset, use default local SCCP address */
if (!msc->a.bsc_addr.presence)
- osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp, SCCP_SSN_BSSAP);
+ osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp,
+ OSMO_SCCP_SSN_BSSAP);
if (!osmo_sccp_check_addr(&msc->a.bsc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) {
LOGP(DMSC, LOGL_ERROR,
@@ -524,7 +524,7 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs)
if (!msc->a.msc_addr.presence)
osmo_sccp_make_addr_pc_ssn(&msc->a.msc_addr,
osmo_ss7_pointcode_parse(NULL, MSC_DEFAULT_PC),
- SCCP_SSN_BSSAP);
+ OSMO_SCCP_SSN_BSSAP);
if (!osmo_sccp_check_addr(&msc->a.msc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) {
LOGP(DMSC, LOGL_ERROR,