use osmo_sccp_inst_addr_name() instead of looking up ss7

Depends: libosmo-sccp I70ec5c8b42682a23f11a5820431c7e34e225709b
Change-Id: Idb451597c724ac87a391121cebd0b0a927dd49d1
This commit is contained in:
Neels Hofmeyr 2017-11-08 02:39:03 +01:00 committed by Neels Hofmeyr
parent 46e87509c5
commit 7c980544f8
1 changed files with 4 additions and 8 deletions

View File

@ -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);