aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-11-08 02:39:03 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-11-10 23:36:12 +0000
commit7c980544f8ecd62a9ae52c737410d8a861a7c65e (patch)
treef2abb774239fa91cddc21c847048702fbf1ebf22
parent46e87509c555cd15f1bf10b6ec0fc1aae2b90376 (diff)
use osmo_sccp_inst_addr_name() instead of looking up ss7
-rw-r--r--src/osmo-bsc/osmo_bsc_sigtran.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 253f1e866..a18d4f3ad 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -516,8 +516,7 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs)
if (!osmo_sccp_check_addr(&msc->a.bsc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) {
LOGP(DMSC, LOGL_ERROR,
"(%s) A-interface: invalid local (BSC) SCCP address: %s\n",
- msc_name,
- osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), &msc->a.bsc_addr));
+ msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.bsc_addr));
return -EINVAL;
}
@@ -530,17 +529,14 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs)
if (!osmo_sccp_check_addr(&msc->a.msc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) {
LOGP(DMSC, LOGL_ERROR,
"(%s) A-interface: invalid remote (MSC) SCCP address: %s\n",
- msc_name,
- osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), &msc->a.msc_addr));
+ msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.msc_addr));
return -EINVAL;
}
LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: local (BSC) SCCP address: %s\n",
- msc_name,
- osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), &msc->a.bsc_addr));
+ msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.bsc_addr));
LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: remote (MSC) SCCP address: %s\n",
- msc_name,
- osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), &msc->a.msc_addr));
+ msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.msc_addr));
/* Bind SCCP user */
msc->a.sccp_user = osmo_sccp_user_bind(msc->a.sccp, msc_name, sccp_sap_up, msc->a.bsc_addr.ssn);